mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-12 09:28:24 +00:00
Code Issues Releases Activity
69,170 Commits 225 Branches 189 Tags 520 MiB
7585c8f220
Commit Graph

98 Commits

Author SHA1 Message Date
Andreas Schwab
593b4fa884 (diff-apply-hunk): Use proper format string for 
error.
 2007-03-11 10:45:00 +00:00
Richard M. Stallman
b64d66b546 (diff-mode): Doc fix. 2007-03-05 03:14:25 +00:00
Stefan Monnier
2365ab4a00 (diff-sanity-check-hunk): Fix last fix. 2007-02-08 16:34:28 +00:00
Stefan Monnier
a3ee90d98c *** empty log message *** 2007-02-07 17:08:36 +00:00
Stefan Monnier
3a349573d8 (diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions. 
(diff-find-source-location): Use'em to check the hunks are well-formed.
 2007-01-11 16:52:59 +00:00
Stefan Monnier
fe39af99e5 (diff-mode-map): Add a binding for unified->context. 2006-11-27 20:59:54 +00:00
Stefan Monnier
cb9a30c8e1 (diff-apply-hunk-to-backup-file): New var. 
(diff-apply-hunk): Use it to ask for confirmation.
 2006-09-11 18:11:19 +00:00
Stefan Monnier
e78cf8e555 (diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re. 
(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.
 2006-07-02 14:29:28 +00:00
Chong Yidong
dd24cb375f * diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk) 
(diff-refine-hunk): Set inhibit-read-only to t.
 2006-06-06 14:17:31 +00:00
Chong Yidong
53dd481c3f * diff-mode.el (diff-mode): Set buffer-read-only to t when 
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.
 2006-06-06 14:06:13 +00:00
Juri Linkov
a70b0ff8f2 (diff-context->unified): Use region-beginning' and region-end' 
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.
 2006-05-09 23:06:14 +00:00
Richard M. Stallman
28408bfd27 (diff-mode-shared-map): Don't bind M-W, M-U, M-C, 
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.
 2006-05-02 01:39:40 +00:00
Stefan Monnier
cc1eecfd88 Update my email address. 2006-04-30 15:49:08 +00:00
Nick Roberts
ea5d66db38 (diff-function): Make it inherit from diff-header instead of diff-context. 2006-03-21 10:15:39 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Thien-Thi Nguyen
72147c533b (diff-mode): Doc fix. 2005-10-16 21:49:00 +00:00
Juanma Barranquero
6e0f362cb0 (add-log-buffer-file-name-function): Add defvar. 2005-08-31 13:47:51 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Juri Linkov
050dcc13ec (diff-font-lock-keywords): Simplify comments fontifying rule. 2005-07-19 14:42:40 +00:00
Juri Linkov
f3abba999d (diff-file-header): Change foreground color from 
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'.
 2005-07-19 11:28:35 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Juanma Barranquero
bdad2e310e Fix brainos. 2005-07-04 03:11:31 +00:00
Juanma Barranquero
aa753196b9 (diff-mode): Finish `defgroup' description with period. 
(diff-context->unified, diff-reverse-direction, diff-unified->context):
"?\ " -> "?\s".
 2005-07-04 01:55:56 +00:00
Juanma Barranquero
3b696504cd (diff-mode): Fix typo in docstring. 2005-06-14 14:34:40 +00:00
Miles Bader
221711eb23 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368 
Remove "-face" suffix from diff-mode faces

2005-06-10  Miles Bader  <miles@gnu.org>

   * 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.
 2005-06-10 07:43:31 +00:00
Juri Linkov
c4cf171043 * diff-mode.el (diff-context-face): Inherit from `shadow' face. 2005-06-06 12:22:00 +00:00
Lute Kamstra
d676819ef5 (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): Put them in the
diff-mode customization group.
 2005-05-20 13:35:11 +00:00
Juanma Barranquero
f530778210 Specify missing group (and type, if simple) in defcustom. 2005-05-19 19:06:19 +00:00
Lute Kamstra
cfc802279a (diff-minor-mode): Specify :group. 2005-04-04 08:54:58 +00:00
Stefan Monnier
4f8150654e (diff-current-defun): Fix 2004-06-13's change. 2004-10-10 04:08:43 +00:00
Stefan Monnier
bd9d7d76f0 (diff-file-header-re): Tighten up regexp a tiny bit. 
(diff-fixup-modifs): Catch unified-diff file-headers.
 2004-09-29 17:42:50 +00:00
Juri Linkov
677c03828d (diff-mode-map): Rename next-error-follow-mode' to next-error-follow-minor-mode'. 2004-09-08 20:20:05 +00:00
Eli Zaretskii
b711788a4a (diff-mode-map): Bind toggle-next-error-follow-mode. 2004-09-04 12:46:17 +00:00
Kai Großjohann
2f9edc8be5 Reindent `diff-current-defun'. 2004-06-13 16:49:55 +00:00
Kai Großjohann
6393ab2a79 (diff-current-defun): If at start of hunk, use 
position of first change.
 2004-06-13 16:48:44 +00:00
Stefan Monnier
4c174fb4fa (diff-make-unified): Fix regexp. 2004-05-06 18:41:32 +00:00
Stefan Monnier
55f2eb7e34 (diff-header-face, diff-file-header-face): Use min-colors. 2004-05-02 19:27:59 +00:00
Stefan Monnier
6fc049f621 (diff-next-error): New fun. 
(diff-mode): Use it.
 2004-04-22 22:57:09 +00:00
Stefan Monnier
996884b257 (diff-end-of-hunk): Be more careful with unified hunks. 2004-04-16 21:52:14 +00:00
Stefan Monnier
a1e2d7f757 (diff-goto-source): Make it work for mouse bindings. 
(diff-mouse-goto-source): Make it an alias of diff-goto-source.
 2004-04-14 17:31:42 +00:00
Andreas Schwab
5c84686c48 (diff-mode): Fix missing quote. 2004-04-03 20:02:16 +00:00
Stefan Monnier
1ec7bd14f9 (diff-font-lock-keywords): Disable yank-handler. 2004-03-24 21:35:40 +00:00
Stefan Monnier
22cd1973d5 (diff-default-read-only): Change default. 
(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.
 2004-03-23 20:50:36 +00:00
Stefan Monnier
3ccdb14e71 (diff-file-regexp-alist, diff-error-regexp-alist) 
(diff-mode): Remove aborted attempt at support for compile.el.
(diff-mode, diff-minor-mode): Avoid obsolete write-contents-hooks.
 2004-02-06 22:05:16 +00:00
Benjamin Rutt
c010ecfa9a Bind q to `quit-window'. 2004-02-02 21:09:05 +00:00
Thien-Thi Nguyen
067b409428 (diff-hunk-prev, diff-hunk-next): Support 
operation while narrowed, with `diff-restrict-view'.
 2003-11-14 16:23:37 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Juanma Barranquero
71296446d3 Trailing whitespace deleted. 2003-02-04 11:26:42 +00:00
Stefan Monnier
adf8363c7d (diff-mode): Use compilation-minor-mode. 
Don't unbind compilation-last-buffer after autoload compile.el.
Hide the compilation-minor-mode bindings altogether.
 2002-09-18 12:09:07 +00:00
Miles Bader
bd3c9eb622 (diff-mode): Don't evaluate `compilation-last-buffer' unless it's bound. 2002-09-18 02:36:10 +00:00