aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-04-25 16:38:11 +0800
committerChong Yidong2012-04-25 16:38:11 +0800
commit1fc6097bfa931cf17f8a5b76ec8442e22d33c724 (patch)
treed8b32d18b6f229ff6434941d0c6047a4bf8999fc
parentafc6df87865adae50b4ad2eea12d0771a144ee06 (diff)
downloademacs-1fc6097bfa931cf17f8a5b76ec8442e22d33c724.tar.gz
emacs-1fc6097bfa931cf17f8a5b76ec8442e22d33c724.zip
* cus-edit.el (custom-buffer-create-internal): Update header text.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/cus-edit.el11
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e93cd07bda0..76b855e6bc9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-04-25 Chong Yidong <cyd@gnu.org>
2
3 * cus-edit.el (custom-buffer-create-internal): Update header text.
4
12012-04-25 Eli Zaretskii <eliz@gnu.org> 52012-04-25 Eli Zaretskii <eliz@gnu.org>
2 6
3 * progmodes/gdb-mi.el (gdb-init-1): Condition Windows-specific 7 * progmodes/gdb-mi.el (gdb-init-1): Condition Windows-specific
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 4a003f2d043..8198a4594c4 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1591,13 +1591,12 @@ Otherwise use brackets."
1591 (let ((init-file (or custom-file user-init-file))) 1591 (let ((init-file (or custom-file user-init-file)))
1592 ;; Insert verbose help at the top of the custom buffer. 1592 ;; Insert verbose help at the top of the custom buffer.
1593 (when custom-buffer-verbose-help 1593 (when custom-buffer-verbose-help
1594 (widget-insert (if init-file 1594 (unless init-file
1595 "To apply changes, use the Save or Set buttons." 1595 (widget-insert "Custom settings cannot be saved; maybe you started Emacs with `-q'.\n"))
1596 "Custom settings cannot be saved; maybe you started Emacs with `-q'.") 1596 (widget-insert "For help using this buffer, see ")
1597 "\nFor details, see ")
1598 (widget-create 'custom-manual 1597 (widget-create 'custom-manual
1599 :tag "Saving Customizations" 1598 :tag "Easy Customization"
1600 "(emacs)Saving Customizations") 1599 "(emacs)Easy Customization")
1601 (widget-insert " in the ") 1600 (widget-insert " in the ")
1602 (widget-create 'custom-manual 1601 (widget-create 'custom-manual
1603 :tag "Emacs manual" 1602 :tag "Emacs manual"