[Emacs-diffs] /srv/bzr/emacs/trunk r103720: lisp/emacs-lisp/derived.el: Don't warn about keymaps already `defconst'ed.

[Juanma Barranquero]

------------------------------------------------------------
revno: 103720
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2011-03-22 21:58:27 +0100
message:
  lisp/emacs-lisp/derived.el: Don't warn about keymaps already `defconst'ed.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/derived.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-22 15:38:40 +0000
+++ b/lisp/ChangeLog    2011-03-22 20:58:27 +0000
@@ -1,3 +1,9 @@
+2011-03-22  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * abbrev.el (write-abbrev-file): Use utf-8 for writing if it can

=== modified file 'lisp/emacs-lisp/derived.el'
--- a/lisp/emacs-lisp/derived.el        2011-01-25 04:08:28 +0000
+++ b/lisp/emacs-lisp/derived.el        2011-03-22 20:58:27 +0000
@@ -201,7 +201,7 @@
                       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))))