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

[Eli Zaretskii]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.3412 emacs/lisp/ChangeLog:1.3413
*** emacs/lisp/ChangeLog:1.3412 Wed Feb  6 10:43:05 2002
--- emacs/lisp/ChangeLog        Wed Feb  6 11:24:25 2002
***************
*** 121,127 ****
        (showhide-date-time): New function.
        (menu-bar-showhide-menu): New menu-item "Date and time".
  
- >>>>>>> 1.3409
  2002-02-03  Eli Zaretskii  <address@hidden>
  
        * mail/rmail.el (rmail): Use find-buffer-visiting instead of
--- 121,126 ----
***************
*** 144,150 ****
        * dabbrev.el (dabbrev--goto-start-of-abbrev):
        Exit loop on beginning of field rather than bobp.
  
- >>>>>>> 1.3400
  2002-02-02  Eli Zaretskii  <address@hidden>
  
        * mail/uce.el (uce-reply-to-uce): Prune the headers before copying
--- 143,148 ----
***************
*** 202,208 ****
  
        * hi-lock.el (hi-lock-find-patterns): Save restriction.
  
- >>>>>>> 1.3396
  2002-02-01  Eli Zaretskii  <address@hidden>
  
        * calendar/time-date.el: Moved from lisp/gnus.
--- 200,205 ----
***************
*** 259,265 ****
        New functions (separated from command-line-1).
        (command-line-1): Use them.
  
- >>>>>>> 1.3390
  2002-01-28  Eli Zaretskii  <address@hidden>
  
        * calendar/calendar.el (generate-calendar-month): Doc fix.
--- 256,261 ----