| blob | 4eb50899847e80d2355bb733d0eec400d8b8d0e5 |
1 ;;; diff-mode.el --- a mode for viewing/editing context diffs
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
7 ;; Keywords: convenience patch diff
9 ;; This file is part of GNU Emacs.
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by
13 ;; the Free Software Foundation, either version 3 of the License, or
14 ;; (at your option) any later version.
16 ;; GNU Emacs is distributed in the hope that it will be useful,
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 ;; GNU General Public License for more details.
21 ;; You should have received a copy of the GNU General Public License
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
24 ;;; Commentary:
26 ;; Provides support for font-lock, outline, navigation
27 ;; commands, editing and various conversions as well as jumping
28 ;; to the corresponding source file.
30 ;; Inspired by Pavel Machek's patch-mode.el (<pavel@@atrey.karlin.mff.cuni.cz>)
31 ;; Some efforts were spent to have it somewhat compatible with XEmacs'
32 ;; diff-mode as well as with compilation-minor-mode
34 ;; Bugs:
36 ;; - Reverse doesn't work with normal diffs.
38 ;; Todo:
40 ;; - Improve `diff-add-change-log-entries-other-window',
41 ;; it is very simplistic now.
42 ;;
43 ;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks.
44 ;; Also allow C-c C-a to delete already-applied hunks.
45 ;;
46 ;; - Try `diff <file> <hunk>' to try and fuzzily discover the source location
47 ;; of a hunk. Show then the changes between <file> and <hunk> and make it
48 ;; possible to apply them to <file>, <hunk-src>, or <hunk-dst>.
49 ;; Or maybe just make it into a ".rej to diff3-markers converter".
50 ;; Maybe just use `wiggle' (by Neil Brown) to do it for us.
51 ;;
52 ;; - in diff-apply-hunk, strip context in replace-match to better
53 ;; preserve markers and spacing.
54 ;; - Handle `diff -b' output in context->unified.
56 ;;; Code:
63 "Major mode for viewing/editing diffs."
69 "If non-nil, `diff-mode' buffers default to being read-only."
74 "Non-nil means `diff-goto-source' jumps to the old file.
75 Else, it jumps to the new file."
80 "Non-nil means hunk headers are kept up-to-date on-the-fly.
81 When editing a diff file, the line numbers in the hunk headers
82 need to be kept consistent with the actual diff. This can
83 either be done on the fly (but this sometimes interacts poorly with the
84 undo mechanism) or whenever the file is written (can be slow
85 when editing big diffs)."
90 "Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
95 "Run after setting up the `diff-mode' major mode."
103 ;;;;
104 ;;;; keymap, menu, ...
105 ;;;;
115 ("k" . diff-hunk-kill)
116 ("K" . diff-file-kill)
117 ;; From compilation-minor-mode.
118 ("}" . diff-file-next)
119 ("{" . diff-file-prev)
120 ("\C-m" . diff-goto-source)
121 ([mouse-2] . diff-goto-source)
122 ;; From XEmacs' diff-mode.
123 ;; Standard M-w is useful, so don't change M-W.
124 ;;("W" . widen)
125 ;;("." . diff-goto-source) ;display-buffer
126 ;;("f" . diff-goto-source) ;find-file
127 ("o" . diff-goto-source) ;other-window
128 ;;("w" . diff-goto-source) ;other-frame
129 ;;("N" . diff-narrow)
130 ;;("h" . diff-show-header)
131 ;;("j" . diff-show-difference) ;jump to Nth diff
132 ;;("q" . diff-quit)
133 ;; Not useful if you have to metafy them.
134 ;;(" " . scroll-up)
136 ;; Standard M-a is useful, so don't change M-A.
137 ;;("A" . diff-ediff-patch)
138 ;; Standard M-r is useful, so don't change M-r or M-R.
139 ;;("r" . diff-restrict-view)
140 ;;("R" . diff-reverse-direction)
141 ("q" . quit-window))
142 "Basic keymap for `diff-mode', bound to various prefix keys.")
144 (easy-mmode-defmap diff-mode-map
145 `(("\e" . ,diff-mode-shared-map)
146 ;; From compilation-minor-mode.
147 ("\C-c\C-c" . diff-goto-source)
148 ;; By analogy with the global C-x 4 a binding.
149 ("\C-x4A" . diff-add-change-log-entries-other-window)
150 ;; Misc operations.
151 ("\C-c\C-a" . diff-apply-hunk)
152 ("\C-c\C-e" . diff-ediff-patch)
153 ("\C-c\C-n" . diff-restrict-view)
154 ("\C-c\C-s" . diff-split-hunk)
155 ("\C-c\C-t" . diff-test-hunk)
156 ("\C-c\C-r" . diff-reverse-direction)
157 ("\C-c\C-u" . diff-context->unified)
158 ;; `d' because it duplicates the context :-( --Stef
159 ("\C-c\C-d" . diff-unified->context)
160 ("\C-c\C-w" . diff-ignore-whitespace-hunk)
161 ("\C-c\C-b" . diff-refine-hunk) ;No reason for `b' :-(
162 ("\C-c\C-f" . next-error-follow-minor-mode))
163 "Keymap for `diff-mode'. See also `diff-mode-shared-map'.")
165 (easy-menu-define diff-mode-menu diff-mode-map
166 "Menu for `diff-mode'."
167 '("Diff"
168 ["Jump to Source" diff-goto-source
169 :help "Jump to the corresponding source line"]
170 ["Apply hunk" diff-apply-hunk
171 :help "Apply the current hunk to the source file and go to the next"]
172 ["Test applying hunk" diff-test-hunk
173 :help "See whether it's possible to apply the current hunk"]
174 ["Apply diff with Ediff" diff-ediff-patch
175 :help "Call `ediff-patch-file' on the current buffer"]
176 ["Create Change Log entries" diff-add-change-log-entries-other-window
177 :help "Create ChangeLog entries for the changes in the diff buffer"]
178 "-----"
179 ["Reverse direction" diff-reverse-direction
180 :help "Reverse the direction of the diffs"]
181 ["Context -> Unified" diff-context->unified
182 :help "Convert context diffs to unified diffs"]
183 ["Unified -> Context" diff-unified->context
184 :help "Convert unified diffs to context diffs"]
185 ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)]
186 "-----"
187 ["Split hunk" diff-split-hunk
188 :active (diff-splittable-p)
189 :help "Split the current (unified diff) hunk at point into two hunks"]
190 ["Ignore whitespace changes" diff-ignore-whitespace-hunk
191 :help "Re-diff the current hunk, ignoring whitespace differences"]
192 ["Highlight fine changes" diff-refine-hunk
193 :help "Highlight changes of hunk at point at a finer granularity"]
194 ["Kill current hunk" diff-hunk-kill
195 :help "Kill current hunk"]
196 ["Kill current file's hunks" diff-file-kill
197 :help "Kill all current file's hunks"]
198 "-----"
199 ["Previous Hunk" diff-hunk-prev
200 :help "Go to the previous count'th hunk"]
201 ["Next Hunk" diff-hunk-next
202 :help "Go to the next count'th hunk"]
203 ["Previous File" diff-file-prev
204 :help "Go to the previous count'th file"]
205 ["Next File" diff-file-next
206 :help "Go to the next count'th file"]
207 ))
209 (defcustom diff-minor-mode-prefix "\C-c="
210 "Prefix key for `diff-minor-mode' commands."
211 :type '(choice (string "\e") (string "C-c=") string)
212 :group 'diff-mode)
214 (easy-mmode-defmap diff-minor-mode-map
215 `((,diff-minor-mode-prefix . ,diff-mode-shared-map))
216 "Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.")
218 (define-minor-mode diff-auto-refine-mode
219 "Automatically highlight changes in detail as the user visits hunks.
220 When transitioning from disabled to enabled,
221 try to refine the current hunk, as well."
222 :group 'diff-mode :init-value t :lighter nil ;; " Auto-Refine"
223 (when diff-auto-refine-mode
224 (condition-case-no-debug nil (diff-refine-hunk) (error nil))))
226 ;;;;
227 ;;;; font-lock support
228 ;;;;
230 (defface diff-header
231 '((((class color) (min-colors 88) (background light))
232 :background "grey80")
233 (((class color) (min-colors 88) (background dark))
234 :background "grey45")
235 (((class color) (background light))
236 :foreground "blue1" :weight bold)
237 (((class color) (background dark))
238 :foreground "green" :weight bold)
239 (t :weight bold))
240 "`diff-mode' face inherited by hunk and index header faces."
241 :group 'diff-mode)
242 ;; backward-compatibility alias
243 (put 'diff-header-face 'face-alias 'diff-header)
244 (defvar diff-header-face 'diff-header)
246 (defface diff-file-header
247 '((((class color) (min-colors 88) (background light))
248 :background "grey70" :weight bold)
249 (((class color) (min-colors 88) (background dark))
250 :background "grey60" :weight bold)
251 (((class color) (background light))
252 :foreground "green" :weight bold)
253 (((class color) (background dark))
254 :foreground "cyan" :weight bold)
255 (t :weight bold)) ; :height 1.3
256 "`diff-mode' face used to highlight file header lines."
257 :group 'diff-mode)
258 ;; backward-compatibility alias
259 (put 'diff-file-header-face 'face-alias 'diff-file-header)
260 (defvar diff-file-header-face 'diff-file-header)
262 (defface diff-index
263 '((t :inherit diff-file-header))
264 "`diff-mode' face used to highlight index header lines."
265 :group 'diff-mode)
266 ;; backward-compatibility alias
267 (put 'diff-index-face 'face-alias 'diff-index)
268 (defvar diff-index-face 'diff-index)
270 (defface diff-hunk-header
271 '((t :inherit diff-header))
272 "`diff-mode' face used to highlight hunk header lines."
273 :group 'diff-mode)
274 ;; backward-compatibility alias
275 (put 'diff-hunk-header-face 'face-alias 'diff-hunk-header)
276 (defvar diff-hunk-header-face 'diff-hunk-header)
278 (defface diff-removed
279 '((t :inherit diff-changed))
280 "`diff-mode' face used to highlight removed lines."
281 :group 'diff-mode)
282 ;; backward-compatibility alias
283 (put 'diff-removed-face 'face-alias 'diff-removed)
284 (defvar diff-removed-face 'diff-removed)
286 (defface diff-added
287 '((t :inherit diff-changed))
288 "`diff-mode' face used to highlight added lines."
289 :group 'diff-mode)
290 ;; backward-compatibility alias
291 (put 'diff-added-face 'face-alias 'diff-added)
292 (defvar diff-added-face 'diff-added)
294 (defface diff-changed
295 '((((type tty pc) (class color) (background light))
296 :foreground "magenta" :weight bold :slant italic)
297 (((type tty pc) (class color) (background dark))
298 :foreground "yellow" :weight bold :slant italic))
299 "`diff-mode' face used to highlight changed lines."
300 :group 'diff-mode)
301 ;; backward-compatibility alias
302 (put 'diff-changed-face 'face-alias 'diff-changed)
303 (defvar diff-changed-face 'diff-changed)
305 (defface diff-indicator-removed
306 '((t :inherit diff-removed))
307 "`diff-mode' face used to highlight indicator of removed lines (-, <)."
308 :group 'diff-mode
309 :version "22.1")
310 (defvar diff-indicator-removed-face 'diff-indicator-removed)
312 (defface diff-indicator-added
313 '((t :inherit diff-added))
314 "`diff-mode' face used to highlight indicator of added lines (+, >)."
315 :group 'diff-mode
316 :version "22.1")
317 (defvar diff-indicator-added-face 'diff-indicator-added)
319 (defface diff-indicator-changed
320 '((t :inherit diff-changed))
321 "`diff-mode' face used to highlight indicator of changed lines."
322 :group 'diff-mode
323 :version "22.1")
324 (defvar diff-indicator-changed-face 'diff-indicator-changed)
326 (defface diff-function
327 '((t :inherit diff-header))
329 :group 'diff-mode)
330 ;; backward-compatibility alias
331 (put 'diff-function-face 'face-alias 'diff-function)
332 (defvar diff-function-face 'diff-function)
334 (defface diff-context
335 '((((class color grayscale) (min-colors 88)) :inherit shadow))
336 "`diff-mode' face used to highlight context and other side-information."
337 :group 'diff-mode)
338 ;; backward-compatibility alias
339 (put 'diff-context-face 'face-alias 'diff-context)
340 (defvar diff-context-face 'diff-context)
342 (defface diff-nonexistent
343 '((t :inherit diff-file-header))
344 "`diff-mode' face used to highlight nonexistent files in recursive diffs."
345 :group 'diff-mode)
346 ;; backward-compatibility alias
347 (put 'diff-nonexistent-face 'face-alias 'diff-nonexistent)
348 (defvar diff-nonexistent-face 'diff-nonexistent)
350 (defconst diff-yank-handler '(diff-yank-function))
351 (defun diff-yank-function (text)
352 ;; FIXME: the yank-handler is now called separately on each piece of text
353 ;; with a yank-handler property, so the next-single-property-change call
354 ;; below will always return nil :-( --stef
355 (let ((mixed (next-single-property-change 0 'yank-handler text))
356 (start (point)))
357 ;; First insert the text.
358 (insert text)
359 ;; If the text does not include any diff markers and if we're not
360 ;; yanking back into a diff-mode buffer, get rid of the prefixes.
361 (unless (or mixed (derived-mode-p 'diff-mode))
362 (undo-boundary) ; Just in case the user wanted the prefixes.
363 (let ((re (save-excursion
365 (if (eq (char-after) ?!)
367 "^[ <>!+-]"))))
368 (save-excursion
369 (while (re-search-backward re start t)
370 (replace-match "" t t)))))))
372 (defconst diff-hunk-header-re-unified
374 (defconst diff-context-mid-hunk-header-re
377 (defvar diff-font-lock-keywords
379 (1 diff-hunk-header-face) (6 diff-function-face))
381 (1 diff-hunk-header-face) (2 diff-function-face))
383 (,diff-context-mid-hunk-header-re . diff-hunk-header-face) ;context
384 ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face) ;normal
385 ("^---$" . diff-hunk-header-face) ;normal
386 ;; For file headers, accept files with spaces, but be careful to rule
387 ;; out false-positives when matching hunk headers.
388 ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^\t\n]+?\\)\\(?:\t.*\\| \\(\\*\\*\\*\\*\\|----\\)\\)?\n"
389 (0 diff-header-face)
390 (2 (if (not (match-end 3)) diff-file-header-face) prepend))
392 (1 diff-indicator-removed-face) (2 diff-removed-face))
394 (1 diff-indicator-added-face) (2 diff-added-face))
396 (1 diff-indicator-changed-face) (2 diff-changed-face))
398 (0 diff-header-face) (1 diff-index-face prepend))
401 (1 font-lock-comment-delimiter-face)
402 (2 font-lock-comment-face))
405 (defconst diff-font-lock-defaults
406 '(diff-font-lock-keywords t nil nil nil (font-lock-multiline . nil)))
408 (defvar diff-imenu-generic-expression
409 ;; Prefer second name as first is most likely to be a backup or
411 ;; catches Debian source diff files (which lack the trailing date).
415 ;;;;
416 ;;;; Movement
417 ;;;;
419 (defvar diff-valid-unified-empty-line t
420 "If non-nil, empty lines are valid in unified diffs.
421 Some versions of diff replace all-blank context lines in unified format with
422 empty lines. This makes the format less robust, but is tolerated.
423 See http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html")
425 (defconst diff-hunk-header-re
426 (concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$"))
427 (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* \n]\\).+\n" (substring diff-hunk-header-re 1)))
428 (defvar diff-narrowed-to nil)
430 (defun diff-hunk-style (&optional style)
431 (when (looking-at diff-hunk-header-re)
432 (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context)))))
433 (goto-char (match-end 0)))
434 style)
436 (defun diff-end-of-hunk (&optional style donttrustheader)
437 (let (end)
438 (when (looking-at diff-hunk-header-re)
439 ;; Especially important for unified (because headers are ambiguous).
440 (setq style (diff-hunk-style style))
441 (goto-char (match-end 0))
442 (when (and (not donttrustheader) (match-end 2))
443 (let* ((nold (string-to-number (or (match-string 2) "1")))
444 (nnew (string-to-number (or (match-string 4) "1")))
445 (endold
446 (save-excursion
447 (re-search-forward (if diff-valid-unified-empty-line
449 nil t nold)
450 (line-beginning-position 2)))
451 (endnew
452 ;; The hunk may end with a bunch of "+" lines, so the `end' is
453 ;; then further than computed above.
454 (save-excursion
455 (re-search-forward (if diff-valid-unified-empty-line
457 nil t nnew)
458 (line-beginning-position 2))))
459 (setq end (max endold endnew)))))
460 ;; We may have a first evaluation of `end' thanks to the hunk header.
461 (unless end
462 (setq end (and (re-search-forward
463 (case style
464 (unified (concat (if diff-valid-unified-empty-line
466 ;; A `unified' header is ambiguous.
467 diff-file-header-re))
471 nil t)
472 (match-beginning 0)))
473 (when diff-valid-unified-empty-line
474 ;; While empty lines may be valid inside hunks, they are also likely
475 ;; to be unrelated to the hunk.
476 (goto-char (or end (point-max)))
478 (forward-char -1)
479 (setq end (point)))))
480 ;; The return value is used by easy-mmode-define-navigation.
481 (goto-char (or end (point-max)))))
483 (defun diff-beginning-of-hunk (&optional try-harder)
484 "Move back to beginning of hunk.
485 If TRY-HARDER is non-nil, try to cater to the case where we're not in a hunk
486 but in the file header instead, in which case move forward to the first hunk."
487 (beginning-of-line)
488 (unless (looking-at diff-hunk-header-re)
489 (forward-line 1)
490 (condition-case ()
491 (re-search-backward diff-hunk-header-re)
492 (error
493 (if (not try-harder)
494 (error "Can't find the beginning of the hunk")
495 (diff-beginning-of-file-and-junk)
496 (diff-hunk-next))))))
498 (defun diff-unified-hunk-p ()
499 (save-excursion
500 (ignore-errors
501 (diff-beginning-of-hunk)
502 (looking-at "^@@"))))
504 (defun diff-beginning-of-file ()
505 (beginning-of-line)
506 (unless (looking-at diff-file-header-re)
507 (let ((start (point))
508 res)
509 ;; diff-file-header-re may need to match up to 4 lines, so in case
510 ;; we're inside the header, we need to move up to 3 lines forward.
511 (forward-line 3)
512 (if (and (setq res (re-search-backward diff-file-header-re nil t))
513 ;; Maybe the 3 lines forward were too much and we matched
514 ;; a file header after our starting point :-(
515 (or (<= (point) start)
516 (setq res (re-search-backward diff-file-header-re nil t))))
517 res
518 (goto-char start)
519 (error "Can't find the beginning of the file")))))
522 (defun diff-end-of-file ()
525 nil 'move)
526 (if (match-beginning 1)
527 (goto-char (match-beginning 1))
528 (beginning-of-line)))
530 ;; Define diff-{hunk,file}-{prev,next}
531 (easy-mmode-define-navigation
532 diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view
533 (if diff-auto-refine-mode
534 (condition-case-no-debug nil (diff-refine-hunk) (error nil))))
536 (easy-mmode-define-navigation
537 diff-file diff-file-header-re "file" diff-end-of-hunk)
539 (defun diff-restrict-view (&optional arg)
540 "Restrict the view to the current hunk.
541 If the prefix ARG is given, restrict the view to the current file instead."
542 (interactive "P")
543 (save-excursion
544 (if arg (diff-beginning-of-file) (diff-beginning-of-hunk 'try-harder))
545 (narrow-to-region (point)
546 (progn (if arg (diff-end-of-file) (diff-end-of-hunk))
547 (point)))
548 (set (make-local-variable 'diff-narrowed-to) (if arg 'file 'hunk))))
551 (defun diff-hunk-kill ()
552 "Kill current hunk."
553 (interactive)
554 (diff-beginning-of-hunk)
555 (let* ((start (point))
556 (nexthunk (when (re-search-forward diff-hunk-header-re nil t)
557 (match-beginning 0)))
558 (firsthunk (ignore-errors
559 (goto-char start)
560 (diff-beginning-of-file) (diff-hunk-next) (point)))
561 (nextfile (ignore-errors (diff-file-next) (point)))
562 (inhibit-read-only t))
563 (goto-char start)
564 (if (and firsthunk (= firsthunk start)
565 (or (null nexthunk)
566 (and nextfile (> nexthunk nextfile))))
567 ;; It's the only hunk for this file, so kill the file.
568 (diff-file-kill)
569 (diff-end-of-hunk)
570 (kill-region start (point)))))
572 ;; "index ", "old mode", "new mode", "new file mode" and
573 ;; "deleted file mode" are output by git-diff.
574 (defconst diff-file-junk-re
577 (defun diff-beginning-of-file-and-junk ()
578 "Go to the beginning of file-related diff-info.
579 This is like `diff-beginning-of-file' except it tries to skip back over leading
581 (let* ((orig (point))
582 ;; Skip forward over what might be "leading junk" so as to get
583 ;; closer to the actual diff.
584 (_ (progn (beginning-of-line)
585 (while (looking-at diff-file-junk-re)
586 (forward-line 1))))
587 (start (point))
588 (prevfile (condition-case err
589 (save-excursion (diff-beginning-of-file) (point))
590 (error err)))
591 (err (if (consp prevfile) prevfile))
592 (nextfile (ignore-errors
593 (save-excursion
594 (goto-char start) (diff-file-next) (point))))
595 ;; prevhunk is one of the limits.
596 (prevhunk (save-excursion
597 (ignore-errors
598 (if (numberp prevfile) (goto-char prevfile))
599 (diff-hunk-prev) (point))))
600 (previndex (save-excursion
601 (forward-line 1) ;In case we're looking at "Index:".
602 (re-search-backward "^Index: " prevhunk t))))
603 ;; If we're in the junk, we should use nextfile instead of prevfile.
604 (if (and (numberp nextfile)
605 (or (not (numberp prevfile))
606 (and previndex (> previndex prevfile))))
607 (setq prevfile nextfile))
608 (if (and previndex (numberp prevfile) (< previndex prevfile))
609 (setq prevfile previndex))
610 (if (and (numberp prevfile) (<= prevfile start))
611 (progn
612 (goto-char prevfile)
613 ;; Now skip backward over the leading junk we may have before the
614 ;; diff itself.
615 (while (save-excursion
616 (and (zerop (forward-line -1))
617 (looking-at diff-file-junk-re)))
618 (forward-line -1)))
619 ;; File starts *after* the starting point: we really weren't in
620 ;; a file diff but elsewhere.
621 (goto-char orig)
622 (signal (car err) (cdr err)))))
624 (defun diff-file-kill ()
625 "Kill current file's hunks."
626 (interactive)
627 (let ((orig (point))
628 (start (progn (diff-beginning-of-file-and-junk) (point)))
629 (inhibit-read-only t))
630 (diff-end-of-file)
632 (if (> orig (point)) (error "Not inside a file diff"))
633 (kill-region start (point))))
635 (defun diff-kill-junk ()
636 "Kill spurious empty diffs."
637 (interactive)
638 (save-excursion
639 (let ((inhibit-read-only t))
640 (goto-char (point-min))
645 nil t)
646 (delete-region (if (match-end 4) (match-beginning 0) (match-end 1))
647 (match-beginning 3))
648 (beginning-of-line)))))
650 (defun diff-count-matches (re start end)
651 (save-excursion
652 (let ((n 0))
653 (goto-char start)
654 (while (re-search-forward re end t) (incf n))
655 n)))
657 (defun diff-splittable-p ()
658 (save-excursion
659 (beginning-of-line)
660 (and (looking-at "^[-+ ]")
661 (progn (forward-line -1) (looking-at "^[-+ ]"))
662 (diff-unified-hunk-p))))
664 (defun diff-split-hunk ()
665 "Split the current (unified diff) hunk at point into two hunks."
666 (interactive)
667 (beginning-of-line)
668 (let ((pos (point))
669 (start (progn (diff-beginning-of-hunk) (point))))
670 (unless (looking-at diff-hunk-header-re-unified)
671 (error "diff-split-hunk only works on unified context diffs"))
672 (forward-line 1)
673 (let* ((start1 (string-to-number (match-string 1)))
674 (start2 (string-to-number (match-string 3)))
677 (inhibit-read-only t))
678 (goto-char pos)
679 ;; Hopefully the after-change-function will not screw us over.
680 (insert "@@ -" (number-to-string newstart1) ",1 +"
682 ;; Fix the original hunk-header.
683 (diff-fixup-modifs start pos))))
686 ;;;;
687 ;;;; jump to other buffers
688 ;;;;
690 (defvar diff-remembered-files-alist nil)
691 (defvar diff-remembered-defdir nil)
693 (defun diff-filename-drop-dir (file)
694 (when (string-match "/" file) (substring file (match-end 0))))
696 (defun diff-merge-strings (ancestor from to)
697 "Merge the diff between ANCESTOR and FROM into TO.
698 Returns the merged string if successful or nil otherwise.
700 If ANCESTOR = FROM, returns TO.
701 If ANCESTOR = TO, returns FROM.
702 The heuristic is simplistic and only really works for cases
704 ;; Ideally, we want:
705 ;; AMB ANB CMD -> CND
706 ;; but that's ambiguous if `foo' or `bar' is empty:
707 ;; a/foo a/foo1 b/foo.c -> b/foo1.c but not 1b/foo.c or b/foo.c1
709 (when (and (string-match (concat
713 (equal to (match-string 5 str)))
714 (concat (substring str (match-beginning 5) (match-beginning 6))
715 (match-string 4 str)
716 (substring str (match-end 6) (match-end 5))))))
718 (defun diff-tell-file-name (old name)
719 "Tell Emacs where the find the source file of the current hunk.
720 If the OLD prefix arg is passed, tell the file NAME of the old file."
721 (interactive
722 (let* ((old current-prefix-arg)
723 (fs (diff-hunk-file-names current-prefix-arg)))
724 (unless fs (error "No file name to look for"))
725 (list old (read-file-name (format "File for %s: " (car fs))
726 nil (diff-find-file-name old 'noprompt) t))))
727 (let ((fs (diff-hunk-file-names old)))
728 (unless fs (error "No file name to look for"))
729 (push (cons fs name) diff-remembered-files-alist)))
731 (defun diff-hunk-file-names (&optional old)
732 "Give the list of file names textually mentioned for the current hunk."
733 (save-excursion
734 (unless (looking-at diff-file-header-re)
735 (or (ignore-errors (diff-beginning-of-file))
736 (re-search-forward diff-file-header-re nil t)))
737 (let ((limit (save-excursion
738 (condition-case ()
739 (progn (diff-hunk-prev) (point))
740 (error (point-min)))))
741 (header-files
743 (list (if old (match-string 1) (match-string 3))
744 (if old (match-string 3) (match-string 1)))
745 (forward-line 1) nil)))
746 (delq nil
747 (append
748 (when (and (not old)
749 (save-excursion
751 (list (match-string 1)))
752 header-files
753 (when (re-search-backward
755 nil t)
756 (list (if old (match-string 2) (match-string 4))
757 (if old (match-string 4) (match-string 2)))))))))
759 (defun diff-find-file-name (&optional old noprompt prefix)
760 "Return the file corresponding to the current patch.
761 Non-nil OLD means that we want the old file.
762 Non-nil NOPROMPT means to prefer returning nil than to prompt the user.
763 PREFIX is only used internally: don't use it."
764 (unless (equal diff-remembered-defdir default-directory)
765 ;; Flush diff-remembered-files-alist if the default-directory is changed.
766 (set (make-local-variable 'diff-remembered-defdir) default-directory)
767 (set (make-local-variable 'diff-remembered-files-alist) nil))
768 (save-excursion
769 (unless (looking-at diff-file-header-re)
770 (or (ignore-errors (diff-beginning-of-file))
771 (re-search-forward diff-file-header-re nil t)))
772 (let ((fs (diff-hunk-file-names old)))
773 (if prefix (setq fs (mapcar (lambda (f) (concat prefix f)) fs)))
774 (or
775 ;; use any previously used preference
776 (cdr (assoc fs diff-remembered-files-alist))
777 ;; try to be clever and use previous choices as an inspiration
778 (dolist (rf diff-remembered-files-alist)
779 (let ((newfile (diff-merge-strings (caar rf) (car fs) (cdr rf))))
780 (if (and newfile (file-exists-p newfile)) (return newfile))))
781 ;; look for each file in turn. If none found, try again but
782 ;; ignoring the first level of directory, ...
783 (do* ((files fs (delq nil (mapcar 'diff-filename-drop-dir files)))
784 (file nil nil))
785 ((or (null files)
786 (setq file (do* ((files files (cdr files))
787 (file (car files) (car files)))
788 ;; Use file-regular-p to avoid
789 ;; /dev/null, directories, etc.
790 ((or (null file) (file-regular-p file))
791 file))))
792 file))
793 ;; <foo>.rej patches implicitly apply to <foo>
795 (let ((file (substring buffer-file-name 0 (match-beginning 0))))
796 (when (file-exists-p file) file)))
797 ;; If we haven't found the file, maybe it's because we haven't paid
798 ;; attention to the PCL-CVS hint.
799 (and (not prefix)
800 (boundp 'cvs-pcl-cvs-dirchange-re)
801 (save-excursion
802 (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
803 (diff-find-file-name old noprompt (match-string 1)))
804 ;; if all else fails, ask the user
805 (unless noprompt
806 (let ((file (read-file-name (format "Use file %s: "
807 (or (first fs) ""))
808 nil (first fs) t (first fs))))
809 (set (make-local-variable 'diff-remembered-files-alist)
810 (cons (cons fs file) diff-remembered-files-alist))
811 file))))))
814 (defun diff-ediff-patch ()
815 "Call `ediff-patch-file' on the current buffer."
816 (interactive)
817 (condition-case err
818 (ediff-patch-file nil (current-buffer))
819 (wrong-number-of-arguments (ediff-patch-file))))
821 ;;;;
822 ;;;; Conversion functions
823 ;;;;
825 ;;(defvar diff-inhibit-after-change nil
826 ;; "Non-nil means inhibit `diff-mode's after-change functions.")
828 (defun diff-unified->context (start end)
829 "Convert unified diffs to context diffs.
830 START and END are either taken from the region (if a prefix arg is given) or
831 else cover the whole buffer."
832 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
833 (list (region-beginning) (region-end))
834 (list (point-min) (point-max))))
835 (unless (markerp end) (setq end (copy-marker end t)))
836 (let (;;(diff-inhibit-after-change t)
837 (inhibit-read-only t))
838 (save-excursion
839 (goto-char start)
840 (while (and (re-search-forward
843 nil t)
844 (< (point) end))
845 (combine-after-change-calls
846 (if (match-beginning 2)
847 ;; we matched a file header
848 (progn
849 ;; use reverse order to make sure the indices are kept valid
850 (replace-match "---" t t nil 3)
851 (replace-match "***" t t nil 2))
852 ;; we matched a hunk header
853 (let ((line1 (match-string 4))
854 (lines1 (or (match-string 5) "1"))
855 (line2 (match-string 6))
856 (lines2 (or (match-string 7) "1"))
857 ;; Variables to use the special undo function.
858 (old-undo buffer-undo-list)
859 (old-end (marker-position end))
860 (start (match-beginning 0))
861 (reversible t))
862 (replace-match
864 (number-to-string (+ (string-to-number line1)
865 (string-to-number lines1)
866 -1))
867 " ****"))
868 (save-restriction
869 (narrow-to-region (line-beginning-position 2)
870 ;; Call diff-end-of-hunk from just before
871 ;; the hunk header so it can use the hunk
872 ;; header info.
873 (progn (diff-end-of-hunk 'unified) (point)))
874 (let ((hunk (buffer-string)))
875 (goto-char (point-min))
876 (if (not (save-excursion (re-search-forward "^-" nil t)))
877 (delete-region (point) (point-max))
878 (goto-char (point-max))
879 (let ((modif nil) last-pt)
880 (while (progn (setq last-pt (point))
881 (= (forward-line -1) 0))
882 (case (char-after)
883 (?\s (insert " ") (setq modif nil) (backward-char 1))
884 (?+ (delete-region (point) last-pt) (setq modif t))
885 (?- (if (not modif)
886 (progn (forward-char 1)
887 (insert " "))
888 (delete-char 1)
889 (insert "! "))
890 (backward-char 2))
892 (= (char-after) ?+))
893 (delete-region (point) last-pt) (setq modif t)))
894 ;; diff-valid-unified-empty-line.
896 (t (setq modif nil))))))
897 (goto-char (point-max))
898 (save-excursion
899 (insert "--- " line2 ","
900 (number-to-string (+ (string-to-number line2)
901 (string-to-number lines2)
902 -1))
904 ;;(goto-char (point-min))
905 (forward-line 1)
906 (if (not (save-excursion (re-search-forward "^+" nil t)))
907 (delete-region (point) (point-max))
908 (let ((modif nil) (delete nil))
910 ;; Normally, lines in a substitution come with
911 ;; first the removals and then the additions, and
912 ;; the context->unified function follows this
913 ;; convention, of course. Yet, other alternatives
914 ;; are valid as well, but they preclude the use of
915 ;; context->unified as an undo command.
916 (setq reversible nil))
917 (while (not (eobp))
918 (case (char-after)
919 (?\s (insert " ") (setq modif nil) (backward-char 1))
920 (?- (setq delete t) (setq modif t))
921 (?+ (if (not modif)
922 (progn (forward-char 1)
923 (insert " "))
924 (delete-char 1)
925 (insert "! "))
926 (backward-char 2))
928 (not (eobp)))
929 (setq delete t) (setq modif t)))
930 ;; diff-valid-unified-empty-line.
932 (setq reversible nil))
933 (t (setq modif nil)))
934 (let ((last-pt (point)))
935 (forward-line 1)
936 (when delete
937 (delete-region last-pt (point))
938 (setq delete nil)))))))
939 (unless (or (not reversible) (eq buffer-undo-list t))
940 ;; Drop the many undo entries and replace them with
941 ;; a single entry that uses diff-context->unified to do
942 ;; the work.
943 (setq buffer-undo-list
944 (cons (list 'apply (- old-end end) start (point-max)
945 'diff-context->unified start (point-max))
946 old-undo)))))))))))
948 (defun diff-context->unified (start end &optional to-context)
949 "Convert context diffs to unified diffs.
950 START and END are either taken from the region
951 \(when it is highlighted) or else cover the whole buffer.
952 With a prefix argument, convert unified format to context format."
953 (interactive (if (and transient-mark-mode mark-active)
954 (list (region-beginning) (region-end) current-prefix-arg)
955 (list (point-min) (point-max) current-prefix-arg)))
956 (if to-context
957 (diff-unified->context start end)
958 (unless (markerp end) (setq end (copy-marker end t)))
959 (let ( ;;(diff-inhibit-after-change t)
960 (inhibit-read-only t))
961 (save-excursion
962 (goto-char start)
963 (while (and (re-search-forward "^\\(\\(\\*\\*\\*\\) .+\n\\(---\\) .+\\|\\*\\{15\\}.*\n\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]+\\) \\*\\*\\*\\*\\)$" nil t)
964 (< (point) end))
965 (combine-after-change-calls
966 (if (match-beginning 2)
967 ;; we matched a file header
968 (progn
969 ;; use reverse order to make sure the indices are kept valid
970 (replace-match "+++" t t nil 3)
971 (replace-match "---" t t nil 2))
972 ;; we matched a hunk header
973 (let ((line1s (match-string 4))
974 (line1e (match-string 5))
975 (pt1 (match-beginning 0))
976 ;; Variables to use the special undo function.
977 (old-undo buffer-undo-list)
978 (old-end (marker-position end))
979 (reversible t))
980 (replace-match "")
981 (unless (re-search-forward
982 diff-context-mid-hunk-header-re nil t)
983 (error "Can't find matching `--- n1,n2 ----' line"))
984 (let ((line2s (match-string 1))
985 (line2e (match-string 2))
986 (pt2 (progn
987 (delete-region (progn (beginning-of-line) (point))
988 (progn (forward-line 1) (point)))
989 (point-marker))))
990 (goto-char pt1)
991 (forward-line 1)
992 (while (< (point) pt2)
993 (case (char-after)
994 (?! (delete-char 2) (insert "-") (forward-line 1))
995 (?- (forward-char 1) (delete-char 1) (forward-line 1))
996 (?\s ;merge with the other half of the chunk
997 (let* ((endline2
998 (save-excursion
999 (goto-char pt2) (forward-line 1) (point))))
1000 (case (char-after pt2)
1001 ((?! ?+)
1002 (insert "+"
1003 (prog1 (buffer-substring (+ pt2 2) endline2)
1004 (delete-region pt2 endline2))))
1005 (?\s
1006 (unless (= (- endline2 pt2)
1007 (- (line-beginning-position 2) (point)))
1008 ;; If the two lines we're merging don't have the
1009 ;; same length (can happen with "diff -b"), then
1010 ;; diff-unified->context will not properly undo
1011 ;; this operation.
1012 (setq reversible nil))
1013 (delete-region pt2 endline2)
1014 (delete-char 1)
1015 (forward-line 1))
1017 (t (setq reversible nil)
1018 (delete-char 1) (forward-line 1)))))
1019 (t (setq reversible nil) (forward-line 1))))
1020 (while (looking-at "[+! ] ")
1021 (if (/= (char-after) ?!) (forward-char 1)
1022 (delete-char 1) (insert "+"))
1023 (delete-char 1) (forward-line 1))
1024 (save-excursion
1025 (goto-char pt1)
1026 (insert "@@ -" line1s ","
1027 (number-to-string (- (string-to-number line1e)
1028 (string-to-number line1s)
1029 -1))
1030 " +" line2s ","
1031 (number-to-string (- (string-to-number line2e)
1032 (string-to-number line2s)
1033 -1)) " @@"))
1034 (set-marker pt2 nil)
1035 ;; The whole procedure succeeded, let's replace the myriad
1036 ;; of undo elements with just a single special one.
1037 (unless (or (not reversible) (eq buffer-undo-list t))
1038 (setq buffer-undo-list
1039 (cons (list 'apply (- old-end end) pt1 (point)
1040 'diff-unified->context pt1 (point))
1041 old-undo)))
1042 )))))))))
1044 (defun diff-reverse-direction (start end)
1045 "Reverse the direction of the diffs.
1046 START and END are either taken from the region (if a prefix arg is given) or
1047 else cover the whole buffer."
1048 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
1049 (list (region-beginning) (region-end))
1050 (list (point-min) (point-max))))
1051 (unless (markerp end) (setq end (copy-marker end t)))
1052 (let (;;(diff-inhibit-after-change t)
1053 (inhibit-read-only t))
1054 (save-excursion
1055 (goto-char start)
1056 (while (and (re-search-forward "^\\(\\([-*][-*][-*] \\)\\(.+\\)\n\\([-+][-+][-+] \\)\\(.+\\)\\|\\*\\{15\\}.*\n\\*\\*\\* \\(.+\\) \\*\\*\\*\\*\\|@@ -\\([0-9,]+\\) \\+\\([0-9,]+\\) @@.*\\)$" nil t)
1057 (< (point) end))
1058 (combine-after-change-calls
1059 (cond
1060 ;; a file header
1062 ;; a context-diff hunk header
1063 ((match-beginning 6)
1064 (let ((pt-lines1 (match-beginning 6))
1065 (lines1 (match-string 6)))
1066 (replace-match "" nil nil nil 6)
1067 (forward-line 1)
1068 (let ((half1s (point)))
1070 (when (= (char-after) ?-) (delete-char 1) (insert "+"))
1071 (forward-line 1))
1072 (let ((half1 (delete-and-extract-region half1s (point))))
1073 (unless (looking-at diff-context-mid-hunk-header-re)
1074 (insert half1)
1075 (error "Can't find matching `--- n1,n2 ----' line"))
1076 (let* ((str1end (or (match-end 2) (match-end 1)))
1077 (str1 (buffer-substring (match-beginning 1) str1end)))
1078 (goto-char str1end)
1079 (insert lines1)
1080 (delete-region (match-beginning 1) str1end)
1081 (forward-line 1)
1082 (let ((half2s (point)))
1084 (when (= (char-after) ?+) (delete-char 1) (insert "-"))
1085 (forward-line 1))
1086 (let ((half2 (delete-and-extract-region half2s (point))))
1087 (insert (or half1 ""))
1088 (goto-char half1s)
1089 (insert (or half2 ""))))
1090 (goto-char pt-lines1)
1091 (insert str1))))))
1092 ;; a unified-diff hunk header
1093 ((match-beginning 7)
1095 (forward-line 1)
1096 (let ((c (char-after)) first last)
1097 (while (case (setq c (char-after))
1098 (?- (setq first (or first (point)))
1099 (delete-char 1) (insert "+") t)
1100 (?+ (setq last (or last (point)))
1101 (delete-char 1) (insert "-") t)
1103 (t (when (and first last (< first last))
1104 (insert (delete-and-extract-region first last)))
1105 (setq first nil last nil)
1106 (memq c (if diff-valid-unified-empty-line
1108 (forward-line 1))))))))))
1110 (defun diff-fixup-modifs (start end)
1111 "Fixup the hunk headers (in case the buffer was modified).
1112 START and END are either taken from the region (if a prefix arg is given) or
1113 else cover the whole buffer."
1114 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
1115 (list (region-beginning) (region-end))
1116 (list (point-min) (point-max))))
1117 (let ((inhibit-read-only t))
1118 (save-excursion
1119 (goto-char end) (diff-end-of-hunk nil 'donttrustheader)
1120 (let ((plus 0) (minus 0) (space 0) (bang 0))
1121 (while (and (= (forward-line -1) 0) (<= start (point)))
1122 (if (not (looking-at
1123 (concat diff-hunk-header-re-unified
1126 (case (char-after)
1127 (?\s (incf space))
1128 (?+ (incf plus))
1129 (?- (incf minus))
1130 (?! (incf bang))
1132 (t (setq space 0 plus 0 minus 0 bang 0)))
1133 (cond
1134 ((looking-at diff-hunk-header-re-unified)
1135 (let* ((old1 (match-string 2))
1136 (old2 (match-string 4))
1137 (new1 (number-to-string (+ space minus)))
1138 (new2 (number-to-string (+ space plus))))
1139 (if old2
1140 (unless (string= new2 old2) (replace-match new2 t t nil 4))
1141 (goto-char (match-end 4)) (insert "," new2))
1142 (if old1
1143 (unless (string= new1 old1) (replace-match new1 t t nil 2))
1144 (goto-char (match-end 2)) (insert "," new1))))
1145 ((looking-at diff-context-mid-hunk-header-re)
1146 (when (> (+ space bang plus) 0)
1147 (let* ((old1 (match-string 1))
1148 (old2 (match-string 2))
1149 (new (number-to-string
1150 (+ space bang plus -1 (string-to-number old1)))))
1151 (unless (string= new old2) (replace-match new t t nil 2)))))
1153 (when (> (+ space bang minus) 0)
1154 (let* ((old (match-string 1))
1155 (new (format
1156 (concat "%0" (number-to-string (length old)) "d")
1157 (+ space bang minus -1 (string-to-number old)))))
1158 (unless (string= new old) (replace-match new t t nil 2))))))
1159 (setq space 0 plus 0 minus 0 bang 0)))))))
1161 ;;;;
1162 ;;;; Hooks
1163 ;;;;
1165 (defun diff-write-contents-hooks ()
1166 "Fixup hunk headers if necessary."
1167 (if (buffer-modified-p) (diff-fixup-modifs (point-min) (point-max)))
1168 nil)
1170 ;; It turns out that making changes in the buffer from within an
1171 ;; *-change-function is asking for trouble, whereas making them
1172 ;; from a post-command-hook doesn't pose much problems
1173 (defvar diff-unhandled-changes nil)
1174 (defun diff-after-change-function (beg end len)
1175 "Remember to fixup the hunk header.
1176 See `after-change-functions' for the meaning of BEG, END and LEN."
1177 ;; Ignoring changes when inhibit-read-only is set is strictly speaking
1178 ;; incorrect, but it turns out that inhibit-read-only is normally not set
1179 ;; inside editing commands, while it tends to be set when the buffer gets
1180 ;; updated by an async process or by a conversion function, both of which
1181 ;; would rather not be uselessly slowed down by this hook.
1182 (when (and (not undo-in-progress) (not inhibit-read-only))
1183 (if diff-unhandled-changes
1184 (setq diff-unhandled-changes
1185 (cons (min beg (car diff-unhandled-changes))
1186 (max end (cdr diff-unhandled-changes))))
1187 (setq diff-unhandled-changes (cons beg end)))))
1189 (defun diff-post-command-hook ()
1190 "Fixup hunk headers if necessary."
1191 (when (consp diff-unhandled-changes)
1192 (ignore-errors
1193 (save-excursion
1194 (goto-char (car diff-unhandled-changes))
1195 ;; Maybe we've cut the end of the hunk before point.
1196 (if (and (bolp) (not (bobp))) (backward-char 1))
1197 ;; We used to fixup modifs on all the changes, but it turns out that
1198 ;; it's safer not to do it on big changes, e.g. when yanking a big
1199 ;; diff, or when the user edits the header, since we might then
1200 ;; screw up perfectly correct values. --Stef
1201 (diff-beginning-of-hunk)
1203 (start (line-beginning-position (if (eq style 'context) 3 2)))
1204 (mid (if (eq style 'context)
1205 (save-excursion
1206 (re-search-forward diff-context-mid-hunk-header-re
1207 nil t)))))
1208 (when (and ;; Don't try to fixup changes in the hunk header.
1209 (> (car diff-unhandled-changes) start)
1210 ;; Don't try to fixup changes in the mid-hunk header either.
1211 (or (not mid)
1212 (< (cdr diff-unhandled-changes) (match-beginning 0))
1213 (> (car diff-unhandled-changes) (match-end 0)))
1214 (save-excursion
1215 (diff-end-of-hunk nil 'donttrustheader)
1216 ;; Don't try to fixup changes past the end of the hunk.
1217 (>= (point) (cdr diff-unhandled-changes))))
1218 (diff-fixup-modifs (point) (cdr diff-unhandled-changes)))))
1219 (setq diff-unhandled-changes nil))))
1221 (defun diff-next-error (arg reset)
1222 ;; Select a window that displays the current buffer so that point
1223 ;; movements are reflected in that window. Otherwise, the user might
1224 ;; never see the hunk corresponding to the source she's jumping to.
1225 (pop-to-buffer (current-buffer))
1226 (if reset (goto-char (point-min)))
1227 (diff-hunk-next arg)
1228 (diff-goto-source))
1230 ;;;###autoload
1231 (define-derived-mode diff-mode fundamental-mode "Diff"
1232 "Major mode for viewing/editing context diffs.
1233 Supports unified and context diffs as well as (to a lesser extent)
1234 normal diffs.
1236 When the buffer is read-only, the ESC prefix is not necessary.
1237 If you edit the buffer manually, diff-mode will try to update the hunk
1238 headers for you on-the-fly.
1246 (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
1247 (set (make-local-variable 'outline-regexp) diff-outline-regexp)
1248 (set (make-local-variable 'imenu-generic-expression)
1249 diff-imenu-generic-expression)
1250 ;; These are not perfect. They would be better done separately for
1251 ;; context diffs and unidiffs.
1252 ;; (set (make-local-variable 'paragraph-start)
1253 ;; (concat "@@ " ; unidiff hunk
1256 ;; ; start (first or second line)
1257 ;; (set (make-local-variable 'paragraph-separate) paragraph-start)
1259 ;; compile support
1260 (set (make-local-variable 'next-error-function) 'diff-next-error)
1262 (set (make-local-variable 'beginning-of-defun-function)
1263 'diff-beginning-of-file-and-junk)
1264 (set (make-local-variable 'end-of-defun-function)
1265 'diff-end-of-file)
1267 (setq buffer-read-only diff-default-read-only)
1268 ;; setup change hooks
1269 (if (not diff-update-on-the-fly)
1270 (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t)
1271 (make-local-variable 'diff-unhandled-changes)
1272 (add-hook 'after-change-functions 'diff-after-change-function nil t)
1273 (add-hook 'post-command-hook 'diff-post-command-hook nil t))
1274 ;; Neat trick from Dave Love to add more bindings in read-only mode:
1275 (lexical-let ((ro-bind (cons 'buffer-read-only diff-mode-shared-map)))
1276 (add-to-list 'minor-mode-overriding-map-alist ro-bind)
1277 ;; Turn off this little trick in case the buffer is put in view-mode.
1278 (add-hook 'view-mode-hook
1279 (lambda ()
1280 (setq minor-mode-overriding-map-alist
1281 (delq ro-bind minor-mode-overriding-map-alist)))
1282 nil t))
1283 ;; add-log support
1284 (set (make-local-variable 'add-log-current-defun-function)
1285 'diff-current-defun)
1286 (set (make-local-variable 'add-log-buffer-file-name-function)
1287 (lambda () (diff-find-file-name nil 'noprompt))))
1289 ;;;###autoload
1290 (define-minor-mode diff-minor-mode
1291 "Minor mode for viewing/editing context diffs.
1293 :group 'diff-mode :lighter " Diff"
1294 ;; FIXME: setup font-lock
1295 ;; setup change hooks
1296 (if (not diff-update-on-the-fly)
1297 (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t)
1298 (make-local-variable 'diff-unhandled-changes)
1299 (add-hook 'after-change-functions 'diff-after-change-function nil t)
1300 (add-hook 'post-command-hook 'diff-post-command-hook nil t)))
1302 ;;; Handy hook functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1304 (defun diff-delete-if-empty ()
1305 ;; An empty diff file means there's no more diffs to integrate, so we
1306 ;; can just remove the file altogether. Very handy for .rej files if we
1307 ;; remove hunks as we apply them.
1308 (when (and buffer-file-name
1309 (eq 0 (nth 7 (file-attributes buffer-file-name))))
1310 (delete-file buffer-file-name)))
1312 (defun diff-delete-empty-files ()
1313 "Arrange for empty diff files to be removed."
1314 (add-hook 'after-save-hook 'diff-delete-if-empty nil t))
1316 (defun diff-make-unified ()
1317 "Turn context diffs into unified diffs if applicable."
1318 (if (save-excursion
1319 (goto-char (point-min))
1320 (and (looking-at diff-hunk-header-re) (eq (char-after) ?*)))
1321 (let ((mod (buffer-modified-p)))
1322 (unwind-protect
1323 (diff-context->unified (point-min) (point-max))
1324 (restore-buffer-modified-p mod)))))
1326 ;;;
1327 ;;; Misc operations that have proved useful at some point.
1328 ;;;
1330 (defun diff-next-complex-hunk ()
1333 Only works for unified diffs."
1334 (interactive)
1335 (while
1336 (and (re-search-forward diff-hunk-header-re-unified nil t)
1337 (equal (match-string 2) (match-string 4)))))
1339 (defun diff-sanity-check-context-hunk-half (lines)
1340 (let ((count lines))
1341 (while
1342 (cond
1343 ((and (memq (char-after) '(?\s ?! ?+ ?-))
1345 (decf count) t)
1346 ((or (zerop count) (= count lines)) nil)
1347 ((memq (char-after) '(?! ?+ ?-))
1349 (y-or-n-p "Try to auto-fix whitespace loss damage? ")))
1350 (error "End of hunk ambiguously marked")
1351 (forward-char 1) (insert " ") (forward-line -1) t))
1352 ((< lines 0)
1353 (error "End of hunk ambiguously marked"))
1354 ((not (y-or-n-p "Try to auto-fix whitespace loss and word-wrap damage? "))
1355 (error "Abort!"))
1356 ((eolp) (insert " ") (forward-line -1) t)
1357 (t (insert " ") (delete-region (- (point) 2) (- (point) 1)) t))
1358 (forward-line))))
1360 (defun diff-sanity-check-hunk ()
1361 (let (;; Every modification is protected by a y-or-n-p, so it's probably
1362 ;; OK to override a read-only setting.
1363 (inhibit-read-only t))
1364 (save-excursion
1365 (cond
1366 ((not (looking-at diff-hunk-header-re))
1367 (error "Not recognizable hunk header"))
1369 ;; A context diff.
1370 ((eq (char-after) ?*)
1371 (if (not (looking-at "\\*\\{15\\}\\(?: .*\\)?\n\\*\\*\\* \\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? \\*\\*\\*\\*"))
1372 (error "Unrecognized context diff first hunk header format")
1373 (forward-line 2)
1374 (diff-sanity-check-context-hunk-half
1375 (if (match-end 2)
1376 (1+ (- (string-to-number (match-string 2))
1377 (string-to-number (match-string 1))))
1378 1))
1379 (if (not (looking-at diff-context-mid-hunk-header-re))
1380 (error "Unrecognized context diff second hunk header format")
1381 (forward-line)
1382 (diff-sanity-check-context-hunk-half
1383 (if (match-end 2)
1384 (1+ (- (string-to-number (match-string 2))
1385 (string-to-number (match-string 1))))
1386 1)))))
1388 ;; A unified diff.
1389 ((eq (char-after) ?@)
1390 (if (not (looking-at diff-hunk-header-re-unified))
1391 (error "Unrecognized unified diff hunk header format")
1392 (let ((before (string-to-number (or (match-string 2) "1")))
1393 (after (string-to-number (or (match-string 4) "1"))))
1394 (forward-line)
1395 (while
1396 (case (char-after)
1397 (?\s (decf before) (decf after) t)
1398 (?-
1399 (if (and (looking-at diff-file-header-re)
1400 (zerop before) (zerop after))
1401 ;; No need to query: this is a case where two patches
1402 ;; are concatenated and only counting the lines will
1403 ;; give the right result. Let's just add an empty
1404 ;; line so that our code which doesn't count lines
1405 ;; will not get confused.
1407 (decf before) t))
1408 (?+ (decf after) t)
1409 (t
1410 (cond
1411 ((and diff-valid-unified-empty-line
1412 ;; Not just (eolp) so we don't infloop at eob.
1414 (> before 0) (> after 0))
1415 (decf before) (decf after) t)
1416 ((and (zerop before) (zerop after)) nil)
1417 ((or (< before 0) (< after 0))
1418 (error (if (or (zerop before) (zerop after))
1419 "End of hunk ambiguously marked"
1420 "Hunk seriously messed up")))
1421 ((not (y-or-n-p (concat "Try to auto-fix " (if (eolp) "whitespace loss" "word-wrap damage") "? ")))
1422 (error "Abort!"))
1423 ((eolp) (insert " ") (forward-line -1) t)
1424 (t (insert " ")
1425 (delete-region (- (point) 2) (- (point) 1)) t))))
1426 (forward-line)))))
1428 ;; A plain diff.
1429 (t
1430 ;; TODO.
1431 )))))
1433 (defun diff-hunk-text (hunk destp char-offset)
1434 "Return the literal source text from HUNK as (TEXT . OFFSET).
1435 If DESTP is nil, TEXT is the source, otherwise the destination text.
1436 CHAR-OFFSET is a char-offset in HUNK, and OFFSET is the corresponding
1437 char-offset in TEXT."
1438 (with-temp-buffer
1439 (insert hunk)
1440 (goto-char (point-min))
1441 (let ((src-pos nil)
1442 (dst-pos nil)
1443 (divider-pos nil)
1444 (num-pfx-chars 2))
1445 ;; Set the following variables:
1446 ;; SRC-POS buffer pos of the source part of the hunk or nil if none
1447 ;; DST-POS buffer pos of the destination part of the hunk or nil
1448 ;; DIVIDER-POS buffer pos of any divider line separating the src & dst
1449 ;; NUM-PFX-CHARS number of line-prefix characters used by this format"
1450 (cond ((looking-at "^@@")
1451 ;; unified diff
1452 (setq num-pfx-chars 1)
1453 (forward-line 1)
1454 (setq src-pos (point) dst-pos (point)))
1456 ;; context diff
1457 (forward-line 2)
1458 (setq src-pos (point))
1459 (re-search-forward diff-context-mid-hunk-header-re nil t)
1460 (forward-line 0)
1461 (setq divider-pos (point))
1462 (forward-line 1)
1463 (setq dst-pos (point)))
1464 ((looking-at "^[0-9]+a[0-9,]+$")
1465 ;; normal diff, insert
1466 (forward-line 1)
1467 (setq dst-pos (point)))
1468 ((looking-at "^[0-9,]+d[0-9]+$")
1469 ;; normal diff, delete
1470 (forward-line 1)
1471 (setq src-pos (point)))
1472 ((looking-at "^[0-9,]+c[0-9,]+$")
1473 ;; normal diff, change
1474 (forward-line 1)
1475 (setq src-pos (point))
1476 (re-search-forward "^---$" nil t)
1477 (forward-line 0)
1478 (setq divider-pos (point))
1479 (forward-line 1)
1480 (setq dst-pos (point)))
1481 (t
1482 (error "Unknown diff hunk type")))
1484 (if (if destp (null dst-pos) (null src-pos))
1485 ;; Implied empty text
1486 (if char-offset '("" . 0) "")
1488 ;; For context diffs, either side can be empty, (if there's only
1489 ;; added or only removed text). We should then use the other side.
1490 (cond ((equal src-pos divider-pos) (setq src-pos dst-pos))
1491 ((equal dst-pos (point-max)) (setq dst-pos src-pos)))
1493 (when char-offset (goto-char (+ (point-min) char-offset)))
1495 ;; Get rid of anything except the desired text.
1496 (save-excursion
1497 ;; Delete unused text region
1498 (let ((keep (if destp dst-pos src-pos)))
1499 (when (and divider-pos (> divider-pos keep))
1500 (delete-region divider-pos (point-max)))
1501 (delete-region (point-min) keep))
1502 ;; Remove line-prefix characters, and unneeded lines (unified diffs).
1503 (let ((kill-char (if destp ?- ?+)))
1504 (goto-char (point-min))
1505 (while (not (eobp))
1506 (if (eq (char-after) kill-char)
1507 (delete-region (point) (progn (forward-line 1) (point)))
1508 (delete-char num-pfx-chars)
1509 (forward-line 1)))))
1511 (let ((text (buffer-substring-no-properties (point-min) (point-max))))
1512 (if char-offset (cons text (- (point) (point-min))) text))))))
1515 (defun diff-find-text (text)
1516 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT.
1517 If TEXT isn't found, nil is returned."
1518 (let* ((orig (point))
1519 (forw (and (search-forward text nil t)
1520 (cons (match-beginning 0) (match-end 0))))
1521 (back (and (goto-char (+ orig (length text)))
1522 (search-backward text nil t)
1523 (cons (match-beginning 0) (match-end 0)))))
1524 ;; Choose the closest match.
1525 (if (and forw back)
1526 (if (> (- (car forw) orig) (- orig (car back))) back forw)
1527 (or back forw))))
1529 (defun diff-find-approx-text (text)
1530 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT.
1531 Whitespace differences are ignored."
1532 (let* ((orig (point))
1536 (forw (and (re-search-forward re nil t)
1537 (cons (match-beginning 0) (match-end 0))))
1538 (back (and (goto-char (+ orig (length text)))
1539 (re-search-backward re nil t)
1540 (cons (match-beginning 0) (match-end 0)))))
1541 ;; Choose the closest match.
1542 (if (and forw back)
1543 (if (> (- (car forw) orig) (- orig (car back))) back forw)
1544 (or back forw))))
1546 (defsubst diff-xor (a b) (if a (if (not b) a) b))
1548 (defun diff-find-source-location (&optional other-file reverse noprompt)
1549 "Find out (BUF LINE-OFFSET POS SRC DST SWITCHED).
1550 BUF is the buffer corresponding to the source file.
1551 LINE-OFFSET is the offset between the expected and actual positions
1552 of the text of the hunk or nil if the text was not found.
1553 POS is a pair (BEG . END) indicating the position of the text in the buffer.
1554 SRC and DST are the two variants of text as returned by `diff-hunk-text'.
1555 SRC is the variant that was found in the buffer.
1556 SWITCHED is non-nil if the patch is already applied.
1557 NOPROMPT, if non-nil, means not to prompt the user."
1558 (save-excursion
1559 (let* ((other (diff-xor other-file diff-jump-to-old-file))
1560 (char-offset (- (point) (progn (diff-beginning-of-hunk 'try-harder)
1561 (point))))
1562 ;; Check that the hunk is well-formed. Otherwise diff-mode and
1563 ;; the user may disagree on what constitutes the hunk
1564 ;; (e.g. because an empty line truncates the hunk mid-course),
1565 ;; leading to potentially nasty surprises for the user.
1566 (_ (diff-sanity-check-hunk))
1567 (hunk (buffer-substring
1568 (point) (save-excursion (diff-end-of-hunk) (point))))
1569 (old (diff-hunk-text hunk reverse char-offset))
1570 (new (diff-hunk-text hunk (not reverse) char-offset))
1571 ;; Find the location specification.
1572 (line (if (not (looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?"))
1573 (error "Can't find the hunk header")
1574 (if other (match-string 1)
1575 (if (match-end 3) (match-string 3)
1576 (unless (re-search-forward
1577 diff-context-mid-hunk-header-re nil t)
1578 (error "Can't find the hunk separator"))
1579 (match-string 1)))))
1580 (file (or (diff-find-file-name other noprompt)
1581 (error "Can't find the file")))
1582 (buf (find-file-noselect file)))
1583 ;; Update the user preference if he so wished.
1584 (when (> (prefix-numeric-value other-file) 8)
1585 (setq diff-jump-to-old-file other))
1586 (with-current-buffer buf
1587 (goto-line (string-to-number line))
1588 (let* ((orig-pos (point))
1589 (switched nil)
1590 ;; FIXME: Check for case where both OLD and NEW are found.
1591 (pos (or (diff-find-text (car old))
1592 (progn (setq switched t) (diff-find-text (car new)))
1593 (progn (setq switched nil)
1594 (condition-case nil
1595 (diff-find-approx-text (car old))
1596 (invalid-regexp nil))) ;Regex too big.
1597 (progn (setq switched t)
1598 (condition-case nil
1599 (diff-find-approx-text (car new))
1600 (invalid-regexp nil))) ;Regex too big.
1601 (progn (setq switched nil) nil))))
1602 (nconc
1603 (list buf)
1604 (if pos
1605 (list (count-lines orig-pos (car pos)) pos)
1606 (list nil (cons orig-pos (+ orig-pos (length (car old))))))
1607 (if switched (list new old t) (list old new))))))))
1610 (defun diff-hunk-status-msg (line-offset reversed dry-run)
1611 (let ((msg (if dry-run
1612 (if reversed "already applied" "not yet applied")
1613 (if reversed "undone" "applied"))))
1614 (message (cond ((null line-offset) "Hunk text not found")
1615 ((= line-offset 0) "Hunk %s")
1616 ((= line-offset 1) "Hunk %s at offset %d line")
1617 (t "Hunk %s at offset %d lines"))
1618 msg line-offset)))
1620 (defvar diff-apply-hunk-to-backup-file nil)
1622 (defun diff-apply-hunk (&optional reverse)
1623 "Apply the current hunk to the source file and go to the next.
1624 By default, the new source file is patched, but if the variable
1625 `diff-jump-to-old-file' is non-nil, then the old source file is
1626 patched instead (some commands, such as `diff-goto-source' can change
1627 the value of this variable when given an appropriate prefix argument).
1629 With a prefix argument, REVERSE the hunk."
1630 (interactive "P")
1631 (destructuring-bind (buf line-offset pos old new &optional switched)
1632 ;; Sometimes we'd like to have the following behavior: if REVERSE go
1633 ;; to the new file, otherwise go to the old. But that means that by
1634 ;; default we use the old file, which is the opposite of the default
1635 ;; for diff-goto-source, and is thus confusing. Also when you don't
1636 ;; know about it it's pretty surprising.
1637 ;; TODO: make it possible to ask explicitly for this behavior.
1638 ;;
1639 ;; This is duplicated in diff-test-hunk.
1640 (diff-find-source-location nil reverse)
1641 (cond
1642 ((null line-offset)
1643 (error "Can't find the text to patch"))
1644 ((with-current-buffer buf
1645 (and buffer-file-name
1646 (backup-file-name-p buffer-file-name)
1647 (not diff-apply-hunk-to-backup-file)
1648 (not (set (make-local-variable 'diff-apply-hunk-to-backup-file)
1649 (yes-or-no-p (format "Really apply this hunk to %s? "
1650 (file-name-nondirectory
1651 buffer-file-name)))))))
1652 (error "%s"
1653 (substitute-command-keys
1656 ((and switched
1657 ;; A reversed patch was detected, perhaps apply it in reverse.
1658 (not (save-window-excursion
1659 (pop-to-buffer buf)
1660 (goto-char (+ (car pos) (cdr old)))
1661 (y-or-n-p
1662 (if reverse
1663 "Hunk hasn't been applied yet; apply it now? "
1664 "Hunk has already been applied; undo it? ")))))
1665 (message "(Nothing done)"))
1666 (t
1667 ;; Apply the hunk
1668 (with-current-buffer buf
1669 (goto-char (car pos))
1670 (delete-region (car pos) (cdr pos))
1671 (insert (car new)))
1672 ;; Display BUF in a window
1673 (set-window-point (display-buffer buf) (+ (car pos) (cdr new)))
1674 (diff-hunk-status-msg line-offset (diff-xor switched reverse) nil)
1675 (when diff-advance-after-apply-hunk
1676 (diff-hunk-next))))))
1679 (defun diff-test-hunk (&optional reverse)
1680 "See whether it's possible to apply the current hunk.
1681 With a prefix argument, try to REVERSE the hunk."
1682 (interactive "P")
1683 (destructuring-bind (buf line-offset pos src dst &optional switched)
1684 (diff-find-source-location nil reverse)
1685 (set-window-point (display-buffer buf) (+ (car pos) (cdr src)))
1686 (diff-hunk-status-msg line-offset (diff-xor reverse switched) t)))
1689 (defalias 'diff-mouse-goto-source 'diff-goto-source)
1691 (defun diff-goto-source (&optional other-file event)
1692 "Jump to the corresponding source line.
1693 `diff-jump-to-old-file' (or its opposite if the OTHER-FILE prefix arg
1694 is given) determines whether to jump to the old or the new file.
1695 If the prefix arg is bigger than 8 (for example with \\[universal-argument] \\[universal-argument])
1696 then `diff-jump-to-old-file' is also set, for the next invocations."
1697 (interactive (list current-prefix-arg last-input-event))
1698 ;; When pointing at a removal line, we probably want to jump to
1699 ;; the old location, and else to the new (i.e. as if reverting).
1700 ;; This is a convenient detail when using smerge-diff.
1701 (if event (posn-set-point (event-end event)))
1702 (let ((rev (not (save-excursion (beginning-of-line) (looking-at "[-<]")))))
1703 (destructuring-bind (buf line-offset pos src dst &optional switched)
1704 (diff-find-source-location other-file rev)
1705 (pop-to-buffer buf)
1706 (goto-char (+ (car pos) (cdr src)))
1707 (diff-hunk-status-msg line-offset (diff-xor rev switched) t))))
1710 (defun diff-current-defun ()
1711 "Find the name of function at point.
1712 For use in `add-log-current-defun-function'."
1713 ;; Kill change-log-default-name so it gets recomputed each time, since
1714 ;; each hunk may belong to another file which may belong to another
1715 ;; directory and hence have a different ChangeLog file.
1716 (kill-local-variable 'change-log-default-name)
1717 (save-excursion
1718 (when (looking-at diff-hunk-header-re)
1719 (forward-line 1)
1720 (re-search-forward "^[^ ]" nil t))
1721 (destructuring-bind (&optional buf line-offset pos src dst switched)
1722 ;; Use `noprompt' since this is used in which-func-mode and such.
1723 (ignore-errors ;Signals errors in place of prompting.
1724 (diff-find-source-location nil nil 'noprompt))
1725 (when buf
1726 (beginning-of-line)
1727 (or (when (memq (char-after) '(?< ?-))
1728 ;; Cursor is pointing at removed text. This could be a removed
1729 ;; function, in which case, going to the source buffer will
1730 ;; not help since the function is now removed. Instead,
1731 ;; try to figure out the function name just from the
1732 ;; code-fragment.
1733 (let ((old (if switched dst src)))
1734 (with-temp-buffer
1735 (insert (car old))
1736 (funcall (buffer-local-value 'major-mode buf))
1737 (goto-char (+ (point-min) (cdr old)))
1738 (add-log-current-defun))))
1739 (with-current-buffer buf
1740 (goto-char (+ (car pos) (cdr src)))
1741 (add-log-current-defun)))))))
1743 (defun diff-ignore-whitespace-hunk ()
1744 "Re-diff the current hunk, ignoring whitespace differences."
1745 (interactive)
1746 (let* ((char-offset (- (point) (progn (diff-beginning-of-hunk 'try-harder)
1747 (point))))
1748 (opts (case (char-after) (?@ "-bu") (?* "-bc") (t "-b")))
1750 (error "Can't find line number"))
1751 (string-to-number (match-string 1))))
1752 (inhibit-read-only t)
1753 (hunk (delete-and-extract-region
1754 (point) (save-excursion (diff-end-of-hunk) (point))))
1756 (file1 (make-temp-file "diff1"))
1757 (file2 (make-temp-file "diff2"))
1758 (coding-system-for-read buffer-file-coding-system)
1759 old new)
1760 (unwind-protect
1761 (save-excursion
1762 (setq old (diff-hunk-text hunk nil char-offset))
1763 (setq new (diff-hunk-text hunk t char-offset))
1764 (write-region (concat lead (car old)) nil file1 nil 'nomessage)
1765 (write-region (concat lead (car new)) nil file2 nil 'nomessage)
1766 (with-temp-buffer
1767 (let ((status
1768 (call-process diff-command nil t nil
1769 opts file1 file2)))
1770 (case status
1771 (0 nil) ;Nothing to reformat.
1772 (1 (goto-char (point-min))
1773 ;; Remove the file-header.
1774 (when (re-search-forward diff-hunk-header-re nil t)
1775 (delete-region (point-min) (match-beginning 0))))
1776 (t (goto-char (point-max))
1778 (insert hunk)))
1779 (setq hunk (buffer-string))
1780 (unless (memq status '(0 1))
1781 (error "Diff returned: %s" status)))))
1782 ;; Whatever happens, put back some equivalent text: either the new
1783 ;; one or the original one in case some error happened.
1784 (insert hunk)
1785 (delete-file file1)
1786 (delete-file file2))))
1788 ;;; Fine change highlighting.
1790 (defface diff-refine-change
1791 '((((class color) (min-colors 88) (background light))
1792 :background "grey85")
1793 (((class color) (min-colors 88) (background dark))
1794 :background "grey60")
1795 (((class color) (background light))
1796 :background "yellow")
1797 (((class color) (background dark))
1798 :background "green")
1799 (t :weight bold))
1800 "Face used for char-based changes shown by `diff-refine-hunk'."
1801 :group 'diff-mode)
1803 (defun diff-refine-preproc ()
1804 (while (re-search-forward "^[+>]" nil t)
1805 ;; Remove spurious changes due to the fact that one side of the hunk is
1806 ;; marked with leading + or > and the other with leading - or <.
1807 ;; We used to replace all the prefix chars with " " but this only worked
1808 ;; when we did char-based refinement (or when using
1809 ;; smerge-refine-weight-hack) since otherwise, the `forward' motion done
1810 ;; in chopup do not necessarily do the same as the ones in highlight
1811 ;; since the "_" is not treated the same as " ".
1812 (replace-match (cdr (assq (char-before) '((?+ . "-") (?> . "<"))))))
1813 )
1815 (defun diff-refine-hunk ()
1816 "Highlight changes of hunk at point at a finer granularity."
1817 (interactive)
1818 (eval-and-compile (require 'smerge-mode))
1819 (save-excursion
1820 (diff-beginning-of-hunk 'try-harder)
1821 (let* ((style (diff-hunk-style)) ;Skips the hunk header as well.
1822 (beg (point))
1823 (props '((diff-mode . fine) (face diff-refine-change)))
1824 (end (progn (diff-end-of-hunk) (point))))
1826 (remove-overlays beg end 'diff-mode 'fine)
1828 (goto-char beg)
1829 (case style
1830 (unified
1832 end t)
1833 (smerge-refine-subst (match-beginning 0) (match-end 1)
1834 (match-end 1) (match-end 0)
1835 props 'diff-refine-preproc)))
1836 (context
1837 (let* ((middle (save-excursion (re-search-forward "^---")))
1838 (other middle))
1840 (smerge-refine-subst (match-beginning 0) (match-end 0)
1841 (save-excursion
1842 (goto-char other)
1844 (setq other (match-end 0))
1845 (match-beginning 0))
1846 other
1847 props 'diff-refine-preproc))))
1848 (t ;; Normal diffs.
1849 (let ((beg1 (1+ (point))))
1851 ;; It's a combined add&remove, so there's something to do.
1852 (smerge-refine-subst beg1 (match-beginning 0)
1853 (match-end 0) end
1854 props 'diff-refine-preproc))))))))
1857 (defun diff-add-change-log-entries-other-window ()
1858 "Iterate through the current diff and create ChangeLog entries.
1859 I.e. like `add-change-log-entry-other-window' but applied to all hunks."
1860 (interactive)
1861 ;; XXX: Currently add-change-log-entry-other-window is only called
1862 ;; once per hunk. Some hunks have multiple changes, it would be
1863 ;; good to call it for each change.
1864 (save-excursion
1865 (goto-char (point-min))
1866 (let ((orig-buffer (current-buffer)))
1867 (condition-case nil
1868 ;; Call add-change-log-entry-other-window for each hunk in
1869 ;; the diff buffer.
1870 (while (progn
1871 (diff-hunk-next)
1872 ;; Move to where the changes are,
1873 ;; `add-change-log-entry-other-window' works better in
1874 ;; that case.
1875 (re-search-forward
1877 ;; If the hunk is a context hunk with an empty first
1878 ;; half, recognize the "--- NNN,MMM ----" line
1880 ;; and skip to the next non-context line.
1882 nil t))
1883 (save-excursion
1884 (add-change-log-entry nil nil t nil t)))
1885 ;; When there's no more hunks, diff-hunk-next signals an error.
1886 (error nil)))))
1888 (defun diff-show-trailing-whitespaces ()
1889 "Show trailing whitespaces in modified lines for diff-mode."
1890 (interactive)
1891 (let ((whitespace-style '(trailing))
1893 (whitespace-mode 1))) ; display trailing whitespace in diff buffer
1895 ;; provide the package
1896 (provide 'diff-mode)
1898 ;;; Old Change Log from when diff-mode wasn't part of Emacs:
1899 ;; Revision 1.11 1999/10/09 23:38:29 monnier
1900 ;; (diff-mode-load-hook): dropped.
1901 ;; (auto-mode-alist): also catch *.diffs.
1902 ;; (diff-find-file-name, diff-mode): add smarts to find the right file
1903 ;; for *.rej files (that lack any file name indication).
1904 ;;
1905 ;; Revision 1.10 1999/09/30 15:32:11 monnier
1906 ;; added support for "\ No newline at end of file".
1907 ;;
1908 ;; Revision 1.9 1999/09/15 00:01:13 monnier
1909 ;; - added basic `compile' support.
1910 ;; - have diff-kill-hunk call diff-kill-file if it's the only hunk.
1911 ;; - diff-kill-file now tries to kill the leading garbage as well.
1912 ;;
1913 ;; Revision 1.8 1999/09/13 21:10:09 monnier
1914 ;; - don't use CL in the autoloaded code
1915 ;; - accept diffs using -T
1916 ;;
1917 ;; Revision 1.7 1999/09/05 20:53:03 monnier
1918 ;; interface to ediff-patch
1919 ;;
1920 ;; Revision 1.6 1999/09/01 20:55:13 monnier
1921 ;; (ediff=patch-file): add bindings to call ediff-patch.
1922 ;; (diff-find-file-name): taken out of diff-goto-source.
1923 ;; (diff-unified->context, diff-context->unified, diff-reverse-direction,
1924 ;; diff-fixup-modifs): only use the region if a prefix arg is given.
1925 ;;
1926 ;; Revision 1.5 1999/08/31 19:18:52 monnier
1927 ;; (diff-beginning-of-file, diff-prev-file): fixed wrong parenthesis.
1928 ;;
1929 ;; Revision 1.4 1999/08/31 13:01:44 monnier
1930 ;; use `combine-after-change-calls' to minimize the slowdown of font-lock.
1931 ;;
1933 ;; arch-tag: 2571d7ff-bc28-4cf9-8585-42e21890be66
1934 ;;; diff-mode.el ends here