Commit graph

157 commits

Author SHA1 Message Date
Stefan Monnier
365bdf633b (diff-hunk-header-re): Refine the regexp. 2008-05-11 21:57:27 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Miles Bader
341dd15a7b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1129
2008-04-26 05:40:19 +00:00
Stefan Monnier
43392d1263 (diff-hunk-header-re-unified): Allow elided line counts.
(diff-end-of-hunk, diff-unified->context, diff-fixup-modifs)
(diff-sanity-check-hunk): Adjust code accordingly.
2008-04-25 02:08:43 +00:00
Miles Bader
5bc6ddff00 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
2008-04-05 23:01:26 +00:00
Dan Nicolaescu
8d73b84e3b * diff-mode.el (diff-file-junk-re): Recognize the git format for
new files, deleted files and for changing permissions.
2008-04-05 00:56:31 +00:00
Dan Nicolaescu
2f745f7fa4 * diff-mode.el (diff-file-junk-re): Recognize the git format for
new files and for changing permissions.
2008-04-05 00:35:46 +00:00
Dan Nicolaescu
19446c41b1 (diff-file-junk-re): Recognize the git format for
new files.
(diff-mode): Set beginning-of-defun-function and
2008-04-04 22:34:35 +00:00
Stefan Monnier
adf4cc7e0a (diff-remembered-defdir): New var.
(diff-find-file-name): Use it to flush diff-remembered-files-alist.
2008-03-25 04:01:48 +00:00
Dan Nicolaescu
9f4e4f5bb9 (diff-header): Make the color louder.
(diff-refine-change): Tone the color down.
2008-03-19 04:59:34 +00:00
Stefan Monnier
aec1ef0729 (diff-end-of-hunk): Be careful not to overlook trailing
"+" lines not accounted for by counting "-" and context lines.
2008-03-18 20:49:52 +00:00
Dan Nicolaescu
5e15554dac (diff-refine-change): Adjust colors to be more visible. 2008-03-12 06:53:18 +00:00
Dan Nicolaescu
fb4dfdd28e (diff-mode-menu): Add :help. 2008-03-09 15:39:48 +00:00
Dan Nicolaescu
14cf0430e4 (diff-ignore-whitespace-hunk): Bind
inhibit-read-only before trying to change the buffer.
2008-03-08 07:56:13 +00:00
Miles Bader
51fb064bc7 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
2008-03-01 01:28:31 +00:00
Stefan Monnier
79fd616806 (diff-sanity-check-hunk): Only accept an empty line if
we still expect more lines.
2008-02-29 02:40:10 +00:00
Stefan Monnier
f52d2f9c30 * diff-mode.el (diff-file-junk-re): New const.
(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.
2008-02-25 03:54:54 +00:00
Stefan Monnier
5f082d1fe6 (diff-file-junk-re): New const.
(diff-beginning-of-file-and-junk): Use it.
(diff-file-kill): Make sure we were really inside a file diff.
2008-02-19 21:31:20 +00:00
Stefan Monnier
95dfb89d87 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.
2008-02-19 19:44:48 +00:00
Dan Nicolaescu
40c02e0035 (diff-add-change-log-entries-other-window): Use
add-change-log-entry.
2008-02-10 18:38:05 +00:00
Stefan Monnier
f060b622fb (diff-beginning-of-file-and-junk): If we're on the
Index: line, don't search backward for the previous one.
2008-02-10 16:36:07 +00:00
Stefan Monnier
02e3336d0c (diff-add-change-log-entries-other-window): Avoid the
splitter in context hunks.
2008-02-08 16:00:55 +00:00
Stefan Monnier
8330c1755e (diff-add-change-log-entries-other-window):
Rename from diff-create-changelog.  Change users.
Minor change to hopefully work with plain diffs.
(diff-mode-map): Add binding for it.
2008-02-05 02:14:10 +00:00
Dan Nicolaescu
8a72c7f8c9 Add new TODO entry.
(diff-create-changelog): New function.
(diff-mode-menu): Bind it.
2008-02-04 21:41:09 +00:00
Glenn Morris
c422d9f0ff (diff-end-of-hunk): Revert 2008-01-08 change. 2008-01-15 03:54:51 +00:00
Glenn Morris
858fd4a4b4 (diff-end-of-hunk): Revert 2008-01-08 change. 2008-01-15 03:46:59 +00:00
Glenn Morris
1c6aa2f55f (diff-end-of-hunk): Don't match empty lines in unified format. 2008-01-08 05:19:13 +00:00
Glenn Morris
1c58b439bf (diff-end-of-hunk): Don't match empty lines in unified format. 2008-01-08 05:17:47 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Dan Nicolaescu
2f42c75fb0 * progmodes/gud.el (gud-target-name): Move definition before use.
* 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.
2007-10-21 07:33:32 +00:00
Dan Nicolaescu
975460179e * term/x-win.el (x-gtk-stock-map, icon-map-list)
(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.
2007-10-20 06:30:18 +00:00
Stefan Monnier
2659df6808 (diff-auto-refine): New var.
(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.
2007-10-20 02:02:22 +00:00
Stefan Monnier
8872469d6c (diff-fine-highlight-preproc): Stick to minimal changes
which will not affect the behavior of things like forward-word.
(diff-fine-highlight): Preserve point.
2007-10-19 17:16:43 +00:00
Dan Nicolaescu
5eee3c954e * diff-mode.el (diff-fine-change): Add :group. 2007-10-13 00:07:23 +00:00
Stefan Monnier
ef63ea1c7a (diff-current-defun): Force recomputation of change-log-default-name. 2007-10-12 19:36:28 +00:00
Miles Bader
1af74d06e5 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
2007-10-09 08:52:57 +00:00
Stefan Monnier
011f48f234 (diff-mode-map, diff-mode-menu): Add diff-fine-highlight. 2007-10-09 04:22:11 +00:00
Stefan Monnier
be36f934da (diff-hunk-style): New fun.
(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.
2007-10-09 04:12:24 +00:00
Dan Nicolaescu
25edda535b * pcvs-defs.el (cvs-mode-map): Bind TAB and backtab.
* log-view.el (log-view-mode-map): Likewise.

* diff-mode.el (diff-mode-shared-map): Likewise.
2007-09-22 23:27:53 +00:00
Stefan Monnier
80a01d975a (diff-sanity-check-hunk): Fix up the case when unified
diffs are concatenated with no intervening line.
2007-09-12 05:11:07 +00:00
Thien-Thi Nguyen
7fb6ce6ef1 (diff-sanity-check-hunk): Also accept single-line hunks. 2007-09-11 07:00:04 +00:00
Glenn Morris
f9274544eb (diff-find-file-name): Only accept regular files, to rule out
/dev/null, directories, etc.
2007-08-27 07:11:57 +00:00
Glenn Morris
73f21f883c (diff-find-file-name): Only accept regular files, to rule out
/dev/null, directories, etc.
2007-08-27 07:10:50 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Stefan Monnier
dfbd373dfb (diff-unified->context, diff-reverse-direction, diff-fixup-modifs):
Typo in docstring.
2007-08-06 20:08:55 +00:00
Stefan Monnier
4c969f97e3 (diff-font-lock-keywords): Fix up false positives.
(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.
2007-08-03 22:06:36 +00:00
Dan Nicolaescu
eff23ff376 * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
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.
2007-07-30 00:19:06 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
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
2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Stefan Monnier
f151b310f6 (diff-refine-ignore-spaces-hunk): Rename from
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.
2007-07-22 22:02:49 +00:00