diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-10-25 01:37:17 +0100 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-10-25 01:53:46 +0100 |
| commit | 79fac080d277fed07b3c192890ad59d36d9f83b6 (patch) | |
| tree | 856c29de61b6bb7c77680b0dd05d4c980513846f /lisp/custom.el | |
| parent | b6c6629ebe570baac53ed2a737f54711f29f79ca (diff) | |
| download | emacs-79fac080d277fed07b3c192890ad59d36d9f83b6.tar.gz emacs-79fac080d277fed07b3c192890ad59d36d9f83b6.tar.bz2 emacs-79fac080d277fed07b3c192890ad59d36d9f83b6.zip | |
* lisp/custom.el (custom-declare-variable): Shorten code a bit
Diffstat (limited to 'lisp/custom.el')
| -rw-r--r-- | lisp/custom.el | 57 |
1 files changed, 23 insertions, 34 deletions
diff --git a/lisp/custom.el b/lisp/custom.el index c5d0e65f42b..cc284ef51ce 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -155,40 +155,29 @@ set to nil, as the value is no longer rogue." (unless (memq :group args) (custom-add-to-group (custom-current-group) symbol 'custom-variable)) (while args - (let ((arg (car args))) - (setq args (cdr args)) - (unless (symbolp arg) - (error "Junk in args %S" args)) - (let ((keyword arg) - (value (car args))) - (unless args - (error "Keyword %s is missing an argument" keyword)) - (setq args (cdr args)) - (cond ((eq keyword :initialize) - (setq initialize value)) - ((eq keyword :set) - (put symbol 'custom-set value)) - ((eq keyword :get) - (put symbol 'custom-get value)) - ((eq keyword :require) - (push value requests)) - ((eq keyword :risky) - (put symbol 'risky-local-variable value)) - ((eq keyword :safe) - (put symbol 'safe-local-variable value)) - ((eq keyword :type) - (put symbol 'custom-type (purecopy value))) - ((eq keyword :options) - (if (get symbol 'custom-options) - ;; Slow safe code to avoid duplicates. - (mapc (lambda (option) - (custom-add-option symbol option)) - value) - ;; Fast code for the common case. - (put symbol 'custom-options (copy-sequence value)))) - (t - (custom-handle-keyword symbol keyword value - 'custom-variable)))))) + (let ((keyword (pop args))) + (unless (symbolp keyword) + (error "Junk in args %S" (cons keyword args))) + (unless args + (error "Keyword %s is missing an argument" keyword)) + (let ((value (pop args))) + (pcase keyword + (`:initialize (setq initialize value)) + (`:set (put symbol 'custom-set value)) + (`:get (put symbol 'custom-get value)) + (`:require (push value requests)) + (`:risky (put symbol 'risky-local-variable value)) + (`:safe (put symbol 'safe-local-variable value)) + (`:type (put symbol 'custom-type (purecopy value))) + (`:options (if (get symbol 'custom-options) + ;; Slow safe code to avoid duplicates. + (mapc (lambda (option) + (custom-add-option symbol option)) + value) + ;; Fast code for the common case. + (put symbol 'custom-options (copy-sequence value)))) + (_ (custom-handle-keyword symbol keyword value + 'custom-variable)))))) (put symbol 'custom-requests requests) ;; Do the actual initialization. (unless custom-dont-initialize |