diff options
| author | Juanma Barranquero <[email protected]> | 2011-03-11 15:05:31 +0100 |
|---|---|---|
| committer | Juanma Barranquero <[email protected]> | 2011-03-11 15:05:31 +0100 |
| commit | 6dbf95e5b3cf85fce57a5cdd67e7e50b8acb8787 (patch) | |
| tree | 6404b45b327c3977a1a7a46f0efccc5fa0c6789a /lisp | |
| parent | 2920e68d73e0009f368e817207964efaff751f85 (diff) | |
Backport 2011-03-11T00:33:[email protected] from trunk.
* lisp/help-fns.el (describe-variable): Don't complete keywords.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/help-fns.el | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6685e35536..d84f98a132 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-03-11 Juanma Barranquero <[email protected]> + + Backport revno:103622 from trunk. + * help-fns.el (describe-variable): Don't complete keywords. + Suggested by Teodor Zlatanov <[email protected]>. + 2011-03-11 Eli Zaretskii <[email protected]> * files.el (file-ownership-preserved-p): Pass `integer' as an diff --git a/lisp/help-fns.el b/lisp/help-fns.el index ba8565f5e1..e0cfb7039f 100644 --- 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 "") |