[Emacs-diffs] /srv/bzr/emacs/trunk r105602: Make custom-theme-choose-mode inherit from special-mode.

[Chong Yidong]

------------------------------------------------------------
revno: 105602
fixes bug(s): http://debbugs.gnu.org/9124
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-08-28 15:05:26 -0400
message:
  Make custom-theme-choose-mode inherit from special-mode.
  
  * lisp/cus-theme.el (custom-theme-choose-mode): Inherit from special-mode.
  (custom-theme-choose-mode-map): Add special-mode to parent.
modified:
  lisp/ChangeLog
  lisp/cus-theme.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-28 18:58:16 +0000
+++ b/lisp/ChangeLog    2011-08-28 19:05:26 +0000
@@ -11,6 +11,10 @@
 
        * server.el (server-port): Doc fix.
 
+       * cus-theme.el (custom-theme-choose-mode): Inherit from
+       special-mode (Bug#9124).
+       (custom-theme-choose-mode-map): Add special-mode to parent.
+
 2011-08-28  Alan Mackenzie  <address@hidden>
 
        * progmodes/cc-fonts.el

=== modified file 'lisp/cus-theme.el'
--- a/lisp/cus-theme.el 2011-06-30 01:39:52 +0000
+++ b/lisp/cus-theme.el 2011-08-28 19:05:26 +0000
@@ -521,7 +521,8 @@
 
 (defvar custom-theme-choose-mode-map
   (let ((map (make-keymap)))
-    (set-keymap-parent map widget-keymap)
+    (set-keymap-parent map (make-composed-keymap widget-keymap
+                                                special-mode-map))
     (suppress-keymap map)
     (define-key map "\C-x\C-s" 'custom-theme-save)
     (define-key map "n" 'widget-forward)
@@ -530,7 +531,7 @@
     map)
   "Keymap for `custom-theme-choose-mode'.")
 
-(define-derived-mode custom-theme-choose-mode nil "Themes"
+(define-derived-mode custom-theme-choose-mode special-mode "Themes"
   "Major mode for selecting Custom themes.
 Do not call this mode function yourself.  It is meant for internal use."
   (use-local-map custom-theme-choose-mode-map)