summaryrefslogtreecommitdiff
path: root/lisp/diff-mode.el
Commit message (Collapse)AuthorAgeFilesLines
* (diff-minor-mode): Specify :group.Lute Kamstra2005-04-041-5/+5
|
* (diff-current-defun): Fix 2004-06-13's change.Stefan Monnier2004-10-101-25/+24
|
* (diff-file-header-re): Tighten up regexp a tiny bit.Stefan Monnier2004-09-291-3/+6
| | | | (diff-fixup-modifs): Catch unified-diff file-headers.
* (diff-mode-map): Rename `next-error-follow-mode' to ↵Juri Linkov2004-09-081-1/+1
| | | | `next-error-follow-minor-mode'.
* (diff-mode-map): Bind toggle-next-error-follow-mode.Eli Zaretskii2004-09-041-1/+2
|
* Reindent `diff-current-defun'.Kai Großjohann2004-06-131-6/+6
|
* (diff-current-defun): If at start of hunk, useKai Großjohann2004-06-131-1/+4
| | | | position of first change.
* (diff-make-unified): Fix regexp.Stefan Monnier2004-05-061-1/+1
|
* (diff-header-face, diff-file-header-face): Use min-colors.Stefan Monnier2004-05-021-12/+12
|
* (diff-next-error): New fun.Stefan Monnier2004-04-221-4/+9
| | | | (diff-mode): Use it.
* (diff-end-of-hunk): Be more careful with unified hunks.Stefan Monnier2004-04-161-1/+5
|
* (diff-goto-source): Make it work for mouse bindings.Stefan Monnier2004-04-141-11/+6
| | | | (diff-mouse-goto-source): Make it an alias of diff-goto-source.
* (diff-mode): Fix missing quote.Andreas Schwab2004-04-031-1/+1
|
* (diff-font-lock-keywords): Disable yank-handler.Stefan Monnier2004-03-241-5/+7
|
* (diff-default-read-only): Change default.Stefan Monnier2004-03-231-47/+178
| | | | | | | | | | | | | | | | | | | | (diff-mode-hook): Make it a defcustom. Add some options. (diff-mode-map): Bind diff-refine-hook. (diff-yank-handler): New var. (diff-yank-function): New fun. (diff-font-lock-keywords): Use them. (diff-end-of-file): Handle case where file-header looks like diff text. (diff-hunk-kill): Adjust to "new" hunk-next behavior. (diff-file-kill): Delete a subsequent empty line, if applicable. (diff-hunk-file-names): New fun, extracted from diff-tell-file-name. (diff-find-file-name): Use it. (diff-tell-file-name): New command. (diff-mode): Be careful with view-mode. (diff-delete-if-empty, diff-delete-empty-files, diff-make-unified): New functions, for use in diff-mode-hook. (diff-find-source-location): Catch "regex too large" errors. (diff-apply-hunk, diff-test-hunk): Go to old or new file. (diff-refine-hunk): New command.
* (diff-file-regexp-alist, diff-error-regexp-alist)Stefan Monnier2004-02-061-36/+4
| | | | | (diff-mode): Remove aborted attempt at support for compile.el. (diff-mode, diff-minor-mode): Avoid obsolete write-contents-hooks.
* Bind q to `quit-window'.Benjamin Rutt2004-02-021-1/+2
|
* (diff-hunk-prev, diff-hunk-next): SupportThien-Thi Nguyen2003-11-141-1/+1
| | | | operation while narrowed, with `diff-restrict-view'.
* Add arch taglinesMiles Bader2003-09-011-0/+1
|
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-7/+7
|
* (diff-mode): Use compilation-minor-mode.Stefan Monnier2002-09-181-5/+9
| | | | | Don't unbind compilation-last-buffer after autoload compile.el. Hide the compilation-minor-mode bindings altogether.
* (diff-mode): Don't evaluate `compilation-last-buffer' unless it's bound.Miles Bader2002-09-181-2/+4
|
* (diff-mode): Turn on compilation-minor-modeStefan Monnier2002-09-131-10/+13
| | | | support again, but more carefully this time.
* (diff-mode): Docstring improvement.Stefan Monnier2002-09-121-1/+7
|
* (diff-reverse-direction): Simplify.Stefan Monnier2002-07-161-7/+6
| | | | | | (diff-after-change-function): Fix typo. (diff-post-command-hook): Take care of edge cases. (diff-current-defun): Do `goto-char' after setting the mode.
* Comment fixes.Pavel Janík2002-01-011-9/+4
|
* (various face definitions): Use :weight and :slant.Richard M. Stallman2001-12-311-10/+10
|
* (diff-end-of-hunk): Watch out for ambiguities.Stefan Monnier2001-11-261-70/+92
| | | | | | | | | | | (diff-hunk-kill): Simplify. (diff-post-command-hook): Only apply to a single hunk. (diff-hunk-text): Make `char-offset' non-optional. (diff-find-text): Return a cons cell. (diff-find-approx-text): New fun. (diff-find-source-location): Use it. (diff-apply-hunk, diff-test-hunk, diff-goto-source): Adapt to new retval of diff-find-source-location.
* (diff-default-read-only): New var.Stefan Monnier2001-09-221-6/+10
| | | | (diff-mode): Use it.
* (diff-mode): Don't make the buffer read-only if it's empty (and thusMiles Bader2001-09-181-2/+3
| | | | probably a new patch file about to be edited).
* (diff-font-lock-keywords): Fix unanchored regexp.Stefan Monnier2001-06-131-1/+1
|
* (diff-jump-to-old-file, diff-update-on-the-fly):Stefan Monnier2001-05-211-9/+9
| | | | | Renamed by removing the silly `-flag' suffix. (diff-mode, diff-minor-mode, diff-find-source-location): Update.
* (diff-nonexistent-face, diff-font-lock-keywords):Stefan Monnier2001-05-041-4/+4
| | | | Typo `nonexistant' -> `nonexistent'.
* (diff-nonexistant-face): New face.Stefan Monnier2001-05-011-3/+8
| | | | (diff-font-lock-keywords): Use it.
* (diff-mode): Disable preliminary support for `compile'.Stefan Monnier2001-01-241-12/+17
|
* (diff-imenu-generic-expression): Modify unidiffDave Love2000-11-141-3/+4
| | | | pattern.
* (diff-mode-menu): Add entry for applying hunk.Stefan Monnier2000-11-121-10/+42
| | | | | (diff-count-matches, diff-split-hunk): New functions. (diff-mode-map): Bind C-c C-s to diff-split-hunk.
* (diff-find-file-name): Fix regex subgroup number.Stefan Monnier2000-10-191-3/+3
|
* (diff-header-face, diff-file-header-face)Eli Zaretskii2000-10-181-9/+15
| | | | | | (diff-changed-face): Add bold and italic attributes to tty faces. (diff-function-face): New face. (diff-font-lock-keywords): Use it.
* (diff-header-face, diff-file-header-face):Stefan Monnier2000-10-171-7/+15
| | | | | | Add specific setting for dark background. (diff-context-face): Renamed from diff-comment-face. Set explicitly rather than inheriting from font-lock-comment-face.
* (diff-header-face, diff-file-header-face)Eli Zaretskii2000-10-171-5/+17
| | | | (diff-changed-face): Define tty-specific colors.
* (diff-find-file-name): Fix regexp.Stefan Monnier2000-10-151-2/+2
|
* (diff-goto-source):Miles Bader2000-10-041-2/+2
| | | | Update call to `diff-hunk-status-msg' to reflect new REV variable.
* (diff-font-lock-keywords): Minor regex fix.Stefan Monnier2000-10-031-12/+11
| | | | (diff-goto-source): Be smarter when choosing REVERSE or not.
* (diff-test-hunk): Backout previous change. Fix doc string.Miles Bader2000-10-021-26/+17
| | | | (diff-apply-hunk): Don't return a value.
* (diff-goto-source): Emit a status message.Miles Bader2000-10-021-8/+17
| | | | | | | (diff-test-hunk, diff-apply-hunk): Remove unneeded `let'. (diff-test-hunk): Make the return value agree with the doc string. (diff-apply-hunk): Only advance if `diff-advance-after-apply-hunk'. (diff-advance-after-apply-hunk): New variable.
* (diff-add-log-file-name): Remove.Stefan Monnier2000-09-291-9/+4
| | | | (diff-mode): Use add-log-buffer-file-name-function.
* (diff-mode-map, diff-minor-mode-prefix):Stefan Monnier2000-09-291-16/+13
| | | | | | Avoid user-reserved bindings. (diff-mode, diff-minor-mode): Drop make-local-hook (done by add-hook). (diff-header-face): Revert to grey85.
* (diff-hunk-text): Properly handle one-sided context diffs.Stefan Monnier2000-09-211-72/+79
| | | | (diff-apply-hunk): When done, advance to the next hunk.
* (diff-file-header-face): Reset to its previous value.Stefan Monnier2000-09-211-111/+93
| | | | | | | | | | (diff-hunk-text): Correctly use offsets rather than buffer-positions. (diff-xor): New function. (diff-find-source-location): Use it. Fix a stupid name clash. (diff-hunk-status-msg): New function. (diff-apply-hunk): Drop args OTHER-FILE, DRY-RUN, POPUP and NOERROR. (diff-test-hunk): Use diff-find-source-location. (diff-goto-source): Favor the `reverse'.