Backport 2011-03-11T00:33:57Z!lekktu@gmail.com from trunk.

* lisp/help-fns.el (describe-variable): Don't complete keywords.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6685e35..d84f98a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       Backport revno:103622 from trunk.
+       * help-fns.el (describe-variable): Don't complete keywords.
+       Suggested by Teodor Zlatanov <tzz@lifelogs.com>.
+
 2011-03-11  Eli Zaretskii  <eliz@gnu.org>
 
        * files.el (file-ownership-preserved-p): Pass `integer' as an

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index ba8565f..e0cfb70 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -585,9 +585,10 @@ it is displayed along with the global value."
                                     "Describe variable (default %s): " v)
                                  "Describe variable: ")
                                obarray
-                               '(lambda (vv)
-                                  (or (boundp vv)
-                                      (get vv 'variable-documentation)))
+                                (lambda (vv)
+                                  (and (not (keywordp vv))
+                                       (or (boundp vv)
+                                           (get vv 'variable-documentation))))
                                t nil nil
                                (if (symbolp v) (symbol-name v))))
      (list (if (equal val "")