summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog.0210
-rw-r--r--lisp/erc/erc-truncate.el2
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index f7ade03aee1..d46a57b18c6 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -162,7 +162,7 @@
* erc.el(erc-truncate-buffer-on-save):
Removed documentation that
- described behaviour now changed. It used to say "When nil, no
+ described behavior now changed. It used to say "When nil, no
buffer is ever truncated." This is no longer true; even when
buffers are NOT truncated on save, they can be truncated, eg. by
adding erc-truncate-buffer to the hook.
@@ -1916,7 +1916,7 @@
Fix C-c C-t to not include the nick/time info
(both from antifuchs)
- * erc-complete.el: Fix for xemacs elt behaviour
+ * erc-complete.el: Fix for xemacs elt behavior
2002-04-17 John Wiegley <johnw@gnu.org>
@@ -1970,7 +1970,7 @@
2002-04-11 Mario Lang <mlang@delysid.org>
* erc-track.el:
- try to fix behaviour when used with different frames.
+ try to fix behavior when used with different frames.
2002-04-09 Mario Lang <mlang@delysid.org>
@@ -2162,7 +2162,7 @@
* erc-match.el:
Minor fix related to hook call method change (-until-seccess now)
- * erc.el: fixed ctcp behaviour abit (with auto-query on)
+ * erc.el: fixed ctcp behavior abit (with auto-query on)
* erc-list.el: ChanList mode.
Load it, and type M-x erc-chanlist RET
@@ -2396,7 +2396,7 @@
2002-01-30 Andreas Fuchs <asf@void.at>
* erc.el:
- * erc-send-current-line: fix behaviour where buffer changes.
+ * erc-send-current-line: fix behavior where buffer changes.
* erc-mark-message: fix stupid face bug. highlighting of pals should work now.
* erc-ring.el, erc.el:
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 0737fb1a0b7..02641c70a36 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -70,7 +70,7 @@ region is logged if `erc-logging-enabled' returns non-nil."
(set-buffer buffer)
;; Note that when erc-insert-post-hook runs, the buffer is
;; narrowed to the new message. So do this delicate widening.
- ;; I am not sure, I think this was not recommended behaviour in
+ ;; I am not sure, I think this was not recommended behavior in
;; Emacs 20.
(save-restriction
(widen)