diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/erc/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/erc/erc-pcomplete.el | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index b5b36693dd2..bf9e1e21e0e 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,10 @@ +2011-04-29 Stefan Monnier <monnier@iro.umontreal.ca> + + * erc-pcomplete.el (erc-pcomplete-nick-postfix): Remove the " " in the + suffix that's added by pcomplete-termination-string anyway. + (pcomplete-erc-setup): Remove pcomplete-suffix-list setting now that + it's not needed any more. + 2011-04-26 Stefan Monnier <monnier@iro.umontreal.ca> * erc.el (erc-mode-map): Use completion-at-point. diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el index 48c260c19fc..eb1398d5b05 100644 --- a/lisp/erc/erc-pcomplete.el +++ b/lisp/erc/erc-pcomplete.el @@ -48,7 +48,7 @@ "Programmable completion for ERC" :group 'erc) -(defcustom erc-pcomplete-nick-postfix ": " +(defcustom erc-pcomplete-nick-postfix ":" "*When `pcomplete' is used in the first word after the prompt, add this string to nicks completed." :group 'erc-pcomplete @@ -93,8 +93,6 @@ for use on `completion-at-point-function'." t) (set (make-local-variable 'pcomplete-use-paring) nil) - (set (make-local-variable 'pcomplete-suffix-list) - '(? ?:)) (set (make-local-variable 'pcomplete-parse-arguments-function) 'pcomplete-parse-erc-arguments) (set (make-local-variable 'pcomplete-command-completion-function) |