Merge from mainline.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b7dd5a0463..e508174e118 100644
--- 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 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))))