| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
yellow to green on light backgrounds.
(diff-context): Inherit from `shadow' only for color/grayscale
with more than 88 colors.
(diff-indicator-removed, diff-indicator-added)
(diff-indicator-changed): New faces.
(diff-font-lock-keywords): Use new faces. Regroup rules.
Add "^---$" for `normal' diff format. Fontify `#' lines with
font-lock-comment-delimiter-face and font-lock-comment-face.
Add `#' to ^[^...] in the rule for `diff-context-face'.
|
| |
|
| |
|
|
|
|
|
| |
(diff-context->unified, diff-reverse-direction, diff-unified->context):
"?\ " -> "?\s".
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove "-face" suffix from diff-mode faces
2005-06-10 Miles Bader <[email protected]>
* lisp/diff-mode.el (diff-header, diff-file-header, diff-index)
(diff-hunk-header, diff-removed, diff-added, diff-changed)
(diff-function, diff-context, diff-nonexistent): Remove "-face"
suffix from face names.
(diff-header-face, diff-file-header-face, diff-index-face)
(diff-hunk-header-face, diff-removed-face, diff-added-face)
(diff-changed-face, diff-function-face, diff-context-face)
(diff-nonexistent-face): New backward-compatibility aliases for
renamed faces.
(diff-header-face, diff-file-header-face)
(diff-index, diff-index-face, diff-hunk-header)
(diff-hunk-header-face, diff-removed, diff-removed-face)
(diff-added, diff-added-face, diff-changed-face, diff-function)
(diff-function-face, diff-context-face, diff-nonexistent)
(diff-nonexistent-face): Use renamed diff-mode faces.
|
| |
|
|
|
|
|
|
|
| |
(diff-index-face, diff-hunk-header-face, diff-removed-face)
(diff-added-face, diff-changed-face, diff-function-face)
(diff-context-face, diff-nonexistent-face): Put them in the
diff-mode customization group.
|
| |
|
| |
|
| |
|
|
|
|
| |
(diff-fixup-modifs): Catch unified-diff file-headers.
|
|
|
|
| |
`next-error-follow-minor-mode'.
|
| |
|
| |
|
|
|
|
| |
position of first change.
|
| |
|
| |
|
|
|
|
| |
(diff-mode): Use it.
|
| |
|
|
|
|
| |
(diff-mouse-goto-source): Make it an alias of diff-goto-source.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(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-mode): Remove aborted attempt at support for compile.el.
(diff-mode, diff-minor-mode): Avoid obsolete write-contents-hooks.
|
| |
|
|
|
|
| |
operation while narrowed, with `diff-restrict-view'.
|
| |
|
| |
|
|
|
|
|
| |
Don't unbind compilation-last-buffer after autoload compile.el.
Hide the compilation-minor-mode bindings altogether.
|
| |
|
|
|
|
| |
support again, but more carefully this time.
|
| |
|
|
|
|
|
|
| |
(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.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
(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-mode): Use it.
|
|
|
|
| |
probably a new patch file about to be edited).
|
| |
|
|
|
|
|
| |
Renamed by removing the silly `-flag' suffix.
(diff-mode, diff-minor-mode, diff-find-source-location): Update.
|
|
|
|
| |
Typo `nonexistant' -> `nonexistent'.
|
|
|
|
| |
(diff-font-lock-keywords): Use it.
|
| |
|