mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

(custom-save-variables): Slight cleanup.

Browse Source 
(Custom-no-edit): Renamed from custom-no-edit.
(Custom-newline): Renamed from custom-newline.
(custom-mode-map): Use new names.
This commit is contained in:
Richard M. Stallman 2006-08-31 23:16:03 +00:00
parent da506c0e74
commit adcc7a37ed
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lisp/cus-edit.el
View File

@ -4255,19 +4255,31 @@ This function does not save the buffer."
(let ((spec (car-safe (get symbol 'theme-value))) (let ((spec (car-safe (get symbol 'theme-value)))
(value (get symbol 'saved-value)) (value (get symbol 'saved-value))
(requests (get symbol 'custom-requests)) (requests (get symbol 'custom-requests))
(now (not (or (custom-variable-p symbol) (now (and (not (custom-variable-p symbol))
(and (not (boundp symbol)) (or (boundp symbol)
(not (eq (get symbol 'force-value) (eq (get symbol 'force-value)
'rogue)))))) 'rogue))))
(comment (get symbol 'saved-variable-comment))) (comment (get symbol 'saved-variable-comment)))
;; Check `requests'. ;; Check REQUESTS for validity.
(dolist (request requests) (dolist (request requests)
(when (and (symbolp request) (not (featurep request))) (when (and (symbolp request) (not (featurep request)))
(message "Unknown requested feature: %s" request) (message "Unknown requested feature: %s" request)
(setq requests (delq request requests)))) (setq requests (delq request requests))))
;; Is there anything customized about this variable?
(when (or (and spec (eq (car spec) 'user)) (when (or (and spec (eq (car spec) 'user))
comment comment
(and (null spec) (get symbol 'saved-value))) (and (null spec) (get symbol 'saved-value)))
;; Output an element for this variable.
;; It has the form (SYMBOL VALUE-FORM NOW REQUESTS COMMENT).
;; SYMBOL is the variable name.
;; VALUE-FORM is an expression to return the customized value.
;; NOW if non-nil means always set the variable immediately
;; when the customizations are reloaded. This is used
;; for rogue variables
;; REQUESTS is a list of packages to load before setting the
;; variable. Each element of it will be passed to `require'.
;; COMMENT is whatever comment the user has specified
;; with the customize facility.
(unless (bolp) (unless (bolp)
(princ "\n")) (princ "\n"))
(princ " '(") (princ " '(")
@ -4435,8 +4447,8 @@ The format is suitable for use with `easy-menu-define'."
;; Actually, this misfeature of dense keymaps was fixed on 2001-11-26. ;; Actually, this misfeature of dense keymaps was fixed on 2001-11-26.
(let ((map (make-keymap))) (let ((map (make-keymap)))
(set-keymap-parent map widget-keymap) (set-keymap-parent map widget-keymap)
(define-key map [remap self-insert-command] 'custom-no-edit) (define-key map [remap self-insert-command] 'Custom-no-edit)
(define-key map "\^m" 'custom-newline) (define-key map "\^m" 'Custom-newline)
(define-key map " " 'scroll-up) (define-key map " " 'scroll-up)
(define-key map "\177" 'scroll-down) (define-key map "\177" 'scroll-down)
(define-key map "\C-c\C-c" 'Custom-set) (define-key map "\C-c\C-c" 'Custom-set)
@ -4448,12 +4460,12 @@ The format is suitable for use with `easy-menu-define'."
map) map)
"Keymap for `custom-mode'.") "Keymap for `custom-mode'.")
(defun custom-no-edit (pos &optional event) (defun Custom-no-edit (pos &optional event)
"Invoke button at POS, or refuse to allow editing of Custom buffer." "Invoke button at POS, or refuse to allow editing of Custom buffer."
(interactive "@d") (interactive "@d")
(error "You can't edit this part of the Custom buffer")) (error "You can't edit this part of the Custom buffer"))
(defun custom-newline (pos &optional event) (defun Custom-newline (pos &optional event)
"Invoke button at POS, or refuse to allow editing of Custom buffer." "Invoke button at POS, or refuse to allow editing of Custom buffer."
(interactive "@d") (interactive "@d")
(let ((button (get-char-property pos 'button))) (let ((button (get-char-property pos 'button)))