Mercurial > emacs
comparison lisp/cus-edit.el @ 18086:dbae3eb8b351
(customize-option): Renamed from custom-variable.
(customize-variable): Add it as an alias.
(customize-option-other-window):
Renamed from customize-variable-other-window.
(custom-load-symbol): Search for both short and absolute
names of the library, when avoiding duplicate loading.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 01 Jun 1997 06:41:08 +0000 |
parents | 3da4eaba1fe8 |
children | 05c70aa62552 |
comparison
equal
deleted
inserted
replaced
18085:3da4eaba1fe8 | 18086:dbae3eb8b351 |
---|---|
738 (setq symbol (intern symbol)))) | 738 (setq symbol (intern symbol)))) |
739 (custom-buffer-create-other-window | 739 (custom-buffer-create-other-window |
740 (list (list symbol 'custom-group)) | 740 (list (list symbol 'custom-group)) |
741 (format "*Customize Group: %s*" (custom-unlispify-tag-name symbol)))) | 741 (format "*Customize Group: %s*" (custom-unlispify-tag-name symbol)))) |
742 | 742 |
743 ;;;### (defalias 'customize-variable 'customize-option) | |
744 | |
743 ;;;###autoload | 745 ;;;###autoload |
744 (defun customize-variable (symbol) | 746 (defun customize-option (symbol) |
745 "Customize SYMBOL, which must be a variable." | 747 "Customize SYMBOL, which must be a user option variable." |
746 (interactive (custom-variable-prompt)) | 748 (interactive (custom-variable-prompt)) |
747 (custom-buffer-create (list (list symbol 'custom-variable)) | 749 (custom-buffer-create (list (list symbol 'custom-variable)) |
748 (format "*Customize Variable: %s*" | 750 (format "*Customize Option: %s*" |
749 (custom-unlispify-tag-name symbol)))) | 751 (custom-unlispify-tag-name symbol)))) |
750 | 752 |
751 ;;;###autoload | 753 ;;;###autoload |
752 (defun customize-variable-other-window (symbol) | 754 (defun customize-option-other-window (symbol) |
753 "Customize SYMBOL, which must be a variable. | 755 "Customize SYMBOL, which must be a user option variable. |
754 Show the buffer in another window, but don't select it." | 756 Show the buffer in another window, but don't select it." |
755 (interactive (custom-variable-prompt)) | 757 (interactive (custom-variable-prompt)) |
756 (custom-buffer-create-other-window | 758 (custom-buffer-create-other-window |
757 (list (list symbol 'custom-variable)) | 759 (list (list symbol 'custom-variable)) |
758 (format "*Customize Variable: %s*" (custom-unlispify-tag-name symbol)))) | 760 (format "*Customize Option: %s*" (custom-unlispify-tag-name symbol)))) |
759 | 761 |
760 ;;;###autoload | 762 ;;;###autoload |
761 (defun customize-face (&optional symbol) | 763 (defun customize-face (&optional symbol) |
762 "Customize SYMBOL, which should be a face name or nil. | 764 "Customize SYMBOL, which should be a face name or nil. |
763 If SYMBOL is nil, customize all faces." | 765 If SYMBOL is nil, customize all faces." |
1329 (cond ((symbolp load) | 1331 (cond ((symbolp load) |
1330 (condition-case nil | 1332 (condition-case nil |
1331 (require load) | 1333 (require load) |
1332 (error nil))) | 1334 (error nil))) |
1333 ;; Don't reload a file already loaded. | 1335 ;; Don't reload a file already loaded. |
1336 ((assoc load load-history)) | |
1334 ((assoc (locate-library load) load-history)) | 1337 ((assoc (locate-library load) load-history)) |
1335 (t | 1338 (t |
1336 (condition-case nil | 1339 (condition-case nil |
1337 ;; Without this, we would load cus-edit recursively. | 1340 ;; Without this, we would load cus-edit recursively. |
1338 ;; We are still loading it when we call this, | 1341 ;; We are still loading it when we call this, |