diff options
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog.03 | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-capab.el | 2 |
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 @@ | |||
| 1474 | 1474 | ||
| 1475 | * erc.el: | 1475 | * erc.el: |
| 1476 | erc-error-face: setting a background doesn't work so well with multi-line | 1476 | erc-error-face: setting a background doesn't work so well with multi-line |
| 1477 | messages, so we don't. fg colour is negotiable ;-) | 1477 | messages, so we don't. fg color is negotiable ;-) |
| 1478 | (erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it | 1478 | (erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it |
| 1479 | (erc-send-current-line): allow multi-line messages provided they don't start | 1479 | (erc-send-current-line): allow multi-line messages provided they don't start |
| 1480 | with a slash - there's no need to prohibit them if the slash isn't the | 1480 | 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 @@ | |||
| 43 | ;; From freenode.net's web site (not there anymore) on how to mark | 43 | ;; From freenode.net's web site (not there anymore) on how to mark |
| 44 | ;; unidentified users: | 44 | ;; unidentified users: |
| 45 | ;; "We recommend that you add an asterisk before the nick, and | 45 | ;; "We recommend that you add an asterisk before the nick, and |
| 46 | ;; optionally either highlight or colourize the line in some | 46 | ;; optionally either highlight or colorize the line in some |
| 47 | ;; appropriate fashion, if the user is not identified." | 47 | ;; appropriate fashion, if the user is not identified." |
| 48 | 48 | ||
| 49 | ;;; Usage: | 49 | ;;; Usage: |