From: Neil Jerram <neil@ossau.uklinux.net>
Date: Fri, 21 Aug 2009 21:04:03 +0000 (+0100)
Subject: Merge branch 'wip-manual' of ssh://ossau@git.sv.gnu.org/srv/git/guile
X-Git-Url: https://git.hcoop.net/bpt/guile.git/commitdiff_plain/5f5f251895818a8dec3acfc3832012088d07a7ee

Merge branch 'wip-manual' of ssh://ossau@git.sv.gnu.org/srv/git/guile

Conflicts:

	doc/ref/autoconf.texi
	doc/ref/vm.texi
---

5f5f251895818a8dec3acfc3832012088d07a7ee
diff --cc doc/ref/vm.texi
index 04a3b7949,28fa43b1b..43b265596
--- a/doc/ref/vm.texi
+++ b/doc/ref/vm.texi
@@@ -308,19 -297,19 +308,19 @@@ scheme@@(guile-user)> (define (foo a) (
  scheme@@(guile-user)> ,x foo
  Disassembly of #<program foo (a)>:
  
-    0    (object-ref 1)                  ;; #<program b7e478b0 at <unknown port>:0:16 (b)>
-    2    (local-ref 0)                   ;; `a' (arg)
-    4    (vector 0 1)                    ;; 1 element
 -   0    (local-ref 0)           ;; `a' (arg)
 -   2    (external-set 0)        ;; `a' (arg)
 -   4    (object-ref 1)          ;; #<program b70d2910 at <unknown port>:0:16 (b)>
 -   6    (make-closure)                  
 -   7    (return)                        
++   0    (object-ref 1)          ;; #<program b7e478b0 at <unknown port>:0:16 (b)>
++   2    (local-ref 0)           ;; `a' (arg)
++   4    (vector 0 1)            ;; 1 element
 +   7    (make-closure)                  
 +   8    (return)                        
  
  ----------------------------------------
 -Disassembly of #<program b70d2910 at <unknown port>:0:16 (b)>:
 +Disassembly of #<program b7e478b0 at <unknown port>:0:16 (b)>:
  
-    0    (toplevel-ref 1)                ;; `foo'
-    2    (free-ref 0)                    ;; (closure variable)
-    4    (local-ref 0)                   ;; `b' (arg)
-    6    (list 0 3)                      ;; 3 elements         at (unknown file):0:28
+    0    (toplevel-ref 1)        ;; `foo'
 -   2    (external-ref 0)        ;; (closure variable)
++   2    (free-ref 0)            ;; (closure variable)
+    4    (local-ref 0)           ;; `b' (arg)
+    6    (list 0 3)              ;; 3 elements         at (unknown file):0:28
     9    (return)                        
  @end smallexample