diff options
| author | Ingo Lohmar <i.lohmar@gmail.com> | 2014-02-07 21:18:31 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-02-07 21:18:31 -0500 |
| commit | 7e088b295918674ab935cf416c5cf987da8d4a24 (patch) | |
| tree | 7423554482054371b9152ca4bb308a1825d1a942 /lisp/help-fns.el | |
| parent | 36f1351eb90c3af31245fea0f46cb09ca3b08427 (diff) | |
| download | emacs-7e088b295918674ab935cf416c5cf987da8d4a24.tar.gz | |
* help-fns.el (describe-variable): Fix case where value is directory-local
with no dir-locals file.
Fixes: debbugs:16635
Diffstat (limited to 'lisp/help-fns.el')
| -rw-r--r-- | lisp/help-fns.el | 3 |
1 files changed, 2 insertions, 1 deletions
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 `")) |