Backport 2011-04-04T22:08:01Z!lekktu@gmail.com and 2011-04-04T22:33:12Z!lekktu@gmail.com from trunk.

* help-fns.el (describe-variable): Complete all variables having
  documentation, including keywords.
  http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00112.html

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c71d21b627..9cab908cdae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        Backport revno:103823 and revno:103824 from trunk.
+        * help-fns.el (describe-variable): Complete all variables having
+        documentation, including keywords.
+        http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00112.html
+
 2011-03-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * vc-annotate.el (vc-annotate-show-log-revision-at-line):
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e0cfb7039f9..fbe87d99208 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -586,9 +586,8 @@ it is displayed along with the global value."
                                   "Describe variable: ")
                                 obarray
                                 (lambda (vv)
-                                  (and (not (keywordp vv))
-                                       (or (boundp vv)
-                                           (get vv 'variable-documentation))))
+                                  (or (get vv 'variable-documentation)
+                                      (and (boundp vv) (not (keywordp vv)))))
                                 t nil nil
                                 (if (symbolp v) (symbol-name v))))
      (list (if (equal val "")