diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-22 17:24:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-22 17:24:09 -0700 |
| commit | 2c520ab5fb6054f0f54804301e36d519387ccbab (patch) | |
| tree | 0ec880a6bd0d3b82ea93caa1802601f31f2f7e67 /lisp/emacs-lisp | |
| parent | 8af8e70ee535bd2d657a034e1452f78925c9ca38 (diff) | |
| parent | 9d0da923ebd2b78abb6e02f0b90cfe9d818eb301 (diff) | |
| download | emacs-2c520ab5fb6054f0f54804301e36d519387ccbab.tar.gz emacs-2c520ab5fb6054f0f54804301e36d519387ccbab.tar.bz2 emacs-2c520ab5fb6054f0f54804301e36d519387ccbab.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/derived.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 425a77ee77f..1db98ac39c8 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -201,7 +201,7 @@ No problems result if this variable is not bound. name)))) (unless (boundp ',map) (put ',map 'definition-name ',child)) - (defvar ,map (make-sparse-keymap)) + (with-no-warnings (defvar ,map (make-sparse-keymap))) (unless (get ',map 'variable-documentation) (put ',map 'variable-documentation (purecopy ,(format "Keymap for `%s'." child)))) |