summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog.032
-rw-r--r--lisp/erc/erc-capab.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 30e6664dd27..526042ea08d 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -1474,7 +1474,7 @@
* erc.el:
erc-error-face: setting a background doesn't work so well with multi-line
- messages, so we don't. fg colour is negotiable ;-)
+ messages, so we don't. fg color is negotiable ;-)
(erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it
(erc-send-current-line): allow multi-line messages provided they don't start
with a slash - there's no need to prohibit them if the slash isn't the
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index e153e0185d2..2a6e2811a0d 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -43,7 +43,7 @@
;; From freenode.net's web site (not there anymore) on how to mark
;; unidentified users:
;; "We recommend that you add an asterisk before the nick, and
-;; optionally either highlight or colourize the line in some
+;; optionally either highlight or colorize the line in some
;; appropriate fashion, if the user is not identified."
;;; Usage: