;;; Commentary:
;;
-;; Must be run before the user has changed the value of any options!
+;; This file adds customize support for built-in variables.
-;;; Code:
+;; While dumping Emacs, this file is loaded, but it only records
+;; the standard values; it does not do the rest of the job.
+;; Later on, if the user makes a customization buffer,
+;; this file is loaded again with (require 'cus-start);
+;; then it does the whole job.
-(defun custom-start-quote (sexp)
- ;; This is copied from `cus-edit.el'.
- "Quote SEXP iff it is not self quoting."
- (if (or (memq sexp '(t nil))
- (and (symbolp sexp)
- (eq (aref (symbol-name sexp) 0) ?:))
- (and (listp sexp)
- (memq (car sexp) '(lambda)))
- (stringp sexp)
- (numberp sexp)
- (and (fboundp 'characterp)
- (characterp sexp)))
- sexp
- (list 'quote sexp)))
+;;; Code:
-;; Add support for build in variables.
(let ((all '(;; abbrev.c
(abbrev-all-caps abbrev-mode boolean)
(pre-abbrev-expand-hook abbrev-mode hook)
;; buffer.c
(mode-line-format modeline sexp) ;Hard to do right.
(default-major-mode internal function)
+ (enable-multibyte-characters mule boolean)
(case-fold-search matching boolean)
(fill-column fill integer)
(left-margin fill integer)
(symbol :format "%v"))
(const :tag "always" t)))
(debug-ignored-errors debug (repeat (choice symbol regexp)))
- (debug-on-quit debug choice)
+ (debug-on-quit debug
+ (choice (const :tag "off")
+ (repeat :menu-tag "When"
+ :value (nil)
+ (symbol :format "%v"))
+ (const :tag "always" t)))
;; fileio.c
(insert-default-directory minibuffer boolean)
;; frame.c
(auto-save-interval auto-save integer)
(auto-save-timeout auto-save (choice (const :tag "off" nil)
(integer :format "%v")))
- (echo-keystrokes minibuffer boolean)
+ (echo-keystrokes minibuffer integer)
(polling-period keyboard integer)
- (double-click-time mouse integer)
+ (double-click-time mouse (restricted-sexp
+ :match-alternatives (integerp 'nil 't)))
(inhibit-local-menu-bar-menus menu boolean)
(help-char keyboard character)
(help-event-list keyboard (repeat (sexp :format "%v")))
(menu-prompting menu boolean)
- (track-mouse mouse boolean)
(suggest-key-bindings keyboard (choice (const :tag "off" nil)
(integer :tag "time" 2)
(sexp :tag "on"
:format "%t")))
;; lread.c
(load-path environment
- (repeat (choice :tag "Directory"
- (const :tag "default" nil)
+ (repeat (choice :tag "[Current dir?]"
+ :format "%[Current dir?%] %v"
+ (const :tag " current dir" nil)
(directory :format "%v"))))
;; minibuf.c
(completion-auto-help minibuffer boolean)
(enable-recursive-minibuffers minibuffer boolean)
(minibuffer-auto-raise minibuffer boolean)
;; process.c
- (delete-exited-processes proces-basics boolean)
+ (delete-exited-processes processes-basics boolean)
;; syntax.c
(parse-sexp-ignore-comments editing-basics boolean)
(words-include-escapes editing-basics boolean)
;; xfns.c
(x-bitmap-file-path installation
(repeat (directory :format "%v")))))
- this symbol group type)
+ this symbol group type
+ ;; This function turns a value
+ ;; into an expression which produces that value.
+ (quoter (lambda (sexp)
+ (if (or (memq sexp '(t nil))
+ (and (symbolp sexp)
+ (eq (aref (symbol-name sexp) 0) ?:))
+ (and (listp sexp)
+ (memq (car sexp) '(lambda)))
+ (stringp sexp)
+ (numberp sexp)
+ (and (fboundp 'characterp)
+ (characterp sexp)))
+ sexp
+ (list 'quote sexp)))))
(while all
(setq this (car all)
all (cdr all)
type (nth 2 this))
(if (not (boundp symbol))
;; If variables are removed from C code, give an error here!
- (message "Intrinsic `%S' not bound" symbol)
- ;; This is called before any user can have changed the value.
- (put symbol 'factory-value
- (list (custom-start-quote (default-value symbol))))
- ;; Add it to the right group.
- (custom-add-to-group group symbol 'custom-variable)
- ;; Set the type.
- (put symbol 'custom-type type))))
+ (message "Note, built-in variable `%S' not bound" symbol)
+ ;; Save the standard value, unless we already did.
+ (or (get symbol 'standard-value)
+ (put symbol 'standard-value
+ (list (funcall quoter (default-value symbol)))))
+ ;; If this is NOT while dumping Emacs,
+ ;; set up the rest of the customization info.
+ (unless purify-flag
+ ;; Add it to the right group.
+ (custom-add-to-group group symbol 'custom-variable)
+ ;; Set the type.
+ (put symbol 'custom-type type)))))
-;; Add support for build in faces.
-(let ((all '((bold "Use bold font.")
- (bold-italic "Use bold italic font.")
- (italic "Use italic font.")
- (underline "Underline text.")
- (default "Used for text not covered by other faces.")
- (highlight "Highlight text in some way.")
- (modeline "Used for displaying the modeline.")
- (region "Used for displaying the region.")
- (secondary-selection
- "Used for displaying the secondary selection.")))
- entry symbol doc)
- (while all
- (setq entry (car all)
- all (cdr all)
- symbol (nth 0 entry)
- doc (nth 1 entry))
- (put symbol 'face-documentation doc)))
+;; Record cus-start as loaded
+;; if we have set up all the info that we can set up.
+;; Don't record cus-start as loaded
+;; if we have set up only the standard values.
+(unless purify-flag
+ (provide 'cus-start))
;;; cus-start.el ends here.
HCoop / bpt / emacs.git / blobdiff