# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 865147268 0
# Node ID dbae3eb8b351506bc85d148cf1e65533a03986f1
# Parent  3da4eaba1fe892de6ef015db4a84c960b7f020c7
(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.

diff -r 3da4eaba1fe8 -r dbae3eb8b351 lisp/cus-edit.el
--- a/lisp/cus-edit.el	Sun Jun 01 05:58:36 1997 +0000
+++ b/lisp/cus-edit.el	Sun Jun 01 06:41:08 1997 +0000
@@ -740,22 +740,24 @@
    (list (list symbol 'custom-group))
    (format "*Customize Group: %s*" (custom-unlispify-tag-name symbol))))
 
+;;;### (defalias 'customize-variable 'customize-option)
+
 ;;;###autoload
-(defun customize-variable (symbol)
-  "Customize SYMBOL, which must be a variable."
+(defun customize-option (symbol)
+  "Customize SYMBOL, which must be a user option variable."
   (interactive (custom-variable-prompt))
   (custom-buffer-create (list (list symbol 'custom-variable))
-			(format "*Customize Variable: %s*"
+			(format "*Customize Option: %s*"
 				(custom-unlispify-tag-name symbol))))
 
 ;;;###autoload
-(defun customize-variable-other-window (symbol)
-  "Customize SYMBOL, which must be a variable.
+(defun customize-option-other-window (symbol)
+  "Customize SYMBOL, which must be a user option variable.
 Show the buffer in another window, but don't select it."
   (interactive (custom-variable-prompt))
   (custom-buffer-create-other-window
    (list (list symbol 'custom-variable))
-   (format "*Customize Variable: %s*" (custom-unlispify-tag-name symbol))))
+   (format "*Customize Option: %s*" (custom-unlispify-tag-name symbol))))
 
 ;;;###autoload
 (defun customize-face (&optional symbol)
@@ -1331,6 +1333,7 @@
 		   (require load)
 		 (error nil)))
 	      ;; Don't reload a file already loaded.
+	      ((assoc load load-history))
 	      ((assoc (locate-library load) load-history))
 	      (t
 	       (condition-case nil