summaryrefslogtreecommitdiff
path: root/lisp/diff-mode.el
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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.
* | (diff-font-lock-keywords): Fix up false positives.Stefan Monnier2007-08-031-26/+47
| | | | | | | | | | | | (diff-beginning-of-file): Adjust to the fact that diff-file-header-re may match up to 4 lines. (diff-beginning-of-file-and-junk): Rewrite.
* | Merge from emacs--rel--22Miles Bader2007-07-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
| * Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
| |
* | (diff-refine-ignore-spaces-hunk): Rename fromStefan Monnier2007-07-221-4/+17
| | | | | | | | | | | | diff-refine-hunk. Adjust users. (diff-unified-hunk-p, diff-splittable-p): New functions. (diff-mode-menu): Use it to disable Split when it doesn't work.
* | *** empty log message ***Stefan Monnier2007-07-221-1/+12
| |
* | (diff-unified->context): Use the new `apply' undo entry kindStefan Monnier2007-07-221-2/+23
| | | | | | | | if applicable, so as to save undo-log space.
* | (diff-find-file-name): Add arg `batch'.Stefan Monnier2007-07-221-2/+7
| |
* | (diff-beginning-of-file-and-junk): New function.Stefan Monnier2007-07-221-12/+40
| | | | | | | | | | | | | | (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.
* | (diff-font-lock-keywords): Fix M. Kifer's last change differently.Stefan Monnier2007-06-221-1/+1
| |
* | (diff-font-lock-keywords): Fix M. Kifer's last change.Stefan Monnier2007-06-131-1/+1
| |
* | 2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2007-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * viper-cmd.el (viper-prefix-arg-com,viper-prefix-arg-value): display error messages (viper-prev-destructive-command,viper-insert-prev-from-insertion-ring): get rid of cl.el dependencies. * viper-init.el (viper-suppress-input-method-change-message): new variable. (viper-activate-input-method-action,viper-inactivate-input-method-action): use viper-suppress-input-method-change-message. * viper-kem.el (viper-vi-basic-map): disable the bindings for C-s, C-r. * viper-util.el (viper-set-cursor-color-according-to-state): use viper-replace-overlay-cursor-color instead of viper-replace-overlay-cursor-color. (viper-sit-for-short): use sit-for with 3 arguments. * viper.el (viper-insert-state-mode-list): add gud-mode. (viper-major-mode-modifier-list): add viper-comint-mode-modifier-map to gud-mode. * ediff-mult.el (ediff-meta-buffer-brief-message,ediff-meta-buffer-verbose-message): new variables. (ediff-meta-buffer-message): variable deleted. (ediff-verbose-help-enabled): new variable. (ediff-toggle-verbose-help-meta-buffer): new function. (ediff-redraw-directory-group-buffer): made aware of short/verbose message options * ediff-ptch.el (ediff-context-diff-label-regexp): better regexp. (ediff-fixup-patch-map): improved heuristic.
* | (diff-apply-hunk, diff-test-hunk): Don't do by defaultStefan Monnier2007-05-081-6/+12
|/ | | | the exact opposite of diff-goto-source.
* (diff-mode): Revert 2007-03-04 change.Chong Yidong2007-04-061-5/+1
|
* (diff-apply-hunk): Use proper format string forAndreas Schwab2007-03-111-1/+2
| | | | error.
* (diff-mode): Doc fix.Richard M. Stallman2007-03-051-2/+9
|
* (diff-sanity-check-hunk): Fix last fix.Stefan Monnier2007-02-081-1/+1
|
* *** empty log message ***Stefan Monnier2007-02-071-2/+2
|
* (diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.Stefan Monnier2007-01-111-1/+83
| | | | (diff-find-source-location): Use'em to check the hunks are well-formed.
* (diff-mode-map): Add a binding for unified->context.Stefan Monnier2006-11-271-2/+4
|
* (diff-apply-hunk-to-backup-file): New var.Stefan Monnier2006-09-111-0/+12
| | | | (diff-apply-hunk): Use it to ask for confirmation.
* (diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.Stefan Monnier2006-07-021-21/+33
| | | | | | | (diff-unified->context, diff-context->unified) (diff-reverse-direction): Make sure the end marker stays at the end. (diff-mode): Add the keymap table at the end of docstring. Use lexical-let rather than constructing a closure manually.
* * diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)Chong Yidong2006-06-061-3/+7
| | | | (diff-refine-hunk): Set inhibit-read-only to t.
* * diff-mode.el (diff-mode): Set buffer-read-only to t whenChong Yidong2006-06-061-2/+1
| | | | | | | | | diff-default-read-only is non-nill. * diff.el (diff-sentinel, diff): Set inhibit-read-only to t when modifying the *Diff* buffer. (diff-process-filter): New filter function for diff process that sets inhibit-read-only to t when modifying the *Diff* buffer.
* (diff-context->unified): Use `region-beginning' and `region-end'Juri Linkov2006-05-091-9/+9
| | | | | | | | instead of `mark' and `point'. (diff-unified->context, diff-reverse-direction, diff-fixup-modifs): Operate on region in Transient Mark mode when the mark is active. Use `region-beginning' and `region-end' instead of `mark' and `point'. (diff-hunk-text, diff-goto-source): Doc fix.
* (diff-mode-shared-map): Don't bind M-W, M-U, M-C,Richard M. Stallman2006-05-021-80/+88
| | | | | | M-r, M-R, M-A, M-SPC or M-DEL. (diff-mode-map): diff-refine-hunk now on C-c C-w (diff-mode-map): Bind C-c C-e, C-c C-n, C-c C-r, C-c C-u.
* Update my email address.Stefan Monnier2006-04-301-1/+1
|
* (diff-function): Make it inherit from diff-header instead of diff-context.Nick Roberts2006-03-211-1/+1
|
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
|
* (diff-mode): Doc fix.Thien-Thi Nguyen2005-10-161-1/+1
|
* (add-log-buffer-file-name-function): Add defvar.Juanma Barranquero2005-08-311-0/+2
|
View Lorry Controller Status