diff options
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index eec2478b162..9ffbcbd5201 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,6 +1,7 @@ 2007-06-06 Juanma Barranquero <lekktu@gmail.com> - * erc.el (erc-show-channel-key-p): Fix typo in docstring. + * erc.el (erc-show-channel-key-p, erc-startup-file-list): + Fix typo in docstring. 2007-04-01 Michael Olson <mwolson@gnu.org> diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 72442de9f95..d6875ffc4af 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -842,7 +842,7 @@ See `erc-server-flood-margin' for other flood-related parameters.") The first existent and readable one will get executed. If the filename ends with `.el' it is presumed to be an Emacs Lisp -script and it gets (load)ed. Otherwise is is treated as a bunch of +script and it gets (load)ed. Otherwise it is treated as a bunch of regular IRC commands." :group 'erc-scripts :type '(repeat file)) |