Mercurial > emacs
comparison lisp/ChangeLog @ 51072:52709955c5a5
2003-05-18 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-mult.el (ediff-default-filtering-regexp): new variable.
* ediff-util.el (ediff-maybe-save-and-delete-merge): change in a
message.
* ediff.el (ediff-directories,ediff-directory-revisions,
ediff-directories3,ediff-merge-directories,
ediff-merge-directories-with-ancestor,ediff-merge-directory-revisions,
ediff-merge-directory-revisions-with-ancestor): make use of the new
ediff-default-filtering-regexp variable.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sun, 18 May 2003 17:18:09 +0000 |
| parents | 5659e974cceb |
| children | b11ec18b9706 |
comparison
equal
deleted
inserted
replaced
| 51071:5659e974cceb | 51072:52709955c5a5 |
|---|---|
| 1 2003-05-18 Michael Kifer <kifer@cs.stonybrook.edu> | |
| 2 | |
| 3 * ediff-mult.el (ediff-default-filtering-regexp): new variable. | |
| 4 | |
| 5 * ediff-util.el (ediff-maybe-save-and-delete-merge): change in a | |
| 6 message. | |
| 7 | |
| 8 * ediff.el (ediff-directories,ediff-directory-revisions, | |
| 9 ediff-directories3,ediff-merge-directories, | |
| 10 ediff-merge-directories-with-ancestor,ediff-merge-directory-revisions, | |
| 11 ediff-merge-directory-revisions-with-ancestor): make use of the new | |
| 12 ediff-default-filtering-regexp variable. | |
| 13 | |
| 1 2003-05-18 Richard M. Stallman <rms@gnu.org> | 14 2003-05-18 Richard M. Stallman <rms@gnu.org> |
| 2 | 15 |
| 3 * which-func.el (which-func-current, which-func-format): | 16 * which-func.el (which-func-current, which-func-format): |
| 4 Preload the risky-local-variable properties for them. | 17 Preload the risky-local-variable properties for them. |
| 5 | 18 |