aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
authorGlenn Morris2014-01-16 00:34:43 -0800
committerGlenn Morris2014-01-16 00:34:43 -0800
commitd967cd184c6dff62705de16823ca92b0ceb7ba23 (patch)
tree89d905c4ff407d849b86cde7be1d5acbe57f73c0 /lisp/erc
parentc5e24e666e6bdbccdea28619849c9de646b9e799 (diff)
downloademacs-d967cd184c6dff62705de16823ca92b0ceb7ba23.tar.gz
emacs-d967cd184c6dff62705de16823ca92b0ceb7ba23.zip
ChangeLog fixes
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog2
-rw-r--r--lisp/erc/ChangeLog.0220
-rw-r--r--lisp/erc/ChangeLog.034
-rw-r--r--lisp/erc/ChangeLog.042
-rw-r--r--lisp/erc/ChangeLog.062
5 files changed, 16 insertions, 14 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index b5cbf56d888..6bfaa184b70 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -200,7 +200,7 @@
200 200
2012012-10-04 Julien Danjou <julien@danjou.info> 2012012-10-04 Julien Danjou <julien@danjou.info>
202 202
203 * erc-desktop-notifications.el: Rename from erc-notifications to 203 * erc-desktop-notifications.el: Rename from erc-notifications.el to
204 avoid clash with 8+3 filename format and erc-notify.el. 204 avoid clash with 8+3 filename format and erc-notify.el.
205 205
2062012-09-25 Chong Yidong <cyd@gnu.org> 2062012-09-25 Chong Yidong <cyd@gnu.org>
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 32ff17e65f6..77d4855abc2 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -1032,13 +1032,12 @@
1032 * erc-autoaway.el, erc-fill.el, erc.el: erc-autoaway.el: 1032 * erc-autoaway.el, erc-fill.el, erc.el: erc-autoaway.el:
1033 * new file 1033 * new file
1034 1034
1035 erc.el: 1035 * erc.el: Removed auto-discard-away facility (now included in
1036 * Removed auto-discard-away facility (now included in erc-autoaway.el) 1036 erc-autoaway.el)
1037 * (erc-away-p): new function 1037 (erc-away-p): new function
1038 1038
1039 erc-fill.el: 1039 * erc-fill.el (erc-fill-variable): Check whether erc-timestamp-format
1040 * (erc-fill-variable): Check whether erc-timestamp-format is bound before 1040 is bound before using it (erc-fill.el does not require erc-stamp).
1041 using it (erc-fill.el does not require erc-stamp).
1042 1041
10432002-11-10 Alex Schroeder <alex@gnu.org> 10422002-11-10 Alex Schroeder <alex@gnu.org>
1044 1043
@@ -1650,10 +1649,13 @@
1650 Changed some instances of member to memq. 1649 Changed some instances of member to memq.
1651 1650
1652 * erc-track.el, erc.el: 1651 * erc-track.el, erc.el:
1653 erc.el: (erc-message-type-member): New function, used to test 1652 * erc.el (erc-message-type-member): New function, used to test
1654 for message type. Require erc-parsed text-property. 1653 for message type. Require erc-parsed text-property.
1655 erc-track.el: erc-track-exclude-types: New variable. Defaults to ("JOIN" "PART") right now for testing, it should eventually set to nil soon again. 1654 * erc-track.el (erc-track-exclude-types): New variable. Defaults
1656 (erc-track-modified-channels): Use above fun and var to optionally exclude certain message types from channel tracking. 1655 to ("JOIN" "PART") right now for testing, it should eventually set
1656 to nil soon again.
1657 (erc-track-modified-channels): Use above fun and var to optionally
1658 exclude certain message types from channel tracking.
1657 1659
16582002-05-28 Diane Murray <disumu@x3y2z1.net> 16602002-05-28 Diane Murray <disumu@x3y2z1.net>
1659 1661
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index fff3e8560cc..5f04cf8ebe5 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -678,7 +678,7 @@
678 to erc-truncate.el 678 to erc-truncate.el
679 * erc-truncate-buffer-on-save: moved to erc-log.el 679 * erc-truncate-buffer-on-save: moved to erc-log.el
680 * erc-initialize-log-marker: new function. 680 * erc-initialize-log-marker: new function.
681 erc-log.el: 681 * erc-log.el:
682 * erc-truncate-buffer-on-save: New defcust here; from erc.el 682 * erc-truncate-buffer-on-save: New defcust here; from erc.el
683 * erc-truncate-buffer-on-save: Put it in group `erc-log' 683 * erc-truncate-buffer-on-save: Put it in group `erc-log'
684 * erc-log-channels-directory: Remove trailing slash from 684 * erc-log-channels-directory: Remove trailing slash from
@@ -686,7 +686,7 @@
686 * Add functions to erc-connect-pre-hook, erc-part-hook and 686 * Add functions to erc-connect-pre-hook, erc-part-hook and
687 erc-quit-hook to avoid getting autoloaded. 687 erc-quit-hook to avoid getting autoloaded.
688 688
689 erc-truncate.el: 689 * erc-truncate.el:
690 * Contains the truncation functions and defcusts from erc.el. 690 * Contains the truncation functions and defcusts from erc.el.
691 * define-erc-module clause added; new erc-truncate-mode. 691 * define-erc-module clause added; new erc-truncate-mode.
692 692
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index c82d9e5028e..07f2fa9efdc 100644
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -491,7 +491,7 @@
491 members has been made some time ago. Clean up the various tries to 491 members has been made some time ago. Clean up the various tries to
492 do this in the past. 492 do this in the past.
493 493
494 erc-macs.el: Removed. erc-members.el: Removed. 494 * erc-macs.el, erc-members.el: Removed.
495 495
4962004-08-10 Jorgen Schaefer <forcer@users.sourceforge.net> 4962004-08-10 Jorgen Schaefer <forcer@users.sourceforge.net>
497 497
diff --git a/lisp/erc/ChangeLog.06 b/lisp/erc/ChangeLog.06
index 197fd991c76..a547da6b27c 100644
--- a/lisp/erc/ChangeLog.06
+++ b/lisp/erc/ChangeLog.06
@@ -1095,7 +1095,7 @@
1095 `ibuffer-define-column'. Require 'ibuf-ext so that the macros 1095 `ibuffer-define-column'. Require 'ibuf-ext so that the macros
1096 work without compiler warnings. 1096 work without compiler warnings.
1097 1097
1098 * man/erc.texi (Obtaining ERC, Installation): Note that these 1098 * erc.texi (Obtaining ERC, Installation): Note that these
1099 sections may be skipped if using the version of ERC that comes 1099 sections may be skipped if using the version of ERC that comes
1100 with Emacs. 1100 with Emacs.
1101 1101