annotate lisp/diff-mode.el @ 70805:fa518a2e4cd5

Update date.
author Richard M. Stallman <rms@gnu.org>
date Sun, 21 May 2006 05:16:02 +0000
parents ef7506f44a3a
children 3071d2ae4624 146cd8369025
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
42472
5787452daded Comment fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42455
diff changeset
1 ;;; diff-mode.el --- a mode for viewing/editing context diffs
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2
64762
41bb365f41c4 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64512
diff changeset
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
68651
3bd95f4f2941 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 66130
diff changeset
4 ;; 2005, 2006 Free Software Foundation, Inc.
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
5
70292
2b77fa42947f Update my email address.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 69608
diff changeset
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
42472
5787452daded Comment fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42455
diff changeset
7 ;; Keywords: convenience patch diff
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
8
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
10
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
14 ;; any later version.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
15
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
19 ;; GNU General Public License for more details.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
20
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64091
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 64045
diff changeset
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 64045
diff changeset
24 ;; Boston, MA 02110-1301, USA.
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
25
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
26 ;;; Commentary:
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
27
35526
b40a6cecc4d5 (diff-mode): Disable preliminary support for `compile'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33488
diff changeset
28 ;; Provides support for font-lock, outline, navigation
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
29 ;; commands, editing and various conversions as well as jumping
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
30 ;; to the corresponding source file.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
31
53833
32e20bdb34c9 (diff-file-regexp-alist, diff-error-regexp-alist)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53782
diff changeset
32 ;; Inspired by Pavel Machek's patch-mode.el (<pavel@@atrey.karlin.mff.cuni.cz>)
42472
5787452daded Comment fixes.
Pavel Janík <Pavel@Janik.cz>
parents: 42455
diff changeset
33 ;; Some efforts were spent to have it somewhat compatible with XEmacs'
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
34 ;; diff-mode as well as with compilation-minor-mode
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
35
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
36 ;; Bugs:
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
37
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
38 ;; - Reverse doesn't work with normal diffs.
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
39
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
40 ;; Todo:
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
41
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
42 ;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
43 ;; Also allow C-c C-a to delete already-applied hunks.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
44 ;;
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
45 ;; - Try `diff <file> <hunk>' to try and fuzzily discover the source location
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
46 ;; of a hunk. Show then the changes between <file> and <hunk> and make it
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
47 ;; possible to apply them to <file>, <hunk-src>, or <hunk-dst>.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
48 ;; Or maybe just make it into a ".rej to diff3-markers converter".
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
49 ;;
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
50 ;; - Refine hunk on a word-by-word basis.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
51 ;;
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
52 ;; - Handle `diff -b' output in context->unified.
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
53
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
54 ;;; Code:
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
55
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
56 (eval-when-compile (require 'cl))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
57
65287
0cf1480347a9 (add-log-buffer-file-name-function): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64762
diff changeset
58 (defvar add-log-buffer-file-name-function)
0cf1480347a9 (add-log-buffer-file-name-function): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64762
diff changeset
59
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
60
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
61 (defgroup diff-mode ()
64004
ea880752de3b (diff-mode): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents: 63415
diff changeset
62 "Major mode for viewing/editing diffs."
31269
64bb4634d6d8 (diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents: 30873
diff changeset
63 :version "21.1"
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
64 :group 'tools
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
65 :group 'diff)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
66
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
67 (defcustom diff-default-read-only nil
39386
50956864fe56 (diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39323
diff changeset
68 "If non-nil, `diff-mode' buffers default to being read-only."
50956864fe56 (diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39323
diff changeset
69 :type 'boolean
50956864fe56 (diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39323
diff changeset
70 :group 'diff-mode)
50956864fe56 (diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39323
diff changeset
71
37866
4e2d06e10072 (diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37567
diff changeset
72 (defcustom diff-jump-to-old-file nil
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
73 "*Non-nil means `diff-goto-source' jumps to the old file.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
74 Else, it jumps to the new file."
62531
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
75 :type 'boolean
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
76 :group 'diff-mode)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
77
37866
4e2d06e10072 (diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37567
diff changeset
78 (defcustom diff-update-on-the-fly t
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
79 "*Non-nil means hunk headers are kept up-to-date on-the-fly.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
80 When editing a diff file, the line numbers in the hunk headers
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
81 need to be kept consistent with the actual diff. This can
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
82 either be done on the fly (but this sometimes interacts poorly with the
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
83 undo mechanism) or whenever the file is written (can be slow
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
84 when editing big diffs)."
62531
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
85 :type 'boolean
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
86 :group 'diff-mode)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
87
32061
cdfabbe10a24 (diff-goto-source): Emit a status message.
Miles Bader <miles@gnu.org>
parents: 32012
diff changeset
88 (defcustom diff-advance-after-apply-hunk t
cdfabbe10a24 (diff-goto-source): Emit a status message.
Miles Bader <miles@gnu.org>
parents: 32012
diff changeset
89 "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
62531
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
90 :type 'boolean
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
91 :group 'diff-mode)
32061
cdfabbe10a24 (diff-goto-source): Emit a status message.
Miles Bader <miles@gnu.org>
parents: 32012
diff changeset
92
cdfabbe10a24 (diff-goto-source): Emit a status message.
Miles Bader <miles@gnu.org>
parents: 32012
diff changeset
93
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
94 (defcustom diff-mode-hook nil
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
95 "Run after setting up the `diff-mode' major mode."
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
96 :type 'hook
62531
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
97 :options '(diff-delete-empty-files diff-make-unified)
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
98 :group 'diff-mode)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
99
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
100 (defvar diff-outline-regexp
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
101 "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
102
33432
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
103 ;;;;
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
104 ;;;; keymap, menu, ...
33432
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
105 ;;;;
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
106
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
107 (easy-mmode-defmap diff-mode-shared-map
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
108 '(;; From Pavel Machek's patch-mode.
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
109 ("n" . diff-hunk-next)
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
110 ("N" . diff-file-next)
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
111 ("p" . diff-hunk-prev)
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
112 ("P" . diff-file-prev)
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
113 ("k" . diff-hunk-kill)
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
114 ("K" . diff-file-kill)
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
115 ;; From compilation-minor-mode.
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
116 ("}" . diff-file-next)
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
117 ("{" . diff-file-prev)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
118 ("\C-m" . diff-goto-source)
54869
c491468e3c18 (diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54693
diff changeset
119 ([mouse-2] . diff-goto-source)
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
120 ;; From XEmacs' diff-mode.
70333
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
121 ;; Standard M-w is useful, so don't change M-W.
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
122 ;; ("W" . widen)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
123 ;;("." . diff-goto-source) ;display-buffer
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
124 ;;("f" . diff-goto-source) ;find-file
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
125 ("o" . diff-goto-source) ;other-window
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
126 ;;("w" . diff-goto-source) ;other-frame
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
127 ;;("N" . diff-narrow)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
128 ;;("h" . diff-show-header)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
129 ;;("j" . diff-show-difference) ;jump to Nth diff
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
130 ;;("q" . diff-quit)
70333
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
131 ;; Not useful if you have to metafy them.
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
132 ;; (" " . scroll-up)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
133 ;; ("\177" . scroll-down)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
134 ;; Standard M-a is useful, so don't change M-A.
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
135 ;; ("A" . diff-ediff-patch)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
136 ;; Standard M-r is useful, so don't change M-r or M-R.
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
137 ;; ("r" . diff-restrict-view)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
138 ;; ("R" . diff-reverse-direction)
53782
12d228ede0dd Bind q to `quit-window'.
Benjamin Rutt <brutt@bloomington.in.us>
parents: 53058
diff changeset
139 ("q" . quit-window))
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
140 "Basic keymap for `diff-mode', bound to various prefix keys.")
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
141
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
142 (easy-mmode-defmap diff-mode-map
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
143 `(("\e" . ,diff-mode-shared-map)
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
144 ;; From compilation-minor-mode.
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
145 ("\C-c\C-c" . diff-goto-source)
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
146 ;; Misc operations.
70333
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
147 ("\C-c\C-a" . diff-apply-hunk)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
148 ("\C-c\C-e" . diff-ediff-patch)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
149 ("\C-c\C-n" . diff-restrict-view)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
150 ("\C-c\C-r" . diff-reverse-direction)
33432
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
151 ("\C-c\C-s" . diff-split-hunk)
56919
34b22fc9d0ed (diff-mode-map): Bind toggle-next-error-follow-mode.
Eli Zaretskii <eliz@gnu.org>
parents: 56073
diff changeset
152 ("\C-c\C-t" . diff-test-hunk)
70333
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
153 ("\C-c\C-u" . diff-context->unified)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
154 ("\C-c\C-w" . diff-refine-hunk)
57020
f1329d47fa1a (diff-mode-map): Rename `next-error-follow-mode' to `next-error-follow-minor-mode'.
Juri Linkov <juri@jurta.org>
parents: 56919
diff changeset
155 ("\C-c\C-f" . next-error-follow-minor-mode))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
156 "Keymap for `diff-mode'. See also `diff-mode-shared-map'.")
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
157
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
158 (easy-menu-define diff-mode-menu diff-mode-map
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
159 "Menu for `diff-mode'."
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
160 '("Diff"
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
161 ["Jump to Source" diff-goto-source t]
33432
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
162 ["Apply hunk" diff-apply-hunk t]
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
163 ["Apply diff with Ediff" diff-ediff-patch t]
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
164 ["-----" nil nil]
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
165 ["Reverse direction" diff-reverse-direction t]
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
166 ["Context -> Unified" diff-context->unified t]
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
167 ["Unified -> Context" diff-unified->context t]
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
168 ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)]
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
169 ))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
170
31973
ad9838a9349c (diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31819
diff changeset
171 (defcustom diff-minor-mode-prefix "\C-c="
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
172 "Prefix key for `diff-minor-mode' commands."
62531
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
173 :type '(choice (string "\e") (string "C-c=") string)
c905fcf5e3d9 Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents: 61269
diff changeset
174 :group 'diff-mode)
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
175
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
176 (easy-mmode-defmap diff-minor-mode-map
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
177 `((,diff-minor-mode-prefix . ,diff-mode-shared-map))
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
178 "Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.")
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
179
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
180
33432
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
181 ;;;;
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
182 ;;;; font-lock support
33432
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
183 ;;;;
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
184
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
185 (defface diff-header
55322
a02bfe4ba7ab (diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55088
diff changeset
186 '((((class color) (min-colors 88) (background light))
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
187 :background "grey85")
55322
a02bfe4ba7ab (diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55088
diff changeset
188 (((class color) (min-colors 88) (background dark))
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
189 :background "grey45")
55322
a02bfe4ba7ab (diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55088
diff changeset
190 (((class color) (background light))
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
191 :foreground "blue1" :weight bold)
55322
a02bfe4ba7ab (diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55088
diff changeset
192 (((class color) (background dark))
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
193 :foreground "green" :weight bold)
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
194 (t :weight bold))
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
195 "`diff-mode' face inherited by hunk and index header faces."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
196 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
197 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
198 (put 'diff-header-face 'face-alias 'diff-header)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
199 (defvar diff-header-face 'diff-header)
31734
6b057ae8165d Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31705
diff changeset
200
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
201 (defface diff-file-header
55322
a02bfe4ba7ab (diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55088
diff changeset
202 '((((class color) (min-colors 88) (background light))
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
203 :background "grey70" :weight bold)
55322
a02bfe4ba7ab (diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55088
diff changeset
204 (((class color) (min-colors 88) (background dark))
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
205 :background "grey60" :weight bold)
55322
a02bfe4ba7ab (diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55088
diff changeset
206 (((class color) (background light))
64496
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
207 :foreground "green" :weight bold)
55322
a02bfe4ba7ab (diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55088
diff changeset
208 (((class color) (background dark))
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
209 :foreground "cyan" :weight bold)
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
210 (t :weight bold)) ; :height 1.3
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
211 "`diff-mode' face used to highlight file header lines."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
212 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
213 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
214 (put 'diff-file-header-face 'face-alias 'diff-file-header)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
215 (defvar diff-file-header-face 'diff-file-header)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
216
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
217 (defface diff-index
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
218 '((t :inherit diff-file-header))
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
219 "`diff-mode' face used to highlight index header lines."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
220 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
221 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
222 (put 'diff-index-face 'face-alias 'diff-index)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
223 (defvar diff-index-face 'diff-index)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
224
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
225 (defface diff-hunk-header
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
226 '((t :inherit diff-header))
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
227 "`diff-mode' face used to highlight hunk header lines."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
228 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
229 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
230 (put 'diff-hunk-header-face 'face-alias 'diff-hunk-header)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
231 (defvar diff-hunk-header-face 'diff-hunk-header)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
232
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
233 (defface diff-removed
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
234 '((t :inherit diff-changed))
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
235 "`diff-mode' face used to highlight removed lines."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
236 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
237 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
238 (put 'diff-removed-face 'face-alias 'diff-removed)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
239 (defvar diff-removed-face 'diff-removed)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
240
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
241 (defface diff-added
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
242 '((t :inherit diff-changed))
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
243 "`diff-mode' face used to highlight added lines."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
244 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
245 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
246 (put 'diff-added-face 'face-alias 'diff-added)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
247 (defvar diff-added-face 'diff-added)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
248
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
249 (defface diff-changed
32576
c6eb63e9c25c (diff-header-face, diff-file-header-face)
Eli Zaretskii <eliz@gnu.org>
parents: 32482
diff changeset
250 '((((type tty pc) (class color) (background light))
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
251 :foreground "magenta" :weight bold :slant italic)
32576
c6eb63e9c25c (diff-header-face, diff-file-header-face)
Eli Zaretskii <eliz@gnu.org>
parents: 32482
diff changeset
252 (((type tty pc) (class color) (background dark))
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
253 :foreground "yellow" :weight bold :slant italic))
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
254 "`diff-mode' face used to highlight changed lines."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
255 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
256 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
257 (put 'diff-changed-face 'face-alias 'diff-changed)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
258 (defvar diff-changed-face 'diff-changed)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
259
64496
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
260 (defface diff-indicator-removed
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
261 '((t :inherit diff-removed))
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
262 "`diff-mode' face used to highlight indicator of removed lines (-, <)."
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
263 :group 'diff-mode
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
264 :version "22.1")
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
265 (defvar diff-indicator-removed-face 'diff-indicator-removed)
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
266
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
267 (defface diff-indicator-added
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
268 '((t :inherit diff-added))
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
269 "`diff-mode' face used to highlight indicator of added lines (+, >)."
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
270 :group 'diff-mode
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
271 :version "22.1")
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
272 (defvar diff-indicator-added-face 'diff-indicator-added)
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
273
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
274 (defface diff-indicator-changed
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
275 '((t :inherit diff-changed))
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
276 "`diff-mode' face used to highlight indicator of changed lines."
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
277 :group 'diff-mode
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
278 :version "22.1")
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
279 (defvar diff-indicator-changed-face 'diff-indicator-changed)
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
280
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
281 (defface diff-function
69608
0c54773776e4 (diff-function): Make it inherit from diff-header instead of diff-context.
Nick Roberts <nickrob@snap.net.nz>
parents: 68651
diff changeset
282 '((t :inherit diff-header))
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
283 "`diff-mode' face used to highlight function names produced by \"diff -p\"."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
284 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
285 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
286 (put 'diff-function-face 'face-alias 'diff-function)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
287 (defvar diff-function-face 'diff-function)
32603
87af45b9ad99 (diff-header-face, diff-file-header-face)
Eli Zaretskii <eliz@gnu.org>
parents: 32588
diff changeset
288
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
289 (defface diff-context
64496
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
290 '((((class color grayscale) (min-colors 88)) :inherit shadow))
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
291 "`diff-mode' face used to highlight context and other side-information."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
292 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
293 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
294 (put 'diff-context-face 'face-alias 'diff-context)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
295 (defvar diff-context-face 'diff-context)
31734
6b057ae8165d Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31705
diff changeset
296
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
297 (defface diff-nonexistent
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
298 '((t :inherit diff-file-header))
62553
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
299 "`diff-mode' face used to highlight nonexistent files in recursive diffs."
e7408ff25265 (diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents: 62531
diff changeset
300 :group 'diff-mode)
63197
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
301 ;; backward-compatibility alias
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
302 (put 'diff-nonexistent-face 'face-alias 'diff-nonexistent)
ce2a9eb0ff8a Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents: 63051
diff changeset
303 (defvar diff-nonexistent-face 'diff-nonexistent)
37531
e71362bfa695 (diff-nonexistant-face): New face.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35526
diff changeset
304
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
305 (defconst diff-yank-handler '(diff-yank-function))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
306 (defun diff-yank-function (text)
54540
2449619c7ccf (diff-font-lock-keywords): Disable yank-handler.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54528
diff changeset
307 ;; FIXME: the yank-handler is now called separately on each piece of text
2449619c7ccf (diff-font-lock-keywords): Disable yank-handler.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54528
diff changeset
308 ;; with a yank-handler property, so the next-single-property-change call
2449619c7ccf (diff-font-lock-keywords): Disable yank-handler.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54528
diff changeset
309 ;; below will always return nil :-( --stef
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
310 (let ((mixed (next-single-property-change 0 'yank-handler text))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
311 (start (point)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
312 ;; First insert the text.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
313 (insert text)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
314 ;; If the text does not include any diff markers and if we're not
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
315 ;; yanking back into a diff-mode buffer, get rid of the prefixes.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
316 (unless (or mixed (derived-mode-p 'diff-mode))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
317 (undo-boundary) ; Just in case the user wanted the prefixes.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
318 (let ((re (save-excursion
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
319 (if (re-search-backward "^[><!][ \t]" start t)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
320 (if (eq (char-after) ?!)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
321 "^[!+- ][ \t]" "^[<>][ \t]")
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
322 "^[ <>!+-]"))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
323 (save-excursion
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
324 (while (re-search-backward re start t)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
325 (replace-match "" t t)))))))
61269
5d2796fc9f80 (diff-minor-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents: 57418
diff changeset
326
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
327
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
328 (defvar diff-font-lock-keywords
64496
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
329 `(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
330 (1 diff-hunk-header-face) (2 diff-function-face))
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
331 ("^\\(\\*\\{15\\}\\)\\(.*\\)$" ;context
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
332 (1 diff-hunk-header-face) (2 diff-function-face))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
333 ("^\\*\\*\\* .+ \\*\\*\\*\\*". diff-hunk-header-face) ;context
64496
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
334 ("^--- .+ ----$" . diff-hunk-header-face) ;context
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
335 ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face) ;normal
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
336 ("^---$" . diff-hunk-header-face) ;normal
32111
161c2ec9f5b2 (diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32063
diff changeset
337 ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\(\\S-+\\)\\(.*[^*-]\\)?\n"
31734
6b057ae8165d Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31705
diff changeset
338 (0 diff-header-face) (2 diff-file-header-face prepend))
64496
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
339 ("^\\([-<]\\)\\(.*\n\\)"
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
340 (1 diff-indicator-removed-face) (2 diff-removed-face))
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
341 ("^\\([+>]\\)\\(.*\n\\)"
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
342 (1 diff-indicator-added-face) (2 diff-added-face))
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
343 ("^\\(!\\)\\(.*\n\\)"
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
344 (1 diff-indicator-changed-face) (2 diff-changed-face))
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
345 ("^Index: \\(.+\\).*\n"
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
346 (0 diff-header-face) (1 diff-index-face prepend))
37567
50d77d1b2d58 (diff-nonexistent-face, diff-font-lock-keywords):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37531
diff changeset
347 ("^Only in .*\n" . diff-nonexistent-face)
64496
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
348 ("^\\(#\\)\\(.*\\)"
64512
a4d1eb8d55e6 (diff-font-lock-keywords): Simplify comments fontifying rule.
Juri Linkov <juri@jurta.org>
parents: 64496
diff changeset
349 (1 font-lock-comment-delimiter-face)
a4d1eb8d55e6 (diff-font-lock-keywords): Simplify comments fontifying rule.
Juri Linkov <juri@jurta.org>
parents: 64496
diff changeset
350 (2 font-lock-comment-face))
64496
558b187cced1 (diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
351 ("^[^-=+*!<>#].*\n" (0 diff-context-face))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
352
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
353 (defconst diff-font-lock-defaults
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
354 '(diff-font-lock-keywords t nil nil nil (font-lock-multiline . nil)))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
355
31269
64bb4634d6d8 (diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents: 30873
diff changeset
356 (defvar diff-imenu-generic-expression
64bb4634d6d8 (diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents: 30873
diff changeset
357 ;; Prefer second name as first is most likely to be a backup or
33488
352cb95d9f27 (diff-imenu-generic-expression): Modify unidiff
Dave Love <fx@gnu.org>
parents: 33432
diff changeset
358 ;; version-control name. The [\t\n] at the end of the unidiff pattern
352cb95d9f27 (diff-imenu-generic-expression): Modify unidiff
Dave Love <fx@gnu.org>
parents: 33432
diff changeset
359 ;; catches Debian source diff files (which lack the trailing date).
352cb95d9f27 (diff-imenu-generic-expression): Modify unidiff
Dave Love <fx@gnu.org>
parents: 33432
diff changeset
360 '((nil "\\+\\+\\+\\ \\([^\t\n]+\\)[\t\n]" 1) ; unidiffs
31269
64bb4634d6d8 (diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents: 30873
diff changeset
361 (nil "^--- \\([^\t\n]+\\)\t.*\n\\*" 1))) ; context diffs
64bb4634d6d8 (diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents: 30873
diff changeset
362
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
363 ;;;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
364 ;;;; Movement
33432
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
365 ;;;;
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
366
29423
12e89e9b65f6 (diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28858
diff changeset
367 (defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")
57279
c8797551b3a0 (diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57020
diff changeset
368 (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1)))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
369 (defvar diff-narrowed-to nil)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
370
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
371 (defun diff-end-of-hunk (&optional style)
54928
28a55e2ec30f (diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54869
diff changeset
372 (when (looking-at diff-hunk-header-re)
28a55e2ec30f (diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54869
diff changeset
373 (unless style
28a55e2ec30f (diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54869
diff changeset
374 ;; Especially important for unified (because headers are ambiguous).
28a55e2ec30f (diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54869
diff changeset
375 (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context))))))
28a55e2ec30f (diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54869
diff changeset
376 (goto-char (match-end 0)))
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
377 (let ((end (and (re-search-forward (case style
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
378 ;; A `unified' header is ambiguous.
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
379 (unified (concat "^[^-+# \\]\\|"
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
380 diff-file-header-re))
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
381 (context "^[^-+#! \\]")
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
382 (normal "^[^<>#\\]")
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
383 (t "^[^-+#!<> \\]"))
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
384 nil t)
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
385 (match-beginning 0))))
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
386 ;; The return value is used by easy-mmode-define-navigation.
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
387 (goto-char (or end (point-max)))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
388
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
389 (defun diff-beginning-of-hunk ()
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
390 (beginning-of-line)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
391 (unless (looking-at diff-hunk-header-re)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
392 (forward-line 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
393 (condition-case ()
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
394 (re-search-backward diff-hunk-header-re)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
395 (error (error "Can't find the beginning of the hunk")))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
396
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
397 (defun diff-beginning-of-file ()
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
398 (beginning-of-line)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
399 (unless (looking-at diff-file-header-re)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
400 (forward-line 2)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
401 (condition-case ()
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
402 (re-search-backward diff-file-header-re)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
403 (error (error "Can't find the beginning of the file")))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
404
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
405 (defun diff-end-of-file ()
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
406 (re-search-forward "^[-+#!<>0-9@* \\]" nil t)
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
407 (re-search-forward (concat "^[^-+#!<>0-9@* \\]\\|" diff-file-header-re)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
408 nil 'move)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
409 (if (match-beginning 1)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
410 (goto-char (match-beginning 1))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
411 (beginning-of-line)))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
412
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
413 ;; Define diff-{hunk,file}-{prev,next}
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
414 (easy-mmode-define-navigation
53058
6ae6b1d05de0 (diff-hunk-prev, diff-hunk-next): Support
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52401
diff changeset
415 diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view)
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
416 (easy-mmode-define-navigation
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
417 diff-file diff-file-header-re "file" diff-end-of-hunk)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
418
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
419 (defun diff-restrict-view (&optional arg)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
420 "Restrict the view to the current hunk.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
421 If the prefix ARG is given, restrict the view to the current file instead."
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
422 (interactive "P")
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
423 (save-excursion
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
424 (if arg (diff-beginning-of-file) (diff-beginning-of-hunk))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
425 (narrow-to-region (point)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
426 (progn (if arg (diff-end-of-file) (diff-end-of-hunk))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
427 (point)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
428 (set (make-local-variable 'diff-narrowed-to) (if arg 'file 'hunk))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
429
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
430
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
431 (defun diff-hunk-kill ()
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
432 "Kill current hunk."
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
433 (interactive)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
434 (diff-beginning-of-hunk)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
435 (let* ((start (point))
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
436 (nexthunk (when (re-search-forward diff-hunk-header-re nil t)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
437 (match-beginning 0)))
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
438 (firsthunk (ignore-errors
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
439 (goto-char start)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
440 (diff-beginning-of-file) (diff-hunk-next) (point)))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
441 (nextfile (ignore-errors (diff-file-next) (point))))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
442 (goto-char start)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
443 (if (and firsthunk (= firsthunk start)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
444 (or (null nexthunk)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
445 (and nextfile (> nexthunk nextfile))))
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
446 ;; It's the only hunk for this file, so kill the file.
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
447 (diff-file-kill)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
448 (diff-end-of-hunk)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
449 (kill-region start (point)))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
450
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
451 (defun diff-file-kill ()
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
452 "Kill current file's hunks."
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
453 (interactive)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
454 (diff-beginning-of-file)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
455 (let* ((start (point))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
456 (prevhunk (save-excursion
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
457 (ignore-errors
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
458 (diff-hunk-prev) (point))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
459 (index (save-excursion
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
460 (re-search-backward "^Index: " prevhunk t))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
461 (when index (setq start index))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
462 (diff-end-of-file)
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
463 (if (looking-at "^\n") (forward-char 1)) ;`tla' generates such diffs.
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
464 (kill-region start (point))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
465
27637
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
466 (defun diff-kill-junk ()
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
467 "Kill spurious empty diffs."
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
468 (interactive)
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
469 (save-excursion
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
470 (let ((inhibit-read-only t))
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
471 (goto-char (point-min))
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
472 (while (re-search-forward (concat "^\\(Index: .*\n\\)"
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
473 "\\([^-+!* <>].*\n\\)*?"
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
474 "\\(\\(Index:\\) \\|"
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
475 diff-file-header-re "\\)")
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
476 nil t)
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
477 (delete-region (if (match-end 4) (match-beginning 0) (match-end 1))
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
478 (match-beginning 3))
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
479 (beginning-of-line)))))
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
480
33432
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
481 (defun diff-count-matches (re start end)
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
482 (save-excursion
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
483 (let ((n 0))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
484 (goto-char start)
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
485 (while (re-search-forward re end t) (incf n))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
486 n)))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
487
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
488 (defun diff-split-hunk ()
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
489 "Split the current (unified diff) hunk at point into two hunks."
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
490 (interactive)
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
491 (beginning-of-line)
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
492 (let ((pos (point))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
493 (start (progn (diff-beginning-of-hunk) (point))))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
494 (unless (looking-at "@@ -\\([0-9]+\\),[0-9]+ \\+\\([0-9]+\\),[0-9]+ @@")
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
495 (error "diff-split-hunk only works on unified context diffs"))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
496 (forward-line 1)
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
497 (let* ((start1 (string-to-number (match-string 1)))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
498 (start2 (string-to-number (match-string 2)))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
499 (newstart1 (+ start1 (diff-count-matches "^[- \t]" (point) pos)))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
500 (newstart2 (+ start2 (diff-count-matches "^[+ \t]" (point) pos))))
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
501 (goto-char pos)
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
502 ;; Hopefully the after-change-function will not screw us over.
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
503 (insert "@@ -" (number-to-string newstart1) ",1 +"
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
504 (number-to-string newstart2) ",1 @@\n")
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
505 ;; Fix the original hunk-header.
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
506 (diff-fixup-modifs start pos))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47523
diff changeset
507
33432
7f6ffdaecedc (diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32666
diff changeset
508
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
509 ;;;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
510 ;;;; jump to other buffers
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
511 ;;;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
512
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
513 (defvar diff-remembered-files-alist nil)
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
514
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
515 (defun diff-filename-drop-dir (file)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
516 (when (string-match "/" file) (substring file (match-end 0))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
517
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
518 (defun diff-merge-strings (ancestor from to)
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
519 "Merge the diff between ANCESTOR and FROM into TO.
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
520 Returns the merged string if successful or nil otherwise.
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
521 The strings are assumed not to contain any \"\\n\" (i.e. end of line).
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
522 If ANCESTOR = FROM, returns TO.
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
523 If ANCESTOR = TO, returns FROM.
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
524 The heuristic is simplistic and only really works for cases
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
525 like \(diff-merge-strings \"b/foo\" \"b/bar\" \"/a/c/foo\")."
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
526 ;; Ideally, we want:
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
527 ;; AMB ANB CMD -> CND
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
528 ;; but that's ambiguous if `foo' or `bar' is empty:
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
529 ;; a/foo a/foo1 b/foo.c -> b/foo1.c but not 1b/foo.c or b/foo.c1
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
530 (let ((str (concat ancestor "\n" from "\n" to)))
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
531 (when (and (string-match (concat
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
532 "\\`\\(.*?\\)\\(.*\\)\\(.*\\)\n"
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
533 "\\1\\(.*\\)\\3\n"
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
534 "\\(.*\\(\\2\\).*\\)\\'") str)
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
535 (equal to (match-string 5 str)))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
536 (concat (substring str (match-beginning 5) (match-beginning 6))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
537 (match-string 4 str)
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
538 (substring str (match-end 6) (match-end 5))))))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
539
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
540 (defun diff-tell-file-name (old name)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
541 "Tell Emacs where the find the source file of the current hunk.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
542 If the OLD prefix arg is passed, tell the file NAME of the old file."
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
543 (interactive
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
544 (let* ((old current-prefix-arg)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
545 (fs (diff-hunk-file-names current-prefix-arg)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
546 (unless fs (error "No file name to look for"))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
547 (list old (read-file-name (format "File for %s: " (car fs))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
548 nil (diff-find-file-name old) t))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
549 (let ((fs (diff-hunk-file-names old)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
550 (unless fs (error "No file name to look for"))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
551 (push (cons fs name) diff-remembered-files-alist)))
61269
5d2796fc9f80 (diff-minor-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents: 57418
diff changeset
552
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
553 (defun diff-hunk-file-names (&optional old)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
554 "Give the list of file names textually mentioned for the current hunk."
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
555 (save-excursion
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
556 (unless (looking-at diff-file-header-re)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
557 (or (ignore-errors (diff-beginning-of-file))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
558 (re-search-forward diff-file-header-re nil t)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
559 (let ((limit (save-excursion
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
560 (condition-case ()
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
561 (progn (diff-hunk-prev) (point))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
562 (error (point-min)))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
563 (header-files
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
564 (if (looking-at "[-*][-*][-*] \\(\\S-+\\)\\(\\s-.*\\)?\n[-+][-+][-+] \\(\\S-+\\)")
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
565 (list (if old (match-string 1) (match-string 3))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
566 (if old (match-string 3) (match-string 1)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
567 (forward-line 1) nil)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
568 (delq nil
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
569 (append
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
570 (when (and (not old)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
571 (save-excursion
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
572 (re-search-backward "^Index: \\(.+\\)" limit t)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
573 (list (match-string 1)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
574 header-files
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
575 (when (re-search-backward
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
576 "^diff \\(-\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?"
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
577 nil t)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
578 (list (if old (match-string 2) (match-string 4))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
579 (if old (match-string 4) (match-string 2)))))))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
580
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
581 (defun diff-find-file-name (&optional old)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
582 "Return the file corresponding to the current patch.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
583 Non-nil OLD means that we want the old file."
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
584 (save-excursion
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
585 (unless (looking-at diff-file-header-re)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
586 (or (ignore-errors (diff-beginning-of-file))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
587 (re-search-forward diff-file-header-re nil t)))
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
588 (let ((fs (diff-hunk-file-names old)))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
589 (or
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
590 ;; use any previously used preference
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
591 (cdr (assoc fs diff-remembered-files-alist))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
592 ;; try to be clever and use previous choices as an inspiration
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
593 (dolist (rf diff-remembered-files-alist)
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
594 (let ((newfile (diff-merge-strings (caar rf) (car fs) (cdr rf))))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
595 (if (and newfile (file-exists-p newfile)) (return newfile))))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
596 ;; look for each file in turn. If none found, try again but
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
597 ;; ignoring the first level of directory, ...
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
598 (do* ((files fs (delq nil (mapcar 'diff-filename-drop-dir files)))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
599 (file nil nil))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
600 ((or (null files)
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
601 (setq file (do* ((files files (cdr files))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
602 (file (car files) (car files)))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
603 ((or (null file) (file-exists-p file))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
604 file))))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
605 file))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
606 ;; <foo>.rej patches implicitly apply to <foo>
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
607 (and (string-match "\\.rej\\'" (or buffer-file-name ""))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
608 (let ((file (substring buffer-file-name 0 (match-beginning 0))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
609 (when (file-exists-p file) file)))
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
610 ;; if all else fails, ask the user
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
611 (let ((file (read-file-name (format "Use file %s: " (or (first fs) ""))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
612 nil (first fs) t (first fs))))
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
613 (set (make-local-variable 'diff-remembered-files-alist)
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
614 (cons (cons fs file) diff-remembered-files-alist))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
615 file)))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
616
32012
b1edfcd919a7 (diff-add-log-file-name): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31973
diff changeset
617
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
618 (defun diff-ediff-patch ()
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
619 "Call `ediff-patch-file' on the current buffer."
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
620 (interactive)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
621 (condition-case err
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
622 (ediff-patch-file nil (current-buffer))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
623 (wrong-number-of-arguments (ediff-patch-file))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
624
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47523
diff changeset
625 ;;;;
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
626 ;;;; Conversion functions
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47523
diff changeset
627 ;;;;
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
628
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
629 ;;(defvar diff-inhibit-after-change nil
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
630 ;; "Non-nil means inhibit `diff-mode's after-change functions.")
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
631
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
632 (defun diff-unified->context (start end)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
633 "Convert unified diffs to context diffs.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
634 START and END are either taken from the region (if a prefix arg is given) or
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
635 else cover the whole bufer."
70542
ef7506f44a3a (diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents: 70333
diff changeset
636 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
ef7506f44a3a (diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents: 70333
diff changeset
637 (list (region-beginning) (region-end))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
638 (list (point-min) (point-max))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
639 (unless (markerp end) (setq end (copy-marker end)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
640 (let (;;(diff-inhibit-after-change t)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
641 (inhibit-read-only t))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
642 (save-excursion
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
643 (goto-char start)
29423
12e89e9b65f6 (diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28858
diff changeset
644 (while (and (re-search-forward "^\\(\\(---\\) .+\n\\(\\+\\+\\+\\) .+\\|@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@.*\\)$" nil t)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
645 (< (point) end))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
646 (combine-after-change-calls
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
647 (if (match-beginning 2)
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
648 ;; we matched a file header
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
649 (progn
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
650 ;; use reverse order to make sure the indices are kept valid
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
651 (replace-match "---" t t nil 3)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
652 (replace-match "***" t t nil 2))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
653 ;; we matched a hunk header
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
654 (let ((line1 (match-string 4))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
655 (lines1 (match-string 5))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
656 (line2 (match-string 6))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
657 (lines2 (match-string 7)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
658 (replace-match
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
659 (concat "***************\n*** " line1 ","
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
660 (number-to-string (+ (string-to-number line1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
661 (string-to-number lines1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
662 -1)) " ****"))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
663 (forward-line 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
664 (save-restriction
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
665 (narrow-to-region (point)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
666 (progn (diff-end-of-hunk 'unified) (point)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
667 (let ((hunk (buffer-string)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
668 (goto-char (point-min))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
669 (if (not (save-excursion (re-search-forward "^-" nil t)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
670 (delete-region (point) (point-max))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
671 (goto-char (point-max))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
672 (let ((modif nil) last-pt)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
673 (while (progn (setq last-pt (point))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
674 (= (forward-line -1) 0))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
675 (case (char-after)
64045
30fe6a97264a Fix brainos.
Juanma Barranquero <lekktu@gmail.com>
parents: 64004
diff changeset
676 (?\s (insert " ") (setq modif nil) (backward-char 1))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
677 (?+ (delete-region (point) last-pt) (setq modif t))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
678 (?- (if (not modif)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
679 (progn (forward-char 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
680 (insert " "))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
681 (delete-char 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
682 (insert "! "))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
683 (backward-char 2))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
684 (?\\ (when (save-excursion (forward-line -1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
685 (= (char-after) ?+))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
686 (delete-region (point) last-pt) (setq modif t)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
687 (t (setq modif nil))))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
688 (goto-char (point-max))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
689 (save-excursion
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
690 (insert "--- " line2 ","
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
691 (number-to-string (+ (string-to-number line2)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
692 (string-to-number lines2)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
693 -1)) " ----\n" hunk))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
694 ;;(goto-char (point-min))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
695 (forward-line 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
696 (if (not (save-excursion (re-search-forward "^+" nil t)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
697 (delete-region (point) (point-max))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
698 (let ((modif nil) (delete nil))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
699 (while (not (eobp))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
700 (case (char-after)
64045
30fe6a97264a Fix brainos.
Juanma Barranquero <lekktu@gmail.com>
parents: 64004
diff changeset
701 (?\s (insert " ") (setq modif nil) (backward-char 1))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
702 (?- (setq delete t) (setq modif t))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
703 (?+ (if (not modif)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
704 (progn (forward-char 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
705 (insert " "))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
706 (delete-char 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
707 (insert "! "))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
708 (backward-char 2))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
709 (?\\ (when (save-excursion (forward-line 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
710 (not (eobp)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
711 (setq delete t) (setq modif t)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
712 (t (setq modif nil)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
713 (let ((last-pt (point)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
714 (forward-line 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
715 (when delete
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
716 (delete-region last-pt (point))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
717 (setq delete nil)))))))))))))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
718
70333
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
719 (defun diff-context->unified (start end &optional to-context)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
720 "Convert context diffs to unified diffs.
70333
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
721 START and END are either taken from the region
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
722 \(when it is highlighted) or else cover the whole buffer.
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
723 With a prefix argument, convert unified format to context format."
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
724 (interactive (if (and transient-mark-mode mark-active)
70542
ef7506f44a3a (diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents: 70333
diff changeset
725 (list (region-beginning) (region-end) current-prefix-arg)
70333
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
726 (list (point-min) (point-max) current-prefix-arg)))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
727 (if to-context
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
728 (diff-unified->context start end)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
729 (unless (markerp end) (setq end (copy-marker end)))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
730 (let ( ;;(diff-inhibit-after-change t)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
731 (inhibit-read-only t))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
732 (save-excursion
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
733 (goto-char start)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
734 (while (and (re-search-forward "^\\(\\(\\*\\*\\*\\) .+\n\\(---\\) .+\\|\\*\\{15\\}.*\n\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]+\\) \\*\\*\\*\\*\\)$" nil t)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
735 (< (point) end))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
736 (combine-after-change-calls
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
737 (if (match-beginning 2)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
738 ;; we matched a file header
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
739 (progn
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
740 ;; use reverse order to make sure the indices are kept valid
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
741 (replace-match "+++" t t nil 3)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
742 (replace-match "---" t t nil 2))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
743 ;; we matched a hunk header
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
744 (let ((line1s (match-string 4))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
745 (line1e (match-string 5))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
746 (pt1 (match-beginning 0)))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
747 (replace-match "")
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
748 (unless (re-search-forward
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
749 "^--- \\([0-9]+\\),\\(-?[0-9]+\\) ----$" nil t)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
750 (error "Can't find matching `--- n1,n2 ----' line"))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
751 (let ((line2s (match-string 1))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
752 (line2e (match-string 2))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
753 (pt2 (progn
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
754 (delete-region (progn (beginning-of-line) (point))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
755 (progn (forward-line 1) (point)))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
756 (point-marker))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
757 (goto-char pt1)
70333
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
758 (forward-line 1)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
759 (while (< (point) pt2)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
760 (case (char-after)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
761 ((?! ?-) (delete-char 2) (insert "-") (forward-line 1))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
762 (?\s ;merge with the other half of the chunk
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
763 (let* ((endline2
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
764 (save-excursion
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
765 (goto-char pt2) (forward-line 1) (point)))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
766 (c (char-after pt2)))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
767 (case c
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
768 ((?! ?+)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
769 (insert "+"
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
770 (prog1 (buffer-substring (+ pt2 2) endline2)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
771 (delete-region pt2 endline2))))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
772 (?\s ;FIXME: check consistency
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
773 (delete-region pt2 endline2)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
774 (delete-char 1)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
775 (forward-line 1))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
776 (?\\ (forward-line 1))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
777 (t (delete-char 1) (forward-line 1)))))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
778 (t (forward-line 1))))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
779 (while (looking-at "[+! ] ")
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
780 (if (/= (char-after) ?!) (forward-char 1)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
781 (delete-char 1) (insert "+"))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
782 (delete-char 1) (forward-line 1))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
783 (save-excursion
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
784 (goto-char pt1)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
785 (insert "@@ -" line1s ","
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
786 (number-to-string (- (string-to-number line1e)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
787 (string-to-number line1s)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
788 -1))
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
789 " +" line2s ","
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
790 (number-to-string (- (string-to-number line2e)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
791 (string-to-number line2s)
64d227e5dd44 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents: 70292
diff changeset
792 -1)) " @@")))))))))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
793
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
794 (defun diff-reverse-direction (start end)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
795 "Reverse the direction of the diffs.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
796 START and END are either taken from the region (if a prefix arg is given) or
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
797 else cover the whole bufer."
70542
ef7506f44a3a (diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents: 70333
diff changeset
798 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
ef7506f44a3a (diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents: 70333
diff changeset
799 (list (region-beginning) (region-end))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
800 (list (point-min) (point-max))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
801 (unless (markerp end) (setq end (copy-marker end)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
802 (let (;;(diff-inhibit-after-change t)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
803 (inhibit-read-only t))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
804 (save-excursion
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
805 (goto-char start)
29423
12e89e9b65f6 (diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28858
diff changeset
806 (while (and (re-search-forward "^\\(\\([-*][-*][-*] \\)\\(.+\\)\n\\([-+][-+][-+] \\)\\(.+\\)\\|\\*\\{15\\}.*\n\\*\\*\\* \\(.+\\) \\*\\*\\*\\*\\|@@ -\\([0-9,]+\\) \\+\\([0-9,]+\\) @@.*\\)$" nil t)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
807 (< (point) end))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
808 (combine-after-change-calls
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
809 (cond
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
810 ;; a file header
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
811 ((match-beginning 2) (replace-match "\\2\\5\n\\4\\3" nil))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
812 ;; a context-diff hunk header
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
813 ((match-beginning 6)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
814 (let ((pt-lines1 (match-beginning 6))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
815 (lines1 (match-string 6)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
816 (replace-match "" nil nil nil 6)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
817 (forward-line 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
818 (let ((half1s (point)))
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
819 (while (looking-at "[-! \\][ \t]\\|#")
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
820 (when (= (char-after) ?-) (delete-char 1) (insert "+"))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
821 (forward-line 1))
27637
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
822 (let ((half1 (delete-and-extract-region half1s (point))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
823 (unless (looking-at "^--- \\([0-9]+,-?[0-9]+\\) ----$")
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
824 (insert half1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
825 (error "Can't find matching `--- n1,n2 ----' line"))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
826 (let ((str1 (match-string 1)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
827 (replace-match lines1 nil nil nil 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
828 (forward-line 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
829 (let ((half2s (point)))
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
830 (while (looking-at "[!+ \\][ \t]\\|#")
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
831 (when (= (char-after) ?+) (delete-char 1) (insert "-"))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
832 (forward-line 1))
27637
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
833 (let ((half2 (delete-and-extract-region half2s (point))))
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
834 (insert (or half1 ""))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
835 (goto-char half1s)
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
836 (insert (or half2 ""))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
837 (goto-char pt-lines1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
838 (insert str1))))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
839 ;; a unified-diff hunk header
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
840 ((match-beginning 7)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
841 (replace-match "@@ -\\8 +\\7 @@" nil)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
842 (forward-line 1)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
843 (let ((c (char-after)) first last)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
844 (while (case (setq c (char-after))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
845 (?- (setq first (or first (point)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
846 (delete-char 1) (insert "+") t)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
847 (?+ (setq last (or last (point)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
848 (delete-char 1) (insert "-") t)
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
849 ((?\\ ?#) t)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
850 (t (when (and first last (< first last))
46407
4c4398249108 (diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42472
diff changeset
851 (insert (delete-and-extract-region first last)))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
852 (setq first nil last nil)
64004
ea880752de3b (diff-mode): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents: 63415
diff changeset
853 (equal ?\s c)))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
854 (forward-line 1))))))))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
855
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
856 (defun diff-fixup-modifs (start end)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
857 "Fixup the hunk headers (in case the buffer was modified).
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
858 START and END are either taken from the region (if a prefix arg is given) or
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
859 else cover the whole bufer."
70542
ef7506f44a3a (diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents: 70333
diff changeset
860 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
ef7506f44a3a (diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents: 70333
diff changeset
861 (list (region-beginning) (region-end))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
862 (list (point-min) (point-max))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
863 (let ((inhibit-read-only t))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
864 (save-excursion
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
865 (goto-char end) (diff-end-of-hunk)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
866 (let ((plus 0) (minus 0) (space 0) (bang 0))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
867 (while (and (= (forward-line -1) 0) (<= start (point)))
57279
c8797551b3a0 (diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57020
diff changeset
868 (if (not (looking-at
c8797551b3a0 (diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57020
diff changeset
869 (concat "@@ -[0-9,]+ \\+[0-9,]+ @@"
c8797551b3a0 (diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57020
diff changeset
870 "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$"
c8797551b3a0 (diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57020
diff changeset
871 "\\|--- .+\n\\+\\+\\+ ")))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
872 (case (char-after)
57279
c8797551b3a0 (diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57020
diff changeset
873 (?\s (incf space))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
874 (?+ (incf plus))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
875 (?- (incf minus))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
876 (?! (incf bang))
28858
85d4cc0b8741 (diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28240
diff changeset
877 ((?\\ ?#) nil)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
878 (t (setq space 0 plus 0 minus 0 bang 0)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
879 (cond
29423
12e89e9b65f6 (diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28858
diff changeset
880 ((looking-at "@@ -[0-9]+,\\([0-9]*\\) \\+[0-9]+,\\([0-9]*\\) @@.*$")
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
881 (let* ((old1 (match-string 1))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
882 (old2 (match-string 2))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
883 (new1 (number-to-string (+ space minus)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
884 (new2 (number-to-string (+ space plus))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
885 (unless (string= new2 old2) (replace-match new2 t t nil 2))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
886 (unless (string= new1 old1) (replace-match new1 t t nil 1))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
887 ((looking-at "--- \\([0-9]+\\),\\([0-9]*\\) ----$")
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
888 (when (> (+ space bang plus) 0)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
889 (let* ((old1 (match-string 1))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
890 (old2 (match-string 2))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
891 (new (number-to-string
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
892 (+ space bang plus -1 (string-to-number old1)))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
893 (unless (string= new old2) (replace-match new t t nil 2)))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
894 ((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$")
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
895 (when (> (+ space bang minus) 0)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
896 (let* ((old (match-string 1))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
897 (new (format
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
898 (concat "%0" (number-to-string (length old)) "d")
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
899 (+ space bang minus -1 (string-to-number old)))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
900 (unless (string= new old) (replace-match new t t nil 2))))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
901 (setq space 0 plus 0 minus 0 bang 0)))))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
902
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47523
diff changeset
903 ;;;;
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
904 ;;;; Hooks
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47523
diff changeset
905 ;;;;
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
906
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
907 (defun diff-write-contents-hooks ()
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
908 "Fixup hunk headers if necessary."
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
909 (if (buffer-modified-p) (diff-fixup-modifs (point-min) (point-max)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
910 nil)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
911
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
912 ;; It turns out that making changes in the buffer from within an
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
913 ;; *-change-function is asking for trouble, whereas making them
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
914 ;; from a post-command-hook doesn't pose much problems
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
915 (defvar diff-unhandled-changes nil)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
916 (defun diff-after-change-function (beg end len)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
917 "Remember to fixup the hunk header.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
918 See `after-change-functions' for the meaning of BEG, END and LEN."
29423
12e89e9b65f6 (diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28858
diff changeset
919 ;; Ignoring changes when inhibit-read-only is set is strictly speaking
12e89e9b65f6 (diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28858
diff changeset
920 ;; incorrect, but it turns out that inhibit-read-only is normally not set
12e89e9b65f6 (diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28858
diff changeset
921 ;; inside editing commands, while it tends to be set when the buffer gets
12e89e9b65f6 (diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28858
diff changeset
922 ;; updated by an async process or by a conversion function, both of which
12e89e9b65f6 (diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28858
diff changeset
923 ;; would rather not be uselessly slowed down by this hook.
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
924 (when (and (not undo-in-progress) (not inhibit-read-only))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
925 (if diff-unhandled-changes
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
926 (setq diff-unhandled-changes
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
927 (cons (min beg (car diff-unhandled-changes))
46407
4c4398249108 (diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42472
diff changeset
928 (max end (cdr diff-unhandled-changes))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
929 (setq diff-unhandled-changes (cons beg end)))))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
930
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
931 (defun diff-post-command-hook ()
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
932 "Fixup hunk headers if necessary."
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
933 (when (consp diff-unhandled-changes)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
934 (ignore-errors
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
935 (save-excursion
27637
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
936 (goto-char (car diff-unhandled-changes))
46407
4c4398249108 (diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42472
diff changeset
937 ;; Maybe we've cut the end of the hunk before point.
4c4398249108 (diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42472
diff changeset
938 (if (and (bolp) (not (bobp))) (backward-char 1))
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
939 ;; We used to fixup modifs on all the changes, but it turns out
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
940 ;; that it's safer not to do it on big changes, for example
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
941 ;; when yanking a big diff, since we might then screw up perfectly
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
942 ;; correct values. -stef
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
943 ;; (unless (ignore-errors
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
944 ;; (diff-beginning-of-hunk)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
945 ;; (save-excursion
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
946 ;; (diff-end-of-hunk)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
947 ;; (> (point) (car diff-unhandled-changes))))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
948 ;; (goto-char (car diff-unhandled-changes))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
949 ;; (re-search-forward diff-hunk-header-re (cdr diff-unhandled-changes))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
950 ;; (diff-beginning-of-hunk))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
951 ;; (diff-fixup-modifs (point) (cdr diff-unhandled-changes))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
952 (diff-beginning-of-hunk)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
953 (when (save-excursion
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
954 (diff-end-of-hunk)
46407
4c4398249108 (diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42472
diff changeset
955 (>= (point) (cdr diff-unhandled-changes)))
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
956 (diff-fixup-modifs (point) (cdr diff-unhandled-changes)))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
957 (setq diff-unhandled-changes nil)))
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
958
55088
386e33861abd (diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54928
diff changeset
959 (defun diff-next-error (arg reset)
386e33861abd (diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54928
diff changeset
960 ;; Select a window that displays the current buffer so that point
386e33861abd (diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54928
diff changeset
961 ;; movements are reflected in that window. Otherwise, the user might
386e33861abd (diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54928
diff changeset
962 ;; never see the hunk corresponding to the source she's jumping to.
386e33861abd (diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54928
diff changeset
963 (pop-to-buffer (current-buffer))
386e33861abd (diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54928
diff changeset
964 (if reset (goto-char (point-min)))
386e33861abd (diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54928
diff changeset
965 (diff-hunk-next arg)
386e33861abd (diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54928
diff changeset
966 (diff-goto-source))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
967
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
968 ;;;###autoload
28240
a0b15838fd22 (diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27637
diff changeset
969 (define-derived-mode diff-mode fundamental-mode "Diff"
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
970 "Major mode for viewing/editing context diffs.
39386
50956864fe56 (diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39323
diff changeset
971 Supports unified and context diffs as well as (to a lesser extent)
50956864fe56 (diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39323
diff changeset
972 normal diffs.
47445
d54b5b9a2b77 (diff-mode): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46407
diff changeset
973 When the buffer is read-only, the ESC prefix is not necessary.
63415
3ed17f92f3c9 (diff-mode): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 63197
diff changeset
974 If you edit the buffer manually, diff-mode will try to update the hunk
47445
d54b5b9a2b77 (diff-mode): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46407
diff changeset
975 headers for you on-the-fly.
d54b5b9a2b77 (diff-mode): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46407
diff changeset
976
d54b5b9a2b77 (diff-mode): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46407
diff changeset
977 You can also switch between context diff and unified diff with \\[diff-context->unified],
66130
a6131b478689 (diff-mode): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 65287
diff changeset
978 or vice versa with \\[diff-unified->context] and you can also reverse the direction of
47445
d54b5b9a2b77 (diff-mode): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46407
diff changeset
979 a diff with \\[diff-reverse-direction]."
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
980 (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
981 (set (make-local-variable 'outline-regexp) diff-outline-regexp)
31269
64bb4634d6d8 (diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents: 30873
diff changeset
982 (set (make-local-variable 'imenu-generic-expression)
64bb4634d6d8 (diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents: 30873
diff changeset
983 diff-imenu-generic-expression)
31479
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
984 ;; These are not perfect. They would be better done separately for
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
985 ;; context diffs and unidiffs.
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
986 ;; (set (make-local-variable 'paragraph-start)
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
987 ;; (concat "@@ " ; unidiff hunk
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
988 ;; "\\|\\*\\*\\* " ; context diff hunk or file start
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
989 ;; "\\|--- [^\t]+\t")) ; context or unidiff file
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
990 ;; ; start (first or second line)
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
991 ;; (set (make-local-variable 'paragraph-separate) paragraph-start)
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
992 ;; (set (make-local-variable 'page-delimiter) "--- [^\t]+\t")
d58461428926 (diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents: 31269
diff changeset
993 ;; compile support
55088
386e33861abd (diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54928
diff changeset
994 (set (make-local-variable 'next-error-function) 'diff-next-error)
35526
b40a6cecc4d5 (diff-mode): Disable preliminary support for `compile'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33488
diff changeset
995
39386
50956864fe56 (diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39323
diff changeset
996 (when (and (> (point-max) (point-min)) diff-default-read-only)
50956864fe56 (diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39323
diff changeset
997 (toggle-read-only t))
27637
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
998 ;; setup change hooks
37866
4e2d06e10072 (diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37567
diff changeset
999 (if (not diff-update-on-the-fly)
53833
32e20bdb34c9 (diff-file-regexp-alist, diff-error-regexp-alist)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53782
diff changeset
1000 (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t)
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1001 (make-local-variable 'diff-unhandled-changes)
31973
ad9838a9349c (diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31819
diff changeset
1002 (add-hook 'after-change-functions 'diff-after-change-function nil t)
ad9838a9349c (diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31819
diff changeset
1003 (add-hook 'post-command-hook 'diff-post-command-hook nil t))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1004 ;; Neat trick from Dave Love to add more bindings in read-only mode:
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1005 (let ((ro-bind (cons 'buffer-read-only diff-mode-shared-map)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1006 (add-to-list 'minor-mode-overriding-map-alist ro-bind)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1007 ;; Turn off this little trick in case the buffer is put in view-mode.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1008 (add-hook 'view-mode-hook
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1009 `(lambda ()
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1010 (setq minor-mode-overriding-map-alist
54693
ea036372013a (diff-mode): Fix missing quote.
Andreas Schwab <schwab@suse.de>
parents: 54540
diff changeset
1011 (delq ',ro-bind minor-mode-overriding-map-alist)))
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1012 nil t))
31795
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1013 ;; add-log support
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1014 (set (make-local-variable 'add-log-current-defun-function)
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1015 'diff-current-defun)
32012
b1edfcd919a7 (diff-add-log-file-name): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31973
diff changeset
1016 (set (make-local-variable 'add-log-buffer-file-name-function)
b1edfcd919a7 (diff-add-log-file-name): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31973
diff changeset
1017 'diff-find-file-name))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1018
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1019 ;;;###autoload
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
1020 (define-minor-mode diff-minor-mode
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
1021 "Minor mode for viewing/editing context diffs.
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
1022 \\{diff-minor-mode-map}"
61269
5d2796fc9f80 (diff-minor-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents: 57418
diff changeset
1023 :group 'diff-mode :lighter " Diff"
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
1024 ;; FIXME: setup font-lock
27637
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
1025 ;; setup change hooks
37866
4e2d06e10072 (diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37567
diff changeset
1026 (if (not diff-update-on-the-fly)
53833
32e20bdb34c9 (diff-file-regexp-alist, diff-error-regexp-alist)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53782
diff changeset
1027 (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t)
27637
79014abee3cc (diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26748
diff changeset
1028 (make-local-variable 'diff-unhandled-changes)
31973
ad9838a9349c (diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31819
diff changeset
1029 (add-hook 'after-change-functions 'diff-after-change-function nil t)
ad9838a9349c (diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31819
diff changeset
1030 (add-hook 'post-command-hook 'diff-post-command-hook nil t)))
26748
8b8438e9ac12 * diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26009
diff changeset
1031
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1032 ;;; Handy hook functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1033
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1034 (defun diff-delete-if-empty ()
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1035 ;; An empty diff file means there's no more diffs to integrate, so we
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1036 ;; can just remove the file altogether. Very handy for .rej files if we
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1037 ;; remove hunks as we apply them.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1038 (when (and buffer-file-name
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1039 (eq 0 (nth 7 (file-attributes buffer-file-name))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1040 (delete-file buffer-file-name)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1041
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1042 (defun diff-delete-empty-files ()
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1043 "Arrange for empty diff files to be removed."
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1044 (add-hook 'after-save-hook 'diff-delete-if-empty nil t))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1045
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1046 (defun diff-make-unified ()
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1047 "Turn context diffs into unified diffs if applicable."
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1048 (if (save-excursion
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1049 (goto-char (point-min))
55392
480f9d542579 (diff-make-unified): Fix regexp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55322
diff changeset
1050 (and (looking-at diff-hunk-header-re) (eq (char-after) ?*)))
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1051 (let ((mod (buffer-modified-p)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1052 (unwind-protect
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1053 (diff-context->unified (point-min) (point-max))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1054 (restore-buffer-modified-p mod)))))
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1055
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1056 ;;;
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1057 ;;; Misc operations that have proved useful at some point.
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1058 ;;;
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1059
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1060 (defun diff-next-complex-hunk ()
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1061 "Jump to the next \"complex\" hunk.
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1062 \"Complex\" is approximated by \"the hunk changes the number of lines\".
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1063 Only works for unified diffs."
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1064 (interactive)
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1065 (while
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1066 (and (re-search-forward "^@@ [-0-9]+,\\([0-9]+\\) [+0-9]+,\\([0-9]+\\) @@"
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1067 nil t)
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1068 (equal (match-string 1) (match-string 2)))))
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1069
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1070 (defun diff-hunk-text (hunk destp char-offset)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1071 "Return the literal source text from HUNK as (TEXT . OFFSET).
70542
ef7506f44a3a (diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents: 70333
diff changeset
1072 If DESTP is nil, TEXT is the source, otherwise the destination text.
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1073 CHAR-OFFSET is a char-offset in HUNK, and OFFSET is the corresponding
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1074 char-offset in TEXT."
31556
74d7a9c42c2a (diff-hunk-text): Use `with-temp-buffer'.
Miles Bader <miles@gnu.org>
parents: 31538
diff changeset
1075 (with-temp-buffer
31819
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1076 (insert hunk)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1077 (goto-char (point-min))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1078 (let ((src-pos nil)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1079 (dst-pos nil)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1080 (divider-pos nil)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1081 (num-pfx-chars 2))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1082 ;; Set the following variables:
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1083 ;; SRC-POS buffer pos of the source part of the hunk or nil if none
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1084 ;; DST-POS buffer pos of the destination part of the hunk or nil
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1085 ;; DIVIDER-POS buffer pos of any divider line separating the src & dst
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1086 ;; NUM-PFX-CHARS number of line-prefix characters used by this format"
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1087 (cond ((looking-at "^@@")
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1088 ;; unified diff
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1089 (setq num-pfx-chars 1)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1090 (forward-line 1)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1091 (setq src-pos (point) dst-pos (point)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1092 ((looking-at "^\\*\\*")
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1093 ;; context diff
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1094 (forward-line 2)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1095 (setq src-pos (point))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1096 (re-search-forward "^--- " nil t)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1097 (forward-line 0)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1098 (setq divider-pos (point))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1099 (forward-line 1)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1100 (setq dst-pos (point)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1101 ((looking-at "^[0-9]+a[0-9,]+$")
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1102 ;; normal diff, insert
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1103 (forward-line 1)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1104 (setq dst-pos (point)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1105 ((looking-at "^[0-9,]+d[0-9]+$")
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1106 ;; normal diff, delete
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1107 (forward-line 1)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1108 (setq src-pos (point)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1109 ((looking-at "^[0-9,]+c[0-9,]+$")
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1110 ;; normal diff, change
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1111 (forward-line 1)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1112 (setq src-pos (point))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1113 (re-search-forward "^---$" nil t)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1114 (forward-line 0)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1115 (setq divider-pos (point))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1116 (forward-line 1)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1117 (setq dst-pos (point)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1118 (t
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1119 (error "Unknown diff hunk type")))
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1120
31819
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1121 (if (if destp (null dst-pos) (null src-pos))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1122 ;; Implied empty text
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1123 (if char-offset '("" . 0) "")
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1124
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1125 ;; For context diffs, either side can be empty, (if there's only
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1126 ;; added or only removed text). We should then use the other side.
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1127 (cond ((equal src-pos divider-pos) (setq src-pos dst-pos))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1128 ((equal dst-pos (point-max)) (setq dst-pos src-pos)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1129
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1130 (when char-offset (goto-char (+ (point-min) char-offset)))
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1131
31819
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1132 ;; Get rid of anything except the desired text.
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1133 (save-excursion
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1134 ;; Delete unused text region
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1135 (let ((keep (if destp dst-pos src-pos)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1136 (when (and divider-pos (> divider-pos keep))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1137 (delete-region divider-pos (point-max)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1138 (delete-region (point-min) keep))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1139 ;; Remove line-prefix characters, and unneeded lines (unified diffs).
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1140 (let ((kill-char (if destp ?- ?+)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1141 (goto-char (point-min))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1142 (while (not (eobp))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1143 (if (eq (char-after) kill-char)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1144 (delete-region (point) (progn (forward-line 1) (point)))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1145 (delete-char num-pfx-chars)
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1146 (forward-line 1)))))
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1147
31819
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1148 (let ((text (buffer-substring-no-properties (point-min) (point-max))))
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1149 (if char-offset (cons text (- (point) (point-min))) text))))))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1150
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1151
31734
6b057ae8165d Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31705
diff changeset
1152 (defun diff-find-text (text)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1153 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT.
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1154 If TEXT isn't found, nil is returned."
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1155 (let* ((orig (point))
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1156 (forw (and (search-forward text nil t)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1157 (cons (match-beginning 0) (match-end 0))))
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1158 (back (and (goto-char (+ orig (length text)))
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1159 (search-backward text nil t)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1160 (cons (match-beginning 0) (match-end 0)))))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1161 ;; Choose the closest match.
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1162 (if (and forw back)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1163 (if (> (- (car forw) orig) (- orig (car back))) back forw)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1164 (or back forw))))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1165
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1166 (defun diff-find-approx-text (text)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1167 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT.
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1168 Whitespace differences are ignored."
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1169 (let* ((orig (point))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1170 (re (concat "^[ \t\n ]*"
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1171 (mapconcat 'regexp-quote (split-string text) "[ \t\n ]+")
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1172 "[ \t\n ]*\n"))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1173 (forw (and (re-search-forward re nil t)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1174 (cons (match-beginning 0) (match-end 0))))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1175 (back (and (goto-char (+ orig (length text)))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1176 (re-search-backward re nil t)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1177 (cons (match-beginning 0) (match-end 0)))))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1178 ;; Choose the closest match.
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1179 (if (and forw back)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1180 (if (> (- (car forw) orig) (- orig (car back))) back forw)
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1181 (or back forw))))
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1182
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1183 (defsubst diff-xor (a b) (if a (not b) b))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1184
31786
181947e98152 (diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31749
diff changeset
1185 (defun diff-find-source-location (&optional other-file reverse)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1186 "Find out (BUF LINE-OFFSET POS SRC DST SWITCHED).
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1187 BUF is the buffer corresponding to the source file.
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1188 LINE-OFFSET is the offset between the expected and actual positions
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1189 of the text of the hunk or nil if the text was not found.
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1190 POS is a pair (BEG . END) indicating the position of the text in the buffer.
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1191 SRC and DST are the two variants of text as returned by `diff-hunk-text'.
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1192 SRC is the variant that was found in the buffer.
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1193 SWITCHED is non-nil if the patch is already applied."
31735
9d50fe5df6ce Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31734
diff changeset
1194 (save-excursion
37866
4e2d06e10072 (diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37567
diff changeset
1195 (let* ((other (diff-xor other-file diff-jump-to-old-file))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1196 (char-offset (- (point) (progn (diff-beginning-of-hunk) (point))))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1197 (hunk (buffer-substring (point)
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1198 (save-excursion (diff-end-of-hunk) (point))))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1199 (old (diff-hunk-text hunk reverse char-offset))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1200 (new (diff-hunk-text hunk (not reverse) char-offset))
31735
9d50fe5df6ce Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31734
diff changeset
1201 ;; Find the location specification.
31786
181947e98152 (diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31749
diff changeset
1202 (line (if (not (looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?"))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1203 (error "Can't find the hunk header")
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1204 (if other (match-string 1)
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1205 (if (match-end 3) (match-string 3)
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1206 (unless (re-search-forward "^--- \\([0-9,]+\\)" nil t)
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1207 (error "Can't find the hunk separator"))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1208 (match-string 1)))))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1209 (file (or (diff-find-file-name other) (error "Can't find the file")))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1210 (buf (find-file-noselect file)))
31735
9d50fe5df6ce Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31734
diff changeset
1211 ;; Update the user preference if he so wished.
9d50fe5df6ce Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31734
diff changeset
1212 (when (> (prefix-numeric-value other-file) 8)
37866
4e2d06e10072 (diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37567
diff changeset
1213 (setq diff-jump-to-old-file other))
31786
181947e98152 (diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31749
diff changeset
1214 (with-current-buffer buf
181947e98152 (diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31749
diff changeset
1215 (goto-line (string-to-number line))
181947e98152 (diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31749
diff changeset
1216 (let* ((orig-pos (point))
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1217 (switched nil)
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1218 ;; FIXME: Check for case where both OLD and NEW are found.
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1219 (pos (or (diff-find-text (car old))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1220 (progn (setq switched t) (diff-find-text (car new)))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1221 (progn (setq switched nil)
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1222 (condition-case nil
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1223 (diff-find-approx-text (car old))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1224 (invalid-regexp nil))) ;Regex too big.
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1225 (progn (setq switched t)
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1226 (condition-case nil
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1227 (diff-find-approx-text (car new))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1228 (invalid-regexp nil))) ;Regex too big.
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1229 (progn (setq switched nil) nil))))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1230 (nconc
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1231 (list buf)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1232 (if pos
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1233 (list (count-lines orig-pos (car pos)) pos)
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1234 (list nil (cons orig-pos (+ orig-pos (length (car old))))))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1235 (if switched (list new old t) (list old new))))))))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1236
31735
9d50fe5df6ce Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31734
diff changeset
1237
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1238 (defun diff-hunk-status-msg (line-offset reversed dry-run)
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1239 (let ((msg (if dry-run
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1240 (if reversed "already applied" "not yet applied")
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1241 (if reversed "undone" "applied"))))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1242 (message (cond ((null line-offset) "Hunk text not found")
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1243 ((= line-offset 0) "Hunk %s")
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1244 ((= line-offset 1) "Hunk %s at offset %d line")
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1245 (t "Hunk %s at offset %d lines"))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1246 msg line-offset)))
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1247
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1248
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1249 (defun diff-apply-hunk (&optional reverse)
31819
e5a0c7120611 (diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31817
diff changeset
1250 "Apply the current hunk to the source file and go to the next.
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1251 By default, the new source file is patched, but if the variable
37866
4e2d06e10072 (diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37567
diff changeset
1252 `diff-jump-to-old-file' is non-nil, then the old source file is
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1253 patched instead (some commands, such as `diff-goto-source' can change
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1254 the value of this variable when given an appropriate prefix argument).
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1255
32063
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1256 With a prefix argument, REVERSE the hunk."
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1257 (interactive "P")
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1258 (destructuring-bind (buf line-offset pos old new &optional switched)
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1259 ;; If REVERSE go to the new file, otherwise go to the old.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1260 (diff-find-source-location (not reverse) reverse)
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1261 (cond
32063
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1262 ((null line-offset)
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1263 (error "Can't find the text to patch"))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1264 ((and switched
35526
b40a6cecc4d5 (diff-mode): Disable preliminary support for `compile'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33488
diff changeset
1265 ;; A reversed patch was detected, perhaps apply it in reverse.
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1266 (not (save-window-excursion
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1267 (pop-to-buffer buf)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1268 (goto-char (+ (car pos) (cdr old)))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1269 (y-or-n-p
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1270 (if reverse
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1271 "Hunk hasn't been applied yet; apply it now? "
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1272 "Hunk has already been applied; undo it? ")))))
32063
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1273 (message "(Nothing done)"))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1274 (t
32063
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1275 ;; Apply the hunk
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1276 (with-current-buffer buf
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1277 (goto-char (car pos))
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1278 (delete-region (car pos) (cdr pos))
32063
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1279 (insert (car new)))
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1280 ;; Display BUF in a window
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1281 (set-window-point (display-buffer buf) (+ (car pos) (cdr new)))
32063
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1282 (diff-hunk-status-msg line-offset (diff-xor switched reverse) nil)
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1283 (when diff-advance-after-apply-hunk
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1284 (diff-hunk-next))))))
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1285
31684
e05ee0693dda (diff-hunk-text):
Miles Bader <miles@gnu.org>
parents: 31556
diff changeset
1286
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1287 (defun diff-test-hunk (&optional reverse)
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1288 "See whether it's possible to apply the current hunk.
32063
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1289 With a prefix argument, try to REVERSE the hunk."
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1290 (interactive "P")
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1291 (destructuring-bind (buf line-offset pos src dst &optional switched)
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1292 ;; If REVERSE go to the new file, otherwise go to the old.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1293 (diff-find-source-location (not reverse) reverse)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1294 (set-window-point (display-buffer buf) (+ (car pos) (cdr src)))
32063
3fb2a3b13c5e (diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents: 32061
diff changeset
1295 (diff-hunk-status-msg line-offset (diff-xor reverse switched) t)))
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1296
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1297
54869
c491468e3c18 (diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54693
diff changeset
1298 (defalias 'diff-mouse-goto-source 'diff-goto-source)
c491468e3c18 (diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54693
diff changeset
1299
c491468e3c18 (diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54693
diff changeset
1300 (defun diff-goto-source (&optional other-file event)
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1301 "Jump to the corresponding source line.
37866
4e2d06e10072 (diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37567
diff changeset
1302 `diff-jump-to-old-file' (or its opposite if the OTHER-FILE prefix arg
31795
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1303 is given) determines whether to jump to the old or the new file.
31538
46aca282e6b0 (diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents: 31479
diff changeset
1304 If the prefix arg is bigger than 8 (for example with \\[universal-argument] \\[universal-argument])
70542
ef7506f44a3a (diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents: 70333
diff changeset
1305 then `diff-jump-to-old-file' is also set, for the next invocations."
54869
c491468e3c18 (diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54693
diff changeset
1306 (interactive (list current-prefix-arg last-input-event))
32111
161c2ec9f5b2 (diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32063
diff changeset
1307 ;; When pointing at a removal line, we probably want to jump to
161c2ec9f5b2 (diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32063
diff changeset
1308 ;; the old location, and else to the new (i.e. as if reverting).
161c2ec9f5b2 (diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32063
diff changeset
1309 ;; This is a convenient detail when using smerge-diff.
54869
c491468e3c18 (diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54693
diff changeset
1310 (if event (posn-set-point (event-end event)))
32111
161c2ec9f5b2 (diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32063
diff changeset
1311 (let ((rev (not (save-excursion (beginning-of-line) (looking-at "[-<]")))))
161c2ec9f5b2 (diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32063
diff changeset
1312 (destructuring-bind (buf line-offset pos src dst &optional switched)
161c2ec9f5b2 (diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32063
diff changeset
1313 (diff-find-source-location other-file rev)
161c2ec9f5b2 (diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32063
diff changeset
1314 (pop-to-buffer buf)
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1315 (goto-char (+ (car pos) (cdr src)))
32143
299f601ca8ba (diff-goto-source):
Miles Bader <miles@gnu.org>
parents: 32111
diff changeset
1316 (diff-hunk-status-msg line-offset (diff-xor rev switched) t))))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1317
31786
181947e98152 (diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31749
diff changeset
1318
31795
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1319 (defun diff-current-defun ()
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1320 "Find the name of function at point.
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1321 For use in `add-log-current-defun-function'."
56073
dc1d86d80c20 Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56072
diff changeset
1322 (save-excursion
dc1d86d80c20 Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56072
diff changeset
1323 (when (looking-at diff-hunk-header-re)
dc1d86d80c20 Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56072
diff changeset
1324 (forward-line 1)
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
1325 (re-search-forward "^[^ ]" nil t))
56073
dc1d86d80c20 Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56072
diff changeset
1326 (destructuring-bind (buf line-offset pos src dst &optional switched)
dc1d86d80c20 Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 56072
diff changeset
1327 (diff-find-source-location)
31795
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1328 (beginning-of-line)
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1329 (or (when (memq (char-after) '(?< ?-))
31817
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1330 ;; Cursor is pointing at removed text. This could be a removed
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1331 ;; function, in which case, going to the source buffer will
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1332 ;; not help since the function is now removed. Instead,
e23774b771e1 (diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31795
diff changeset
1333 ;; try to figure out the function name just from the code-fragment.
31795
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1334 (let ((old (if switched dst src)))
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1335 (with-temp-buffer
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1336 (insert (car old))
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1337 (funcall (with-current-buffer buf major-mode))
46407
4c4398249108 (diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42472
diff changeset
1338 (goto-char (+ (point-min) (cdr old)))
31795
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1339 (add-log-current-defun))))
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1340 (with-current-buffer buf
41526
f0fb05d40941 (diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39386
diff changeset
1341 (goto-char (+ (car pos) (cdr src)))
31795
868648c4a36b * diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31786
diff changeset
1342 (add-log-current-defun))))))
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1343
54528
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1344 (defun diff-refine-hunk ()
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1345 "Refine the current hunk by ignoring space differences."
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1346 (interactive)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1347 (let* ((char-offset (- (point) (progn (diff-beginning-of-hunk) (point))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1348 (opts (case (char-after) (?@ "-bu") (?* "-bc") (t "-b")))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1349 (line-nb (and (or (looking-at "[^0-9]+\\([0-9]+\\)")
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1350 (error "Can't find line number"))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1351 (string-to-number (match-string 1))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1352 (hunk (delete-and-extract-region
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1353 (point) (save-excursion (diff-end-of-hunk) (point))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1354 (lead (make-string (1- line-nb) ?\n)) ;Line nums start at 1.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1355 (file1 (make-temp-file "diff1"))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1356 (file2 (make-temp-file "diff2"))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1357 (coding-system-for-read buffer-file-coding-system)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1358 old new)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1359 (unwind-protect
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1360 (save-excursion
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1361 (setq old (diff-hunk-text hunk nil char-offset))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1362 (setq new (diff-hunk-text hunk t char-offset))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1363 (write-region (concat lead (car old)) nil file1 nil 'nomessage)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1364 (write-region (concat lead (car new)) nil file2 nil 'nomessage)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1365 (with-temp-buffer
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1366 (let ((status
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1367 (call-process diff-command nil t nil
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1368 opts file1 file2)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1369 (case status
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1370 (0 nil) ;Nothing to reformat.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1371 (1 (goto-char (point-min))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1372 ;; Remove the file-header.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1373 (when (re-search-forward diff-hunk-header-re nil t)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1374 (delete-region (point-min) (match-beginning 0))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1375 (t (goto-char (point-max))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1376 (unless (bolp) (insert "\n"))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1377 (insert hunk)))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1378 (setq hunk (buffer-string))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1379 (unless (memq status '(0 1))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1380 (error "Diff returned: %s" status)))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1381 ;; Whatever happens, put back some equivalent text: either the new
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1382 ;; one or the original one in case some error happened.
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1383 (insert hunk)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1384 (delete-file file1)
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1385 (delete-file file2))))
67419634950d (diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53833
diff changeset
1386
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1387 ;; provide the package
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1388 (provide 'diff-mode)
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1389
30873
7f824fa01e10 (diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29423
diff changeset
1390 ;;; Old Change Log from when diff-mode wasn't part of Emacs:
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1391 ;; Revision 1.11 1999/10/09 23:38:29 monnier
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1392 ;; (diff-mode-load-hook): dropped.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1393 ;; (auto-mode-alist): also catch *.diffs.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1394 ;; (diff-find-file-name, diff-mode): add smarts to find the right file
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1395 ;; for *.rej files (that lack any file name indication).
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1396 ;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1397 ;; Revision 1.10 1999/09/30 15:32:11 monnier
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1398 ;; added support for "\ No newline at end of file".
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1399 ;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1400 ;; Revision 1.9 1999/09/15 00:01:13 monnier
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1401 ;; - added basic `compile' support.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1402 ;; - have diff-kill-hunk call diff-kill-file if it's the only hunk.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1403 ;; - diff-kill-file now tries to kill the leading garbage as well.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1404 ;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1405 ;; Revision 1.8 1999/09/13 21:10:09 monnier
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1406 ;; - don't use CL in the autoloaded code
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1407 ;; - accept diffs using -T
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1408 ;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1409 ;; Revision 1.7 1999/09/05 20:53:03 monnier
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1410 ;; interface to ediff-patch
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1411 ;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1412 ;; Revision 1.6 1999/09/01 20:55:13 monnier
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1413 ;; (ediff=patch-file): add bindings to call ediff-patch.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1414 ;; (diff-find-file-name): taken out of diff-goto-source.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1415 ;; (diff-unified->context, diff-context->unified, diff-reverse-direction,
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1416 ;; diff-fixup-modifs): only use the region if a prefix arg is given.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1417 ;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1418 ;; Revision 1.5 1999/08/31 19:18:52 monnier
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1419 ;; (diff-beginning-of-file, diff-prev-file): fixed wrong parenthesis.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1420 ;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1421 ;; Revision 1.4 1999/08/31 13:01:44 monnier
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1422 ;; use `combine-after-change-calls' to minimize the slowdown of font-lock.
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1423 ;;
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1424
57418
3a8c458de33d (diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57279
diff changeset
1425 ;; arch-tag: 2571d7ff-bc28-4cf9-8585-42e21890be66
25959
1c62cbeca833 Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1426 ;;; diff-mode.el ends here