1. 09 May, 2011 1 commit
  2. 02 Jan, 2011 1 commit
  3. 13 Jan, 2010 1 commit
  4. 04 Oct, 2009 1 commit
  5. 08 Sep, 2009 1 commit
  6. 01 Sep, 2009 1 commit
  7. 02 Feb, 2009 1 commit
  8. 05 Jan, 2009 1 commit
  9. 28 Oct, 2008 1 commit
  10. 21 Jul, 2008 1 commit
    • Thien-Thi Nguyen's avatar
      Make auto-refining a minor mode, and diff- and smerge- use it. · 7381be9d
      Thien-Thi Nguyen authored
      * diff-mode.el (diff-auto-refine): Delete defcustom.
      (diff-auto-refine-mode): New func/var via define-minor-mode.
      Update var ref to use diff-auto-refine-mode.
      * smerge-mode.el (diff-mode): Require when compiling.
      (smerge-auto-refine): Delete defcustom.
      Update smerge-auto-refine ref to use diff-auto-refine-mode.
      7381be9d
  11. 12 May, 2008 1 commit
  12. 11 May, 2008 2 commits
  13. 10 May, 2008 2 commits
  14. 06 May, 2008 1 commit
  15. 05 May, 2008 1 commit
  16. 11 Apr, 2008 1 commit
  17. 31 Mar, 2008 2 commits
  18. 13 Feb, 2008 1 commit
  19. 16 Jan, 2008 1 commit
  20. 15 Jan, 2008 1 commit
  21. 14 Jan, 2008 1 commit
    • Dan Nicolaescu's avatar
      * smerge-mode.el (smerge-auto): New function. · ba463d9e
      Dan Nicolaescu authored
      * vc-svn.el (vc-svn-find-file-hook):
      * vc-arch.el (vc-arch-find-file-hook):
      * pcvs.el (cvs-revert-if-needed):
      * vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
      (top-level): Add a Todo list.
      ba463d9e
  22. 07 Jan, 2008 1 commit
  23. 19 Nov, 2007 1 commit
    • Dan Nicolaescu's avatar
      * progmodes/octave-mod.el (inferior-octave-send-list-and-digest): · 004a00f4
      Dan Nicolaescu authored
      * play/yow.el (doctor-ret-or-read):
      * vc-hooks.el (vc-dired-resynch-file):
      * vc-hg.el (log-view-get-marked):
      * smerge-mode.el (ediff-cleanup-mess):
      * pcvs.el (vc-editable-p, vc-checkout):
      * pcomplete.el (comint-bol):
      * informat.el (texinfo-format-refill):
      * ido.el (tramp-tramp-file-p):
      * ibuffer.el (ibuffer-mark-on-buffer, ibuffer-format-qualifier)
      (ibuffer-generate-filter-groups)
      (ibuffer-format-filter-group-data):
      * add-log.el (c-beginning-of-defun, c-end-of-defun): Declare as
      functions.
      
      * ido.el (ido-file-internal): Move with-no-warnings to include the
      ffap-string-at-point call.
      
      * pcomplete.el (pcomplete-executables): Move defsubst before first
      use.
      
      * vc-hg.el (vc-hg-revision-table): Fix last change.
      004a00f4
  24. 08 Nov, 2007 1 commit
  25. 20 Oct, 2007 2 commits
    • Dan Nicolaescu's avatar
      * term/x-win.el (x-gtk-stock-map, icon-map-list) · 97546017
      Dan Nicolaescu authored
      (x-gtk-map-stock): Delete duplicated definitions from merge.
      
      * progmodes/octave-mod.el: Require octave-inf at compile time
      
      * progmodes/compile.el (compilation-skip-to-next-location)
      (compilation-skip-threshold, compilation-skip-visited): Move
      definitions earlier.
      
      * play/zone.el (zone-fall-through-ws):
      * play/landmark.el (lm-move-down, lm-move-up):
      * play/handwrite.el (handwrite):
      * mail/mspools.el (mspools-visit-spool):
      * wdired.el (wdired-next-line, wdired-previous-line):
      * tar-mode.el (tar-subfile-save-buffer):
      * scroll-lock.el (scroll-lock-next-line)
      (scroll-lock-previous-line):
      * image-dired.el (image-dired-next-line)
      (image-dired-previous-line):
      * ediff-help.el (ediff-help-message-line-length): Use
      forward-line.
      
      * smerge-mode.el (smerge-auto-refine):
      * diff-mode.el (diff-auto-refine): Add :group.
      
      * play/yow.el: Require doctor at compile time.
      
      * vmsproc.el: Provide vmsproc.
      (command-send-input): Use forward-line.
      
      * vms-patch.el: Require ps-print and vmsproc at compile time.
      
      * vc-mtn.el (log-view-message-re, log-view-file-re)
      (log-view-font-lock-keywords): Pacify byte-compiler.
      
      * vc-hg.el: Require log-view at compile time.
      97546017
    • Stefan Monnier's avatar
      (smerge-auto-refine): New var. · 2daf4bc6
      Stefan Monnier authored
      (smerge-next, smerge-prev): Use it.
      (smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
      2daf4bc6
  26. 19 Oct, 2007 1 commit
    • Stefan Monnier's avatar
      Add word-granularity refinement. · cd62539f
      Stefan Monnier authored
      (smerge-refine-forward-function, smerge-refine-ignore-whitespace)
      (smerge-refine-weight-hack): New vars.
      (smerge-refine-forward): New fun.
      (smerge-refine-chopup-region, smerge-refine-highlight-change): Use them.
      (smerge-refine-subst): Use them as well.  Preserve point.
      cd62539f
  27. 09 Oct, 2007 1 commit
  28. 16 Aug, 2007 1 commit
    • Stefan Monnier's avatar
      (smerge-resolve): New arg `safe'. · de689511
      Stefan Monnier authored
      (smerge-resolve-all, smerge-batch-resolve): New function.
      (smerge-refine): Make sure `diff' returns the expected result.
      (smerge-parsep-re): New const.
      (smerge-mode): Use it to adjust paragraph-separate.
      de689511
  29. 25 Jul, 2007 1 commit
  30. 08 Mar, 2007 1 commit
  31. 21 Jan, 2007 1 commit
  32. 30 Apr, 2006 1 commit
  33. 06 Feb, 2006 1 commit
  34. 26 Oct, 2005 1 commit
  35. 23 Sep, 2005 1 commit
  36. 09 Sep, 2005 1 commit