Commits

Author Commit Message Labels Comments Date
Norbert Koch
Added tag ediff-1_84 for changeset 21354092a62d
Norbert Koch
XEmacs Package Release 1.84
Tags
ediff-1_84
Norbert Koch
Added tag ediff-1_83 for changeset 0d683aa1f762
Norbert Koch
XEmacs Package Release 1.83
Tags
ediff-1_83
Jerry James
Migrate .cvsignore files to a single .hgignore file. In addition: - Restore CVS keyword expansions that were lost during the switch to Mercurial - Update texinfo sources for texinfo 5.x See <CAHCOHQmqMvFtLqEt6M+w4vFyq9=e+i1Uy8zaQcUeAjeV3F9uWQ@mail.gmail.com> in xemacs-patches and followups for details.
Norbert Koch
Added tag ediff-1_82 for changeset a24f10b22900
Norbert Koch
XEmacs Package Release 1.82
Tags
ediff-1_82
Vin Shelton
Fix broken requires caused by tramp update
cvs2hg
convert CVS tags
viteno-guest
Increment VERSION in Makefile
Tags
3 tags
kifer-guest
2009-12-19 Michael Kifer <kifer@cs.stonybrook.edu> * ediff-patch.el (ediff-context-diff-label-regexp): regexp fix from the emacs tree.
viteno-guest
Increment VERSION in Makefile
Tags
ediff-1_80
kifer-guest
2009-12-07 Michael Kifer <kifer@cs.stonybrook.edu> * 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 …
viteno-guest
Increment VERSION in Makefile
Tags
ediff-1_79
kifer-guest
2009-11-26 Adrian Aichner <adrian@xemacs.org> * 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
2009-11-26 Michael Kifer <kifer@cs.stonybrook.edu> * 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-b…
viteno
Increment VERSION in Makefile
Tags
ediff-1_78
michaelk
* ediff-init.el (ediff-coding-system): use escape-quoted in case of 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.
viteno
Increment VERSION in Makefile
Tags
2 tags
michaelk
* ediff-hook.el: added tooltips to Emacs menus. * ediff.el: changed date of last update.
viteno
Increment VERSION in Makefile
Tags
ediff-1_76
michaelk
* ediff-util.el (ediff-toggle-multiframe): Check if control window is 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.
viteno
Increment VERSION in Makefile
Tags
ediff-1_75
michaelk
* ediff*.el: replace 3-argument 'require' statements with 1-argument ones (wrapped in if's). For compatibility with the current stable version of XEmacs.
michaelk
* ediff*el: replaced load with require in eval-when-compile. * 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 (…
viteno
Increment VERSION in Makefile
Tags
ediff-1_74
michaelk
* ediff*.el: uncommented declare-function.
viteno
Increment VERSION in Makefile
Tags
ediff-1_73
michaelk
* ediff*.el: many minor changes from the emacs tree. * ediff-util (eqiff-quit): autoraise minibuffer. * ediff-diff (ediff-convert-fine-diffs-to-overlays): make it a defin instead of defsubst.
viteno
Increment VERSION in Makefile
Tags
ediff-1_72
  1. Prev
  2. Next