From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 28 Aug 2011 19:05:26 +0000 (-0400)
Subject: Make custom-theme-choose-mode inherit from special-mode.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~45
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b9696605a311d77c32139aeb0dcce021cd8d05c4;p=emacs.git

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.

Fixes: debbugs:9124
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d4470a7f87..a6a81ff0fb2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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  <acm@muc.de>
 
 	* progmodes/cc-fonts.el
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 04a9e728b22..1f33c3e8256 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -521,7 +521,8 @@ It includes all faces in list FACES."
 
 (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 @@ It includes all faces in list FACES."
     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)