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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c794ddb07881ff8f355cc4de4dd041ce7cbb090a..ca24dcff4a7d0eb37dca080a8ab4779f2f8d7a23 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       * help-fns.el (describe-variable): Don't complete keywords.
+       Suggested by Teodor Zlatanov <tzz@lifelogs.com>.
+
 2011-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
        * emacs-lisp/package.el (package-version-join): Impose a standard

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 38e331dc992aa583c5e3613260d71965f1aaf369..e27a1e47b5c0e0dc90de366d96eb523cc99ede91 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -592,9 +592,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 "")