[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/bytecomp.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/08/23 19:58:32

Index: emacs-lisp/bytecomp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/bytecomp.el,v
retrieving revision 2.205
retrieving revision 2.206
diff -u -b -r2.205 -r2.206
--- emacs-lisp/bytecomp.el      21 Aug 2007 15:53:38 -0000      2.205
+++ emacs-lisp/bytecomp.el      23 Aug 2007 19:58:31 -0000      2.206
@@ -2037,9 +2037,7 @@
   ;; We need to examine byte-compile-dynamic-docstrings
   ;; in the input buffer (now current), not in the output buffer.
   (let ((dynamic-docstrings byte-compile-dynamic-docstrings))
-    (set-buffer
-     (prog1 (current-buffer)
-       (set-buffer outbuffer)
+    (with-current-buffer outbuffer
        (let (position)
 
         ;; Insert the doc string, and make it a comment with address@hidden
@@ -2115,7 +2113,7 @@
                        (goto-char (point-max)))))
                   (t
                    (prin1 (car form) outbuffer)))))
-        (insert (nth 2 info))))))
+        (insert (nth 2 info)))))
   nil)
 
 (defun byte-compile-keep-pending (form &optional handler)
@@ -2401,9 +2399,7 @@
 ;; If QUOTED is non-nil, print with quoting; otherwise, print without quoting.
 (defun byte-compile-output-as-comment (exp quoted)
   (let ((position (point)))
-    (set-buffer
-     (prog1 (current-buffer)
-       (set-buffer outbuffer)
+    (with-current-buffer outbuffer
 
        ;; Insert EXP, and make it a comment with address@hidden
        (insert " ")
@@ -2433,7 +2429,7 @@
        ;; and subtract 1 to convert from an 1-origin Emacs position
        ;; to a file position; they cancel.
        (setq position (point))
-       (goto-char (point-max))))
+      (goto-char (point-max)))
     position))