mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-30 11:09:23 +00:00
Code Issues Releases Activity
60,315 Commits 226 Branches 190 Tags 542 MiB
932af01bc5
Commit Graph

83 Commits

Author SHA1 Message Date
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
Stefan Monnier
3baada38f8 (diff-mode): Turn on compilation-minor-mode 
support again, but more carefully this time.
 2002-09-13 19:45:36 +00:00
Stefan Monnier
df52e0e7ac (diff-mode): Docstring improvement. 2002-09-12 21:44:23 +00:00
Stefan Monnier
cb4e817652 (diff-reverse-direction): Simplify. 
(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.
 2002-07-16 13:37:15 +00:00
Pavel Janík
b532d57530 Comment fixes. 2002-01-01 22:12:19 +00:00
Richard M. Stallman
58b64ac7d9 (various face definitions): Use :weight and :slant. 2001-12-31 20:43:36 +00:00
Stefan Monnier
1eabc5e6c7 (diff-end-of-hunk): Watch out for ambiguities. 
(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.
 2001-11-26 00:20:41 +00:00
Stefan Monnier
769dd0f172 (diff-default-read-only): New var. 
(diff-mode): Use it.
 2001-09-22 19:11:24 +00:00
Miles Bader
2b960ac022 (diff-mode): Don't make the buffer read-only if it's empty (and thus 
probably a new patch file about to be edited).
 2001-09-18 01:19:51 +00:00
Stefan Monnier
a62d56ab3b (diff-font-lock-keywords): Fix unanchored regexp. 2001-06-13 19:52:43 +00:00
Stefan Monnier
e8a1ed310d (diff-jump-to-old-file, diff-update-on-the-fly): 
Renamed by removing the silly `-flag' suffix.
(diff-mode, diff-minor-mode, diff-find-source-location): Update.
 2001-05-21 18:45:05 +00:00
Stefan Monnier
7dfb000f42 (diff-nonexistent-face, diff-font-lock-keywords): 
Typo `nonexistant' -> `nonexistent'.
 2001-05-04 17:56:03 +00:00
Stefan Monnier
469fc0a23f (diff-nonexistant-face): New face. 
(diff-font-lock-keywords): Use it.
 2001-05-01 13:33:59 +00:00
Stefan Monnier
cdbb79c1ed (diff-mode): Disable preliminary support for `compile'. 2001-01-24 23:26:40 +00:00
Dave Love
824693e7dd (diff-imenu-generic-expression): Modify unidiff 
pattern.
 2000-11-14 18:09:21 +00:00
Stefan Monnier
cd632e57a5 (diff-mode-menu): Add entry for applying hunk. 
(diff-count-matches, diff-split-hunk): New functions.
(diff-mode-map): Bind C-c C-s to diff-split-hunk.
 2000-11-12 16:59:52 +00:00