aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ediff.el
Commit message (Collapse)AuthorAgeFilesLines
* * ediff-diff.el (ediff-install-fine-diff-if-necessary): takeMichael Kifer2002-03-201-52/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* * ediff-init.el: comments.Michael Kifer2002-03-051-23/+41
| | | | | | | | | | | | | | | | | | | | | | * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories, ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision): cleanup. (ediff-draw-dir-diffs): now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): new function that implements copying of files from one Ediff dir to another (ediff-bury-dir-diffs-buffer): kills the buffer instead. (ediff-append-custom-diff): better error msgs. * ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix. (ediff-inferior-compare-regions): Use ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface.
* Fix typo.Pavel Janík2002-01-131-1/+1
|
* 2002-01-07 Michael Kifer <[email protected]>Michael Kifer2002-01-081-39/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <[email protected]>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
* * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesyMichael Kifer2001-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03-17 Michael Kifer <[email protected]>Michael Kifer2001-03-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | * 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-01-19 Michael Kifer <[email protected]>Michael Kifer2001-01-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]> * ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in diff mode, if available. 2001-01-19 Vin Shelton <[email protected]> * ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button 2001-01-19 Steve Youngs <[email protected]> * ediff-init.el (subst-char-in-string): Define and use it, unless it's already defined.
* 2000-12-25 Michael Kifer <[email protected]>Michael Kifer2000-12-251-9/+23
| | | | | | | | | | | * 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.
* * ediff.el (ediff-regions-internal, ediff-documentation):Dave Love2000-11-101-1/+5
| | | | | * ediff-vers.el (rcs-ediff-view-revision): Put temp buffer into fundamental mode.
* 2000-10-29 Michael Kifer <[email protected]>Michael Kifer2000-10-291-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* * viper-cmd.el (viper-envelop-ESC-key): added the option toMichael Kifer2000-02-281-1/+1
| | | | | | | | | | | | | 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.
* Fix copyright dates.Dave Love2000-01-311-1/+1
|
* *** empty log message ***Michael Kifer1999-11-251-19/+17
|
* *** empty log message ***Michael Kifer1999-11-011-81/+117
|
* Update version number.Karl Heuer1998-05-301-2/+2
|
* new versionMichael Kifer1998-05-041-2/+2
|
* new versionMichael Kifer1997-11-011-22/+51
|
* new versionMichael Kifer1997-09-301-2/+2
|
* new versionMichael Kifer1997-09-061-4/+5
|
* new versionMichael Kifer1997-08-221-0/+1
|
* new versionMichael Kifer1997-08-091-1/+1
|
* new versionMichael Kifer1997-07-311-9/+9
|
* new versionMichael Kifer1997-07-171-20/+22
|
* new versionMichael Kifer1997-05-311-23/+44
|
* *** empty log message ***Michael Kifer1996-12-281-2/+2
|
* *** empty log message ***Michael Kifer1996-09-201-27/+69
|
* *** empty log message ***Michael Kifer1996-06-221-242/+98
|
* *** empty log message ***Michael Kifer1996-02-161-200/+87
|
* Update FSF's address.Erik Naggum1996-01-141-10/+5
|
* Comment fixes.Karl Heuer1996-01-051-3/+3
|
* (ediff-mult): Require ediff-mult.Richard M. Stallman1995-11-201-1/+1
|
* (ediff-version): is now autoloaded.Michael Kifer1995-10-141-2/+11
|
* (ediff-files,ediff-merge-files): better file-name defaults.Michael Kifer1995-10-061-909/+522
| | | | | | | | | (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
* Update address in comment.Karl Heuer1995-08-171-1/+1
|
* Fixed bogus references to menu-bar-file-menu in define-key forms.Roland McGrath1995-06-171-4/+4
|
* don't make the patch buffer RO.Karl Heuer1995-06-051-1116/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | (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.
* (ediff-revision-key): Default value nil.Richard M. Stallman1995-05-081-6/+7
| | | | | (ediff-load-version-control): Don't remind any key if ediff-revision-key is nil.
* Update copyright.Karl Heuer1995-04-071-1/+1
|
* Don't put ediff-windows in the menu.Karl Heuer1995-03-181-3/+4
|
* (ediff-patch-buffer): Use buffer name in error message.Karl Heuer1995-03-181-1/+1
|
* Delete some autoloads that are now in menu-bar.el.Karl Heuer1995-03-171-6/+0
|
* Installed new version from author.Karl Heuer1995-03-161-3761/+1873
|
* (ediff-submit-report, ediff-revision)Richard M. Stallman1994-09-181-194/+389
| | | | | | | | | | | | | | | | (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.
* Undo change in condition for defining the menu bar items.Richard M. Stallman1994-08-111-8/+8
| | | | Use purify-flag once again.
* (ediff-find-file, ediff-patch-file): Handle symlinks.Richard M. Stallman1994-08-101-199/+343
| | | | | | | | | | | | | | | 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.
* (ediff-version): Function, variable deleted.Richard M. Stallman1994-08-041-16/+1
| | | | | (ediff-date): Var deleted. (ediff-status-info): Don't call ediff-version.
* Made menu bar's autoloaded stuff conditional onRichard M. Stallman1994-07-261-75/+111
| | | | | | | | | | | | | | 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.
* (Emacs 19 menu setup): Move back to top level and do it only if purify-flag.Richard M. Stallman1994-07-201-434/+865
| | | | | | | | | | | | | | | (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.
* (ediff-patch-buffer): Fix autoload cookie.Richard M. Stallman1994-05-281-1/+1
|
* Doc fix.Richard M. Stallman1994-05-221-1/+1
|