diff options
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c237c28d24a..e3bd85f1db3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2007-09-05 Glenn Morris <rgm@gnu.org> + + * cus-edit.el (custom-buffer-create-internal): Check tool-bar-mode + is bound. + +2007-09-05 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> + + * emacs-lisp/advice.el (ad-make-advised-docstring): Highlight note + in doc string. + 2007-09-04 Dan Nicolaescu <dann@ics.uci.edu> * server.el (server-start, server-unload-hook): Undo previous diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 869533b3c3e..9d313c2344d 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1550,7 +1550,8 @@ possibly because you started Emacs with `-q'.") ;; 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")) |