Mercurial > emacs
diff lisp/emacs-lisp/autoload.el @ 90751:52a7f3f50b89
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 624-636)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 200-201)
- Merge from emacs--devo--0
- Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-171
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 13 Feb 2007 12:14:16 +0000 |
| parents | 95d0cdf160ea a70527c58a3f |
| children | 03ec96a627ba |
line wrap: on
line diff
--- a/lisp/emacs-lisp/autoload.el Mon Feb 12 02:58:27 2007 +0000 +++ b/lisp/emacs-lisp/autoload.el Tue Feb 13 12:14:16 2007 +0000 @@ -73,6 +73,7 @@ (cond ;; For complex cases, try again on the macro-expansion. ((and (memq car '(easy-mmode-define-global-mode define-global-minor-mode + define-globalized-minor-mode easy-mmode-define-minor-mode define-minor-mode)) (setq expand (let ((load-file-name file)) (macroexpand form))) (eq (car expand) 'progn) @@ -88,6 +89,7 @@ ((memq car '(defun define-skeleton defmacro define-derived-mode define-compilation-mode define-generic-mode easy-mmode-define-global-mode define-global-minor-mode + define-globalized-minor-mode easy-mmode-define-minor-mode define-minor-mode defun* defmacro*)) (let* ((macrop (memq car '(defmacro defmacro*))) @@ -110,6 +112,7 @@ define-generic-mode easy-mmode-define-global-mode define-global-minor-mode + define-globalized-minor-mode easy-mmode-define-minor-mode define-minor-mode)) t) (eq (car-safe (car body)) 'interactive))