[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/cus-edit.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/cus-edit.el,v |
Date: |
Sun, 16 Nov 2008 23:27:41 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/11/16 23:27:41
Index: cus-edit.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cus-edit.el,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -b -r1.358 -r1.359
--- cus-edit.el 11 Nov 2008 00:28:10 -0000 1.358
+++ cus-edit.el 16 Nov 2008 23:27:41 -0000 1.359
@@ -741,8 +741,7 @@
;;; Custom Mode Commands.
;; This variable is used by `custom-tool-bar-map', or directly by
-;; `custom-buffer-create-internal' if the toolbar is not present and
-;; `custom-buffer-verbose-help' is non-nil.
+;; `custom-buffer-create-internal' if `custom-buffer-verbose-help' is non-nil.
(defvar custom-commands
'(("Set for current session" Custom-set t
@@ -1582,11 +1581,15 @@
:help-echo "Read the Emacs manual."
"(emacs)Top")
(widget-insert "."))
- ;; Insert custom command buttons if the toolbar is not in use.
-
(widget-insert "\n")
- ;; tool-bar is not dumped in builds without x.
- (when (not (and (bound-and-true-p tool-bar-mode) (display-graphic-p)))
+ ;; The custom command buttons are also in the toolbar, so for a
+ ;; time they were not inserted in the buffer if the toolbar was in use.
+ ;; But it can be a little confusing for the buffer layout to
+ ;; change according to whether or nor the toolbar is on, not to
+ ;; mention that a custom buffer can in theory be created in a
+ ;; frame with a toolbar, then later viewed in one without.
+ ;; So now the buttons are always inserted in the buffer. (Bug#1326)
+;;; (when (not (and (bound-and-true-p tool-bar-mode) (display-graphic-p)))
(if custom-buffer-verbose-help
(widget-insert "\n
Operate on all settings in this buffer that are not marked HIDDEN:\n"))
@@ -1612,7 +1615,7 @@
(apply button (pop commands)) ; Erase customization
(widget-insert " ")
(pop commands) ; Help (omitted)
- (apply button (pop commands))))) ; Exit
+ (apply button (pop commands)))) ; Exit
(widget-insert "\n\n"))
;; Now populate the custom buffer.
- [Emacs-diffs] Changes to emacs/lisp/cus-edit.el,v, Glenn Morris, 2008/11/05
- [Emacs-diffs] Changes to emacs/lisp/cus-edit.el,v, Glenn Morris, 2008/11/05
- [Emacs-diffs] Changes to emacs/lisp/cus-edit.el,v, Chong Yidong, 2008/11/10
- [Emacs-diffs] Changes to emacs/lisp/cus-edit.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/cus-edit.el,v, Chong Yidong, 2008/11/17