Skip to content
Snippets Groups Projects
  1. Jan 27, 2013
  2. Jan 21, 2013
  3. Sep 03, 2011
  4. Dec 21, 2009
  5. Dec 19, 2009
  6. Dec 07, 2009
    • viteno-guest's avatar
      Increment VERSION in Makefile · 7828d62e4c8b
      viteno-guest authored
      ediff-1_80
      7828d62e4c8b
    • kifer-guest's avatar
      2009-12-07 Michael Kifer <kifer@cs.stonybrook.edu> · 3ca7520d0d3e
      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.
      3ca7520d0d3e
  7. Nov 27, 2009
  8. Nov 26, 2009
    • kifer-guest's avatar
      2009-11-26 Adrian Aichner <adrian@xemacs.org> · 7dc4d05e1e71
      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.
      7dc4d05e1e71
    • kifer-guest's avatar
      2009-11-26 Michael Kifer <kifer@cs.stonybrook.edu> · 13f06b6e2c40
      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.
      13f06b6e2c40
  9. Aug 16, 2009
  10. Aug 15, 2009
    • michaelk's avatar
      * ediff-init.el (ediff-coding-system): use escape-quoted in case of · c04eef4c4589
      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.
      c04eef4c4589
  11. Dec 01, 2008
  12. Nov 23, 2008
  13. Nov 19, 2008
  14. Nov 16, 2008
  15. Apr 07, 2008
  16. Apr 06, 2008
  17. Apr 04, 2008
    • michaelk's avatar
      * ediff*el: replaced load with require in eval-when-compile. · 5f4f11c87263
      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.
      5f4f11c87263
  18. Jan 10, 2008
  19. Jan 09, 2008
  20. Nov 05, 2007
  21. Nov 02, 2007
  22. Aug 28, 2007
  23. Aug 19, 2007
  24. Jun 12, 2007
  25. Jan 24, 2007
  26. Jan 23, 2007
  27. Dec 28, 2006
  28. Dec 23, 2006
  29. Nov 27, 2006
  30. Nov 23, 2006
Loading