Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.7820 emacs/lisp/ChangeLog:1.7821
*** emacs/lisp/ChangeLog:1.7820 Tue Jun 21 13:10:02 2005
--- emacs/lisp/ChangeLog Tue Jun 21 13:39:27 2005
***************
*** 1,3 ****
--- 1,7 ----
+ 2005-06-21 Reiner Steib <[EMAIL PROTECTED]>
+
+ * pcvs-defs.el (cvs-menu): Add cvs-mode-mark and cvs-mode-unmark.
+
2005-06-21 Glenn Morris <[EMAIL PROTECTED]>
* calendar/appt.el (appt-make-list): Activate the package, if
***************
*** 541,546 ****
--- 545,551 ----
variables, unless either `gtk' is boundp or this isn't a
`windows-nt' build.
+ >>>>>>> 1.7817
2005-06-13 Lute Kamstra <[EMAIL PROTECTED]>
* abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and
***************
*** 1448,1453 ****
--- 1453,1459 ----
* simple.el (filter-buffer-substring): Fix typo in docstring.
+ >>>>>>> 1.7768
2005-05-31 Richard M. Stallman <[EMAIL PROTECTED]>
* progmodes/vhdl-mode.el (vhdl-fill-region): Test ARG, not INTERACTIVE.
***************
*** 1484,1489 ****
--- 1490,1496 ----
* 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 <[EMAIL PROTECTED]>
* calendar/diary-lib.el (mark-included-diary-files): Only kill
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
