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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c71d21b62751d9d9fdcd00de728051a395a2fb3..9cab908cdae810b4f8fa48954217e15a97aa76b1 100644 (file)
--- 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 e0cfb7039f93adf9ed510819aa58f191c09b531e..fbe87d992083474c6359534860365806dd52aec9 100644 (file)
--- 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 "")