diff options
| author | Juanma Barranquero | 2007-06-07 00:38:27 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-06-07 00:38:27 +0000 |
| commit | 680a990518ac593cb479f00faa5814fbfc916de2 (patch) | |
| tree | 3b1ad30517708b16ecb8f1f55b35bf36932d498f | |
| parent | d367ab1ffd4add62851aab756807fff381f9d725 (diff) | |
| download | emacs-680a990518ac593cb479f00faa5814fbfc916de2.tar.gz emacs-680a990518ac593cb479f00faa5814fbfc916de2.zip | |
(erc-startup-file-list): Fix typo in docstring.
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index eec2478b162..5f283b44ee0 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-06-07 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * erc.el (erc-startup-file-list): Fix typo in docstring. | ||
| 4 | |||
| 1 | 2007-06-06 Juanma Barranquero <lekktu@gmail.com> | 5 | 2007-06-06 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * erc.el (erc-show-channel-key-p): Fix typo in docstring. | 7 | * erc.el (erc-show-channel-key-p): Fix typo in docstring. |
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.") | |||
| 842 | The first existent and readable one will get executed. | 842 | The first existent and readable one will get executed. |
| 843 | 843 | ||
| 844 | If the filename ends with `.el' it is presumed to be an Emacs Lisp | 844 | If the filename ends with `.el' it is presumed to be an Emacs Lisp |
| 845 | script and it gets (load)ed. Otherwise is is treated as a bunch of | 845 | script and it gets (load)ed. Otherwise it is treated as a bunch of |
| 846 | regular IRC commands." | 846 | regular IRC commands." |
| 847 | :group 'erc-scripts | 847 | :group 'erc-scripts |
| 848 | :type '(repeat file)) | 848 | :type '(repeat file)) |