lisp/emacs-lisp/derived.el: Don't warn about keymaps already `defconst'ed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b7dd5a046311aa160e120eecf6c667d81efca23..e508174e118156fb967813bf4e8be2fd5bfd6ddd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-22  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacs-lisp/derived.el (define-derived-mode): Wrap declaration of
+       keymap variable in `with-no-warnings' to avoid a warning when the
+       keymap has been already `defconst'ed.
+
 2011-03-22  Leo Liu  <sdl.web@gmail.com>
 
        * abbrev.el (write-abbrev-file): Use utf-8 for writing if it can

diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 425a77ee77fd13d4c9fb275c1743bfad435d0f3c..1db98ac39c8ba67ccefcdf239f1db68518921e0b 100644 (file)
--- 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))))