1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-19 10:22:27 +00:00
Commit Graph

51 Commits

Author SHA1 Message Date
Michael Kifer
02f34c7046 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-init.el (ediff-highest-priority): bug fix.

	* viper-cmd.el (viper-special-read-and-insert-char): new function
	that reads a character and uses the current input method or
	iso-accents when appropriate.

	* viper.el and all others: corrections to the comment blocks at
	the top.
2001-09-09 22:33:38 +00:00
Michael Kifer
4960e7572a * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
	(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
	(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
	Deleted functions.
	(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
	ex-token-list.
	(viper-get-ex-address-subr): convert registers to char data type.

	* viper-util.el (viper-int-to-char,viper-char-equal): new
	functions.
	(viper-memq-char): use viper-int-to-char.
	(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
	vc-locking-state.
	(viper-read-key): use viper-read-key-sequence.

	* viper.el (viper-major-mode-modifier-list): added
	inferior-emacs-lisp-mode.
	(this-major-mode-requires-vi-state): new function that uses simple
	heuristics to decide if vi state is appropriate.
	(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
	(viper-non-hook-settings): don't advise read-key-sequence.
	(viper-read-key-sequence): new function that replaces the
	previously used advice to read-key-sequence.

	* viper-cmd.el (viper-test-com-defun,viper-exec-change,
	viper-exec-Change,viper-execute-com,viper-insert,viper-append,
	viper-Append,viper-Insert,viper-open-line,viper-Open-line,
	viper-open-line-at-point,viper-substitute,viper-overwrite,
	viper-replace-char-subr,viper-forward-word,viper-forward-Word):
	got rid of the negative character hack.
	(viper-escape-to-state,viper-replace-state-exit-cmd):
	use viper-read-key-sequence.
	(viper-envelop-ESC-key): no need for ad-get-orig-definition.
	(viper-minibuffer-standard-hook,viper-read-string-with-history):
	don't override existing minibuffer-setup-hook.
	(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
	convert registers to char data type.
	(viper-autoindent): use viper-indent-line.

	* viper-keym.el: use viper-exec-key-in-emacs.

	* viper.texi: Added credits, new commands, like :make.

	* ediff-util.el: Copyright years.
	(ediff-choose-syntax-table): New function.
	(ediff-setup): Use ediff-choose-syntax-table.
	(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
	vc-state is available.
	(ediff-make-temp-file): use ediff-coding-system-for-write.

	* ediff-init.el (ediff-with-syntax-table): New macro, uses
	with-syntax-table.
	(ediff-coding-system-for-read): from ediff-diff.el
	(ediff-coding-system-for-write): new variable.
	(ediff-highest-priority): fixed the bug having to do with disappearing
	overlays.
	(ediff-file-remote-p): use file-remote-p, if available.
	(ediff-listable-file): new function.
	(ediff-file-attributes): use ediff-listable-file.

	* ediff-mult.el (ediff-meta-insert-file-info1): use
	ediff-listable-file.

	* ediff-ptch.el (ediff-prompt-for-patch-file): use
	ediff-coding-system-for-read.
	(ediff-patch-file-internal): use ediff-coding-system-for-write.

	* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
	(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.

	* ediff.el: Date of last update, copyright years.

	* ediff-wind (ediff-setup-control-frame): Nill->nil.

	* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
Pavel Janík
3afbc435ac Some fixes to follow coding conventions. 2001-07-16 07:46:48 +00:00
Michael Kifer
4986c2c6c8 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-util.el: Copyright years.
	(ediff-choose-syntax-table): New function.
	(ediff-setup): Use ediff-choose-syntax-table.

	* ediff-init.el (ediff-with-syntax-table): New macro, uses
	with-syntax-table.

	* ediff.el: Date of last update, copyright years.

	* ediff-wind (ediff-setup-control-frame): Nill->nil.

	* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
	of Scott Bronson.
	(ex-cmd-assoc,ex-cmd-one-letr): New functions.
	(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
	Deleted functions.
	(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
	ex-token-list.

	* viper-util.el: Spaces, indentation.

	* viper.el: Changed version, modification time.
2001-03-17 18:59:39 +00:00
Michael Kifer
513bea4565 2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks
	for remote files.
	(ediff-coding-system-for-read): replaced the no-conversion default
	with raw-text.
	* ediff-init.el: Removed :version from defcustom vars.
	* ediff-util.el (ediff-compute-custom-diffs-maybe): Better
	handling of the diff mode
	* ediff.texi: Added ediff-coding-system-for-read.
	* viper.texi: typos
2001-02-12 08:47:13 +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
Dave Love
ca7d9565e9 (ediff-before-setup-hook)
(ediff-merge-filename-prefix): Add :version.
2001-01-17 18:28:50 +00:00
Michael Kifer
7261ece3c0 2000-12-25 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-init.el (ediff-quit-hook,ediff-suspend-hook): changed
	initialization; use add-hook.
	(ediff-file-remote-p): use file-local-copy.

	* ediff-ptch.el (ediff-prompt-for-patch-buffer): improved defaults.

	* ediff.el (ediff-patch-buffer): bug fix.
	(ediff-revision): allow selection of the file at the prompt.
2000-12-25 07:57:37 +00:00
Michael Kifer
7d0278167b * ediff-diff.el: Moved variables around to have it compile under NT.
* ediff-help.el (ediff-use-long-help-message): made it customizable.

	* ediff-init.el (ediff-abbrev-jobname): use capitalize.

	* ediff-wind.el (ediff-skip-unsuitable-frames): deleted the
	redundant skip-small-frames test.

	* viper-cmd.el (viper-change-state-to-vi): disable overwrite mode.
	(viper-downgrade-to-insert): protect against errors in hooks.

	* viper-init.el (viper-vi-state-hook,viper-insert-state-hook,
	viper-replace-state-hook,viper-emacs-state-hook): do cursor handling.
	(viper-restore-cursor-type,viper-set-insert-cursor-type): new
	functions.

	* viper-util.el (viper-memq-char): bug fixes

	* viper.el (viper-mode): fix cursor handling.
2000-11-24 08:15:11 +00:00
Thien-Thi Nguyen
acce6d21f9 (ediff-prepare-buffer-hook): Expand docstring, no functional change. 2000-10-31 18:05:59 +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
Dave Love
a21f0bd5b4 (ediff-region-help-echo): Bind face-help. 2000-07-24 09:44:02 +00:00
Dave Love
475de6f44d (ediff-region-help-echo): Modify to use overlay
now passed to the function.  It now works properly.
2000-07-21 19:42:57 +00:00
Dave Love
30729019be Fix last checkin. 2000-07-19 16:00:04 +00:00
Dave Love
50575ec215 (ediff-region-help-echo): Partially fix for Emacs implementation. 2000-07-19 15:56:50 +00:00
Michael Kifer
d396e5218f 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-diff.el (ediff-wordify): use syntax table.
	* ediff-init.el (ediff-has-face-support-p): use
	ediff-color-display-p.
	(ediff-color-display-p): use display-color-p, changed to defun
	from defsubst.
	Got rid of special cases for NeXT and OS/2.
	* ediff-wind.el (ediff-setup-control-frame): set proper modeline
	face.
2000-07-06 05:36:21 +00:00
Michael Kifer
560ef11a16 2000-06-05 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-init.el (ediff-has-face-support-p): make it paint faces on
	tty's.
	* ediff-diff.el (ediff-exec-process): use --binary for fine
	differences whenever apropriate.
	* viper-cmd.el (viper-smart-suffix-list): rearranged list members.
	* viper.el (find-file,find-file-other-window): get viper to do
	wildcards.
2000-06-05 00:07:02 +00:00
Michael Kifer
6de3983ff8 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-diff.el (ediff-forward-word): take syntactic word class into
	account.
	(ediff-test-utility,ediff-diff-mandatory-option,
	ediff-reset-diff-options): utilities for proper initialization of
	ediff-diff-options and ediff-diff3-options on Windows.

	* ediff-init.el (ediff-merge-filename-prefix): new customizable
	variable.

	* ediff-mult.el (ediff-filegroup-action): use
	ediff-merge-filename-prefix.
2000-05-24 17:31:16 +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
Eli Zaretskii
659cb92874 (ediff-temp-file-prefix): Use
small-temporary-file-directory if non-nil.
1999-09-02 12:33:53 +00:00
Karl Heuer
a09cfce720 (ediff-even-diff-face-A): Fix spelling. 1998-11-12 02:00:33 +00:00
Andreas Schwab
b2cd996123 (ediff-autostore-merges): Use `other' widget
type.
1998-06-24 08:58:07 +00:00
Richard M. Stallman
61d5c49207 (ediff-temp-file-prefix): Use temporary-file-directory. 1998-05-16 17:47:27 +00:00
Richard M. Stallman
4a37a5df9e (ediff-temp-file-prefix): Use system-tmp-directory. 1998-05-16 03:41:42 +00:00
Michael Kifer
d84b06effa *** empty log message *** 1998-05-06 19:54:57 +00:00
Michael Kifer
2eb4bdca8a new version 1998-05-04 22:42:59 +00:00
Andreas Schwab
0f94f94657 (ediff-autostore-merges): Doc fix. 1998-04-14 10:56:46 +00:00
Michael Kifer
c004db972f new version 1997-11-25 02:10:08 +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
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
Richard M. Stallman
cca9c6fcbb (ediff-eval-in-buffer): Add properties
such lisp-indent-function, lisp-indent-hook, edebug-form-spec.
1996-09-11 23:30:32 +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
Richard M. Stallman
36d57fa96f Make sure `facemenu-unlisted-faces' is bound. 1996-02-10 05:14:34 +00:00
Karl Heuer
d62af4649b (ediff-event-point, ediff-event-buffer): Fix error format string. 1996-01-29 23:12:01 +00:00
Erik Naggum
b578f267af Update FSF's address. 1996-01-14 07:34:30 +00:00
Karl Heuer
ceb0ea8ba6 (ediff-keep-variants): Doc fix. 1996-01-04 23:33:39 +00:00
Karl Heuer
2ff24a23f4 All faces added to facemenu-unlisted-faces list. 1995-11-10 18:58:59 +00:00
Michael Kifer
009650b3f9 Moved defsubsts up. 1995-10-14 03:14:11 +00:00
Michael Kifer
8343426b70 (ediff-abbreviate-file-name): function modified.
(ediff-truncate-string-left): new function.
(ediff-strip-last-dir,ediff-key-press-event-p,ediff-event-point,
ediff-event-buffer): new functions.
(ediff-frame-has-menubar,ediff-protect-meta-chars): functions deleted.
1995-10-06 00:55:57 +00:00
Richard M. Stallman
b35732e1e2 Delete the Emacs version error check. 1995-06-14 12:05:23 +00:00
Karl Heuer
41d25ad02e 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.
1995-06-05 23:43:51 +00:00
Karl Heuer
732be46569 Update copyright. 1995-04-07 01:20:53 +00:00