summaryrefslogtreecommitdiff
path: root/lisp/diff-mode.el
Commit message (Collapse)AuthorAgeFilesLines
* Make auto-refining a minor mode, and diff- and smerge- use it.Thien-Thi Nguyen2008-07-211-6/+8
| | | | | | | | | * 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.
* * add-log.el (add-change-log-entry): Add new arg to force each newDan Nicolaescu2008-06-241-1/+1
| | | | | entry to be on a new line. * diff-mode.el (diff-add-change-log-entries-other-window): Use it.
* (diff-context-mid-hunk-header-re): New const.Stefan Monnier2008-05-261-25/+35
| | | | | | | (diff-font-lock-keywords, diff-context->unified) (diff-reverse-direction, diff-fixup-modifs, diff-sanity-check-hunk) (diff-hunk-text, diff-find-source-location): Use it. (diff-post-command-hook): Let the user edit the hunk headers.
* (diff-current-defun): Use `buffer-local-value'.John Paul Wallington2008-05-151-1/+1
|
* (diff-hunk-header-re): Refine the regexp.Stefan Monnier2008-05-111-1/+1
|
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
|
* Merge from emacs--rel--22Miles Bader2008-04-261-13/+12
|\ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1129
| * (diff-hunk-header-re-unified): Allow elided line counts.Stefan Monnier2008-04-251-9/+13
| | | | | | | | | | (diff-end-of-hunk, diff-unified->context, diff-fixup-modifs) (diff-sanity-check-hunk): Adjust code accordingly.
* | Merge from emacs--rel--22Miles Bader2008-04-051-3/+14
|\ \ | |/ | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
| * (diff-end-of-hunk): Be careful not to overlook trailingStefan Monnier2008-03-181-3/+14
| | | | | | | | "+" lines not accounted for by counting "-" and context lines.
* | * diff-mode.el (diff-file-junk-re): Recognize the git format forDan Nicolaescu2008-04-051-2/+3
| | | | | | | | new files, deleted files and for changing permissions.
* | * diff-mode.el (diff-file-junk-re): Recognize the git format forDan Nicolaescu2008-04-051-2/+3
| | | | | | | | new files and for changing permissions.
* | (diff-file-junk-re): Recognize the git format forDan Nicolaescu2008-04-041-1/+7
| | | | | | | | | | new files. (diff-mode): Set beginning-of-defun-function and
* | (diff-remembered-defdir): New var.Stefan Monnier2008-03-251-0/+5
| | | | | | | | (diff-find-file-name): Use it to flush diff-remembered-files-alist.
* | (diff-header): Make the color louder.Dan Nicolaescu2008-03-191-2/+2
| | | | | | | | (diff-refine-change): Tone the color down.
* | (diff-refine-change): Adjust colors to be more visible.Dan Nicolaescu2008-03-121-2/+2
| |
* | (diff-mode-menu): Add :help.Dan Nicolaescu2008-03-091-16/+33
| |
* | (diff-ignore-whitespace-hunk): BindDan Nicolaescu2008-03-081-1/+1
| | | | | | | | inhibit-read-only before trying to change the buffer.
* | Merge from emacs--rel--22Miles Bader2008-03-011-1/+2
|\ \ | |/ | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
| * (diff-sanity-check-hunk): Only accept an empty line ifStefan Monnier2008-02-291-1/+2
| | | | | | | | we still expect more lines.
| * (diff-file-junk-re): New const.Stefan Monnier2008-02-191-5/+21
| | | | | | | | | | (diff-beginning-of-file-and-junk): Use it. (diff-file-kill): Make sure we were really inside a file diff.
| * Make it more robust in the presence of empty context lines in unified hunks.Stefan Monnier2008-02-191-40/+80
| | | | | | | | | | | | | | | | | | | | | | (diff-valid-unified-empty-line): New var. (diff-unified->context, diff-sanity-check-hunk): Obey it. (diff-end-of-hunk): Obey it. New arg `donttrustheader'. (diff-fixup-modifs, diff-post-command-hook): Use this new arg. (diff-hunk-header-re-unified): New const. (diff-font-lock-keywords, diff-hunk-header-re, diff-split-hunk) (diff-fixup-modifs, diff-unified->context, diff-next-complex-hunk) (diff-sanity-check-hunk): Use it.
| * (diff-beginning-of-file-and-junk): If we're on theStefan Monnier2008-02-101-0/+1
| | | | | | | | Index: line, don't search backward for the previous one.
| * (diff-end-of-hunk): Revert 2008-01-08 change.Glenn Morris2008-01-151-5/+1
| |
| * (diff-end-of-hunk): Don't match empty lines in unified format.Glenn Morris2008-01-081-1/+5
| |
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
| |
* | * diff-mode.el (diff-file-junk-re): New const.Stefan Monnier2008-02-251-50/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (diff-beginning-of-file-and-junk): Use it. (diff-file-kill): Make sure we were really inside a file diff. * diff-mode.el: Make it more robust in the presence of empty context lines in unified hunks. (diff-valid-unified-empty-line): New var. (diff-unified->context, diff-sanity-check-hunk): Obey it. (diff-end-of-hunk): Obey it. New arg `donttrustheader'. (diff-fixup-modifs, diff-post-command-hook): Use this new arg. (diff-hunk-header-re-unified): New const. (diff-font-lock-keywords, diff-hunk-header-re, diff-split-hunk) (diff-fixup-modifs, diff-unified->context, diff-next-complex-hunk) (diff-sanity-check-hunk): Use it. * diff-mode.el (diff-beginning-of-file-and-junk): If we're on the Index: line, don't search backward for the previous one.
* | (diff-add-change-log-entries-other-window): UseDan Nicolaescu2008-02-101-4/+1
| | | | | | | | add-change-log-entry.
* | (diff-add-change-log-entries-other-window): Avoid theStefan Monnier2008-02-081-1/+8
| | | | | | | | splitter in context hunks.
* | (diff-add-change-log-entries-other-window):Stefan Monnier2008-02-051-19/+20
| | | | | | | | | | | | Rename from diff-create-changelog. Change users. Minor change to hopefully work with plain diffs. (diff-mode-map): Add binding for it.
* | Add new TODO entry.Dan Nicolaescu2008-02-041-0/+33
| | | | | | | | | | (diff-create-changelog): New function. (diff-mode-menu): Bind it.
* | (diff-end-of-hunk): Revert 2008-01-08 change.Glenn Morris2008-01-151-5/+1
| |
* | (diff-end-of-hunk): Don't match empty lines in unified format.Glenn Morris2008-01-081-2/+6
| |
* | * progmodes/gud.el (gud-target-name): Move definition before use.Dan Nicolaescu2007-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * progmodes/dcl-mode.el: Require imenu at compile time. * progmodes/cc-engine.el (c-maybe-stale-found-type): Pacify byte-compiler. * obsolete/fast-lock.el: Use featurep test instead of string-match. * eshell/esh-mode.el (eshell-handle-ansi-color): Require ansi-color at compile time too. * eshell/em-unix.el (eshell/info): Require info at compile time too. * w32-fns.el: Require w32-vars. * diff-mode.el (diff-refine-hunk): Require smerge-mode at compile time too.
* | * term/x-win.el (x-gtk-stock-map, icon-map-list)Dan Nicolaescu2007-10-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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.
* | (diff-auto-refine): New var.Stefan Monnier2007-10-201-17/+31
| | | | | | | | | | | | | | | | (diff-hunk): Use it. (diff-ignore-whitespace-hunk): Rename diff-refine-ignore-spaces-hunk. (diff-refine-change): Rename from diff-fine-change. Change it. (diff-refine-preproc): Rename from diff-fine-highlight-preproc. (diff-refine-hunk): Rename from diff-fine-highlight.
* | (diff-fine-highlight-preproc): Stick to minimal changesStefan Monnier2007-10-191-43/+46
| | | | | | | | | | which will not affect the behavior of things like forward-word. (diff-fine-highlight): Preserve point.
* | * diff-mode.el (diff-fine-change): Add :group.Dan Nicolaescu2007-10-131-1/+2
| |
* | (diff-current-defun): Force recomputation of change-log-default-name.Stefan Monnier2007-10-121-0/+4
| |
* | Merge from emacs--rel--22Miles Bader2007-10-091-1/+12
|\ \ | |/ | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
| * * pcvs-defs.el (cvs-mode-map): Bind TAB and backtab.Dan Nicolaescu2007-09-221-0/+2
| | | | | | | | | | | | * log-view.el (log-view-mode-map): Likewise. * diff-mode.el (diff-mode-shared-map): Likewise.
| * (diff-sanity-check-hunk): Fix up the case when unifiedStefan Monnier2007-09-121-1/+10
| | | | | | | | diffs are concatenated with no intervening line.
| * (diff-find-file-name): Only accept regular files, to rule outGlenn Morris2007-08-271-1/+3
| | | | | | | | /dev/null, directories, etc.
* | (diff-mode-map, diff-mode-menu): Add diff-fine-highlight.Stefan Monnier2007-10-091-3/+3
| |
* | (diff-hunk-style): New fun.Stefan Monnier2007-10-091-65/+146
| | | | | | | | | | | | | | | | | | (diff-end-of-hunk): Use it. (diff-context->unified): Use the new `apply' undo element, if applicable, so as to save undo-log space. (diff-fine-change): New face. (diff-fine-highlight-preproc): New function. (diff-fine-highlight): New command.
* | (diff-sanity-check-hunk): Also accept single-line hunks.Thien-Thi Nguyen2007-09-111-9/+13
| |
* | (diff-find-file-name): Only accept regular files, to rule outGlenn Morris2007-08-271-1/+3
| | | | | | | | /dev/null, directories, etc.
* | Merge from emacs--rel--22Miles Bader2007-08-131-3/+3
|\ \ | |/ | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
| * (diff-unified->context, diff-reverse-direction, diff-fixup-modifs):Stefan Monnier2007-08-061-3/+3
| | | | | | | | Typo in docstring.
| * * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):Dan Nicolaescu2007-07-301-13/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove. (vc-git-revision-completion-table): Enable. * vc-hooks.el (vc-handled-backends): Add GIT and HG. * vc.el (vc-directory-exclusion-list): Add .git and .hg. * vc-hg.el (vc-hg-revision-completion-table): Re-enable. * diff-mode.el (diff-mode-menu): New entries. * diff-mode.el (diff-beginning-of-file-and-junk): New function. (diff-file-kill): Use it. (diff-beginning-of-hunk): Add arg `try-harder' using it. (diff-restrict-view, diff-find-source-location, diff-refine-hunk): Use it so they find the hunk even when we're in the file header. * vc.el: Add new VC operation `revision-completion-table'. (vc-default-revision-completion-table): New function. (vc-version-diff, vc-version-other-window): Use it to provide completion of revision names if the backend provides it. * vc-arch.el (vc-arch--version-completion-table) (vc-arch-revision-completion-table): New functions to provide completion of revision names. * vc-cvs.el: Require CL. (vc-cvs-revision-table, vc-cvs-revision-completion-table): New functions to provide completion of revision names. * eval.c (init_eval_once): Bump max_lisp_eval_depth to 400. * vc2-xtra.texi (Customizing VC): Add GIT and HG.
View Lorry Controller Status