summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2011-03-11 01:33:57 +0100
committerJuanma Barranquero <lekktu@gmail.com>2011-03-11 01:33:57 +0100
commit135e287cda9508d7fa0e33b7d8af00ede1249cb5 (patch)
treed24168cdd1728023bfa1a49e32c6cbb93c93d814 /lisp
parentc40f8d15c0e2fa6468df9c5d8d5797e4d98c074b (diff)
downloademacs-135e287cda9508d7fa0e33b7d8af00ede1249cb5.tar.gz
emacs-135e287cda9508d7fa0e33b7d8af00ede1249cb5.tar.bz2
emacs-135e287cda9508d7fa0e33b7d8af00ede1249cb5.zip
lisp/help-fns.el (describe-variable): Don't complete keywords.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help-fns.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c794ddb0788..ca24dcff4a7 100644
--- 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 38e331dc992..e27a1e47b5c 100644
--- 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 "")