Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.7662 emacs/lisp/ChangeLog:1.7663
*** emacs/lisp/ChangeLog:1.7662 Fri Jun 3 11:23:08 2005
--- emacs/lisp/ChangeLog Fri Jun 3 14:18:31 2005
***************
*** 34,40 ****
* viper.el (viper-non-hook-settings): Fixed the names of defadvices.
- >>>>>>> 1.7661
2005-06-01 Luc Teirlinck <[EMAIL PROTECTED]>
* autorevert.el (auto-revert-buffers): Use save-match-data.
--- 34,39 ----
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
