diff options
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 99 |
1 files changed, 82 insertions, 17 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 1d6b42f48e6..5e81e1545b6 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -1,7 +1,7 @@ ;;; cus-start.el --- define customization properties of builtins -;; -;; Copyright (C) 1997, 1999-2011 Free Software Foundation, Inc. -;; + +;; Copyright (C) 1997, 1999-2012 Free Software Foundation, Inc. + ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: internal ;; Package: emacs @@ -22,7 +22,7 @@ ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: -;; + ;; This file adds customize support for built-in variables. ;; While dumping Emacs, this file is loaded, but it only records @@ -48,8 +48,22 @@ ;; :tag - custom-tag property (let ((all '(;; alloc.c (gc-cons-threshold alloc integer) + (gc-cons-percentage alloc float) (garbage-collection-messages alloc boolean) ;; buffer.c + (cursor-type + display + (choice + (const :tag "Frame default" t) + (const :tag "Filled box" box) + (const :tag "Hollow cursor" hollow) + (const :tag "Vertical bar" bar) + (cons :tag "Vertical bar with specified width" + (const bar) integer) + (const :tag "Horizontal bar" hbar) + (cons :tag "Horizontal bar with specified width" + (const hbar) integer) + (const :tag "None "nil))) (mode-line-format mode-line sexp) ;Hard to do right. (major-mode internal function) (case-fold-search matching boolean) @@ -132,15 +146,25 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (exec-path execute (repeat (choice (const :tag "default directory" nil) (directory :format "%v")))) + (exec-suffixes execute (repeat string)) ;; charset.c (charset-map-path installation (repeat (directory :format "%v"))) ;; coding.c (inhibit-eol-conversion mule boolean) (eol-mnemonic-undecided mule string) - (eol-mnemonic-unix mule string) - (eol-mnemonic-dos mule string) - (eol-mnemonic-mac mule string) + ;; startup.el fiddles with the values. IMO, would be + ;; simpler to just use #ifdefs in coding.c. + (eol-mnemonic-unix mule string nil + :standard + (if (memq system-type '(ms-dos windows-nt)) + "(Unix)" ":")) + (eol-mnemonic-dos mule string nil + :standard + (if (memq system-type '(ms-dos windows-nt)) + "\\" "(DOS)")) + (eol-mnemonic-mac mule string nil + :standard "(Mac)") (file-coding-system-alist mule (alist @@ -165,6 +189,13 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (inverse-video display boolean) (visible-bell display boolean) (no-redraw-on-reenter display boolean) + + ;; dosfns.c + (dos-display-scancodes display boolean) + (dos-hyper-key keyboard integer) + (dos-super-key keyboard integer) + (dos-keypad-mode keyboard integer) + ;; editfns.c (user-full-name mail string) ;; eval.c @@ -181,10 +212,12 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (const :tag "always" t))) (debug-ignored-errors debug (repeat (choice symbol regexp))) (debug-on-quit debug boolean) - ;; fileio.c - (delete-by-moving-to-trash auto-save boolean "23.1") + (debug-on-signal debug boolean) + ;; fileio.c + (delete-by-moving-to-trash auto-save boolean "23.1") (auto-save-visited-file-name auto-save boolean) ;; filelock.c + (create-lockfiles files boolean "24.3") (temporary-file-directory ;; Darwin section added 24.1, does not seem worth :version bump. files directory nil @@ -218,6 +251,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (use-dialog-box menu boolean "21.1") (use-file-dialog menu boolean "22.1") (focus-follows-mouse frames boolean "20.3") + ;; fontset.c + (vertical-centering-font-regexp display regexp) ;; frame.c (default-frame-alist frames (repeat (cons :format "%v" @@ -237,6 +272,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of :set custom-set-minor-mode) ;; fringe.c (overflow-newline-into-fringe fringe boolean) + ;; image.c + (imagemagick-render-type image integer "24.1") ;; indent.c (indent-tabs-mode indent boolean) ;; keyboard.c @@ -258,9 +295,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (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"))) (debug-on-event debug (choice (const :tag "None" nil) (const :tag "When sent SIGUSR1" sigusr1) @@ -401,7 +435,17 @@ since it could result in memory overflow and make Emacs crash." (const :tag "Only on ttys" :value tty) (other :tag "Always" t)) "23.1") (window-combination-resize windows boolean "24.1") - (window-combination-limit windows boolean "24.1") + (window-combination-limit + windows (choice + (const :tag "Never (nil)" :value nil) + (const :tag "For Temp Buffer Resize mode (temp-buffer-resize)" + :value temp-buffer-resize) + (const :tag "For temporary buffers (temp-buffer)" + :value temp-buffer) + (const :tag "For buffer display (display-buffer)" + :value display-buffer) + (other :tag "Always (t)" :value t)) + "24.3") ;; xdisp.c (show-trailing-whitespace whitespace-faces boolean nil :safe booleanp) @@ -411,7 +455,7 @@ since it could result in memory overflow and make Emacs crash." (hscroll-margin windows integer "22.1") (hscroll-step windows number "22.1") (truncate-partial-width-windows display boolean "23.1") - (mode-line-inverse-video mode-line boolean) + (make-cursor-line-fully-visible windows boolean) (mode-line-in-non-selected-windows mode-line boolean "22.1") (line-number-display-limit display (choice integer @@ -421,7 +465,8 @@ since it could result in memory overflow and make Emacs crash." (message-log-max debug (choice (const :tag "Disable" nil) (integer :menu-tag "lines" :format "%v") - (other :tag "Unlimited" t))) + (other :tag "Unlimited" t)) + "24.3") (unibyte-display-via-language-environment mule boolean) (blink-cursor-alist cursor alist "22.1") (overline-margin display integer "22.1") @@ -438,9 +483,19 @@ since it could result in memory overflow and make Emacs crash." (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") + (const :tag "System default" :value nil)) "24.1") + (tool-bar-max-label-size frames integer "24.1") (auto-hscroll-mode scrolling boolean "21.1") + (void-text-area-pointer cursor + (choice + (const :tag "Standard (text pointer)" :value nil) + (const :tag "Arrow" :value arrow) + (const :tag "Text pointer" :value text) + (const :tag "Hand" :value hand) + (const :tag "Vertical dragger" :value vdrag) + (const :tag "Horizontal dragger" :value hdrag) + (const :tag "Same as mode line" :value modeline) + (const :tag "Hourglass" :value hourglass))) (display-hourglass cursor boolean) (hourglass-delay cursor number) @@ -458,6 +513,8 @@ since it could result in memory overflow and make Emacs crash." (x-use-underline-position-properties display boolean "22.1") (x-underline-at-descent-line display boolean "22.1") (x-stretch-cursor display boolean "21.1") + ;; xselect.c + (x-select-enable-clipboard-manager killing boolean "24.1") ;; xsettings.c (font-use-system-font font-selection boolean "23.2"))) this symbol group type standard version native-p rest prop propval @@ -498,18 +555,26 @@ since it could result in memory overflow and make Emacs crash." (featurep 'ns)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) (featurep 'gtk)) + ((string-match "clipboard-manager" (symbol-name symbol)) + (boundp 'x-select-enable-clipboard-manager)) ((string-match "\\`x-" (symbol-name symbol)) (fboundp 'x-create-frame)) ((string-match "selection" (symbol-name symbol)) (fboundp 'x-selection-exists-p)) ((string-match "fringe" (symbol-name symbol)) (fboundp 'define-fringe-bitmap)) + ((string-match "\\`imagemagick" (symbol-name symbol)) + (fboundp 'imagemagick-types)) ((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)) + ((equal "vertical-centering-font-regexp" + (symbol-name symbol)) + ;; Any function from fontset.c will do. + (fboundp 'new-fontset)) (t t)))) (if (not (boundp symbol)) ;; If variables are removed from C code, give an error here! |