diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
| commit | 220d91b834f7f7252b9953460422151b86b3520c (patch) | |
| tree | 8f3e16983e83ac0da6beef346cb05cd2591a7f83 /lisp/erc | |
| parent | 31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff) | |
| parent | 9d4f32e88a1b642070f0adb41df04a0846c31970 (diff) | |
| download | emacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz emacs-220d91b834f7f7252b9953460422151b86b3520c.tar.bz2 emacs-220d91b834f7f7252b9953460422151b86b3520c.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc-xdcc.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 8b248db0808..81bdf5446ec 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-14 Juanma Barranquero <lekktu@gmail.com> + + * erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring. + 2010-10-10 Dan Nicolaescu <dann@ics.uci.edu> * erc-list.el (erc-list-menu-mode-map): Declare and define in one step. diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el index 403be5f720e..8d900e8291e 100644 --- a/lisp/erc/erc-xdcc.el +++ b/lisp/erc/erc-xdcc.el @@ -56,7 +56,7 @@ Your friends should issue \"/ctcp yournick XDCC list\" to see this." (erc-current-nick) " XDCC send #\" to get a particular file number.")) "*Help text sent in response to XDCC help command. A list of messages, each consisting of strings and expressions, expressions -being evaluated and should return stings." +being evaluated and should return strings." :group 'erc-dcc :type '(repeat (repeat :tag "Message" (choice string sexp)))) |