aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-06-21 23:01:01 +0000
committerGlenn Morris2008-06-21 23:01:01 +0000
commit210c6549fa0f26f510e4cd4fc774f944d84f37d7 (patch)
tree03217f0133be72b54f63549dc7b5bc2127e53f85
parente8f28744e2074a4a8821a19c956c97c0068005dd (diff)
downloademacs-210c6549fa0f26f510e4cd4fc774f944d84f37d7.tar.gz
emacs-210c6549fa0f26f510e4cd4fc774f944d84f37d7.zip
(easy-mmode-set-keymap-parents): Evaluate definition when compiling.
-rw-r--r--lisp/emacs-lisp/easy-mmode.el23
1 files changed, 12 insertions, 11 deletions
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 92b314c4110..f2b467383d6 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -388,17 +388,18 @@ See `%s' for more information on %s."
388;;; easy-mmode-defmap 388;;; easy-mmode-defmap
389;;; 389;;;
390 390
391(if (fboundp 'set-keymap-parents) 391(eval-and-compile
392 (defalias 'easy-mmode-set-keymap-parents 'set-keymap-parents) 392 (if (fboundp 'set-keymap-parents)
393 (defun easy-mmode-set-keymap-parents (m parents) 393 (defalias 'easy-mmode-set-keymap-parents 'set-keymap-parents)
394 (set-keymap-parent 394 (defun easy-mmode-set-keymap-parents (m parents)
395 m 395 (set-keymap-parent
396 (cond 396 m
397 ((not (consp parents)) parents) 397 (cond
398 ((not (cdr parents)) (car parents)) 398 ((not (consp parents)) parents)
399 (t (let ((m (copy-keymap (pop parents)))) 399 ((not (cdr parents)) (car parents))
400 (easy-mmode-set-keymap-parents m parents) 400 (t (let ((m (copy-keymap (pop parents))))
401 m)))))) 401 (easy-mmode-set-keymap-parents m parents)
402 m)))))))
402 403
403;;;###autoload 404;;;###autoload
404(defun easy-mmode-define-keymap (bs &optional name m args) 405(defun easy-mmode-define-keymap (bs &optional name m args)