diff options
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index af853c4e230..34aa015d7ac 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2012-04-09 Chong Yidong <cyd@gnu.org> + + * erc.el (erc-cmd-SET): Call custom-variable-p instead of + user-variable-p. + 2012-02-08 Glenn Morris <rgm@gnu.org> * erc-backend.el (erc-coding-system-precedence): diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index b95d42b154a..63777fb3897 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2616,7 +2616,7 @@ VALUE is computed by evaluating the rest of LINE in Lisp." (if (consp val) (concat "\n" (pp-to-string val)) (format " %S\n" val))))) - (apropos-internal "^erc-" 'user-variable-p)))) + (apropos-internal "^erc-" 'custom-variable-p)))) (current-buffer)) t) (t nil))) (defalias 'erc-cmd-VAR 'erc-cmd-SET) |