[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ChangeLog
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ChangeLog |
Date: |
Fri, 04 Nov 2005 00:40:04 -0500 |
Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.8519 emacs/lisp/ChangeLog:1.8520
*** emacs/lisp/ChangeLog:1.8519 Fri Nov 4 05:37:09 2005
--- emacs/lisp/ChangeLog Fri Nov 4 05:40:03 2005
***************
*** 1,3 ****
--- 1,11 ----
+ 2005-11-04 Michael Kifer <address@hidden>
+
+ * ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not
+ merging.
+
+ * ediff-util.el (ediff-previous-difference): don't skip regions that
+ have merge clashes.
+
2005-11-04 YAMAMOTO Mitsuharu <address@hidden>
* mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Undo
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, (continued)
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Sam Steingold, 2005/11/03
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Romain Francoise, 2005/11/03
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Stefan Monnier, 2005/11/03
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Lars Hansen, 2005/11/03
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Richard M . Stallman, 2005/11/03
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Nick Roberts, 2005/11/03
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Dan Nicolaescu, 2005/11/03
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Nick Roberts, 2005/11/03
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, YAMAMOTO Mitsuharu, 2005/11/03
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, YAMAMOTO Mitsuharu, 2005/11/04
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,
Michael Kifer <=
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Carsten Dominik, 2005/11/04
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Eli Zaretskii, 2005/11/04
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Eli Zaretskii, 2005/11/04
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Eli Zaretskii, 2005/11/04
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Eli Zaretskii, 2005/11/04
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Eli Zaretskii, 2005/11/04
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Jan Djärv, 2005/11/04
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Stefan Monnier, 2005/11/04
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Dan Nicolaescu, 2005/11/05
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog, Romain Francoise, 2005/11/05