1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00
Commit Graph

49 Commits

Author SHA1 Message Date
Dave Love
e4d2c13046 * ediff.el (ediff-regions-internal, ediff-documentation):
* ediff-vers.el (rcs-ediff-view-revision): Put temp buffer into
	fundamental mode.
2000-11-10 22:34:22 +00:00
Michael Kifer
657f9cb8b7 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
* viper-cmd.el (viper-preserve-cursor-color): new test that avoids
	rewrawing the screen when changing cursor color.
	(viper-insert-state-pre-command-sentinel,
	viper-replace-state-pre-command-sentinel,
	viper-replace-state-post-command-sentinel): use
	viper-preserve-cursor-color.
	Many functions changed to use viper= instead of = when comparing
	characters.
	* viper-util.el (viper-memq-char,viper=): new functions for
	working with characters.
	(viper-change-cursor-color): fixed buglet.
	Many functions changed to use viper= instead of = when comparing
	characters.
	* viper.el (viper-insert-state-mode-list): added eshell.

	* ediff-init.el (ediff-before-setup-hook): new hook.
	Several typos fixed in various docstrings.
	* ediff-merg.el (ediff-show-clashes-only): docstring typo fixed.
	* ediff-nult.el (ediff-before-session-group-setup-hooks): new
	hook.
	(ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks.
	* ediff-util.el (ediff-setup): run ediff-before-setup-hook.
	(ediff-other-buffer): use selected buffers if in Buffer-menu buffer.
	(ediff-get-selected-buffers): new function.
	* ediff-vers.el (ediff-vc-internal,ediff-rcs-internal,
	ediff-vc-merge-internal,ediff-rcs-merge-internal): use
	save-window-excursion.
	* ediff-wind.el (ediff-skip-unsuitable-frames): more robust
	termination check in while loop.
	* ediff.el (ediff-get-default-file-name): better defaults when in
	dired buffer.
	(ediff-files,ediff-merge-files,ediff-files3,
	ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
2000-10-29 04:56:45 +00:00
Michael Kifer
55d7ff38f1 * viper-cmd.el (viper-envelop-ESC-key): added the option to
translate all ESC key sequences.
	(viper-goto-mark-subr): restore markers for files for which
	they were saved.
	* viper-init.el (viper-translate-all-ESC-keysequences): new variable.
	* viper-util.el (viper-set-replace-overlay-glyphs,
	viper-set-replace-overlay): always check if the replacement
	overlay is live.
	* viper.el (viper-vi-state-mode-list): added major modes.
	* ediff-wind.el: minor comment changes.
	* ediff.el: copyright notice date fix.
2000-02-28 06:16:44 +00:00
Dave Love
b0e40a7fe1 Fix copyright dates. 2000-01-31 22:03:00 +00:00
Michael Kifer
086171bf0b *** empty log message *** 1999-11-25 04:34:23 +00:00
Michael Kifer
3af0304a61 *** empty log message *** 1999-11-01 07:16:15 +00:00
Karl Heuer
64c9affcc4 Update version number. 1998-05-30 14:41:23 +00:00
Michael Kifer
2eb4bdca8a new version 1998-05-04 22:42:59 +00:00
Michael Kifer
328b4b7052 new version 1997-11-01 01:46:51 +00:00
Michael Kifer
8e41a31c5d new version 1997-09-30 01:13:53 +00:00
Michael Kifer
bd698e987e new version 1997-09-06 04:16:05 +00:00
Michael Kifer
34317da2d4 new version 1997-08-22 03:15:57 +00:00
Michael Kifer
985d0dad78 new version 1997-08-09 04:30:41 +00:00
Michael Kifer
e756eb9faf new version 1997-07-31 04:04:23 +00:00
Michael Kifer
1e70790f2f new version 1997-07-17 19:37:07 +00:00
Michael Kifer
ddc90f39b0 new version 1997-05-31 01:10:39 +00:00
Michael Kifer
bf5d92c5e3 *** empty log message *** 1996-12-28 02:53:04 +00:00
Michael Kifer
92c51e075e *** empty log message *** 1996-09-20 01:10:05 +00:00
Michael Kifer
bbe6126cba *** empty log message *** 1996-06-22 01:54:34 +00:00
Michael Kifer
4ae69eaccf *** empty log message *** 1996-02-16 06:36:35 +00:00
Erik Naggum
b578f267af Update FSF's address. 1996-01-14 07:34:30 +00:00
Karl Heuer
a7acbbe4d4 Comment fixes. 1996-01-05 22:21:28 +00:00
Richard M. Stallman
c116ebd8b0 (ediff-mult): Require ediff-mult. 1995-11-20 22:03:14 +00:00
Michael Kifer
138df2ce47 (ediff-version): is now autoloaded. 1995-10-14 03:14:39 +00:00
Michael Kifer
87c668b46d (ediff-files,ediff-merge-files): better file-name defaults.
(ediff-split-string): new function.
(ediff-exec-process): now handles diff args separated by space.
(ediff-backup-extension): new variable.
Replaced -hooks with -hook.
(ediff-revision-key): variable deleted.
Moved menubar definitions to a new file, ediff-hook.el
1995-10-06 01:01:08 +00:00
Karl Heuer
2b9118484e Update address in comment. 1995-08-17 19:37:52 +00:00
Roland McGrath
2ef2d89752 Fixed bogus references to menu-bar-file-menu in define-key forms. 1995-06-17 06:33:08 +00:00
Karl Heuer
f1a5512adf don't make the patch buffer RO.
(ediff-load-version-control): now checks if
ediff-revision-key is non-nil.

(ediff-revision-key): Now defaults to nil.

(ediff-revision): now takes prefix argument; can compare
two versions of the same file.

the merge buffer now assumes the major mode of the
default variant.

(ediff-documentation: new function.

(ediff-patch-buffer): now handles buffers that don't
visit any file.
(ediff-windows): renamed to ediff-windows-wordwise, added
(ediff-windows-linewise): new function.
Changed ediff-small/large-regions to ediff-regions-wordwise/linewise

Converted xemacs *screen* nomenclature to *frame*.
Incorporated overlay strings. Ediff no longer runs under emacs
19.28 and earlier and XEmacs 19.11 and earlier.

Changed window-system to ediff-window-display.
1995-06-05 23:41:43 +00:00
Richard M. Stallman
d8e54b47e6 (ediff-revision-key): Default value nil.
(ediff-load-version-control): Don't remind any key if
ediff-revision-key is nil.
1995-05-08 23:53:13 +00:00
Karl Heuer
732be46569 Update copyright. 1995-04-07 01:20:53 +00:00
Karl Heuer
2f1ce09315 Don't put ediff-windows in the menu. 1995-03-18 01:53:12 +00:00
Karl Heuer
eeb6dd92ea (ediff-patch-buffer): Use buffer name in error message. 1995-03-18 01:12:12 +00:00
Karl Heuer
df9817838b Delete some autoloads that are now in menu-bar.el. 1995-03-17 23:00:49 +00:00
Karl Heuer
0f0b0a86ad Installed new version from author. 1995-03-16 22:31:54 +00:00
Richard M. Stallman
eaccd4d857 (ediff-submit-report, ediff-revision)
(ediff-find-file-name-handler, vc-ediff-internal, rcs-ediff-internal):
New functions.
(ediff-version-control-package): New variable.
(vc-ediff, rcs-ediff): Functions deleted.

(ediff-submit-report): New function.

(ediff-toggle-read-only, ediff-patch-file): Check out
version controlled files before their buffers are modified.
(ediff-local-checkout-flag, ediff-toggle-read-only-function): New variables.

(ediff-find-file, ediff-patch-file): Were getting
confused by symbolic links.  Fixed.
1994-09-18 08:52:32 +00:00
Richard M. Stallman
214b902199 Undo change in condition for defining the menu bar items.
Use purify-flag once again.
1994-08-11 21:48:37 +00:00
Richard M. Stallman
0691ced3c7 (ediff-find-file, ediff-patch-file): Handle symlinks.
Check ediff-if-lucid when setting up Emacs 19 menus.

(ediff-save-buffer): Added option for saving diff output.

(ediff-fine-diff-buffer, ediff-ignore-similar-regions): New variables.
(ediff-no-fine-diffs): Macro added.
(ediff-next-difference, ediff-previous-difference)
(ediff-make-fine-diffs): Enabled a new feature that allows one to
skip over the difference regions where the only differences are
the white space and newlines.
(ediff-toggle-autorefine): Fixed a bug that caused error when the
current difference is <= 0 or > ediff-number-of-differences.
1994-08-10 03:39:47 +00:00
Richard M. Stallman
7c496a7928 (ediff-version): Function, variable deleted.
(ediff-date): Var deleted.
(ediff-status-info): Don't call ediff-version.
1994-08-04 08:22:09 +00:00
Richard M. Stallman
f9ae53246c Made menu bar's autoloaded stuff conditional on
purify-flag, to avoid error message when loading ediff in a frame
that has no menu bar.

(ediff-setup): Improved mode-line-buffer-identification.
Now accommodates buffer identifications generated by
mode-line.el and uniquify.el.

(ediff-current-diff-face-A/B,
ediff-fine-diff-face-A/B,ediff-odd/even-diff-face-A/B):
Variables changed to contain face names
instead of face internal representation.
1994-07-26 20:16:05 +00:00
Richard M. Stallman
fcbadd58ad (Emacs 19 menu setup): Move back to top level and do it only if purify-flag.
(ediff-find-file, ediff-files-internal, ediff-patch-file):
Modified to work with remote and compressed files.

(ediff-read-file-name, ediff-buffers): Better defaults.
(ediff-read-file-name) Handle OS/2.

(ediff-forward-word-function) New function.
(ediff-wordify-function): Variable deleted.
(ediff-toggle-regexp-match, ediff-hide-regexp-matches): New functions.
(ediff-focus-on-regexp-matches): New function.
(ediff-status-info): New function.
(ediff-file-names, ediff-line-numbers): Functions deleted.
1994-07-20 20:04:47 +00:00
Richard M. Stallman
c8dfbe3367 (ediff-patch-buffer): Fix autoload cookie. 1994-05-28 01:59:24 +00:00
Richard M. Stallman
a4e104bf5c Doc fix. 1994-05-22 22:14:17 +00:00
Richard M. Stallman
a1094fc9d0 Make menu bar defines unconditional.
Don't alter menu-bar-files-menu here; menu-bar.el does that.
1994-05-14 08:59:22 +00:00
Richard M. Stallman
c4a6a430aa Move menu bar defines to top level
and split them among three top-level sexps.
1994-05-14 08:33:26 +00:00
Karl Heuer
876b340b1f (ediff-no-help-in-control-buffer): Renamed from
ediff-nix-help-in-control-buffer, to match doc and usage.
1994-05-11 04:51:02 +00:00
Richard M. Stallman
b3a262251d New version from Kifer. 1994-05-10 00:48:00 +00:00
Richard M. Stallman
17fcf5c535 Doc fixes. 1994-05-09 18:07:28 +00:00
Richard M. Stallman
08020d91e0 entered into RCS 1994-05-07 04:39:30 +00:00
Richard M. Stallman
813f532d2f Initial revision 1994-05-02 05:16:59 +00:00