From 7e088b295918674ab935cf416c5cf987da8d4a24 Mon Sep 17 00:00:00 2001 From: Ingo Lohmar Date: Fri, 7 Feb 2014 21:18:31 -0500 Subject: [PATCH] * help-fns.el (describe-variable): Fix case where value is directory-local with no dir-locals file. Fixes: debbugs:16635 --- lisp/ChangeLog | 5 +++++ lisp/help-fns.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 78c6224f7e4..0369e5ed075 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-02-08 Ingo Lohmar + + * help-fns.el (describe-variable): Fix the case where + a value is directory-local with no dir-locals file. (Bug#16635) + 2014-02-08 Glenn Morris * abbrev.el (edit-abbrevs-mode): diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 5e38de88f72..028f6ac0c30 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -930,7 +930,8 @@ if it is given a local binding.\n"))) (setq file (expand-file-name dir-locals-file (car file))) ;; Otherwise, assume it was set directly. - (setq dir-file nil))) + (setq file (car file) + dir-file nil))) (princ (if dir-file "by the file\n `" "for the directory\n `")) -- 2.39.2