[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Colin Walters]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.3688 emacs/lisp/ChangeLog:1.3689
*** emacs/lisp/ChangeLog:1.3688 Wed Apr 10 11:17:17 2002
--- emacs/lisp/ChangeLog        Wed Apr 10 15:10:50 2002
***************
*** 1,3 ****
--- 1,11 ----
+ 2002-04-10  Colin Walters  <address@hidden>
+ 
+       * 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  <address@hidden>
  
        * dired.el (dired-view-command-alist): New variable.
***************
*** 123,132 ****
--- 131,144 ----
  
        * files.el (display-time-string): Fix last change.
  
+ <<<<<<< ChangeLog
+ >>>>>>> 1.3683
+ =======
  2002-04-07  Sam Steingold  <address@hidden>
  
        * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.
  
+ >>>>>>> 1.3687
  2002-04-07  Jason Rumney  <address@hidden>
  
        * international/mule-cmds.el (set-default-coding-systems)
***************
*** 140,145 ****
--- 152,158 ----
  
        * simple.el (play-sound): Move to subr.el.
  
+ >>>>>>> 1.3679
  2002-04-06  Richard M. Stallman  <address@hidden>
  
        * files.el (display-time-string-forms): Mark as risky.