diff options
| author | Glenn Morris <[email protected]> | 2010-10-31 11:26:54 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2010-10-31 11:26:54 -0700 |
| commit | c8c599548191c0d9f903e20d010b076dcd74170a (patch) | |
| tree | a8c2aadda8d732c6458e8e012226507a028c8fd8 /src/frame.c | |
| parent | 35fcc05c0e4f0ee9312c422e10ab14b4d34bb884 (diff) | |
Fix bug#7299; default value of tool-bar-mode in without-x builds.
* src/frame.c (syms_of_frame) <tool-bar-mode>:
Default to nil if !HAVE_WINDOW_SYSTEM.
* lisp/cus-start.el: Handle standard values via a keyword.
Only set version property if specified.
(cursor-in-non-selected-windows, menu-bar-mode)
(tool-bar-mode, show-trailing-whitespace):
Do not specify standard values.
(transient-mark-mode, temporary-file-directory): Use :standard.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c index 1f8ff8d562..ba675be5b5 100644 --- a/src/frame.c +++ b/src/frame.c @@ -4576,7 +4576,11 @@ See the command `tool-bar-mode' for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `tool-bar-mode'. */); +#ifdef HAVE_WINDOW_SYSTEM Vtool_bar_mode = Qt; +#else + Vtool_bar_mode = Qnil; +#endif DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame, doc: /* Minibufferless frames use this frame's minibuffer. |