[Emacs-diffs] trunk r116313: * help-fns.el (describe-variable): Fix case where value is directory-local

[Glenn Morris]

------------------------------------------------------------
revno: 116313
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16635
author: Ingo Lohmar <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-07 21:18:31 -0500
message:
  * help-fns.el (describe-variable): Fix case where value is directory-local
  with no dir-locals file.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/help-fns.el               helpfns.el-20091113204419-o5vbwnq5f7feedwu-2354

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-08 01:26:13 +0000
+++ b/lisp/ChangeLog    2014-02-08 02:18:31 +0000
@@ -1,3 +1,8 @@
+2014-02-08  Ingo Lohmar  <address@hidden>
+
+       * 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  <address@hidden>
 
        * abbrev.el (edit-abbrevs-mode):

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2014-02-02 02:25:05 +0000
+++ b/lisp/help-fns.el  2014-02-08 02:18:31 +0000
@@ -930,7 +930,8 @@
                                 (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  `"))