[Emacs-diffs] /srv/bzr/emacs/trunk r110424: * lisp/emacs-lisp/autoload.el (make-autoload): Add `cl-defmacro' to the

[Stefan Monnier]

------------------------------------------------------------
revno: 110424
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12593
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-07 11:15:16 -0400
message:
  * lisp/emacs-lisp/autoload.el (make-autoload): Add `cl-defmacro' to the
  forms that define macros.
modified:
  lisp/ChangeLog
  lisp/comint.el
  lisp/emacs-lisp/autoload.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-07 13:09:35 +0000
+++ b/lisp/ChangeLog    2012-10-07 15:15:16 +0000
@@ -1,7 +1,12 @@
+2012-10-07  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/autoload.el (make-autoload): Add `cl-defmacro' to the
+       forms that define macros (bug#12593).
+
 2012-10-07  Kenichi Handa  <address@hidden>
 
-       * international/mule-conf.el (compound-text-with-extensions): Add
-       :mime-charset property as x-ctext.
+       * international/mule-conf.el (compound-text-with-extensions):
+       Add :mime-charset property as x-ctext.
 
 2012-10-07  Stefan Merten  <address@hidden>
 

=== modified file 'lisp/comint.el'
--- a/lisp/comint.el    2012-09-25 04:13:02 +0000
+++ b/lisp/comint.el    2012-10-07 15:15:16 +0000
@@ -2783,11 +2783,8 @@
     (if (and buff
             (buffer-modified-p buff)
             (y-or-n-p (format "Save buffer %s first? " (buffer-name buff))))
-       ;; save BUFF.
-       (let ((old-buffer (current-buffer)))
-         (set-buffer buff)
-         (save-buffer)
-         (set-buffer old-buffer)))))
+        (with-current-buffer buff
+         (save-buffer)))))
 
 (defun comint-extract-string ()
   "Return string around point, or nil."

=== modified file 'lisp/emacs-lisp/autoload.el'
--- a/lisp/emacs-lisp/autoload.el       2012-08-11 02:12:12 +0000
+++ b/lisp/emacs-lisp/autoload.el       2012-10-07 15:15:16 +0000
@@ -153,7 +153,7 @@
                   easy-mmode-define-minor-mode define-minor-mode
                   cl-defun defun* cl-defmacro defmacro*
                    define-overloadable-function))
-      (let* ((macrop (memq car '(defmacro defmacro*)))
+      (let* ((macrop (memq car '(defmacro cl-defmacro defmacro*)))
             (name (nth 1 form))
             (args (pcase car
                      ((or `defun `defmacro