diff options
| author | Kenichi Handa <handa@m17n.org> | 2012-02-02 09:32:12 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2012-02-02 09:32:12 +0900 |
| commit | 159462d4d179b280c6e68775bbf0630c3317c486 (patch) | |
| tree | 2b902518bae6f1b373fe2a21f564a5ff23210a09 /lisp/emacs-lisp | |
| parent | d2a51fd7a1d5d3c8f661c2068120b60e84eca875 (diff) | |
| parent | efc708ecadac41bad29d6ed002af7dccaccc5a97 (diff) | |
| download | emacs-159462d4d179b280c6e68775bbf0630c3317c486.tar.gz emacs-159462d4d179b280c6e68775bbf0630c3317c486.tar.bz2 emacs-159462d4d179b280c6e68775bbf0630c3317c486.zip | |
merge trunk
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index efd5ee45d9b..d871f6f1212 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -182,15 +182,9 @@ For example, you could write (:require (setq require (pop body))) (:keymap (setq keymap (pop body))) (:variable (setq variable (pop body)) - (setq tmp (cdr-safe variable)) - (if (not (or (functionp tmp) - (and tmp - (symbolp tmp) - ;; Hack to allow for named functions not within - ;; eval-when-compile. - ;; Cf define-compilation-mode. - (boundp 'byte-compile-function-environment) - (assq tmp byte-compile-function-environment)))) + (if (not (and (setq tmp (cdr-safe variable)) + (or (symbolp tmp) + (functionp tmp)))) ;; PLACE is not of the form (GET . SET). (setq mode variable) (setq mode (car variable)) |