[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100539: Backport revno:103823 and revno:103824 from trunk.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100539
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-04-06 03:26:46 +0200
message:
  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
modified:
  lisp/ChangeLog
  lisp/help-fns.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-24 01:57:22 +0000
+++ b/lisp/ChangeLog    2011-04-06 01:26:46 +0000
@@ -1,3 +1,10 @@
+2011-04-06  Juanma Barranquero  <address@hidden>
+
+       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  <address@hidden>
 
        * vc-annotate.el (vc-annotate-show-log-revision-at-line):

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2011-03-11 14:05:31 +0000
+++ b/lisp/help-fns.el  2011-04-06 01:26:46 +0000
@@ -586,9 +586,8 @@
                                  "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 "")