Mercurial > emacs

diff lisp/cus-edit.el @ 91040:14c4a6aac623

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 866-879) - Merge multi-tty branch - Update from CVS - Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
author Miles Bader <miles@gnu.org>
date Thu, 11 Oct 2007 16:14:00 +0000
parents cd5e99697764 56754c942db2
children d38543a1c0f9
line wrap: on
line diff
--- a/lisp/cus-edit.el	Thu Oct 11 01:51:15 2007 +0000
+++ b/lisp/cus-edit.el	Thu Oct 11 16:14:00 2007 +0000
@@ -1550,7 +1550,8 @@
     ;; Insert custom command buttons if the toolbar is not in use.
 
     (widget-insert "\n")
-    (when (not (and tool-bar-mode (display-graphic-p)))
+    ;; tool-bar is not dumped in builds without x.
+    (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"))
@@ -3010,7 +3011,7 @@
 		    (cons value (cons from (- (point) from))))))))
 
 (defun custom-face-edit-activate (widget)
-  "Make face widget WIDGET inactive for user modifications."
+  "Make face widget WIDGET active for user modifications."
   (let ((inactive (widget-get widget :inactive))
 	(inhibit-read-only t)
 	(inhibit-modification-hooks t))