diff options
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 34 | ||||
| -rw-r--r-- | lisp/erc/erc-autoaway.el | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-dcc.el | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-truncate.el | 2 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 2 |
5 files changed, 25 insertions, 17 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 72754aa1cd3..e885887f453 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,11 @@ +2006-11-06 Juanma Barranquero <lekktu@gmail.com> + + * erc-dcc.el (erc-dcc-send-file): Fix typo in error message. + + * erc.el (read-passwd): + * erc-autoaway.el (erc-autoaway-reestablish-idletimer): + * erc-truncate.el (truncate): Fix typo in docstring. + 2006-08-13 Romain Francoise <romain@orebokech.com> * erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p' @@ -256,7 +264,7 @@ 2006-05-01 Edward O'Connor <ted@oconnor.cx> - * erc-goodies.el: (erc-handle-irc-url): New function, suitable as + * erc-goodies.el (erc-handle-irc-url): New function, suitable as a value for `url-irc-function'. 2006-04-18 Diane Murray <disumu@x3y2z1.net> @@ -360,14 +368,14 @@ 2006-02-12 Michael Olson <mwolson@gnu.org> - * erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el, - erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el, - erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el, - erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el, - erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el, - erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el, - erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el: Add - 2006 to copyright years, to comply with the changed guidelines. + * erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el + * erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el + * erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el + * erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el + * erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el + * erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el + * erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el: + Add 2006 to copyright years, to comply with the changed guidelines. 2006-02-11 Michael Olson <mwolson@gnu.org> @@ -528,7 +536,7 @@ 2006-01-29 Edward O'Connor <ted@oconnor.cx> - * erc-viper.el: Remove. Now that ERC is included in Emacs, these + * erc-viper.el: Remove. Now that ERC is included in Emacs, these work-arounds live in Viper itself. 2006-01-28 Michael Olson <mwolson@gnu.org> @@ -669,10 +677,10 @@ 2006-01-22 Johan Bockgård <bojohan@users.sourceforge.net> * erc-track.el: Use `(eval-when-compile (require 'cl))' (for - `case'). Doc fixes. + `case'). Doc fixes. (erc-find-parsed-property): Simplify. - (erc-track-get-active-buffer): Fix logic. Simplify. - (erc-track-switch-buffer): Remove unused variable `dir'. Simplify. + (erc-track-get-active-buffer): Fix logic. Simplify. + (erc-track-switch-buffer): Remove unused variable `dir'. Simplify. * erc-speak.el: Doc fixes. (erc-speak-region): `propertize' --> `erc-propertize'. diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el index 4614bd70e27..3eff0015b4c 100644 --- a/lisp/erc/erc-autoaway.el +++ b/lisp/erc/erc-autoaway.el @@ -136,7 +136,7 @@ See `erc-auto-discard-away'." (eval-when-compile (defvar erc-autoaway-idle-seconds)) (defun erc-autoaway-reestablish-idletimer () - "Reestablish the emacs idletimer. + "Reestablish the Emacs idletimer. If `erc-autoaway-idle-method' is 'emacs, you must call this function each time you change `erc-autoaway-idle-seconds'." (interactive) diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index 4b9172f06d7..098e9085d74 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -808,7 +808,7 @@ other client." (erc-ip-to-decimal (nth 0 contact)) (nth 1 contact) size))) - (error "`make-network-process' not supported by your emacs."))) + (error "`make-network-process' not supported by your Emacs"))) ;;; GET handling diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el index 7a1feaaedd2..76475ab8ee5 100644 --- a/lisp/erc/erc-truncate.el +++ b/lisp/erc/erc-truncate.el @@ -48,7 +48,7 @@ Used only when auto-truncation is enabled. (define-erc-module truncate nil "Truncate a query buffer if it gets too large. This prevents the query buffer from getting too large, which can -bring any grown emacs to its knees after a few days worth of +bring any grown Emacs to its knees after a few days worth of tracking heavy-traffic channels." ;;enable ((add-hook 'erc-insert-post-hook 'erc-truncate-buffer)) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 41d59576251..315c01c7348 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2002,7 +2002,7 @@ If no buffer matches, return nil." (if (not (fboundp 'read-passwd)) (defun read-passwd (prompt) - "Substitute for read-passwd in early emacsen" + "Substitute for `read-passwd' in early emacsen." (read-from-minibuffer prompt))) (defcustom erc-before-connect nil |