aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b11d2ba269..274625b461 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-10 Colin Walters <[email protected]>
+
+ * ibuffer.el (ibuffer-canonicalize-state-list): Delete unused
+ function.
+ (ibuffer-current-buffers-with-marks): Don't call `buffer-list'
+ ourselves; take it as an argument. Caller updated.
+ (ibuffer-mode): Make mode-class special.
+
2002-04-10 Richard M. Stallman <[email protected]>
* dired.el (dired-view-command-alist): New variable.
@@ -123,10 +131,14 @@
* files.el (display-time-string): Fix last change.
+<<<<<<< ChangeLog
+>>>>>>> 1.3683
+=======
2002-04-07 Sam Steingold <[email protected]>
* vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.
+>>>>>>> 1.3687
2002-04-07 Jason Rumney <[email protected]>
* international/mule-cmds.el (set-default-coding-systems)
@@ -140,6 +152,7 @@
* simple.el (play-sound): Move to subr.el.
+>>>>>>> 1.3679
2002-04-06 Richard M. Stallman <[email protected]>
* files.el (display-time-string-forms): Mark as risky.