Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
90750:f8cc067aba62 | 90751:52a7f3f50b89 |
---|---|
71 or macro definition or a defcustom)." | 71 or macro definition or a defcustom)." |
72 (let ((car (car-safe form)) expand) | 72 (let ((car (car-safe form)) expand) |
73 (cond | 73 (cond |
74 ;; For complex cases, try again on the macro-expansion. | 74 ;; For complex cases, try again on the macro-expansion. |
75 ((and (memq car '(easy-mmode-define-global-mode define-global-minor-mode | 75 ((and (memq car '(easy-mmode-define-global-mode define-global-minor-mode |
76 define-globalized-minor-mode | |
76 easy-mmode-define-minor-mode define-minor-mode)) | 77 easy-mmode-define-minor-mode define-minor-mode)) |
77 (setq expand (let ((load-file-name file)) (macroexpand form))) | 78 (setq expand (let ((load-file-name file)) (macroexpand form))) |
78 (eq (car expand) 'progn) | 79 (eq (car expand) 'progn) |
79 (memq :autoload-end expand)) | 80 (memq :autoload-end expand)) |
80 (let ((end (memq :autoload-end expand))) | 81 (let ((end (memq :autoload-end expand))) |
86 | 87 |
87 ;; For special function-like operators, use the `autoload' function. | 88 ;; For special function-like operators, use the `autoload' function. |
88 ((memq car '(defun define-skeleton defmacro define-derived-mode | 89 ((memq car '(defun define-skeleton defmacro define-derived-mode |
89 define-compilation-mode define-generic-mode | 90 define-compilation-mode define-generic-mode |
90 easy-mmode-define-global-mode define-global-minor-mode | 91 easy-mmode-define-global-mode define-global-minor-mode |
92 define-globalized-minor-mode | |
91 easy-mmode-define-minor-mode define-minor-mode | 93 easy-mmode-define-minor-mode define-minor-mode |
92 defun* defmacro*)) | 94 defun* defmacro*)) |
93 (let* ((macrop (memq car '(defmacro defmacro*))) | 95 (let* ((macrop (memq car '(defmacro defmacro*))) |
94 (name (nth 1 form)) | 96 (name (nth 1 form)) |
95 (args (case car | 97 (args (case car |
108 (list 'autoload (if (listp name) name (list 'quote name)) file doc | 110 (list 'autoload (if (listp name) name (list 'quote name)) file doc |
109 (or (and (memq car '(define-skeleton define-derived-mode | 111 (or (and (memq car '(define-skeleton define-derived-mode |
110 define-generic-mode | 112 define-generic-mode |
111 easy-mmode-define-global-mode | 113 easy-mmode-define-global-mode |
112 define-global-minor-mode | 114 define-global-minor-mode |
115 define-globalized-minor-mode | |
113 easy-mmode-define-minor-mode | 116 easy-mmode-define-minor-mode |
114 define-minor-mode)) t) | 117 define-minor-mode)) t) |
115 (eq (car-safe (car body)) 'interactive)) | 118 (eq (car-safe (car body)) 'interactive)) |
116 (if macrop (list 'quote 'macro) nil)))) | 119 (if macrop (list 'quote 'macro) nil)))) |
117 | 120 |