diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-21 12:42:16 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-21 12:42:16 -0400 |
commit | cafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch) | |
tree | 7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /lisp/custom.el | |
parent | a08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff) | |
parent | 4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff) | |
download | emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz |
Merge from trunk
Diffstat (limited to 'lisp/custom.el')
-rw-r--r-- | lisp/custom.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/custom.el b/lisp/custom.el index d0d11610b91..d9bb4f954bc 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -792,10 +792,10 @@ E.g. dumped variables whose default depends on run-time information." (defvar custom-known-themes '(user changed) "Themes that have been defined with `deftheme'. The default value is the list (user changed). The theme `changed' -contains the settings before custom themes are applied. The -theme `user' contains all the settings the user customized and saved. -Additional themes declared with the `deftheme' macro will be added to -the front of this list.") +contains the settings before custom themes are applied. The theme +`user' contains all the settings the user customized and saved. +Additional themes declared with the `deftheme' macro will be added +to the front of this list.") (defsubst custom-theme-p (theme) "Non-nil when THEME has been defined." @@ -1074,7 +1074,7 @@ order. Each element in the list should be one of the following: named \"themes\" in `data-directory'). - a directory name (a string). -Each theme file is named NAME-theme.el, where THEME is the theme +Each theme file is named THEME-theme.el, where THEME is the theme name." :type '(repeat (choice (const :tag "custom-theme-directory" custom-theme-directory) @@ -1146,7 +1146,7 @@ Return t if THEME was successfully loaded, nil otherwise." '("" "c"))) hash) (unless fn - (error "Unable to find theme file for `%s'." theme)) + (error "Unable to find theme file for `%s'" theme)) (with-temp-buffer (insert-file-contents fn) (setq hash (sha1 (current-buffer))) @@ -1212,7 +1212,7 @@ NAME should be a symbol." (defun custom-available-themes () "Return a list of available Custom themes (symbols)." - (let* (sym themes) + (let (sym themes) (dolist (dir (custom-theme--load-path)) (when (file-directory-p dir) (dolist (file (file-expand-wildcards @@ -1222,7 +1222,7 @@ NAME should be a symbol." (setq sym (intern (match-string 1 file))) (custom-theme-name-valid-p sym) (push sym themes))))) - (delete-dups themes))) + (nreverse (delete-dups themes)))) (defun custom-theme--load-path () (let (lpath) @@ -1338,7 +1338,7 @@ That is to say, it specifies what the value should be according to currently enabled custom themes. This function returns nil if no custom theme specifies a value for VARIABLE." - (let* ((theme-value (get variable 'theme-value))) + (let ((theme-value (get variable 'theme-value))) (if theme-value (cdr (car theme-value))))) |