summaryrefslogtreecommitdiff
path: root/lisp/custom.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-09-28 08:18:38 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-09-28 08:18:38 -0400
commit7f457c067de84a0973883ef7889e648fbb17b055 (patch)
tree383fbed3db4f76978b857b8dceaa2978fc9bd10a /lisp/custom.el
parentc00ebc9835590d94d2b2f241ffcad872a2f2ffd3 (diff)
downloademacs-7f457c067de84a0973883ef7889e648fbb17b055.tar.gz
* lisp/emacs-lisp/pcase.el (pcase--mark-used): New.
(pcase--u1): Use it. * lisp/custom.el (load-theme): Set buffer-file-name so the load is recorded in load-history with the right file name. Fixes: debbugs:12512
Diffstat (limited to 'lisp/custom.el')
-rw-r--r--lisp/custom.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/custom.el b/lisp/custom.el
index dfc8e631152..dc810e3c97d 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1193,7 +1193,8 @@ Return t if THEME was successfully loaded, nil otherwise."
(expand-file-name "themes/" data-directory)))
(member hash custom-safe-themes)
(custom-theme-load-confirm hash))
- (let ((custom--inhibit-theme-enable t))
+ (let ((custom--inhibit-theme-enable t)
+ (buffer-file-name fn)) ;For load-history.
(eval-buffer))
;; Optimization: if the theme changes the `default' face, put that
;; entry first. This avoids some `frame-set-background-mode' rigmarole