2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 685c56bd6ba..72d2167870b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-10  Alan Mackenzie  <acm@muc.de>
+
+        * help-fns.el (describe-variable): Make C-h v work when a variable
+        has variable documentation yet is unbound.
+
 2005-11-10  Masatake YAMATO  <jet@gyve.org>
 
         * man.el (Man-highlight-references): Set an empty
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 9d4d3ea9b08..6e1bd62d04b 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -496,7 +496,11 @@ it is displayed along with the global value."
                                     (format
                                      "Describe variable (default %s): " v)
                                   "Describe variable: ")
-                                obarray 'boundp t nil nil
+                                obarray
+                                '(lambda (vv)
+                                   (or (boundp vv)
+                                       (get vv 'variable-documentation)))
+                                t nil nil
                                 (if (symbolp v) (symbol-name v))))
      (list (if (equal val "")
                v (intern val)))))