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

[Lute Kamstra]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.7825 emacs/lisp/ChangeLog:1.7826
*** emacs/lisp/ChangeLog:1.7825 Wed Jun 22 02:31:48 2005
--- emacs/lisp/ChangeLog        Wed Jun 22 07:36:03 2005
***************
*** 580,586 ****
        variables, unless either `gtk' is boundp or this isn't a
        `windows-nt' build.
  
- >>>>>>> 1.7817
  2005-06-13  Lute Kamstra  <address@hidden>
  
        * abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and
--- 580,585 ----
***************
*** 1488,1494 ****
  
        * simple.el (filter-buffer-substring): Fix typo in docstring.
  
- >>>>>>> 1.7768
  2005-05-31  Richard M. Stallman  <address@hidden>
  
        * progmodes/vhdl-mode.el (vhdl-fill-region): Test ARG, not INTERACTIVE.
--- 1487,1492 ----
***************
*** 1525,1531 ****
        * textmodes/tex-mode.el (tex-compile-commands, tex-compile)
        (tex-start-tex): Undo all but the last part of the 2005-05-28 change.
  
- >>>>>>> 1.7646
  2005-05-30  Glenn Morris  <address@hidden>
  
        * calendar/diary-lib.el (mark-included-diary-files): Only kill
--- 1523,1528 ----