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

[Per Abrahamsen]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.3416 emacs/lisp/ChangeLog:1.3417
*** emacs/lisp/ChangeLog:1.3416 Thu Feb  7 12:32:18 2002
--- emacs/lisp/ChangeLog        Thu Feb  7 12:33:40 2002
***************
*** 1,8 ****
- 2002-02-05  Per Abrahamsen  <address@hidden>
- 
-       * cus-edit.el (customize-mark-to-save): New function.
-       * menu-bar.el (menu-bar-options-save): Rewrote.
- 
  2002-02-06  Kim F. Storm  <address@hidden>
  
        * help.el (where-is): Report remapped commands.
--- 1,3 ----
***************
*** 89,95 ****
        * gud.el (gud-refresh): Call recenter only after we are sure we
        are in the right window.
  
! >>>>>>> 1.3415
  2002-02-05  Pavel Jan,Bm(Bk  <address@hidden>
  
        * cus-start.el (x-use-underline-position-properties):
--- 84,94 ----
        * gud.el (gud-refresh): Call recenter only after we are sure we
        are in the right window.
  
! 2002-02-05  Per Abrahamsen  <address@hidden>
! 
!       * cus-edit.el (customize-mark-to-save): New function.
!       * menu-bar.el (menu-bar-options-save): Rewrote.
! 
  2002-02-05  Pavel Jan,Bm(Bk  <address@hidden>
  
        * cus-start.el (x-use-underline-position-properties):