diff options
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 0f686a434e..a43525f824 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -5,6 +5,7 @@ ;; ;; Author: Per Abrahamsen <[email protected]> ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. @@ -197,6 +198,11 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (help-char keyboard character) (help-event-list keyboard (repeat (sexp :format "%v"))) (menu-prompting menu boolean) + (select-active-regions killing + (choice (const :tag "always" t) + (const :tag "only shift-selection or mouse-drag" only) + (const :tag "off" nil)) + "24.1") (suggest-key-bindings keyboard (choice (const :tag "off" nil) (integer :tag "time" 2) (other :tag "on"))) @@ -347,6 +353,16 @@ since it could result in memory overflow and make Emacs crash." (const :tag "Off (nil)" :value nil) (const :tag "Immediate" :value t) (number :tag "Delay by secs" :value 0.5)) "22.1") + (tool-bar-style + frames (choice + (const :tag "Images" :value image) + (const :tag "Text" :value text) + (const :tag "Both" :value both) + (const :tag "Both-horiz" :value both-horiz) + (const :tag "Text-image-horiz" :value text-image-horiz) + (const :tag "System default" :value nil)) "23.3") + (tool-bar-max-label-size frames integer "23.3") + ;; xfaces.c (scalable-fonts-allowed display boolean "22.1") ;; xfns.c @@ -356,6 +372,7 @@ since it could result in memory overflow and make Emacs crash." (x-gtk-show-hidden-files menu boolean "22.1") (x-gtk-file-dialog-help-text menu boolean "22.1") (x-gtk-whole-detached-tool-bar x boolean "22.1") + (x-gtk-use-system-tooltips tooltip boolean "23.3") ;; xterm.c (x-use-underline-position-properties display boolean "22.1") (x-underline-at-descent-line display boolean "22.1") @@ -407,6 +424,10 @@ since it could result in memory overflow and make Emacs crash." (fboundp 'define-fringe-bitmap)) ((equal "font-use-system-font" (symbol-name symbol)) (featurep 'system-font-setting)) + ;; Conditioned on x-create-frame, because that's + ;; the condition for loadup.el to preload tool-bar.el. + ((string-match "tool-bar-" (symbol-name symbol)) + (fboundp 'x-create-frame)) (t t)))) (if (not (boundp symbol)) ;; If variables are removed from C code, give an error here! |