procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from emacs-23 branch.

Browse source
This commit is contained in:
Juanma Barranquero 2010-10-14 16:32:27 +02:00
commit 220d91b834
50 changed files with 310 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/erc/ChangeLog
View file

@ -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.

2
lisp/erc/erc-xdcc.el
View file

@ -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))))