* lisp/emacs-lisp/autoload.el (make-autoload): Add `cl-defmacro' to the

forms that define macros.

Fixes: debbugs:12593

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7fd6eaf2b6801ca66f8326b4c88fd7a90f838a7..132cea20bdcfb2d4225e9f04f5484c97335f0f5b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
+2012-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/autoload.el (make-autoload): Add `cl-defmacro' to the
+       forms that define macros (bug#12593).
+
 2012-10-07  Kenichi Handa  <handa@gnu.org>
 
-       * 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  <smerten@oekonux.de>
 

diff --git a/lisp/comint.el b/lisp/comint.el
index fea9cecfa033e82084b4aecf2dd480d704327392..080b12e0cdf29a637564273dbe4883213fd817a4 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2783,11 +2783,8 @@ the load or compile."
     (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."

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index e6e2d1e60e0a7ddf19b49a49be26f20f99fb576c..382e25f31217cb5104b47279e985b88c77388673 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -153,7 +153,7 @@ expression, in which case we want to handle forms differently."
                   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