X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fcustom.el;h=5cd137d423c8b495a8c1fa8cfc96d4ef305dd57a;hb=d4351d64ecff8075601e5bddad6ae9612492061d;hp=316e925b1d3de5fe1288505c8071b50a4463ce97;hpb=afa9772e3fcbb4e80e3e4cfd1a40b4fccc6d08b8;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/custom.el b/lisp/custom.el
index 316e925..5cd137d 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -38,10 +38,10 @@
 ;;; Code:
 
 (eval-when-compile
-  (load "cl-macs"))
+  (load "cl-macs" nil t))
 
-(if (not (fboundp 'defun*))
-    (autoload 'defun* "cl-macs"))
+(autoload 'custom-declare-face "cus-face")
+(autoload 'defun* "cl-macs")
 
 (require 'widget)
 
@@ -185,7 +185,7 @@ The following KEYWORD's are defined:
         the current value for that symbol.  The default is
         `default-value'.
 :require VALUE should be a feature symbol.  Each feature will be
-        required after initialization, of the the user have saved this
+        required after initialization, of the user have saved this
         option.
 
 Read the section about customization in the Emacs Lisp manual for more
@@ -227,7 +227,7 @@ For the DISPLAY to match a FRAME, the REQ property of the frame must
 match one of the ITEM.  The following REQ are defined:
 
 `type' (the value of `window-system')
-  Should be one of `x' or `tty'.
+  Should be one of `x', `mswindows', or `tty'.
 
 `class' (the frame's color support)
   Should be one of `color', `grayscale', or `mono'.
@@ -395,8 +395,8 @@ LOAD should be either a library file name, or a feature name."
   "(deftheme THEME &optional DOC &key KEYWORDS)
 
 Define a theme labeled by SYMBOL THEME. The optional argument DOC is a
-doc string describing the the theme. It is optionally followed by the
-following keyboard arguments
+doc string describing the theme. It is optionally followed by the
+following keyword arguments
 
 :short-description DESC
       DESC is a short (one line) description of the theme. If not given DOC
@@ -423,7 +423,7 @@ following keyboard arguments
   (memq theme custom-known-themes))
 
 (defsubst custom-check-theme (theme)
-  "Check whether THEME is valid and signal an error if NOT"
+  "Check whether THEME is valid and signal an error if NOT."
   (unless (custom-theme-p theme)
     (error "Unknown theme `%s'" theme)))
 
@@ -535,7 +535,7 @@ See `custom-set-variables' for a description of the arguments ARGS."
 
 (defun custom-theme-load-themes (by-theme &rest body)
   "Load the themes specified by BODY and record them as required by
-theme BY-THEME. BODY is a secuence of
+theme BY-THEME. BODY is a sequence of
        - a SYMBOL
             require the theme SYMBOL
        - a list (reset THEME)
@@ -565,14 +565,14 @@ BODY is as with custom-theme-load-themes."
 
 
 (defsubst copy-upto-last (elt list)
-  "Copy all the elements of the list upto the last occurence of elt"
+  "Copy all the elements of the list upto the last occurrence of elt."
   ;; Is it faster to do more work in C than to do less in elisp?
   (nreverse (cdr (member elt (reverse list)))))
 
 (defun custom-theme-value (theme theme-spec-list)
   "Determine the value for THEME defined by THEME-SPEC-LIST.
 Returns (list value) if found. Nil otherwise."
-  ;; Note we do _NOT_ singal an error if the theme is unkown
+  ;; Note we do _NOT_ signal an error if the theme is unknown
   ;; it might have gone away without the user knowing.
   (let ((theme-or-lower (memq theme (cons 'user custom-loaded-themes)))
         value)
@@ -614,7 +614,7 @@ VARIABLE.  Nil otherwise."
 
 (defun custom-theme-reset-variables (theme &rest args)
   "Reset the value of the variables to values previously defined.
-Assosiate this setting with THEME.
+Associate this setting with THEME.
 
 ARGS is a list of lists of the form
 
@@ -629,7 +629,7 @@ This means reset variable to its value in to-theme."
 
 (defun custom-reset-variables (&rest args)
     "Reset the value of the variables to values previously defined.
-Assosiate this setting with the `user' theme.
+Associate this setting with the `user' theme.
 
 The ARGS are as in `custom-theme-reset-variables'."
     (apply #'custom-theme-reset-variables 'user args))