aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Rost2003-01-02 18:02:09 +0000
committerMarkus Rost2003-01-02 18:02:09 +0000
commitb59b77f1367306842213a2300c62fa24cea49fb8 (patch)
treee5fb04e937b1644ba5e797d9c70a3b37f225f361
parent0e5ddee193d9a944304e025d0956e490bf0b1adb (diff)
downloademacs-b59b77f1367306842213a2300c62fa24cea49fb8.tar.gz
emacs-b59b77f1367306842213a2300c62fa24cea49fb8.zip
(customize-group, customize-group-other-window):
Call custom-load-symbol unconditionally. (customize-face, customize-face-other-window): Fix format arg.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/cus-edit.el10
2 files changed, 10 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09ceed9a897..522fa2fe9ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12003-01-02 Markus Rost <rost@math.ohio-state.edu>
2
3 * cus-edit.el (customize-group, customize-group-other-window):
4 Call custom-load-symbol unconditionally.
5 (customize-face, customize-face-other-window): Fix format arg.
6
12003-01-02 John Paul Wallington <jpw@shootybangbang.com> 72003-01-02 John Paul Wallington <jpw@shootybangbang.com>
2 8
3 * menu-bar.el (menu-bar-left-scroll-bar): Set `scroll-bar-mode' 9 * menu-bar.el (menu-bar-left-scroll-bar): Set `scroll-bar-mode'
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 4369437a136..e8eded3b1af 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -878,8 +878,7 @@ then prompt for the MODE to customize."
878 (if (string-equal "" group) 878 (if (string-equal "" group)
879 (setq group 'emacs) 879 (setq group 'emacs)
880 (setq group (intern group)))) 880 (setq group (intern group))))
881 (or (get group 'custom-group) 881 (custom-load-symbol group)
882 (custom-load-symbol group))
883 (let ((name (format "*Customize Group: %s*" 882 (let ((name (format "*Customize Group: %s*"
884 (custom-unlispify-tag-name group)))) 883 (custom-unlispify-tag-name group))))
885 (if (get-buffer name) 884 (if (get-buffer name)
@@ -903,8 +902,7 @@ then prompt for the MODE to customize."
903 (if (string-equal "" group) 902 (if (string-equal "" group)
904 (setq group 'emacs) 903 (setq group 'emacs)
905 (setq group (intern group)))) 904 (setq group (intern group))))
906 (or (get group 'custom-group) 905 (custom-load-symbol group)
907 (custom-load-symbol group))
908 (let ((name (format "*Customize Group: %s*" 906 (let ((name (format "*Customize Group: %s*"
909 (custom-unlispify-tag-name group)))) 907 (custom-unlispify-tag-name group))))
910 (if (get-buffer name) 908 (if (get-buffer name)
@@ -1082,7 +1080,7 @@ suggest to customized that face, if it's customizable."
1082 t nil) 1080 t nil)
1083 "*Customize Faces*") 1081 "*Customize Faces*")
1084 (unless (facep face) 1082 (unless (facep face)
1085 (error "Invalid face %S")) 1083 (error "Invalid face %S" face))
1086 (custom-buffer-create (list (list face 'custom-face)) 1084 (custom-buffer-create (list (list face 'custom-face))
1087 (format "*Customize Face: %s*" 1085 (format "*Customize Face: %s*"
1088 (custom-unlispify-tag-name face))))) 1086 (custom-unlispify-tag-name face)))))
@@ -1108,7 +1106,7 @@ suggest to customized that face, if it's customizable."
1108 t nil) 1106 t nil)
1109 "*Customize Faces*") 1107 "*Customize Faces*")
1110 (unless (facep face) 1108 (unless (facep face)
1111 (error "Invalid face %S")) 1109 (error "Invalid face %S" face))
1112 (custom-buffer-create-other-window 1110 (custom-buffer-create-other-window
1113 (list (list face 'custom-face)) 1111 (list (list face 'custom-face))
1114 (format "*Customize Face: %s*" 1112 (format "*Customize Face: %s*"