- Jan 27, 2013
-
-
Norbert Koch authored
-
- Jan 21, 2013
-
-
Vin Shelton authored
-
- Sep 03, 2011
-
-
cvs2hg authored
-
- Dec 21, 2009
-
-
viteno-guest authored
-
- Dec 19, 2009
-
-
kifer-guest authored
* ediff-patch.el (ediff-context-diff-label-regexp): regexp fix from the emacs tree.
-
- Dec 07, 2009
-
-
viteno-guest authored
-
kifer-guest authored
* ediff-init.el (ediff-event-key): use event-to-character instead of event-key. * ediff-mult.el (ediff-setup-meta-map, ediff-prepare-meta-buffer): add menus to the meta mode. (Dan Nicolaescu's <dann@ics.uci.edu> patch.) * ediff.el (ediff-buffers-internal): add unwind-protect. * ediff-util.el (ediff-minibuffer-with-setup-hook): new macro from Emacs tree. (ediff-read-file-name): use that macro.
-
- Nov 27, 2009
-
-
viteno-guest authored
-
- Nov 26, 2009
-
-
kifer-guest authored
* ediff.el (ediff-buffers-internal): Delete temporary files in case of non-local exit, like C-g (keyboard-quit), as well. * ediff.el (ediff-regions-internal): Ditto.
-
kifer-guest authored
* ediff-init.el, ediff-mult.el, ediff-util.el: relpace last-command-char and last-command-event with (ediff-last-command-char) everywhere. * ediff.el (ediff-version): revert change made in Emacs tree. * ediff-menu.el: use purecopy in Emacs menus. * ediff-diff.el, ediff-merge.el, ediff-mult.el, ediff-util.el, ediff.el, ediff-vers.el: use with-current-buffer instead of save-excursion/set-buffer whenever possible. Other cosmetic changes from the Emacs tree. * ediff-mult.el: apply Dan Nicolaescu's patch that adds a menu in ediff-meta mode.
-
- Aug 16, 2009
-
-
viteno authored
-
- Aug 15, 2009
-
-
michaelk authored
XEmacs. * ediff-merg.el (ediff-merge-region-is-non-clash-to-skip, ediff-merge-region-is-non-clash, ediff-skip-merge-region-if-changed-from-default-p): use defun. Also check if the job is really a merge job. * ediff.el (ediff-current-file): new function. * Changes from the Emacs main trunk.
-
- Dec 01, 2008
-
- Nov 23, 2008
-
-
michaelk authored
* ediff.el: changed date of last update.
-
- Nov 19, 2008
-
-
viteno authored
-
- Nov 16, 2008
-
-
michaelk authored
live. (ediff-save-buffer): Let window-min-height to 2. * ediff-wind.el (ediff-setup-windows-plain-compare): Avoid selecting the minibuffer. * ediff*.el, ediff.texi: Copied changes from Emacs CVS.
-
- Apr 07, 2008
-
-
viteno authored
-
- Apr 06, 2008
-
-
michaelk authored
ones (wrapped in if's). For compatibility with the current stable version of XEmacs.
-
- Apr 04, 2008
-
-
michaelk authored
* ediff-hook: deleted all invocations of (autoload ...). * ediff-util.el (ediff-setup): make window-min-height a local variable in ediff control window, and set its min height to 2. (ediff-setup-control-buffer): dedicate the control window. (ediff-toggle-multiframe): undedicate control window. Work directly with ediff-setup-windows-multiframe and ediff-setup-windows-plain. * ediff-wind (ediff-choose-window-setup-function-automatically): new function. (ediff-window-setup-function): change initialization. (ediff-setup-windows-automatic): deleted. (ediff-setup-windows-plain-merge): make control window dedicated. (ediff-destroy-control-frame): do not skip frames if working in a single frame.
-
- Jan 10, 2008
- Jan 09, 2008
- Nov 05, 2007
-
-
viteno authored
-
- Nov 02, 2007
-
-
michaelk authored
-
michaelk authored
-
michaelk authored
-
michaelk authored
Got rid of ediff-copy-list. * ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): do not use face-name. (ediff-test-utility,ediff-diff-mandatory-option) (ediff-reset-diff-options): removed to simplify yhe mandatory option handling on windows. (ediff-set-diff-options): added. (ediff-diff-options): changed. * ediff-vers.el (ediff-vc-internal): use ediff-vc-revision-other-window. (ediff-vc-merge-internal): use ediff-vc-revision-other-window and ediff-vc-working-revision. Require vc-hooks.
-
- Aug 28, 2007
-
-
viteno authored
-
- Aug 19, 2007
- Jun 12, 2007
-
-
viteno authored
-
michaelk authored
parenthesis. * ediff-init.el: doc strings.
-
michaelk authored
* ediff-mult.el (ediff-meta-buffer-brief-message,ediff-meta-buffer-verbose-message): new variables. (ediff-meta-buffer-message): variable deleted. (ediff-verbose-help-enabled): new variable. (ediff-toggle-verbose-help-meta-buffer): new function. (ediff-redraw-directory-group-buffer): made aware of short/verbose message options * ediff-ptch.el (ediff-context-diff-label-regexp): better regexp. (ediff-fixup-patch-map): improved heuristic.
-
- Jan 24, 2007
-
- Jan 23, 2007
-
-
michaelk authored
of message. Activate mark. (ediff-activate-mark): set transient-mark-mode to t. * ediff.el (ediff-regions-wordwise,ediff-regions-linewise): changed docstrings. * other files: 2007 copyright date added
-
- Dec 28, 2006
-
-
viteno authored
-
- Dec 23, 2006
-
-
michaelk authored
(ediff-setup-diff-regions): disallow -u in ediff-diff-options.
-
- Nov 27, 2006
-
- Nov 23, 2006
-
-
michaelk authored
condition-case.
-