diff options
| author | Glenn Morris | 2017-04-19 16:28:48 -0400 |
|---|---|---|
| committer | Glenn Morris | 2017-04-19 16:28:48 -0400 |
| commit | 41a5b76f79e2ef12a089e94406159e2d0e1fad1f (patch) | |
| tree | dc8546dd518c369fa7b209bf7ec6c01527ca8734 | |
| parent | 3533623c4a007df80d57fe2dbc47d7e40d85041c (diff) | |
| download | emacs-41a5b76f79e2ef12a089e94406159e2d0e1fad1f.tar.gz emacs-41a5b76f79e2ef12a089e94406159e2d0e1fad1f.zip | |
Stop cl-lib loading pcase at runtime
The cause was an unexpanded pcase-defmacro in cl-loaddefs.
* lisp/emacs-lisp/autoload.el (make-autoload):
Treat pcase-defmacro like defmacro.
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index d1f3c359f37..90e6aec4e75 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el | |||
| @@ -164,7 +164,8 @@ expression, in which case we want to handle forms differently." | |||
| 164 | ((and (memq car '(easy-mmode-define-global-mode define-global-minor-mode | 164 | ((and (memq car '(easy-mmode-define-global-mode define-global-minor-mode |
| 165 | define-globalized-minor-mode defun defmacro | 165 | define-globalized-minor-mode defun defmacro |
| 166 | easy-mmode-define-minor-mode define-minor-mode | 166 | easy-mmode-define-minor-mode define-minor-mode |
| 167 | define-inline cl-defun cl-defmacro cl-defgeneric)) | 167 | define-inline cl-defun cl-defmacro cl-defgeneric |
| 168 | pcase-defmacro)) | ||
| 168 | (macrop car) | 169 | (macrop car) |
| 169 | (setq expand (let ((load-file-name file)) (macroexpand form))) | 170 | (setq expand (let ((load-file-name file)) (macroexpand form))) |
| 170 | (memq (car expand) '(progn prog1 defalias))) | 171 | (memq (car expand) '(progn prog1 defalias))) |