diff lisp/ChangeLog @ 44487:3d2cd2b5a07b

*** empty log message ***
author Colin Walters <walters@gnu.org>
date Wed, 10 Apr 2002 19:16:02 +0000
parents 5bcb255d9dc5
children 11cfa2d8efb5
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Apr 10 19:15:51 2002 +0000
+++ b/lisp/ChangeLog	Wed Apr 10 19:16:02 2002 +0000
@@ -1,3 +1,11 @@
+2002-04-10  Colin Walters  <walters@verbum.org>
+
+	* 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  <rms@gnu.org>
 
 	* 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  <sds@gnu.org>
 
 	* vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.
 
+>>>>>>> 1.3687
 2002-04-07  Jason Rumney  <jasonr@gnu.org>
 
 	* 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  <rms@gnu.org>
 
 	* files.el (display-time-string-forms): Mark as risky.