1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-11 08:30:45 -08:00
Commit graph

40 commits

Author SHA1 Message Date
Michael Kifer
743a79af65 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
the current highlighting style into account.
	(ediff-forward-word-function,ediff-whitespace,ediff-word-1,
	ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local.

	* ediff-init.el (ediff-patch-job): new macro.

	* ediff-mult.el (ediff-make-new-meta-list-header): new API function.
	(ediff-intersect-directories): use ediff-make-new-meta-list-header.

	* ediff-ptch.el (ediff-map-patch-buffer): use
	ediff-make-new-meta-list-header.
	(ediff-fixup-patch-map): use the meta-list API from ediff-mult.el.

	* ediff-util.el (ediff-toggle-hilit): fix toggling of highliting.
	(ediff-select-difference): take highlighting style into account.
	(ediff-clone-buffer-for-region-comparison): new function.
	(ediff-inferior-compare-regions): added comparison of current diff
	regions.

	* ediff.el (ediff-clone-buffer-for-region-comparison,
	ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
Jason Rumney
b5dcfce9f1 Updated to include w32-vars.el 2002-01-20 16:02:31 +00:00
Sam Steingold
5682d301c3 regenerated 2001-10-26 15:40:03 +00:00
Gerd Moellmann
ad6482122a *** empty log message *** 2001-09-25 10:34:41 +00:00
Gerd Moellmann
09938b6789 *** empty log message *** 2001-07-13 10:39:10 +00:00
Gerd Moellmann
b5c5b319e5 *** empty log message *** 2001-05-08 12:31:31 +00:00
Gerd Moellmann
f383cd0dfe *** empty log message *** 2001-04-05 10:44:22 +00:00
Eli Zaretskii
8e58a55c8b (normal-erase-is-backspace): Use it instead of
delete-key-deletes-forward.
2001-04-04 14:04:43 +00:00
Gerd Moellmann
2a55cd3a13 *** empty log message *** 2001-02-15 13:05:29 +00:00
Gerd Moellmann
efaa080bd7 *** empty log message *** 2001-01-30 19:51:14 +00:00
Gerd Moellmann
c7f48c35d5 *** empty log message *** 2001-01-28 19:27:14 +00:00
Michael Kifer
2550055a67 2001-01-19 Michael Kifer <kifer@cs.sunysb.edu>
* viper.el: call initial-major-mode on startup.

	* ediff.el (ediff-patch-file): use better defaults.

	* ediff-vers.el: fix for 8+3 DOS file systems

2001-01-19  Colin Walters <walters@cis.ohio-state.edu>

	* ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in
	diff mode, if available.

2001-01-19  Vin Shelton <acs@xemacs.org>

	* ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button

2001-01-19  Steve Youngs  <youngs@xemacs.org>

	* ediff-init.el (subst-char-in-string): Define and use it, unless
	it's already defined.
2001-01-19 07:13:03 +00:00
Gerd Moellmann
ac95a62196 *** empty log message *** 2001-01-10 12:50:09 +00:00
Gerd Moellmann
6c083b4cec *** empty log message *** 2000-12-04 12:28:37 +00:00
Gerd Moellmann
bd02b8e072 *** empty log message *** 2000-11-09 23:49:35 +00:00
Kai Großjohann
d09b9dbd23 bogus commit 2000-10-29 17:56:57 +00:00
Kai Großjohann
1da437e9a8 install-info syntax compat change. 2000-10-29 17:36:49 +00:00
Sam Steingold
690ec64977 use lisp-mode-shared-map instead of shared-lisp-mode-map 2000-10-10 17:27:38 +00:00
Gerd Moellmann
54baed30f4 *** empty log message *** 2000-09-04 20:05:31 +00:00
Gerd Moellmann
abb2db1cf3 *** empty log message *** 2000-08-02 21:29:36 +00:00
Gerd Moellmann
f75a0f7a60 *** empty log message *** 2000-06-08 12:49:10 +00:00
Gerd Moellmann
57cb56f585 *** empty log message *** 2000-04-29 19:35:00 +00:00
Gerd Moellmann
cc181e9561 *** empty log message *** 2000-04-24 14:01:22 +00:00
Gerd Moellmann
be0dbdab00 *** empty log message *** 2000-04-09 11:15:57 +00:00
Gerd Moellmann
3b55acc9b0 *** empty log message *** 2000-03-24 12:21:51 +00:00
Gerd Moellmann
81bf3fa70c *** empty log message *** 2000-03-23 15:09:56 +00:00
Gerd Moellmann
3f6e4b8bfb *** empty log message *** 2000-03-21 21:53:43 +00:00
Gerd Moellmann
a25bbe00cb *** empty log message *** 2000-03-20 14:08:44 +00:00
Gerd Moellmann
fd0e837bd1 *** empty log message *** 2000-03-15 23:09:16 +00:00
Gerd Moellmann
d1221ea91d *** empty log message *** 2000-03-09 20:28:18 +00:00
Gerd Moellmann
449c3c5259 *** empty log message *** 2000-02-25 14:05:59 +00:00
Gerd Moellmann
3c4c80642a *** empty log message *** 2000-01-14 14:02:21 +00:00
Gerd Moellmann
0a352cd7a3 *** empty log message *** 2000-01-13 14:50:15 +00:00
Gerd Moellmann
6448a6b36f *** empty log message *** 1999-12-28 13:05:57 +00:00
Gerd Moellmann
2936437d10 *** empty log message *** 1999-12-21 09:08:41 +00:00
Gerd Moellmann
cded5ed3bf *** empty log message *** 1999-12-06 13:37:29 +00:00
Gerd Moellmann
4c56b88eb8 *** empty log message *** 1999-11-11 14:03:18 +00:00
Gerd Moellmann
37ed1e5695 *** empty log message *** 1999-10-28 20:05:55 +00:00
Gerd Moellmann
7518ed7ba7 *** empty log message *** 1999-10-12 21:12:16 +00:00
Dave Love
272a4715c5 # 1999-10-07 11:04:40 +00:00