[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master c051487: lisp/custom.el (load-theme): Only compute
From: |
Mark Oteiza |
Subject: |
[Emacs-diffs] master c051487: lisp/custom.el (load-theme): Only compute hash when needed |
Date: |
Tue, 15 Sep 2015 15:13:33 +0000 |
branch: master
commit c051487fcf379febf4ce5b38de7017609c84a106
Author: Mark Oteiza <address@hidden>
Commit: Mark Oteiza <address@hidden>
lisp/custom.el (load-theme): Only compute hash when needed
---
lisp/custom.el | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lisp/custom.el b/lisp/custom.el
index ea5ab7a..e212e32 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1214,13 +1214,11 @@ Return t if THEME was successfully loaded, nil
otherwise."
(put theme 'theme-documentation nil))
(let ((fn (locate-file (concat (symbol-name theme) "-theme.el")
(custom-theme--load-path)
- '("" "c")))
- hash)
+ '("" "c"))))
(unless fn
(error "Unable to find theme file for `%s'" theme))
(with-temp-buffer
(insert-file-contents fn)
- (setq hash (secure-hash 'sha256 (current-buffer)))
;; Check file safety with `custom-safe-themes', prompting the
;; user if necessary.
(when (or no-confirm
@@ -1228,8 +1226,9 @@ Return t if THEME was successfully loaded, nil otherwise."
(and (memq 'default custom-safe-themes)
(equal (file-name-directory fn)
(expand-file-name "themes/" data-directory)))
- (member hash custom-safe-themes)
- (custom-theme-load-confirm hash))
+ (let ((hash (secure-hash 'sha256 (current-buffer))))
+ (or (member hash custom-safe-themes)
+ (custom-theme-load-confirm hash))))
(let ((custom--inhibit-theme-enable t)
(buffer-file-name fn)) ;For load-history.
(eval-buffer))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master c051487: lisp/custom.el (load-theme): Only compute hash when needed,
Mark Oteiza <=