1. 29 Sep, 2000 1 commit
  2. 21 Sep, 2000 2 commits
  3. 20 Sep, 2000 3 commits
  4. 19 Sep, 2000 3 commits
    • Stefan Monnier's avatar
      Moved closer to its users. · 7b91e0f2
      Stefan Monnier authored
      7b91e0f2
    • Stefan Monnier's avatar
      Docstring fixes. · c0aa75f7
      Stefan Monnier authored
      (diff-header-face, diff-comment-face): New faces.
      (diff-font-lock-keywords): Highlight a bit differently.
      (diff-find-source-location): Don't return SPAN any more.
      (diff-hunk-text): Don't bother erasing the temp buffer.
      (diff-find-text): Drop argument LINE.
      (diff-apply-hunk): Update calls to diff-find-text.
      (diff-goto-source): Use pop-to-buffer again and don't raise an error.
      c0aa75f7
    • Miles Bader's avatar
      Doc fix. · 6217eb55
      Miles Bader authored
      6217eb55
  5. 18 Sep, 2000 1 commit
    • Miles Bader's avatar
      (diff-hunk-text): · 2b612b1f
      Miles Bader authored
        Add new optional arg LINE-OFFSET, and return a cons if it's non-nil.
      (diff-apply-hunk):
        Try to jump to the exact line in the source text corresponding to the
          position of point in the in the hunk.
      2b612b1f
  6. 12 Sep, 2000 1 commit
  7. 11 Sep, 2000 1 commit
    • Miles Bader's avatar
      (diff-apply-hunk): Function basically rewritten. Now understands · 7530b6da
      Miles Bader authored
        non-unified diffs.  Some functionality moved into `diff-hunk-text' and
        `diff-find-text'.  Add OTHER-FILE, DRY-RUN, POPUP, and NOERROR
        arguments.  If DRY-RUN is true, don't actually modify anything.  Only
        reposition point in the patched file if the patch succeeds.  Only pop
        up another window if POPUP is true.  Emit a message describing what
        happened if successful, and at what line-offset.  Automatically detect
        reversed hunks and do something appropriate.
      (diff-hunk-text, diff-find-text): New functions.
      (diff-filter-lines): Function removed.
      (diff-test-hunk): New function.
      (diff-goto-source): Rewritten in terms of diff-apply-hunk.
      7530b6da
  8. 07 Sep, 2000 1 commit
  9. 29 Aug, 2000 1 commit
  10. 16 Aug, 2000 1 commit
    • Stefan Monnier's avatar
      (diff-mode-map): Bind diff-apply-hunk. · 027ac3f8
      Stefan Monnier authored
      (diff-find-source-location): New fun, extracted from diff-goto-source.
      (diff-goto-source): Use it.
      (diff-next-complex-hunk, diff-filter-lines): New function.
      (diff-apply-hunk): New command.
      027ac3f8
  11. 05 Jun, 2000 1 commit
  12. 10 May, 2000 1 commit
    • Stefan Monnier's avatar
      (diff-font-lock-keywords): Recognize comments. · 0e104800
      Stefan Monnier authored
      (diff-font-lock-defaults): Explicitly turn off multiline.
      (diff-end-of-hunk): Handle comments and fix end-of-buffer bug.
      (diff-ediff-patch): Fix call to ediff-patch-file.
      (diff-end-of-file, diff-reverse-direction, diff-fixup-modifs):
      Handle comments.
      0e104800
  13. 21 Mar, 2000 1 commit
    • Stefan Monnier's avatar
      (diff-mode-*-map): use `easy-mmode-defmap'. · d87e5627
      Stefan Monnier authored
      (diff-end-of-hunk): Return the end position for use in
      `easy-mmode-define-navigation'.
      (diff-recenter): Remove.
      (diff-(next|prev)-*): Rename `diff-*-(prev|next)' and defined in terms
      of `easy-mmode-define-navigation'.
      (diff-kill-*): Rename `diff-*-kill' (for consistency with the
      previous renaming) and fix to use new names.
      (diff-merge-strings): Use \n as separator: simpler, faster.
      (diff-mode): Use `define-derived-mode'.
      d87e5627
  14. 07 Feb, 2000 1 commit
    • Stefan Monnier's avatar
      (diff-kill-junk): New interactive function. · fef8c55b
      Stefan Monnier authored
      (diff-reverse-direction): Use delete-and-extract-region.
      (diff-post-command-hook): Restrict the area so that the hook also works
      outside of any diff hunk.  This is necessary for the minor-mode.
      (diff-mode): Use toggle-read-only and minor-mode-overriding-map-alist.
      (diff-minor-mode): Setup the hooks for header-hunk rewriting.
      fef8c55b
  15. 07 Dec, 1999 1 commit
    • Stefan Monnier's avatar
      * diff-mode.el (diff-mode-shared-map): fset'd and doc change. · 0b82e382
      Stefan Monnier authored
      (diff-minor-mode, diff-minor-mode-prefix, diff-minor-mode-map):
      New code to support the minor mode version.
      (diff-recenter): New function.
      (diff-next-hunk, diff-next-file): Use it.
      (diff-remembered-files-alist): New var.
      (diff-merge-strings): New function.
      (diff-find-file-name): Make it smarter and use the user's input more.
      (diff-mode): Cosmetic changes.
      0b82e382
  16. 13 Oct, 1999 1 commit
  17. 11 Oct, 1999 1 commit
  18. 09 Oct, 1999 1 commit