From: Stefan Monnier Date: Sun, 7 Oct 2012 15:15:16 +0000 (-0400) Subject: * lisp/emacs-lisp/autoload.el (make-autoload): Add `cl-defmacro' to the X-Git-Tag: emacs-24.2.90~237^2~81 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13af0d109fc8d2595c0f9f103993e27690f616a3;p=emacs.git * 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 c7fd6eaf2b6..132cea20bdc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,12 @@ +2012-10-07 Stefan Monnier + + * emacs-lisp/autoload.el (make-autoload): Add `cl-defmacro' to the + forms that define macros (bug#12593). + 2012-10-07 Kenichi Handa - * 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 diff --git a/lisp/comint.el b/lisp/comint.el index fea9cecfa03..080b12e0cdf 100644 --- 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 e6e2d1e60e0..382e25f3121 100644 --- 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