annotate lisp/ediff-util.el @ 12719:dde58f45b00a

(cd): When reading arg, use just directory as the default.
author Richard M. Stallman <rms@gnu.org>
date Sun, 30 Jul 1995 07:02:13 +0000
parents 3999c7e35227
children 00ee215f022e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1 ;;; ediff-util.el --- the core commands and utilities of ediff
11234
4d2a2fe1d8d7 Update copyright.
Karl Heuer <kwzh@gnu.org>
parents: 11042
diff changeset
2 ;;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
5
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
6 ;; This file is part of GNU Emacs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
7
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
8 ;; GNU Emacs is free software; you can redistribute it and/or modify
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
9 ;; it under the terms of the GNU General Public License as published by
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
10 ;; the Free Software Foundation; either version 2, or (at your option)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
11 ;; any later version.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
12
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
13 ;; GNU Emacs is distributed in the hope that it will be useful,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
16 ;; GNU General Public License for more details.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
17
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
18 ;; You should have received a copy of the GNU General Public License
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
19 ;; along with GNU Emacs; see the file COPYING. If not, write to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
20 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
21
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
22
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
23 ;;; Code:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
24
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
25 (require 'ediff-init)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
26
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
27
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
28 ;;; Functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
29
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
30 (defun ediff-mode ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
31 "Ediff mode is used by the Ediff file-difference package.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
32 It is entered only through one of the following commands:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
33 `ediff'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
34 `ediff-files'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
35 `ediff-buffers'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
36 `ediff3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
37 `ediff-files3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
38 `ediff-buffers3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
39 `ediff-merge'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
40 `ediff-merge-files'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
41 `ediff-merge-files-with-ancestor'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
42 `ediff-merge-buffers'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
43 `ediff-merge-buffers-with-ancestor'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
44 `ediff-merge-revisions'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
45 `ediff-merge-revisions-with-ancestor'
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
46 `ediff-windows-wordwise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
47 `ediff-windows-linewise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
48 `ediff-regions-wordwise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
49 `ediff-regions-linewise'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
50 `epatch'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
51 `ediff-patch-file'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
52 `ediff-patch-buffer'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
53 `epatch-buffer'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
54 `ediff-revision'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
55
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
56 Commands:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
57 \\{ediff-mode-map}"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
58 (kill-all-local-variables)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
59 (setq major-mode 'ediff-mode)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
60 (setq mode-name "Ediff")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
61 (run-hooks 'ediff-mode-hooks))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
62
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
63 (defun ediff-version ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
64 "Return string describing the version of Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
65 When called interactively, displays the version."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
66 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
67 (if (interactive-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
68 (message (ediff-version))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
69 (format "Ediff %s of %s" ediff-version ediff-date)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
70
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
71
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
72 (require 'ediff-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
73 (require 'ediff-merg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
74
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
75
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
76 ;;; Build keymaps
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
77
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
78 (ediff-defvar-local ediff-mode-map nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
79 "Local keymap used in Ediff mode.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
80 This is local to each Ediff Control Panel, so they may vary from invocation
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
81 to invocation.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
82
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
83 ;; Set up the keymap in the control buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
84 (defun ediff-set-keys ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
85 "Set up Ediff keymap, if necessary."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
86 (if (null ediff-mode-map)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
87 (ediff-setup-keymap))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
88 (use-local-map ediff-mode-map))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
89
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
90 ;; Reload Ediff keymap. For debugging only.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
91 (defun ediff-reload-keymap ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
92 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
93 (setq ediff-mode-map nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
94 (ediff-set-keys))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
95
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
96
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
97 (defun ediff-setup-keymap ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
98 "Set up the keymap used in the control buffer of Ediff."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
99 (setq ediff-mode-map (make-sparse-keymap))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
100 (suppress-keymap ediff-mode-map)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
101
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
102 (define-key ediff-mode-map "p" 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
103 (define-key ediff-mode-map "\C-?" 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
104 (define-key ediff-mode-map [backspace] 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
105 (define-key ediff-mode-map [delete] 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
106 (define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
107 'ediff-previous-difference nil))
12422
3999c7e35227 (ediff-setup-keymap): Bind f1 and help like C-h.
Richard M. Stallman <rms@gnu.org>
parents: 12085
diff changeset
108 (define-key ediff-mode-map [f1] (if ediff-no-emacs-help-in-control-buffer
3999c7e35227 (ediff-setup-keymap): Bind f1 and help like C-h.
Richard M. Stallman <rms@gnu.org>
parents: 12085
diff changeset
109 'ediff-previous-difference nil))
3999c7e35227 (ediff-setup-keymap): Bind f1 and help like C-h.
Richard M. Stallman <rms@gnu.org>
parents: 12085
diff changeset
110 (define-key ediff-mode-map [help] (if ediff-no-emacs-help-in-control-buffer
3999c7e35227 (ediff-setup-keymap): Bind f1 and help like C-h.
Richard M. Stallman <rms@gnu.org>
parents: 12085
diff changeset
111 'ediff-previous-difference nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
112 (define-key ediff-mode-map "n" 'ediff-next-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
113 (define-key ediff-mode-map " " 'ediff-next-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
114 (define-key ediff-mode-map "j" 'ediff-jump-to-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
115 (define-key ediff-mode-map "g" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
116 (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
117 (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
118 (define-key ediff-mode-map "q" 'ediff-quit)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
119 (define-key ediff-mode-map "z" 'ediff-suspend)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
120 (define-key ediff-mode-map "\C-l" 'ediff-recenter)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
121 (define-key ediff-mode-map "|" 'ediff-toggle-split)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
122 (define-key ediff-mode-map "h" 'ediff-toggle-hilit)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
123 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
124 (define-key ediff-mode-map "@" 'ediff-toggle-autorefine))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
125 (if ediff-narrow-job
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
126 (define-key ediff-mode-map "%" 'ediff-toggle-narrow-region))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
127 (define-key ediff-mode-map "~" 'ediff-swap-buffers)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
128 (define-key ediff-mode-map "v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
129 (define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
130 (define-key ediff-mode-map "^" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
131 (define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
132 (define-key ediff-mode-map "V" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
133 (define-key ediff-mode-map "<" 'ediff-scroll-horizontally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
134 (define-key ediff-mode-map ">" 'ediff-scroll-horizontally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
135 (define-key ediff-mode-map "i" 'ediff-status-info)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
136 (define-key ediff-mode-map "D" 'ediff-documentation)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
137 (define-key ediff-mode-map "?" 'ediff-toggle-help)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
138 (define-key ediff-mode-map "!" 'ediff-update-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
139 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
140 (define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
141 (define-key ediff-mode-map "a" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
142 (define-key ediff-mode-map "b" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
143 (define-key ediff-mode-map "r" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
144 (cond (ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
145 ;; In merging, we allow only A->C and B->C copying.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
146 (define-key ediff-mode-map "a" (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
147 (lambda (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
148 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
149 (ediff-diff-to-diff arg "ac"))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
150 (define-key ediff-mode-map "b" (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
151 (lambda (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
152 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
153 (ediff-diff-to-diff arg "bc"))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
154 (define-key ediff-mode-map "r" (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
155 (lambda (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
156 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
157 (ediff-restore-diff arg ?c))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
158 (define-key ediff-mode-map "s" 'ediff-shrink-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
159 (define-key ediff-mode-map "+" 'ediff-combine-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
160 (define-key ediff-mode-map "$" 'ediff-toggle-show-clashes-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
161 (define-key ediff-mode-map "&" 'ediff-re-merge))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
162 (ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
163 (define-key ediff-mode-map "ab" 'ediff-diff-to-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
164 (define-key ediff-mode-map "ba" 'ediff-diff-to-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
165 (define-key ediff-mode-map "ac" 'ediff-diff-to-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
166 (define-key ediff-mode-map "bc" 'ediff-diff-to-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
167 (define-key ediff-mode-map "c" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
168 (define-key ediff-mode-map "ca" 'ediff-diff-to-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
169 (define-key ediff-mode-map "cb" 'ediff-diff-to-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
170 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
171 (define-key ediff-mode-map "rb" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
172 (define-key ediff-mode-map "rc" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
173 (define-key ediff-mode-map "C" 'ediff-toggle-read-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
174 (t ; 2-way comparison
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
175 (define-key ediff-mode-map "a" (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
176 (lambda (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
177 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
178 (ediff-diff-to-diff arg "ab"))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
179 (define-key ediff-mode-map "b" (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
180 (lambda (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
181 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
182 (ediff-diff-to-diff arg "ba"))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
183 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
184 (define-key ediff-mode-map "rb" 'ediff-restore-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
185 ) ; cond
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
186 (define-key ediff-mode-map "G" 'ediff-submit-report)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
187 (define-key ediff-mode-map "#" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
188 (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
189 (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
190 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
191 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
192 (define-key ediff-mode-map "o" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
193 (define-key ediff-mode-map "A" 'ediff-toggle-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
194 (define-key ediff-mode-map "B" 'ediff-toggle-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
195 (define-key ediff-mode-map "w" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
196 (define-key ediff-mode-map "wa" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
197 (define-key ediff-mode-map "wb" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
198 (define-key ediff-mode-map "wd" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
199 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
200 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
201 (define-key ediff-mode-map "wc" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
202 (define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
203 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
204
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
205 (define-key ediff-mode-map "m" 'ediff-toggle-wide-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
206
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
207 (define-key ediff-mode-map "k" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
208 (define-key ediff-mode-map "kkk" 'ediff-reload-keymap) ; for debugging
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
209
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
210 ;; Allow ediff-mode-map to be referenced indirectly
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
211 (fset 'ediff-mode-map ediff-mode-map)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
212 (run-hooks 'ediff-keymap-setup-hooks))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
213
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
214
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
215 ;;; Setup functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
216
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
217 (require 'ediff-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
218
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
219 ;; Common startup entry for all Ediff functions
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
220 ;; It now returns control buffer so other functions can do post-processing
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
221 (defun ediff-setup (buffer-A file-A buffer-B file-B buffer-C file-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
222 startup-hooks setup-parameters)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
223 (setq file-A (expand-file-name file-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
224 (setq file-B (expand-file-name file-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
225 (if (stringp file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
226 (setq file-C (expand-file-name file-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
227 (let* ((control-buffer-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
228 (ediff-unique-buffer-name "*Ediff Control Panel" "*"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
229 (control-buffer (ediff-eval-in-buffer buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
230 (get-buffer-create control-buffer-name))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
231 (ediff-eval-in-buffer control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
232 (ediff-mode)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
233
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
234 ;; unwrap set up parameters passed as argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
235 (while setup-parameters
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
236 (set (car (car setup-parameters)) (cdr (car setup-parameters)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
237 (setq setup-parameters (cdr setup-parameters)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
238
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
239 ;; set variables classifying the current ediff job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
240 (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
241 ediff-merge-job (ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
242 ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
243 ediff-3way-job (ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
244 ediff-diff3-job (ediff-diff3-job)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
245 ediff-narrow-job (ediff-narrow-job)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
246 ediff-windows-job (ediff-windows-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
247 ediff-word-mode-job (ediff-word-mode-job))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
248
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
249 (make-local-variable 'ediff-prefer-long-help-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
250 (make-local-variable 'ediff-prefer-iconified-control-frame)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
251 (make-local-variable 'ediff-split-window-function)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
252 (make-local-variable 'ediff-default-variant)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
253 (make-local-variable 'ediff-merge-window-share)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
254 (make-local-variable 'ediff-window-setup-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
255
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
256 ;; adjust for merge jobs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
257 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
258 (let ((buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
259 ;; Use buf A even if `combined'. The right stuff is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
260 ;; inserted by ediff-do-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
261 (if (eq ediff-default-variant 'default-B) buffer-B buffer-A)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
262
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
263 (setq ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
264 ediff-merge-split-window-function)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
265
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
266 ;; remember the ancestor buffer, if any
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
267 (setq ediff-ancestor-buffer buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
268
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
269 (setq buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
270 (get-buffer-create
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
271 (ediff-unique-buffer-name "*ediff-merge" "*")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
272 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
273 (set-buffer buffer-C)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
274 (insert-buffer buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
275 (funcall (ediff-eval-in-buffer buf major-mode))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
276 ;; after Stig@hackvan.com
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
277 (add-hook 'local-write-file-hooks 'ediff-set-merge-mode)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
278 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
279 (setq buffer-read-only nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
280 ediff-buffer-A buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
281 ediff-buffer-B buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
282 ediff-buffer-C buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
283 ediff-control-buffer control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
284
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
285 (setq ediff-control-buffer-suffix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
286 (if (string-match "<[0-9]*>" control-buffer-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
287 (substring control-buffer-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
288 (match-beginning 0) (match-end 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
289 "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
290 ediff-control-buffer-number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
291 (max
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
292 0
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
293 (1-
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
294 (string-to-number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
295 (substring
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
296 ediff-control-buffer-suffix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
297 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
298 (string-match "[0-9]+" ediff-control-buffer-suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
299 0))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
300
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
301 (setq ediff-error-buffer (get-buffer-create (ediff-unique-buffer-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
302 "*ediff-errors" "*")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
303
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
304 (ediff-eval-in-buffer buffer-A (ediff-strip-mode-line-format))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
305 (ediff-eval-in-buffer buffer-B (ediff-strip-mode-line-format))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
306 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
307 (ediff-eval-in-buffer buffer-C (ediff-strip-mode-line-format)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
308
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
309 (ediff-save-protected-variables) ; save variables to be restored on exit
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
310
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
311 ;; ediff-setup-diff-regions-function must be set after setup
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
312 ;; parameters are processed.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
313 (setq ediff-setup-diff-regions-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
314 (if ediff-diff3-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
315 'ediff-setup-diff-regions3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
316 'ediff-setup-diff-regions))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
317
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
318 (setq ediff-wide-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
319 (list (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
320 '(point-min) '(point-max) ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
321 (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
322 '(point-min) '(point-max) ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
323 (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
324 '(point-min) '(point-max) ediff-buffer-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
325
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
326 ;; This has effect only on ediff-windows/regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
327 ;; In all other cases, ediff-visible-region sets visibility bounds to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
328 ;; ediff-wide-bounds, and ediff-narrow-bounds are ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
329 (if ediff-start-narrowed
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
330 (setq ediff-visible-bounds ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
331 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
332
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
333 (ediff-set-keys) ; comes after parameter setup
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
334
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
335 ;; set up ediff-narrow-bounds, if not set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
336 (or ediff-narrow-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
337 (setq ediff-narrow-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
338
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
339 ;; All these must be inside ediff-eval-in-buffer control-buffer,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
340 ;; since these vars are local to control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
341 ;; These won't run if there are errors in diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
342 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
343 (ediff-nuke-selective-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
344 (run-hooks 'ediff-prepare-buffer-hooks)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
345 (if (ediff-eval-in-buffer control-buffer ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
346 (setq buffer-read-only t))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
347 ;; add control-buffer to the list of sessions--no longer used, but may
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
348 ;; be used again in the future
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
349 (or (memq control-buffer ediff-this-buffer-control-sessions)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
350 (setq ediff-this-buffer-control-sessions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
351 (cons control-buffer ediff-this-buffer-control-sessions)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
352 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
353 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
354 (ediff-nuke-selective-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
355 (run-hooks 'ediff-prepare-buffer-hooks)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
356 (if (ediff-eval-in-buffer control-buffer ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
357 (setq buffer-read-only t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
358 ;; add control-buffer to the list of sessions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
359 (or (memq control-buffer ediff-this-buffer-control-sessions)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
360 (setq ediff-this-buffer-control-sessions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
361 (cons control-buffer ediff-this-buffer-control-sessions)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
362 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
363 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
364 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
365 (ediff-nuke-selective-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
366 (run-hooks 'ediff-prepare-buffer-hooks)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
367 ;; add control-buffer to the list of sessions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
368 (or (memq control-buffer ediff-this-buffer-control-sessions)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
369 (setq ediff-this-buffer-control-sessions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
370 (cons control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
371 ediff-this-buffer-control-sessions)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
372 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
373
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
374 ;; must come after setting up ediff-narrow-bounds AND after
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
375 ;; nuking selective display
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
376 (funcall ediff-setup-diff-regions-function file-A file-B file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
377 (setq ediff-number-of-differences (length ediff-difference-vector-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
378 (setq ediff-current-difference -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
379
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
380 (ediff-make-current-diff-overlay 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
381 (ediff-make-current-diff-overlay 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
382 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
383 (ediff-make-current-diff-overlay 'C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
384
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
385 (if (ediff-window-display-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
386 (ediff-init-var-faces))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
387
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
388 (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
389
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
390 (let ((shift-A (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
391 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
392 'A ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
393 (shift-B (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
394 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
395 'B ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
396 (shift-C (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
397 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
398 'C ediff-narrow-bounds))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
399 ;; position point in buf A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
400 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
401 (select-window ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
402 (goto-char shift-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
403 ;; position point in buf B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
404 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
405 (select-window ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
406 (goto-char shift-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
407 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
408 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
409 (select-window ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
410 (goto-char shift-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
411 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
412
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
413 (select-window ediff-control-window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
414 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
415
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
416 ;; The following is a hack to placate OS/2
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
417 ;; The problem is that OS/2 doesn't let us delete files used by other
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
418 ;; processes. Thus, in ediff-buffers and other functions, we can't
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
419 ;; delete temp files because they might be used by the asynchronous
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
420 ;; process that computes custom diffs. So, under OS/1 we have to wait
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
421 ;; for some time until custom diffs are done.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
422 (if (eq system-type 'emx)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
423 (ediff-eval-in-buffer ediff-custom-diff-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
424 (let ((proc (get-buffer-process (current-buffer))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
425 (while (and (processp proc)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
426 (eq (process-status proc) 'run))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
427 (message "Waiting for the diff program to quit")
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
428 (sleep-for 1))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
429 (message "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
430 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
431
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
432 (run-hooks 'startup-hooks 'ediff-startup-hooks)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
433 (ediff-refresh-mode-lines)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
434 (setq buffer-read-only t))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
435 control-buffer))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
436
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
437
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
438 ;; This function assumes that we are in the window where control buffer is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
439 ;; to reside.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
440 (defun ediff-setup-control-buffer (ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
441 "Set up window for control buffer."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
442 (if (window-dedicated-p (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
443 (set-buffer ctl-buf) ; we are in control frame but just in case
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
444 (switch-to-buffer ctl-buf))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
445 (let ((window-min-height 2))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
446 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
447 (ediff-set-help-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
448 (insert ediff-help-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
449 (shrink-window-if-larger-than-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
450 (or (ediff-multiframe-setup-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
451 (ediff-indent-help-message))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
452 (set-buffer-modified-p nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
453 (ediff-refresh-mode-lines)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
454 (setq ediff-control-window (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
455 (setq ediff-window-config-saved
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
456 (format "%S%S%S%S%S%S%S"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
457 ediff-control-window
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
458 ediff-window-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
459 ediff-window-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
460 ediff-window-C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
461 ediff-split-window-function
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
462 (ediff-multiframe-setup-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
463 ediff-wide-display-p))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
464 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
465 (skip-chars-forward ediff-whitespace)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
466
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
467 ;; assuming we are in control window, calculate length of the first line in
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
468 ;; help message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
469 (defun ediff-help-message-line-length ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
470 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
471 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
472 (if ediff-prefer-long-help-message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
473 (next-line 1))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
474 (end-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
475 (current-column)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
476
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
477
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
478 (defun ediff-indent-help-message ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
479 (let* ((shift (/ (max 0 (- (window-width (selected-window))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
480 (ediff-help-message-line-length)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
481 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
482 (str (make-string shift ?\ )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
483 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
484 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
485 (while (< (point) (point-max))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
486 (insert str)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
487 (beginning-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
488 (forward-line 1)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
489
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
490
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
491 (defun ediff-set-help-message ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
492 (setq ediff-long-help-message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
493 (cond ((and ediff-long-help-message-custom
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
494 (or (symbolp ediff-long-help-message-custom)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
495 (consp ediff-long-help-message-custom)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
496 (funcall ediff-long-help-message-custom))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
497 (ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
498 (concat ediff-long-help-message-head
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
499 ediff-long-help-message-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
500 ediff-long-help-message-tail))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
501 (ediff-narrow-job
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
502 (concat ediff-long-help-message-head
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
503 ediff-long-help-message-narrow2
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
504 ediff-long-help-message-tail))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
505 (ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
506 (concat ediff-long-help-message-head
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
507 ediff-long-help-message-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
508 ediff-long-help-message-tail))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
509 (ediff-diff3-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
510 (concat ediff-long-help-message-head
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
511 ediff-long-help-message-compare3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
512 ediff-long-help-message-tail))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
513 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
514 (concat ediff-long-help-message-head
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
515 ediff-long-help-message-compare2
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
516 ediff-long-help-message-tail))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
517 (setq ediff-brief-help-message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
518 (cond ((and ediff-brief-help-message-custom
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
519 (or (symbolp ediff-brief-help-message-custom)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
520 (consp ediff-brief-help-message-custom)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
521 (funcall ediff-brief-help-message-custom))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
522 ((stringp ediff-brief-help-message-custom)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
523 ediff-brief-help-message-custom)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
524 ((ediff-multiframe-setup-p) ediff-brief-message-string)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
525 (t ; long brief msg, not multiframe --- put in the middle
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
526 ediff-brief-message-string)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
527 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
528 (setq ediff-help-message (if ediff-prefer-long-help-message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
529 ediff-long-help-message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
530 ediff-brief-help-message))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
531 (run-hooks 'ediff-display-help-hooks)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
532 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
533
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
534
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
535
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
536
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
537 ;;; Commands for working with Ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
538
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
539 (defun ediff-update-diffs ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
540 "Recompute difference regions in buffers A, B, and C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
541 Buffers are not synchronized with their respective files, so changes done
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
542 to these buffers are not saved at this point---the user can do this later,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
543 if necessary."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
544 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
545 (let ((point-A (ediff-eval-in-buffer ediff-buffer-A (point)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
546 ;;(point-B (ediff-eval-in-buffer ediff-buffer-B (point)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
547 (tmp-buffer (get-buffer-create ediff-tmp-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
548 (buf-A-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
549 (file-name-nondirectory (or (buffer-file-name ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
550 (buffer-name ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
551 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
552 (buf-B-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
553 (file-name-nondirectory (or (buffer-file-name ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
554 (buffer-name ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
555 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
556 (buf-C-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
557 (file-name-nondirectory (or (buffer-file-name ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
558 ;; if (null ediff-buffer-C), there is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
559 ;; no danger, since we later check if
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
560 ;; ediff-buffer-C is alive
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
561 (buffer-name ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
562 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
563 (overl-A (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
564 'A ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
565 (overl-B (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
566 'B ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
567 (overl-C (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
568 'C ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
569 beg-A end-A beg-B end-B beg-C end-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
570 file-A file-B file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
571 (ediff-unselect-and-select-difference -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
572
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
573 (setq beg-A (ediff-overlay-start overl-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
574 beg-B (ediff-overlay-start overl-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
575 beg-C (ediff-overlay-start overl-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
576 end-A (ediff-overlay-end overl-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
577 end-B (ediff-overlay-end overl-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
578 end-C (ediff-overlay-end overl-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
579
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
580 (if ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
581 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
582 (ediff-wordify beg-A end-A ediff-buffer-A tmp-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
583 (ediff-eval-in-buffer tmp-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
584 (setq file-A (ediff-make-temp-file "regA")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
585 (ediff-wordify beg-B end-B ediff-buffer-B tmp-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
586 (ediff-eval-in-buffer tmp-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
587 (setq file-B (ediff-make-temp-file "regB")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
588 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
589 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
590 (ediff-wordify beg-C end-C ediff-buffer-C tmp-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
591 (ediff-eval-in-buffer tmp-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
592 (setq file-C (ediff-make-temp-file "regC")))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
593 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
594 ;; not word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
595 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
596 (setq file-A (ediff-make-temp-file buf-A-file-name)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
597 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
598 (setq file-B (ediff-make-temp-file buf-B-file-name)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
599 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
600 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
601 (setq file-C (ediff-make-temp-file buf-C-file-name))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
602 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
603
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
604 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
605 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
606 (ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
607 (setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
608
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
609 ;; In case of merge job, full it into thinking that it is just doing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
610 ;; comparison
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
611 (let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
612 (ediff-job-name ediff-job-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
613 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
614 (setq ediff-setup-diff-regions-function 'ediff-setup-diff-regions3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
615 ediff-job-name 'ediff-files3))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
616 (funcall ediff-setup-diff-regions-function file-A file-B file-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
617
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
618 (setq ediff-number-of-differences (length ediff-difference-vector-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
619 (delete-file file-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
620 (delete-file file-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
621 (if file-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
622 (delete-file file-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
623
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
624 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
625 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
626
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
627 (ediff-jump-to-difference (ediff-diff-at-point 'A point-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
628 (message "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
629 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
630
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
631 ;; Not bound to any key---to dangerous. A user can do it if necessary.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
632 (defun ediff-revert-buffers-then-recompute-diffs (noconfirm)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
633 "Revert buffers A, B and C. Then rerun Ediff on file A and file B."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
634 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
635 (let ((bufA ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
636 (bufB ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
637 (bufC ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
638 (ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
639 (ancestor-buf ediff-ancestor-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
640 (ancestor-job ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
641 (merge ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
642 (comparison ediff-3way-comparison-job))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
643 (ediff-eval-in-buffer bufA
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
644 (revert-buffer t noconfirm))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
645 (ediff-eval-in-buffer bufB
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
646 (revert-buffer t noconfirm))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
647 ;; this should only be executed in a 3way comparison, not in merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
648 (if comparison
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
649 (ediff-eval-in-buffer bufC
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
650 (revert-buffer t noconfirm)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
651 (if merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
652 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
653 (set-buffer ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
654 (ediff-really-quit)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
655 (kill-buffer bufC)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
656 (if ancestor-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
657 (ediff-merge-buffers-with-ancestor bufA bufB ancestor-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
658 (ediff-merge-buffers bufA bufB)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
659 (ediff-update-diffs))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
660
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
661
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
662 ;; optional NO-REHIGHLIGHT says to not rehighlight buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
663 (defun ediff-recenter (&optional no-rehighlight)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
664 "Bring the highlighted region of all buffers being compared into view.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
665 Reestablish the default three-window display."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
666 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
667
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
668 ;; force all minibuffer to display ediff's messages.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
669 ;; when xemacs implements minibufferless frames, this won't be necessary
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
670 (if ediff-xemacs-p (setq synchronize-minibuffers t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
671
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
672 (setq ediff-disturbed-overlays nil) ; clear after use
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
673 (let (buffer-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
674 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
675 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
676 (or (not ediff-3way-job)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
677 (ediff-buffer-live-p ediff-buffer-C)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
678 (ediff-setup-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
679 ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
680 (or (eq this-command 'ediff-quit)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
681 (message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
682 "You've killed an essential Ediff buffer---Please quit Ediff"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
683 (beep 1)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
684 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
685
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
686 ;; set visibility range appropriate to this invocation of Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
687 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
688
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
689 ;; raise
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
690 (if (and (ediff-window-display-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
691 (symbolp this-command)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
692 (symbolp last-command)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
693 ;; Either one of the display-changing commands
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
694 (or (memq this-command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
695 '(ediff-recenter
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
696 ediff-toggle-wide-display ediff-toggle-multiframe))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
697 ;; Or one of the movement cmds and prev cmd was an Ediff cmd
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
698 ;; This avoids rasing frames unnecessarily.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
699 (and (memq this-command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
700 '(ediff-next-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
701 ediff-previous-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
702 ediff-jump-to-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
703 ediff-jump-to-difference-at-point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
704 (not (string-match "^ediff-" (symbol-name last-command)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
705 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
706 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
707 (if (window-live-p ediff-window-A)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
708 (raise-frame (window-frame ediff-window-A)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
709 (if (window-live-p ediff-window-B)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
710 (raise-frame (window-frame ediff-window-B)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
711 (if (window-live-p ediff-window-C)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
712 (raise-frame (window-frame ediff-window-C)))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
713 (if (and (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
714 (frame-live-p ediff-control-frame)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
715 (not (ediff-frame-iconified-p ediff-control-frame)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
716 (raise-frame ediff-control-frame))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
717
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
718 ;; Redisplay whatever buffers are showing, if there is a selected difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
719 (let* ((control-frame ediff-control-frame)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
720 (control-buf ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
721 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
722 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
723 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
724 (ediff-buffer-live-p ediff-buffer-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
725 (ediff-valid-difference-p))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
726 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
727 (or no-rehighlight
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
728 (ediff-select-difference ediff-current-difference))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
729
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
730 (ediff-recenter-one-window 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
731 (ediff-recenter-one-window 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
732 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
733 (ediff-recenter-one-window 'C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
734
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
735 (if (and (ediff-multiframe-setup-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
736 (not (ediff-frame-iconified-p ediff-control-frame)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
737 (progn
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
738 (ediff-reset-mouse control-frame)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
739 (or ediff-xemacs-p
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
740 (cond ((eq (ediff-device-type) 'ns)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
741 (unfocus-frame (selected-frame)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
742 (t (unfocus-frame))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
743 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
744 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
745 (ediff-eval-in-buffer control-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
746 (ediff-refresh-mode-lines))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
747 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
748
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
749 ;; this function returns to the window it was called from
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
750 ;; (which was the control window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
751 (defun ediff-recenter-one-window (buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
752 (let* (;; context must be saved before switching to windows A/B/C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
753 (ctl-wind (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
754 (shift (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
755 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
756 buf-type ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
757 (job-name ediff-job-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
758 (control-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
759 (window-name (intern (format "ediff-window-%S" buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
760 (window (if (window-live-p (symbol-value window-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
761 (symbol-value window-name))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
762
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
763 (if (and window ediff-windows-job)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
764 (set-window-start window shift))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
765 (if window
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
766 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
767 (select-window window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
768 (ediff-deactivate-mark)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
769 (ediff-position-region
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
770 (ediff-get-diff-posn buf-type 'beg nil control-buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
771 (ediff-get-diff-posn buf-type 'end nil control-buf)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
772 (ediff-get-diff-posn buf-type 'beg nil control-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
773 job-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
774 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
775 (select-window ctl-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
776 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
777
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
778
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
779 ;; This will have to be refined for 3way jobs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
780 (defun ediff-toggle-split ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
781 "Toggle vertical/horizontal window split.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
782 Does nothing if file-A and file-B are in different frames."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
783 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
784 (let* ((wind-A (if (window-live-p ediff-window-A) ediff-window-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
785 (wind-B (if (window-live-p ediff-window-B) ediff-window-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
786 (wind-C (if (window-live-p ediff-window-C) ediff-window-C))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
787 (frame-A (if wind-A (window-frame wind-A)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
788 (frame-B (if wind-B (window-frame wind-B)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
789 (frame-C (if wind-C (window-frame wind-C))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
790 (if (or (eq frame-A frame-B)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
791 (not (frame-live-p frame-A))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
792 (not (frame-live-p frame-B))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
793 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
794 (or (not (frame-live-p frame-C))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
795 (eq frame-A frame-C) (eq frame-B frame-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
796 (setq ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
797 (if (eq ediff-split-window-function 'split-window-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
798 'split-window-horizontally
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
799 'split-window-vertically))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
800 (message "Buffers being compared are in different frames"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
801 (ediff-recenter 'no-rehighlight)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
802
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
803 (defun ediff-toggle-hilit ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
804 "Switch between highlighting using ASCII flags and highlighting using faces.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
805 On a dumb terminal, switches between ASCII highlighting and no highlighting."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
806 (interactive)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
807 (if (not (ediff-window-display-p))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
808 (if (eq ediff-highlighting-style 'ascii)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
809 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
810 (message "ASCII highlighting flags removed")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
811 (ediff-unselect-and-select-difference ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
812 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
813 (setq ediff-highlighting-style 'off))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
814 (ediff-unselect-and-select-difference ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
815 'select-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
816 (ediff-unselect-and-select-difference ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
817 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
818 ;; cycle through highlighting
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
819 (cond ((and ediff-use-faces ediff-highlight-all-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
820 (message "Unhighlighting unselected difference regions")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
821 (setq ediff-highlight-all-diffs nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
822 (ediff-use-faces
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
823 (message "Highlighting with ASCII flags")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
824 (setq ediff-use-faces nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
825 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
826 (message "Re-highlighting all difference regions")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
827 (setq ediff-use-faces t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
828 ediff-highlight-all-diffs t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
829
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
830 (if (and ediff-use-faces ediff-highlight-all-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
831 (if (not (face-differs-from-default-p 'ediff-odd-diff-face-A-var))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
832 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
833 (copy-face ediff-odd-diff-face-A 'ediff-odd-diff-face-A-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
834 (copy-face ediff-odd-diff-face-B 'ediff-odd-diff-face-B-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
835 (copy-face ediff-odd-diff-face-C 'ediff-odd-diff-face-C-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
836 (copy-face ediff-even-diff-face-A 'ediff-even-diff-face-A-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
837 (copy-face ediff-even-diff-face-B 'ediff-even-diff-face-B-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
838 (copy-face ediff-even-diff-face-C 'ediff-even-diff-face-C-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
839 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
840 (copy-face 'default 'ediff-odd-diff-face-A-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
841 (copy-face 'default 'ediff-odd-diff-face-B-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
842 (copy-face 'default 'ediff-odd-diff-face-C-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
843 (copy-face 'default 'ediff-even-diff-face-A-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
844 (copy-face 'default 'ediff-even-diff-face-B-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
845 (copy-face 'default 'ediff-even-diff-face-C-var))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
846
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
847 (ediff-unselect-and-select-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
848 ediff-current-difference 'select-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
849 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
850
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
851 (defun ediff-toggle-autorefine ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
852 "Toggle auto-refine mode."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
853 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
854 (if ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
855 (error "No fine differences in this mode"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
856 (cond ((eq ediff-auto-refine 'nix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
857 (setq ediff-auto-refine 'on)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
858 (ediff-make-fine-diffs ediff-current-difference 'noforce)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
859 (message "Auto-refining is ON"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
860 ((eq ediff-auto-refine 'on)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
861 (message "Auto-refining is OFF")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
862 (setq ediff-auto-refine 'off))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
863 (t ;; nix 'em
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
864 (ediff-set-fine-diff-properties ediff-current-difference 'default)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
865 (message "Refinements are HIDDEN")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
866 (setq ediff-auto-refine 'nix))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
867 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
868
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
869 (defun ediff-make-or-kill-fine-diffs (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
870 "Compute fine diffs. With negative prefix arg, kill fine diffs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
871 In both cases, operates on the currrent difference region."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
872 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
873 (cond ((eq arg '-)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
874 (ediff-clear-fine-differences ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
875 ((and (numberp arg) (< arg 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
876 (ediff-clear-fine-differences ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
877 (t (ediff-make-fine-diffs))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
878
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
879
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
880 (defun ediff-toggle-help ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
881 "Toggle short/long help message."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
882 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
883 (let (buffer-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
884 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
885 (setq ediff-prefer-long-help-message (not ediff-prefer-long-help-message))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
886 (ediff-set-help-message))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
887 ;; remember the icon status of the control frame when the user requested
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
888 ;; full control message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
889 (if (and ediff-prefer-long-help-message (ediff-multiframe-setup-p))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
890 (setq ediff-prefer-iconified-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
891 (ediff-frame-iconified-p ediff-control-frame)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
892
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
893 (setq ediff-window-config-saved "") ; force redisplay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
894 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
895
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
896
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
897 ;; If BUF, this is the buffer to toggle, not current buffer.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
898 (defun ediff-toggle-read-only (&optional buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
899 "Toggle read-only in current buffer.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
900 If buffer is under version control and locked, check it out first.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
901 If optional argument BUF is specified, toggle read-only in that buffer instead
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
902 of the current buffer."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
903 (interactive)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
904 (let ((ctl-buf (if (null buf) (current-buffer))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
905 (or buf (ediff-recenter))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
906 (or buf
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
907 (setq buf
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
908 (ediff-get-buffer (ediff-char-to-buftype last-command-char))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
909
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
910 (ediff-eval-in-buffer buf ; eval in buf A/B/C
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
911 (let* ((file (buffer-file-name buf))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
912 (file-writable (and file
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
913 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
914 (file-writable-p file)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
915 (toggle-ro-cmd (cond (ediff-toggle-read-only-function)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
916 ((ediff-file-checked-out-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
917 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
918 (file-writable 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
919 (t (key-binding "\C-x\C-q")))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
920 ;; If the file is checked in, make sure we don't make buffer modifiable
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
921 ;; without warning the user. The user can fool our checks by making the
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
922 ;; buffer non-RO without checking the file out. We regard this as a
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
923 ;; user problem.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
924 (if (and (ediff-file-checked-in-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
925 ;; If ctl-buf is null, this means we called this
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
926 ;; non-interactively, in which case don't ask questions
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
927 ctl-buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
928 (cond ((not buffer-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
929 (setq toggle-ro-cmd 'toggle-read-only))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
930 ((and (or (beep 1) t) ; always beep
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
931 (y-or-n-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
932 (format
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
933 "File %s is under version control. Check it out? "
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
934 (abbreviate-file-name file))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
935 ;; if we checked the file out, we should also change the
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
936 ;; original state of buffer-read-only to nil. If we don't
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
937 ;; do this, the mode line will show %%, since the file was
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
938 ;; RO before ediff started, so the user will think the file
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
939 ;; is checked in.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
940 (ediff-eval-in-buffer ctl-buf
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
941 (ediff-change-saved-variable
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
942 'buffer-read-only nil
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
943 (ediff-char-to-buftype last-command-char))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
944 (t
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
945 (setq toggle-ro-cmd 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
946 (beep 1) (beep 1)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
947 (message
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
948 "Boy, this is risky! Better don't change this file...")
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
949 (sit-for 3))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
950 (if (and toggle-ro-cmd
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
951 (string-match "toggle-read-only" (symbol-name toggle-ro-cmd)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
952 (save-excursion
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
953 (save-window-excursion
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
954 (command-execute toggle-ro-cmd)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
955 (error "Don't know how to toggle read-only in buffer %S" buf))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
956
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
957 ;; Check if we made the current buffer updatable, but its file is RO.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
958 ;; Signal a warning in this case.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
959 (if (and file (not buffer-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
960 (eq this-command 'ediff-toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
961 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
962 (not (file-writable-p file)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
963 (message "Warning: file %s is read-only"
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
964 (abbreviate-file-name file) (beep 1)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
965 ))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
966
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
967
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
968 ;; This is a simple-minded check for whether a file is under version control
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
969 ;; and is checked out.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
970 ;; If file,v exists but file doesn't, this file is considered to be not checked
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
971 ;; in and not checked out for the purpose of patching (since patch won't be
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
972 ;; able to read such a file anyway).
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
973 ;; FILE is a string representing file name
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
974 (defsubst ediff-file-checked-out-p (file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
975 (and (stringp file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
976 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
977 (file-writable-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
978 (file-exists-p (concat file ",v"))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
979 (defsubst ediff-file-checked-in-p (file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
980 (and (stringp file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
981 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
982 (not (file-writable-p file))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
983 (file-exists-p (concat file ",v"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
984
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
985 (defun ediff-swap-buffers ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
986 "Rotate the display of buffers A, B, and C."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
987 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
988 (if (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
989 (let ((buf ediff-buffer-A)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
990 (values ediff-buffer-values-orig-A)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
991 (diff-vec ediff-difference-vector-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
992 (hide-regexp ediff-regexp-hide-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
993 (focus-regexp ediff-regexp-focus-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
994 (wide-visibility-p (eq ediff-visible-bounds ediff-wide-bounds))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
995 (overlay (if (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
996 ediff-current-diff-overlay-A)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
997 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
998 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
999 (set-window-buffer ediff-window-A ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1000 (set-window-buffer ediff-window-B ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1001 (set-window-buffer ediff-window-C ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1002 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1003 (set-window-buffer ediff-window-A ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1004 (set-window-buffer ediff-window-B ediff-buffer-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1005 ;; swap diff buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1006 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1007 (setq ediff-buffer-A ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1008 ediff-buffer-C ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1009 ediff-buffer-B buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1010 (setq ediff-buffer-A ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1011 ediff-buffer-B buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1012
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1013 ;; swap saved buffer characteristics
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1014 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1015 (setq ediff-buffer-values-orig-A ediff-buffer-values-orig-C
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1016 ediff-buffer-values-orig-C ediff-buffer-values-orig-B
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1017 ediff-buffer-values-orig-B values)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1018 (setq ediff-buffer-values-orig-A ediff-buffer-values-orig-B
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1019 ediff-buffer-values-orig-B values))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1020
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1021 ;; swap diff vectors
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1022 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1023 (setq ediff-difference-vector-A ediff-difference-vector-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1024 ediff-difference-vector-C ediff-difference-vector-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1025 ediff-difference-vector-B diff-vec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1026 (setq ediff-difference-vector-A ediff-difference-vector-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1027 ediff-difference-vector-B diff-vec))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1028
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1029 ;; swap hide/focus regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1030 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1031 (setq ediff-regexp-hide-A ediff-regexp-hide-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1032 ediff-regexp-hide-C ediff-regexp-hide-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1033 ediff-regexp-hide-B hide-regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1034 ediff-regexp-focus-A ediff-regexp-focus-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1035 ediff-regexp-focus-C ediff-regexp-focus-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1036 ediff-regexp-focus-B focus-regexp)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1037 (setq ediff-regexp-hide-A ediff-regexp-hide-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1038 ediff-regexp-hide-B hide-regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1039 ediff-regexp-focus-A ediff-regexp-focus-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1040 ediff-regexp-focus-B focus-regexp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1041
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1042 ;; The following is needed for XEmacs, since there one can't move
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1043 ;; overlay to another buffer. In Emacs, this swap is redundant.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1044 (if (ediff-window-display-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1045 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1046 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1047 ediff-current-diff-overlay-C ediff-current-diff-overlay-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1048 ediff-current-diff-overlay-B overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1049 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1050 ediff-current-diff-overlay-B overlay)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1051
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1052 ;; swap wide bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1053 (setq ediff-wide-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1054 (cond (ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1055 (list (nth 2 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1056 (nth 0 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1057 (nth 1 ediff-wide-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1058 (ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1059 (list (nth 1 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1060 (nth 0 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1061 (nth 2 ediff-wide-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1062 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1063 (list (nth 1 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1064 (nth 0 ediff-wide-bounds)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1065 ;; swap narrow bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1066 (setq ediff-narrow-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1067 (cond (ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1068 (list (nth 2 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1069 (nth 0 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1070 (nth 1 ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1071 (ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1072 (list (nth 1 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1073 (nth 0 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1074 (nth 2 ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1075 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1076 (list (nth 1 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1077 (nth 0 ediff-narrow-bounds)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1078 (if wide-visibility-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1079 (setq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1080 (setq ediff-visible-bounds ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1081 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1082 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1083 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1084 (ediff-recenter 'no-rehighlight)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1085 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1086
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1087
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1088 (defun ediff-toggle-wide-display ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1089 "Toggle wide/regular display.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1090 This is especially useful when comparing buffers side-by-side."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1091 (interactive)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1092 (or (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1093 (error "%sEmacs is not running as a window application"
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1094 (if ediff-emacs-p "" "X")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1095 (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1096 (let ((ctl-buf ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1097 (setq ediff-wide-display-p (not ediff-wide-display-p))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1098 (if (not ediff-wide-display-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1099 (ediff-eval-in-buffer ctl-buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1100 (modify-frame-parameters
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1101 ediff-wide-display-frame ediff-wide-display-orig-parameters)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1102 (sit-for (if ediff-xemacs-p 0.4 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1103 ;; restore control buf, since ctl window may have been deleted
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1104 ;; during resizing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1105 (set-buffer ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1106 (setq ediff-wide-display-orig-parameters nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1107 ediff-window-B nil) ; force update of window config
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1108 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1109 (funcall ediff-make-wide-display-function)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1110 (sit-for (if ediff-xemacs-p 0.4 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1111 (ediff-eval-in-buffer ctl-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1112 (setq ediff-window-B nil) ; force update of window config
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1113 (ediff-recenter 'no-rehighlight)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1114
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1115 (defun ediff-toggle-multiframe ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1116 "Switch from the multiframe display to single-frame display and back.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1117 This is primarily for debugging, but one can use it for fun, too."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1118 (interactive)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1119 (or (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1120 (error "%sEmacs is not running as a window application"
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1121 (if ediff-emacs-p "" "X")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1122 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1123 (setq ediff-window-setup-function 'ediff-setup-windows-plain))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1124 ((eq ediff-window-setup-function 'ediff-setup-windows-plain)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1125 (setq ediff-window-setup-function 'ediff-setup-windows-multiframe)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1126 (setq ediff-window-B nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1127 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1128
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1129 ;; Merging
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1130
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1131 (defun ediff-toggle-show-clashes-only ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1132 "Toggle the mode where only the regions where both buffers differ with the ancestor are shown."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1133 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1134 (if (not ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1135 (error "This command makes sense only when merging with an ancestor"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1136 (setq ediff-show-clashes-only (not ediff-show-clashes-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1137 (if ediff-show-clashes-only
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1138 (message "Focus on regions where both buffers differ from the ancestor")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1139 (message "Canceling focus on regions where changes clash")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1140
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1141 ;; Widening/narrowing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1142
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1143 (defun ediff-toggle-narrow-region ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1144 "Toggle narrowing in buffers A, B, and C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1145 Used in ediff-windows/regions only."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1146 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1147 (if (eq ediff-buffer-A ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1148 (error
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1149 "Buffers A and B are the same. Can't narrow to two different regions"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1150 (if (eq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1151 (setq ediff-visible-bounds ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1152 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1153 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1154
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1155 ;; Narrow bufs A/B/C to ediff-visible-bounds. If this is currently set to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1156 ;; ediff-wide-bounds, then this actually widens.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1157 ;; This function does nothing if job-name is not
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1158 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1159 ;; Does nothing if buffer-A = buffer-B since we can't narrow
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1160 ;; to two different regions in one buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1161 (defun ediff-visible-region ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1162 (if (or (eq ediff-buffer-A ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1163 (eq ediff-buffer-A ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1164 (eq ediff-buffer-C ediff-buffer-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1165 ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1166 ;; If ediff-*-regions/windows, ediff-visible-bounds is already set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1167 ;; Otherwise, always use full range.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1168 (if (not ediff-narrow-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1169 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1170 (let ((overl-A (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1171 'A ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1172 (overl-B (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1173 'B ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1174 (overl-C (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1175 'C ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1176 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1177 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1178 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1179 (ediff-overlay-start overl-A) (ediff-overlay-end overl-A)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1180 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1181 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1182 (ediff-overlay-start overl-B) (ediff-overlay-end overl-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1183
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1184 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1185 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1186 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1187 (ediff-overlay-start overl-C) (ediff-overlay-end overl-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1188 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1189
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1190
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1191 ;; Window scrolling operations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1192
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1193 ;; Performs some operation on the two file windows (if they are showing).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1194 ;; Traps all errors on the operation in windows A/B/C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1195 ;; Usually, errors come from scrolling off the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1196 ;; beginning or end of the buffer, and this gives error messages.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1197 (defun ediff-operate-on-windows (operation arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1198
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1199 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1200 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1201 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1202 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1203 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1204 (or (not ediff-3way-job) ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1205 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1206 (error "You've killed an essential Ediff buffer---Please quit Ediff"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1207
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1208 (let* ((wind (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1209 (wind-A ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1210 (wind-B ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1211 (wind-C ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1212 (three-way ediff-3way-job))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1213
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1214 (select-window wind-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1215 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1216 (funcall operation arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1217 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1218 (select-window wind-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1219 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1220 (funcall operation arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1221 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1222 (if three-way
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1223 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1224 (select-window wind-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1225 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1226 (funcall operation arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1227 (error))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1228
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1229 (select-window wind)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1230
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1231 (defun ediff-scroll-vertically (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1232 "Vertically scroll buffers A, B \(and C if appropriate\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1233 With optional argument ARG, scroll ARG lines; otherwise scroll by nearly
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1234 the height of window-A."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1235 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1236
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1237 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1238 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1239 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1240 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1241 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1242 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1243 (ediff-buffer-live-p ediff-buffer-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1244 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1245 (error "You've killed an essential Ediff buffer---Please quit Ediff"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1246
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1247 (ediff-operate-on-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1248 (if (memq last-command-char '(?v ?\C-v))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1249 'scroll-up
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1250 'scroll-down)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1251 ;; calculate argument to scroll-up/down
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1252 ;; if there is an explicit argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1253 (if (and arg (not (equal arg '-)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1254 ;; use it
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1255 (prefix-numeric-value arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1256 ;; if not, see if we can determine a default amount (the window height)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1257 (let* (default-amount)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1258 (setq default-amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1259 (- (min (window-height ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1260 (window-height ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1261 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1262 (window-height ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1263 123) ; some large number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1264 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1265 1 next-screen-context-lines))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1266 ;; window found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1267 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1268 ;; C-u as argument means half of default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1269 (/ default-amount 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1270 ;; no argument means default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1271 default-amount)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1272
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1273
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1274 (defun ediff-scroll-horizontally (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1275 "Horizontally scroll buffers A, B \(and C if appropriate\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1276 If an argument is given, that is how many columns are scrolled, else nearly
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1277 the width of the A/B/C windows."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1278 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1279
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1280 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1281 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1282 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1283 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1284 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1285 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1286 (ediff-buffer-live-p ediff-buffer-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1287 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1288 (error "You've killed an essential Ediff buffer---Please quit Ediff"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1289
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1290 (ediff-operate-on-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1291 (if (= last-command-char ?<)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1292 'scroll-left
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1293 'scroll-right)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1294 ;; calculate argument to scroll-left/right
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1295 ;; if there is an explicit argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1296 (if (and arg (not (equal arg '-)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1297 ;; use it
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1298 (prefix-numeric-value arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1299 ;; if not, see if we can determine a default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1300 ;; (half the window width)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1301 (if (null ediff-control-window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1302 ;; no control window, use nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1303 nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1304 (let ((default-amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1305 (- (/ (min (window-width ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1306 (window-width ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1307 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1308 (window-width ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1309 500) ; some large number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1310 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1311 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1312 3)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1313 ;; window found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1314 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1315 ;; C-u as argument means half of default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1316 (/ default-amount 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1317 ;; no argument means default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1318 default-amount))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1319
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1320
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1321 ;;BEG, END show the region to be positioned.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1322 ;;JOB-NAME holds ediff-job-name. Ediff-windows job positions regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1323 ;;differently.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1324 (defun ediff-position-region (beg end pos job-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1325 (if (> end (point-max))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1326 (setq end (point-max)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1327 (if ediff-windows-job
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1328 (if (pos-visible-in-window-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1329 () ; do nothing, wind is already positioned
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1330 ;; at this point, windows are positioned at the beginning of the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1331 ;; file regions (not diff-regions) being compared.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1332 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1333 (move-to-window-line (- (window-height) 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1334 (let ((amount (+ 2 (count-lines (point) end))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1335 (scroll-up amount))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1336 (set-window-start (selected-window) beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1337 (if (pos-visible-in-window-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1338 ;; Determine the number of lines that the region occupies
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1339 (let ((lines 0)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1340 (prev-point 0))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1341 (while ( and (> end (progn
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1342 (move-to-window-line lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1343 (point)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1344 ;; `end' may be beyond the window bottom, so check
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1345 ;; that we are making progres
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1346 (< prev-point (point)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1347 (setq prev-point (point))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1348 (setq lines (1+ lines)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1349 ;; And position the beginning on the right line
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1350 (goto-char beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1351 (recenter (/ (1+ (max (- (1- (window-height (selected-window)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1352 lines)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1353 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1354 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1355 2))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1356 (goto-char pos)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1357 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1358
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1359
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1360 (defun ediff-next-difference (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1361 "Advance to the next difference.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1362 With a prefix argument, go back that many differences."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1363 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1364 (if (< ediff-current-difference ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1365 (let ((n (min ediff-number-of-differences
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1366 (+ ediff-current-difference (if arg arg 1))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1367 regexp-skip)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1368
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1369 (or (>= n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1370 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1371 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1372 (while (and (< n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1373 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1374 ;; regexp skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1375 regexp-skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1376 ;; skip clashes, if necessary
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1377 (and ediff-show-clashes-only
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1378 (string-match "prefer"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1379 (or (ediff-get-state-of-merge n) "")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1380 ;; skip difference regions that differ in white space
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1381 (and ediff-ignore-similar-regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1382 (ediff-no-fine-diffs-p n))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1383 (setq n (1+ n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1384 (if (= 0 (mod n 20))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1385 (message "Skipped over region %d and counting ..." n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1386 (or (>= n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1387 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1388 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1389 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1390 (message "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1391 (ediff-unselect-and-select-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1392 ) ; let
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1393 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1394 (error "At end of the difference list")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1395
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1396 (defun ediff-previous-difference (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1397 "Go to the previous difference.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1398 With a prefix argument, go back that many differences."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1399 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1400 (if (> ediff-current-difference -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1401 (let ((n (max -1 (- ediff-current-difference (if arg arg 1))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1402 regexp-skip)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1403
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1404 (or (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1405 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1406 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1407 (while (and (> n -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1408 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1409 ;; regexp skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1410 regexp-skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1411 ;; skip clashes, if necessary
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1412 (and ediff-show-clashes-only
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1413 (string-match "prefer"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1414 (or (ediff-get-state-of-merge n) "")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1415 ;; skip difference regions that differ in white space
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1416 (and ediff-ignore-similar-regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1417 (ediff-no-fine-diffs-p n))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1418 (if (= 0 (mod (1+ n) 20))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1419 (message "Skipped over region %d and counting ..." (1+ n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1420 (setq n (1- n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1421 (or (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1422 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1423 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1424 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1425 (message "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1426 (ediff-unselect-and-select-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1427 ) ; let
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1428 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1429 (error "At beginning of the difference list")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1430
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1431 (defun ediff-jump-to-difference (difference-number)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1432 "Go to the difference specified as a prefix argument."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1433 (interactive "p")
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1434 (setq difference-number (1- difference-number))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1435 (if (and (>= difference-number -1)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1436 (< difference-number (1+ ediff-number-of-differences)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1437 (ediff-unselect-and-select-difference difference-number)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1438 (error "Bad difference number, %d" difference-number)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1439
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1440 (defun ediff-jump-to-difference-at-point ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1441 "Go to difference closest to the point in buffer A, B, or C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1442 The type of buffer depends on last command character \(a, b, or c\) that
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1443 invoked this command."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1444 (interactive)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1445 (let ((buf-type (ediff-char-to-buftype last-command-char)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1446 (ediff-jump-to-difference (ediff-diff-at-point buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1447
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1448
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1449 ;; find region most related to the current point position (or POS, if given)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1450 (defun ediff-diff-at-point (buf-type &optional pos)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1451 (let ((buffer (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1452 (ctl-buffer ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1453 (max-dif-num (1- ediff-number-of-differences))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1454 (diff-no -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1455 (prev-beg 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1456 (prev-end 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1457 (beg 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1458 (end 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1459
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1460 (ediff-eval-in-buffer buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1461 (setq pos (or pos (point)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1462 (while (and (or (< pos prev-beg) (> pos beg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1463 (< diff-no max-dif-num))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1464 (setq diff-no (1+ diff-no))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1465 (setq prev-beg beg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1466 prev-end end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1467 (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1468 end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1469 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1470
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1471 (if (< (abs (- pos prev-end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1472 (abs (- pos beg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1473 diff-no
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1474 (1+ diff-no)) ; jump-to-diff works with diff nums higher by 1
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1475 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1476
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1477
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1478 ;;; Copying diffs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1479
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1480 (defun ediff-diff-to-diff (arg &optional keys)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1481 "Copy buffer-X'th diff to buffer Y \(X,Y are A, B, or C\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1482 If numerical prefix argument, copy this diff specified in the arg.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1483 Otherwise, copy the difference given by `ediff-current-difference'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1484 This command assumes it is bound to a 2-character key sequence, `ab', `ba',
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1485 `ac', etc., which is used to determine the types of buffers to be used for
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1486 copying difference regions. The first character in the sequence specifies
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1487 the source buffer and the second specifies the target.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1488
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1489 If the second optional argument, a 2-character string, is given, use it to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1490 determine the source and the target buffers instead of the command keys."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1491 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1492 (or keys (setq keys (this-command-keys)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1493 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1494 (ediff-jump-to-difference arg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1495 (let* ((key1 (aref keys 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1496 (key2 (aref keys 1))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1497 (char1 (if (and ediff-xemacs-p (eventp key1)) (event-key key1) key1))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1498 (char2 (if (and ediff-xemacs-p (eventp key1)) (event-key key2) key2)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1499 (ediff-copy-diff ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1500 (ediff-char-to-buftype char1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1501 (ediff-char-to-buftype char2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1502 (ediff-recenter 'no-rehighlight)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1503
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1504
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1505 ;; Copy diff N from FROM-BUF-TYPE \(given as A, B or C\) to TO-BUF-TYPE.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1506 ;; If optional DO-NOT-SAVE is non-nil, do not save the old value of the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1507 ;; target diff. This is used in merging, when constructing the merged
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1508 ;; version.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1509 (defun ediff-copy-diff (n from-buf-type to-buf-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1510 &optional batch-invocation reg-to-copy)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1511 (let* ((to-buf (ediff-get-buffer to-buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1512 ;;(from-buf (if (not reg-to-copy) (ediff-get-buffer from-buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1513 (ctrl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1514 (saved-p t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1515 (three-way ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1516 messg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1517 ediff-verbose-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1518 reg-to-delete reg-to-delete-beg reg-to-delete-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1519
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1520 (setq reg-to-delete-beg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1521 (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1522 (setq reg-to-delete-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1523 (ediff-get-diff-posn to-buf-type 'end n ctrl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1524
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1525 (if reg-to-copy
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1526 (setq from-buf-type nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1527 (setq reg-to-copy (ediff-get-region-contents n from-buf-type ctrl-buf)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1528
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1529 (setq reg-to-delete (ediff-get-region-contents
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1530 n to-buf-type ctrl-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1531 reg-to-delete-beg reg-to-delete-end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1532
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1533 (setq ediff-disturbed-overlays nil) ; clear before use
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1534
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1535 (if (string= reg-to-delete reg-to-copy)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1536 (setq saved-p nil) ; refuse to copy identical buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1537 ;; seems ok to copy
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1538 (if (or batch-invocation (ediff-test-save-region n to-buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1539 (condition-case conds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1540 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1541 (ediff-eval-in-buffer to-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1542 ;; to prevent flags from interfering if buffer is writable
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1543 (let ((inhibit-read-only (null buffer-read-only)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1544 ;; these two insert a dummy char to overcome a bug in
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1545 ;; XEmacs, which sometimes prevents 0-length extents
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1546 ;; from sensing insertion at its end-points.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1547 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1548 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1549 (goto-char reg-to-delete-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1550 (insert-before-markers "@")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1551
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1552 (goto-char reg-to-delete-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1553 (insert-before-markers reg-to-copy)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1554
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1555 ;; delete the dummy char "@"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1556 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1557 (delete-char 1))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1558
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1559 (if ediff-xemacs-p
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1560 (if (> reg-to-delete-end reg-to-delete-beg)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1561 (kill-region reg-to-delete-beg
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1562 reg-to-delete-end))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1563 (if (> reg-to-delete-end reg-to-delete-beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1564 (kill-region reg-to-delete-beg reg-to-delete-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1565 (ediff-move-disturbed-overlays reg-to-delete-beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1566 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1567 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1568 (or batch-invocation
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1569 (setq
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1570 messg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1571 (ediff-save-diff-region n to-buf-type reg-to-delete))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1572 (error (message "ediff-copy-diff: %s %s"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1573 (car conds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1574 (mapconcat 'prin1-to-string (cdr conds) " "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1575 (beep 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1576 (sit-for 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1577 (setq saved-p nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1578 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1579 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1580
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1581 ;; adjust state of difference in case 3-way and diff was copied ok
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1582 (if (and saved-p three-way)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1583 (ediff-set-state-of-diff-in-all-buffers n ctrl-buf))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1584
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1585 (if batch-invocation
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1586 (ediff-clear-fine-differences n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1587 ;; If diff3 job, we should recompute fine diffs so we clear them
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1588 ;; before reinserting flags (and thus before ediff-recenter).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1589 (if (and saved-p three-way)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1590 (ediff-clear-fine-differences n))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1591
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1592 (ediff-refresh-mode-lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1593
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1594 ;; For diff2 jobs, don't recompute fine diffs, since we know there
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1595 ;; aren't any. So we clear diffs after ediff-recenter.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1596 (if (and saved-p (not three-way))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1597 (ediff-clear-fine-differences n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1598 ;; Make sure that the message about saving and how to restore is seen
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1599 ;; by the user
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1600 (message messg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1601 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1602
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1603 ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1604 ;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'. REG
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1605 ;; is the region to save. It is redundant here, but is passed anyway, for
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1606 ;; convenience.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1607 (defun ediff-save-diff-region (n buf-type reg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1608 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1609 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1610 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1611
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1612 (if this-buf-n-th-diff-saved
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1613 ;; either nothing saved for n-th diff and buffer or we OK'ed
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1614 ;; overriding
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1615 (setcdr this-buf-n-th-diff-saved reg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1616 (if n-th-diff-saved ;; n-th diff saved, but for another buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1617 (nconc n-th-diff-saved (list (cons buf reg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1618 (setq ediff-killed-diffs-alist ;; create record for n-th diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1619 (cons (list n (cons buf reg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1620 ediff-killed-diffs-alist))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1621 (message "Saving old diff region #%d of buffer %S. To recover, type `r%s'"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1622 (1+ n) buf-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1623 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1624 "" (downcase (symbol-name buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1625 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1626
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1627 ;; Test if saving Nth difference region of buffer BUF-TYPE is possible.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1628 (defun ediff-test-save-region (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1629 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1630 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1631 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1632
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1633 (if this-buf-n-th-diff-saved
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1634 (if (yes-or-no-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1635 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1636 "You've previously copied diff region %d to buffer %S. Confirm "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1637 (1+ n) buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1638 t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1639 (error "Quit"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1640 t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1641
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1642 (defun ediff-pop-diff (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1643 "Pop last killed Nth diff region from buffer BUF-TYPE."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1644 (let* ((n-th-record (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1645 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1646 (saved-rec (assoc buf (cdr n-th-record)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1647 (three-way ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1648 (ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1649 ediff-verbose-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1650 saved-diff reg-beg reg-end recovered)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1651
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1652 (if (cdr saved-rec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1653 (setq saved-diff (cdr saved-rec))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1654 (if (> ediff-number-of-differences 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1655 (error "Nothing saved for diff %d in buffer %S" (1+ n) buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1656 (error "No differences found")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1657
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1658 (setq reg-beg (ediff-get-diff-posn buf-type 'beg n ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1659 (setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1660 (setq ediff-disturbed-overlays nil) ; clear before use
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1661
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1662 (condition-case conds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1663 (ediff-eval-in-buffer buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1664 (let ((inhibit-read-only (null buffer-read-only)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1665 ;; these two insert a dummy char to overcome a bug in XEmacs,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1666 ;; which sometimes prevents 0-length extents from sensing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1667 ;; insertion at its end-points.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1668 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1669 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1670 (goto-char reg-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1671 (insert-before-markers "@")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1672
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1673 (goto-char reg-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1674 (insert-before-markers saved-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1675
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1676 ;; delete dummy char
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1677 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1678 (delete-char 1))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1679
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1680 (if ediff-xemacs-p
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1681 (if (> reg-end reg-beg)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1682 (kill-region reg-beg reg-end))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1683 (if (> reg-end reg-beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1684 (kill-region reg-beg reg-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1685 (ediff-move-disturbed-overlays reg-beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1686 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1687
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1688 (setq recovered t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1689 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1690 (error (message "ediff-pop-diff: %s %s"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1691 (car conds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1692 (mapconcat 'prin1-to-string (cdr conds) " "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1693 (beep 1)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1694
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1695 ;; Clearing fine diffs is necessary for
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1696 ;; ediff-unselect-and-select-difference to properly recompute them. We
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1697 ;; can't rely on ediff-copy-diff to clear this vector, as the user might
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1698 ;; have modified diff regions after copying and, thus, may have recomputed
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1699 ;; fine diffs.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1700 (if recovered
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1701 (ediff-clear-fine-differences n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1702
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1703 ;; adjust state of difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1704 (if (and three-way recovered)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1705 (ediff-set-state-of-diff-in-all-buffers n ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1706
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1707 (ediff-refresh-mode-lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1708
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1709 (if recovered
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1710 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1711 (setq n-th-record (delq saved-rec n-th-record))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1712 (message "Diff region %d in buffer %S restored" (1+ n) buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1713 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1714 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1715
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1716 (defun ediff-restore-diff (arg &optional key)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1717 "Restore ARGth diff from `ediff-killed-diffs-alist'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1718 ARG is a prefix argument. If ARG is nil, restore current-difference.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1719
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1720 If the second optional argument, a character, is given, use it to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1721 determine the target buffer instead of last-command-char"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1722 (interactive "P")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1723 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1724 (ediff-jump-to-difference arg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1725 (ediff-pop-diff ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1726 (ediff-char-to-buftype (or key last-command-char)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1727 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1728
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1729 (defun ediff-toggle-regexp-match ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1730 "Toggle between focusing and hiding of difference regions that match
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1731 a regular expression typed in by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1732 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1733 (let ((regexp-A "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1734 (regexp-B "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1735 (regexp-C "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1736 msg-connective alt-msg-connective alt-connective)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1737 (cond
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1738 ((or (and (eq ediff-skip-diff-region-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1739 'ediff-focus-on-regexp-matches)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1740 (eq last-command-char ?f))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1741 (and (eq ediff-skip-diff-region-function 'ediff-hide-regexp-matches)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1742 (eq last-command-char ?h)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1743 (message "Selective browsing by regexp turned off")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1744 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1745 ((eq last-command-char ?h)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1746 (setq ediff-skip-diff-region-function 'ediff-hide-regexp-matches
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1747 regexp-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1748 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1749 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1750 "Ignore A-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1751 ediff-regexp-hide-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1752 regexp-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1753 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1754 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1755 "Ignore B-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1756 ediff-regexp-hide-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1757 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1758 (setq regexp-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1759 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1760 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1761 "Ignore C-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1762 ediff-regexp-hide-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1763 (if (eq ediff-hide-regexp-connective 'and)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1764 (setq msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1765 alt-msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1766 alt-connective 'or)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1767 (setq msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1768 alt-msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1769 alt-connective 'and))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1770 (if (y-or-n-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1771 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1772 "Hiding diff regions that match %s regexps. Use %s instead? "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1773 msg-connective alt-msg-connective))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1774 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1775 (setq ediff-hide-regexp-connective alt-connective)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1776 (message "Hiding diff regions that match %s regexps"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1777 alt-msg-connective))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1778 (message "Hiding diff regions that match %s regexps" msg-connective))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1779 (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1780 (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1781 (or (string= regexp-C "") (setq ediff-regexp-hide-C regexp-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1782 ((eq last-command-char ?f)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1783 (setq ediff-skip-diff-region-function 'ediff-focus-on-regexp-matches
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1784 regexp-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1785 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1786 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1787 "Focus on A-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1788 ediff-regexp-focus-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1789 regexp-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1790 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1791 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1792 "Focus on B-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1793 ediff-regexp-focus-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1794 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1795 (setq regexp-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1796 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1797 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1798 "Focus on C-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1799 ediff-regexp-focus-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1800 (if (eq ediff-focus-regexp-connective 'and)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1801 (setq msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1802 alt-msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1803 alt-connective 'or)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1804 (setq msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1805 alt-msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1806 alt-connective 'and))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1807 (if (y-or-n-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1808 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1809 "Focusing on diff regions that match %s regexps. Use %s instead? "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1810 msg-connective alt-msg-connective))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1811 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1812 (setq ediff-focus-regexp-connective alt-connective)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1813 (message "Focusing on diff regions that match %s regexps"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1814 alt-msg-connective))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1815 (message "Focusing on diff regions that match %s regexps"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1816 msg-connective))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1817 (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1818 (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1819 (or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1820
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1821 (defun ediff-toggle-skip-similar ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1822 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1823 (if (not (eq ediff-auto-refine 'on))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1824 (error
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1825 "Can't skip over whitespace regions: first turn auto-refining on"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1826 (setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1827 (if ediff-ignore-similar-regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1828 (message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1829 "Skipping regions that differ only in white space & line breaks")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1830 (message "Skipping over white-space differences turned off")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1831
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1832 (defun ediff-focus-on-regexp-matches (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1833 "Focus on diffs that match regexp `ediff-regexp-focus-A/B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1834 Regions to be ignored according to this function are those where
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1835 buf A region doesn't match `ediff-regexp-focus-A' and buf B region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1836 doesn't match `ediff-regexp-focus-B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1837 This function returns nil if the region number N (specified as
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1838 an argument) is not to be ignored and t if region N is to be ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1839
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1840 N is a region number used by Ediff internally. It is 1 less
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1841 the number seen by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1842 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1843 (let* ((ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1844 (regex-A ediff-regexp-focus-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1845 (regex-B ediff-regexp-focus-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1846 (regex-C ediff-regexp-focus-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1847 (reg-A-match (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1848 (goto-char (ediff-get-diff-posn 'A 'beg n ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1849 (re-search-forward
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1850 regex-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1851 (ediff-get-diff-posn 'A 'end n ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1852 t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1853 (reg-B-match (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1854 (goto-char (ediff-get-diff-posn 'B 'beg n ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1855 (re-search-forward
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1856 regex-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1857 (ediff-get-diff-posn 'B 'end n ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1858 t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1859 (reg-C-match (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1860 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1861 (goto-char
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1862 (ediff-get-diff-posn 'C 'beg n ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1863 (re-search-forward
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1864 regex-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1865 (ediff-get-diff-posn 'C 'end n ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1866 t)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1867 (not (eval (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1868 (list ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1869 reg-A-match reg-B-match reg-C-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1870 (list ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1871 reg-A-match reg-B-match))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1872 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1873
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1874 (defun ediff-hide-regexp-matches (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1875 "Hide diffs that match regexp `ediff-regexp-hide-A/B/C'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1876 Regions to be ignored are those where buf A region matches
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1877 `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1878 This function returns nil if the region number N (specified as
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1879 an argument) is not to be ignored and t if region N is to be ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1880
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1881 N is a region number used by Ediff internally. It is 1 less
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1882 the number seen by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1883 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1884 (let* ((ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1885 (regex-A ediff-regexp-hide-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1886 (regex-B ediff-regexp-hide-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1887 (regex-C ediff-regexp-hide-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1888 (reg-A-match (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1889 (goto-char (ediff-get-diff-posn 'A 'beg n ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1890 (re-search-forward
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1891 regex-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1892 (ediff-get-diff-posn 'A 'end n ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1893 t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1894 (reg-B-match (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1895 (goto-char (ediff-get-diff-posn 'B 'beg n ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1896 (re-search-forward
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1897 regex-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1898 (ediff-get-diff-posn 'B 'end n ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1899 t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1900 (reg-C-match (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1901 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1902 (goto-char
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1903 (ediff-get-diff-posn 'C 'beg n ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1904 (re-search-forward
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1905 regex-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1906 (ediff-get-diff-posn 'C 'end n ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1907 t)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1908 (eval (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1909 (list ediff-hide-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1910 reg-A-match reg-B-match reg-C-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1911 (list ediff-hide-regexp-connective reg-A-match reg-B-match)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1912 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1913
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1914
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1915
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1916 ;;; Quitting, suspending, etc.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1917
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1918 (defun ediff-quit ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1919 "Finish an Ediff session and exit Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1920 Unselects the selected difference, if any, restores the read-only and modified
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1921 flags of the compared file buffers, kills Ediff buffers for this session
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1922 \(but not buffers A, B, C\)."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1923 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1924 (if (prog1
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1925 (y-or-n-p "Do you really want to exit Ediff? ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1926 (message ""))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1927 (ediff-really-quit)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1928
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1929
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1930 ;; Perform the quit operations.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1931 (defun ediff-really-quit ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1932 (ediff-unhighlight-diffs-totally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1933 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1934 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1935 (ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1936
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1937 (ediff-delete-temp-files)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1938
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1939 ;; Restore visibility range. This affects only ediff-*-regions/windows.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1940 ;; Since for other job names ediff-visible-region sets
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1941 ;; ediff-visible-bounds to ediff-wide-bounds, the settings below are
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1942 ;; ignored for such jobs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1943 (if ediff-quit-widened
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1944 (setq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1945 (setq ediff-visible-bounds ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1946
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1947 ;; Apply selective display to narrow or widen
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1948 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1949 (mapcar (function (lambda (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1950 (if (ediff-overlayp overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1951 (ediff-delete-overlay overl))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1952 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1953 (mapcar (function (lambda (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1954 (if (ediff-overlayp overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1955 (ediff-delete-overlay overl))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1956 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1957
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1958 ;; restore buffer mode line id's in buffer-A/B/C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1959 (let ((control-buffer ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1960 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1961 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1962 (setq ediff-this-buffer-control-sessions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1963 (delq control-buffer ediff-this-buffer-control-sessions))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1964 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1965 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1966 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1967 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1968
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1969 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1970 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1971 (setq ediff-this-buffer-control-sessions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1972 (delq control-buffer ediff-this-buffer-control-sessions))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1973 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1974 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1975 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1976 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1977
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1978 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1979 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1980 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1981 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1982 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1983 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1984 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1985 ;; restore state of buffers to what it was before ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1986 (ediff-restore-protected-variables)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1987 ;; good place to kill buffers A/B/C
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1988 (run-hooks 'ediff-cleanup-hooks)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1989 (run-hooks 'ediff-quit-hooks))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1990
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1991
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1992 (defun ediff-delete-temp-files ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1993 (if (stringp ediff-temp-file-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1994 (delete-file ediff-temp-file-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1995 (if (stringp ediff-temp-file-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1996 (delete-file ediff-temp-file-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1997 (if (stringp ediff-temp-file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1998 (delete-file ediff-temp-file-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1999
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2000
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2001 ;; Kill control buffer, other auxiliary Ediff buffers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2002 ;; Leave one of the frames split between buffers A/B/C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2003 (defun ediff-cleanup-mess ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2004 (let ((buff-A ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2005 (buff-B ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2006 (buff-C ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2007 (ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2008 (ctl-frame ediff-control-frame)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2009 (three-way-job ediff-3way-job))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2010
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2011 (ediff-kill-buffer-carefully ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2012 (ediff-kill-buffer-carefully ediff-custom-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2013 (ediff-kill-buffer-carefully ediff-fine-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2014 (ediff-kill-buffer-carefully ediff-tmp-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2015 (ediff-kill-buffer-carefully ediff-error-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2016 (ediff-kill-buffer-carefully ediff-patch-diagnostics)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2017 (ediff-kill-buffer-carefully ediff-msg-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2018 (ediff-kill-buffer-carefully ediff-debug-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2019
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2020 ;;(redraw-display)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2021 (if (and (ediff-window-display-p) (frame-live-p ctl-frame))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2022 (delete-frame ctl-frame))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2023 (ediff-kill-buffer-carefully ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2024
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2025 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2026
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2027 ;; display only if not visible
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2028 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2029 (or (ediff-get-visible-buffer-window buff-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2030 (switch-to-buffer buff-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2031 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2032 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2033 (or (ediff-get-visible-buffer-window buff-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2034 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2035 (if (ediff-get-visible-buffer-window buff-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2036 (split-window-vertically))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2037 (switch-to-buffer buff-A)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2038 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2039 (if three-way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2040 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2041 (or (ediff-get-visible-buffer-window buff-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2042 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2043 (if (or (ediff-get-visible-buffer-window buff-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2044 (ediff-get-visible-buffer-window buff-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2045 (split-window-vertically))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2046 (switch-to-buffer buff-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2047 (balance-windows)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2048 (error)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2049 (message "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2050 ))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2051
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2052 (defun ediff-janitor ()
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2053 "Kill buffers A, B, and, possibly, C, if these buffers aren't modified.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2054 In merge jobs, buffer C is never deleted.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2055 However, the side effect of cleaning up may be that you cannot compare the same
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2056 buffer in two separate Ediff sessions: quitting one of them will delete this
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2057 buffer in another session as well."
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2058 (or (not (ediff-buffer-live-p ediff-buffer-A))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2059 (buffer-modified-p ediff-buffer-A)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2060 (ediff-kill-buffer-carefully ediff-buffer-A))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2061 (or (not (ediff-buffer-live-p ediff-buffer-B))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2062 (buffer-modified-p ediff-buffer-B)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2063 (ediff-kill-buffer-carefully ediff-buffer-B))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2064 (if ediff-merge-job ; don't del buf C if merging--del ancestor buf instead
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2065 (or (not (ediff-buffer-live-p ediff-ancestor-buffer))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2066 (buffer-modified-p ediff-ancestor-buffer)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2067 (ediff-kill-buffer-carefully ediff-ancestor-buffer))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2068 (or (not (ediff-buffer-live-p ediff-buffer-C))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2069 (buffer-modified-p ediff-buffer-C)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2070 (ediff-kill-buffer-carefully ediff-buffer-C))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2071
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2072 ;; The default way of suspending Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2073 ;; Buries Ediff buffers, kills all windows.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2074 (defun ediff-default-suspend-hook ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2075 (let* ((buf-A ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2076 (buf-B ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2077 (buf-C ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2078 (buf-A-wind (ediff-get-visible-buffer-window buf-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2079 (buf-B-wind (ediff-get-visible-buffer-window buf-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2080 (buf-C-wind (ediff-get-visible-buffer-window buf-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2081 (buf-patch ediff-patch-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2082 (buf-patch-diag ediff-patch-diagnostics)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2083 (buf-err ediff-error-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2084 (buf-diff ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2085 (buf-custom-diff ediff-custom-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2086 (buf-fine-diff ediff-fine-diff-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2087
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2088 ;; hide the control panel
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2089 (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2090 (iconify-frame ediff-control-frame)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2091 (bury-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2092 (if buf-err (bury-buffer buf-err))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2093 (if buf-diff (bury-buffer buf-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2094 (if buf-custom-diff (bury-buffer buf-custom-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2095 (if buf-fine-diff (bury-buffer buf-fine-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2096 (if buf-patch (bury-buffer buf-patch))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2097 (if buf-patch-diag (bury-buffer buf-patch-diag))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2098 (if (window-live-p buf-A-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2099 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2100 (select-window buf-A-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2101 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2102 (bury-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2103 (if (ediff-buffer-live-p buf-A) (bury-buffer buf-A)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2104 (if (window-live-p buf-B-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2105 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2106 (select-window buf-B-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2107 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2108 (bury-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2109 (if (ediff-buffer-live-p buf-B) (bury-buffer buf-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2110 (if (window-live-p buf-C-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2111 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2112 (select-window buf-C-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2113 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2114 (bury-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2115 (if (ediff-buffer-live-p buf-C) (bury-buffer buf-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2116
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2117 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2118
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2119
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2120 (defun ediff-suspend ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2121 "Suspend Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2122 To resume, switch to the appropriate `Ediff Control Panel'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2123 buffer and then type \\[ediff-recenter]. Ediff will automatically set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2124 up an appropriate window config."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2125 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2126 (let ((key (substitute-command-keys "\\[ediff-recenter]")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2127 (run-hooks 'ediff-suspend-hooks)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2128 (message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2129 "To resume, switch to Ediff Control Panel and hit `%s'" key)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2130
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2131
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2132 (defun ediff-status-info ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2133 "Show the names of the buffers or files being operated on by Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2134 Hit \\[ediff-recenter] to reset the windows afterward."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2135 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2136 (with-output-to-temp-buffer " *ediff-info*"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2137 (princ (ediff-version))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2138 (princ "\n\n")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2139 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2140 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2141 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2142 (format "File A = %S\n" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2143 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2144 (format "Buffer A = %S\n" (buffer-name)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2145 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2146 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2147 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2148 (format "File B = %S\n" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2149 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2150 (format "Buffer B = %S\n" (buffer-name)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2151 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2152 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2153 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2154 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2155 (format "File C = %S\n" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2156 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2157 (format "Buffer C = %S\n" (buffer-name))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2158
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2159 (let* ((A-line (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2160 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2161 (B-line (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2162 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2163 C-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2164 (princ (format "\Buffer A's point is on line %d\n" A-line))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2165 (princ (format "Buffer B's point is on line %d\n" B-line))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2166 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2167 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2168 (setq C-line (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2169 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2170 (princ (format "Buffer C's point is on line %d\n" C-line)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2171
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2172 (princ (format "\nCurrent difference number = %S\n"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2173 (cond ((< ediff-current-difference 0) 'start)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2174 ((>= ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2175 ediff-number-of-differences) 'end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2176 (t (1+ ediff-current-difference)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2177
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2178 (cond (ediff-ignore-similar-regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2179 (princ "\nSkipping regions that differ only in white space & line breaks"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2180 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2181 (princ "\nNot skipping regions that differ in white space & line breaks")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2182
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2183 (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2184 (princ "\nSelective browsing by regexp is off.\n"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2185 ((eq ediff-skip-diff-region-function 'ediff-hide-regexp-matches)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2186 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2187 "\nIgnoring regions that match")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2188 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2189 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2190 "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2191 ediff-regexp-hide-A ediff-hide-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2192 ediff-regexp-hide-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2193 ((eq ediff-skip-diff-region-function 'ediff-focus-on-regexp-matches)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2194 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2195 "\nFocusing on regions that match")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2196 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2197 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2198 "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2199 ediff-regexp-focus-A ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2200 ediff-regexp-focus-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2201 (t (princ "\nSelective browsing via a user-defined method.\n")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2202
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2203 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2204 (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2205 (substitute-command-keys "\\[ediff-submit-report]")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2206 ))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2207
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2208 (defun ediff-documentation ()
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2209 "Jump to Ediff's Info file."
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2210 (interactive)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2211 (let ((ctl-window ediff-control-window)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2212 (ctl-buf ediff-control-buffer))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2213
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2214 (ediff-skip-unsuitable-frames)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2215 (condition-case nil
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2216 (progn
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2217 (pop-to-buffer (get-buffer-create "*info*"))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2218 (info "ediff")
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2219 (message "Type `i' to search for a specific topic"))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2220 (error (beep 1)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2221 (with-output-to-temp-buffer " *ediff-info*"
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2222 (princ (format "
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2223 The Info file for Ediff does not seem to be installed.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2224
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2225 This file is part of the distribution of %sEmacs.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2226 Please contact your system administrator. "
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2227 (if ediff-xemacs-p "X" ""))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2228 (if (window-live-p ctl-window)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2229 (progn
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2230 (select-window ctl-window)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2231 (switch-to-buffer ctl-buf)))))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2232
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2233
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2234
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2235
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2236 ;;; Support routines
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2237
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2238 ;; Select a difference by placing the ASCII flags around the appropriate
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2239 ;; group of lines in the A, B buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2240 ;; This may have to be modified for buffer C, when it will be supported.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2241 (defun ediff-select-difference (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2242 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2243 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2244 (ediff-valid-difference-p n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2245 (progn
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2246 (if (and (ediff-window-display-p) ediff-use-faces)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2247 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2248 (ediff-highlight-diff n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2249 (setq ediff-highlighting-style 'face))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2250 (setq ediff-highlighting-style 'ascii)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2251 (ediff-place-flags-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2252 'A ediff-buffer-A ediff-control-buffer n)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2253 (ediff-place-flags-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2254 'B ediff-buffer-B ediff-control-buffer n)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2255 (if ediff-3way-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2256 (ediff-place-flags-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2257 'C ediff-buffer-C ediff-control-buffer n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2258 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2259
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2260 (ediff-install-fine-diff-if-necessary n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2261 (run-hooks 'ediff-select-hooks))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2262
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2263
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2264 ;; Unselect a difference by removing the ASCII flags in the buffers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2265 ;; This may have to be modified for buffer C, when it will be supported.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2266 (defun ediff-unselect-difference (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2267 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2268 (progn
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2269 (cond ((and (ediff-window-display-p) ediff-use-faces)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2270 (ediff-unhighlight-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2271 ((eq ediff-highlighting-style 'ascii)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2272 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2273 ediff-buffer-A
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2274 (ediff-get-diff-overlay n 'A))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2275 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2276 ediff-buffer-B
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2277 (ediff-get-diff-overlay n 'B))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2278 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2279 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2280 ediff-buffer-C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2281 (ediff-get-diff-overlay n 'C)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2282 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2283 (setq ediff-highlighting-style nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2284
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2285 ;; unhighlight fine diffs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2286 (ediff-set-fine-diff-properties ediff-current-difference 'default)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2287 (run-hooks 'ediff-unselect-hooks))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2288
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2289
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2290 ;; Unselects prev diff and selects a new one, if FLAG has value other than
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2291 ;; 'select-only or 'unselect-only. If FLAG is 'select-only, the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2292 ;; next difference is selected, but the current selection is not
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2293 ;; unselected. If FLAG is 'unselect-only then the current selection is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2294 ;; unselected, but the next one is not selected. If NO-RECENTER is non-nil,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2295 ;; don't recenter buffers after selecting/unselecting.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2296 ;;
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2297 (defun ediff-unselect-and-select-difference (n &optional flag no-recenter)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2298 (let ((ediff-current-difference n))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2299 (or no-recenter
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2300 (ediff-recenter 'no-rehighlight)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2301
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2302 (let ((control-buf ediff-control-buffer))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2303 (unwind-protect
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2304 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2305 (or (eq flag 'select-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2306 (ediff-unselect-difference ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2307
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2308 (or (eq flag 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2309 (ediff-select-difference n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2310 (setq ediff-current-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2311 ) ; end protected section
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2312
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2313 (ediff-eval-in-buffer control-buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2314 (ediff-refresh-mode-lines))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2315 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2316
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2317
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2318 (defun ediff-read-file-name (prompt default-dir default-file)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2319 ; This is a modified version of a similar function in `emerge.el'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2320 ; PROMPT should not have trailing ': ', so that it can be modified
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2321 ; according to context.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2322 ; If default-file is set, it should be used as the default value.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2323 ; If default-dir is non-nil, use it as the default directory.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2324 ; Otherwise, use the value of Emacs' variable `default-directory.'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2325
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2326 ;; hack default-dir if it is not set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2327 (setq default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2328 (file-name-as-directory
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2329 (abbreviate-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2330 (expand-file-name (or default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2331 (and default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2332 (file-name-directory default-file))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2333 default-directory)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2334
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2335 ;; strip the directory from default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2336 (if default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2337 (setq default-file (file-name-nondirectory default-file)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2338 (if (string= default-file "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2339 (setq default-file nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2340
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2341 (let (f)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2342 (setq f (expand-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2343 (read-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2344 (format "%s%s: "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2345 prompt
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2346 (if default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2347 (concat " (default " default-file ")")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2348 ""))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2349 default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2350 default-file
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2351 t ; must match, no-confirm
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2352 (if default-file (file-name-directory default-file))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2353 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2354 default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2355 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2356 ;; If user enters a directory name, expand the default file in that
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2357 ;; directory. This allows the user to enter a directory name for the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2358 ;; B-file and diff against the default-file in that directory instead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2359 ;; of a DIRED listing!
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2360 (if (and (file-directory-p f) default-file)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2361 (setq f (expand-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2362 (file-name-nondirectory default-file) f)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2363 f))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2364
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2365 ;; If `prefix' is given, then it is used as a prefix for the temp file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2366 ;; name. Otherwise, `_buffer-name' is used. If `file' is given, use this
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2367 ;; file and don't create a new one.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2368 ;; Also, save buffer from START to END in the file.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2369 ;; START defaults to (point-min), END to (point-max)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2370 (defun ediff-make-temp-file (&optional prefix given-file start end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2371 (let ((f (or given-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2372 (make-temp-name (concat
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2373 ediff-temp-file-prefix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2374 (if prefix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2375 (concat prefix "_")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2376 "ediff_"))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2377 ;; create the file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2378 (write-region (if start start (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2379 (if end end (point-max))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2380 f
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2381 nil ; don't append---erase
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2382 'no-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2383 (set-file-modes f ediff-temp-file-mode)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2384 f))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2385
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2386 ;; Quote metacharacters (using \) when executing diff in Unix, but not in
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2387 ;; EMX OS/2
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2388 (defun ediff-protect-metachars (str)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2389 (or (memq system-type '(emx vax-vms axp-vms))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2390 (let ((limit 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2391 (while (string-match ediff-metachars str limit)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2392 (setq str (concat (substring str 0 (match-beginning 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2393 "\\"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2394 (substring str (match-beginning 0))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2395 (setq limit (1+ (match-end 0))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2396 str)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2397
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2398 ;; Make sure the current buffer (for a file) has the same contents as the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2399 ;; file on disk, and attempt to remedy the situation if not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2400 ;; Signal an error if we can't make them the same, or the user doesn't want
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2401 ;; to do what is necessary to make them the same.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2402 ;; If file has file handlers (indicated by the optional arg), then we
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2403 ;; offer to instead of saving. This is one difference with Emerge.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2404 ;; Another is that we always offer to revert obsolete files, whether they
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2405 ;; are modified or not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2406 (defun ediff-verify-file-buffer (&optional file-magic)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2407 ;; First check if the file has been modified since the buffer visited it.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2408 (if (verify-visited-file-modtime (current-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2409 (if (buffer-modified-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2410 ;; If buffer is not obsolete and is modified, offer to save
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2411 (if (yes-or-no-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2412 (format "Buffer out of sync with visited file. %s file %s? "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2413 (if file-magic "Revert" "Save")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2414 buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2415 (if (not file-magic)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2416 (save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2417 ;; for some reason, file-name-handlers append instead of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2418 ;; replacing, so we have to erase first.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2419 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2420 (revert-buffer t t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2421 (error "Buffer out of sync for file %s" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2422 ;; If buffer is not obsolete and is not modified, do nothing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2423 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2424 ;; If buffer is obsolete, offer to revert
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2425 (if (yes-or-no-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2426 (format "Buffer out of sync with visited file. Revert file %s? "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2427 buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2428 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2429 (if file-magic
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2430 (erase-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2431 (revert-buffer t t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2432 (error "Buffer out of sync for file %s" buffer-file-name))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2433
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2434
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2435
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2436 (defun ediff-check-for-ascii-flags ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2437 (eval
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2438 (cons 'or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2439 (mapcar (function (lambda (buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2440 (if (ediff-buffer-live-p buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2441 (ediff-eval-in-buffer buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2442 (eq ediff-highlighting-style 'ascii)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2443 ediff-this-buffer-control-sessions))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2444
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2445 ;; It would be nice to use these two functions as hooks instead of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2446 ;; ediff-insert-in-front and ediff-move-disturbed-overlays.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2447 ;; However, Emacs has a bug that causes BEG and END, below, to be
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2448 ;; the same, i.e., the end of inserted text is not passed correctly.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2449 ;; Since the overlay doesn't move when these hooks run,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2450 ;; there is no way to correctly determine the new (desired) position of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2451 ;; the overlay end.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2452 ;; Either this bug is fixed, or (better) use sticky overlays when they will
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2453 ;; be implemented in Emacs, like they are in XEmacs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2454 ;;(defun ediff-capture-inserts-in-front (overl beg end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2455 ;; (if (ediff-overlay-get overl 'ediff-diff-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2456 ;; (ediff-move-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2457 ;; overl beg (+ (- end beg) (ediff-overlay-end overl)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2458 ;; ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2459 ;;(defun ediff-capture-inserts-behind (overl beg end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2460 ;; (if (ediff-overlay-get overl 'ediff-diff-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2461 ;; (ediff-move-overlay overl (ediff-overlay-start overl) end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2462 ;; ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2463
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2464 ;; to be deleted in due time
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2465 ;; Capture overlays that had insertions in the front.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2466 ;; Called when overlay OVERL gets insertion in front.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2467 (defun ediff-insert-in-front (overl &optional flag beg end length)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2468 (if (ediff-overlay-get overl 'ediff-diff-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2469 (setq ediff-disturbed-overlays
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2470 (cons overl ediff-disturbed-overlays))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2471
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2472
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2473 ;; to be deleted in due time
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2474 ;; We can't move overlays directly in insert-in-front-hooks
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2475 ;; because when diff is highlighted with ascii flags, they will disturb
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2476 ;; overlays and so they will be included in them, which we don't want.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2477 (defun ediff-move-disturbed-overlays (posn)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2478 (mapcar (function (lambda (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2479 (ediff-move-overlay overl
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2480 posn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2481 (ediff-overlay-end overl))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2482 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2483 ediff-disturbed-overlays)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2484 (setq ediff-disturbed-overlays nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2485
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2486
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2487 (defun ediff-save-buffer (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2488 "Safe way of saving buffers A, B, C, and the diff output.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2489 `wa' saves buffer A, `wb' saves buffer B, `wc' saves buffer C,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2490 and `wd' saves the diff output."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2491 (interactive "P")
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2492 (ediff-eval-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2493 (cond ((memq last-command-char '(?a ?b ?c))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2494 (ediff-get-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2495 (ediff-char-to-buftype last-command-char)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2496 ((eq last-command-char ?d)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2497 (message "Saving diff output ...")(sit-for 1)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2498 (if arg ediff-diff-buffer ediff-custom-diff-buffer)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2499 ))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2500 (save-buffer)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2501
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2502
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2503 ;; will simplify it in due time, when emacs acquires before/after strings
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2504 (defun ediff-remove-flags-from-buffer (buffer overlay)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2505 (ediff-eval-in-buffer buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2506 (let ((inhibit-read-only t))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2507 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2508 (ediff-overlay-put overlay 'begin-glyph nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2509 ;; before-string is not yet implemented in emacs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2510 ;; when it will be, I will be able to delete much of the rest of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2511 ;; this function
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2512 (ediff-overlay-put overlay 'before-string nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2513
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2514 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2515 (ediff-overlay-put overlay 'end-glyph nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2516 ;; after-string is not yet implemented in emacs.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2517 (ediff-overlay-put overlay 'after-string nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2518 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2519
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2520
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2521
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2522 ;; will simplify it in due time, when emacs acquires before/after strings
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2523 (defun ediff-place-flags-in-buffer (buf-type buffer ctl-buffer diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2524 (ediff-eval-in-buffer buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2525 (ediff-place-flags-in-buffer1 buf-type ctl-buffer diff)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2526
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2527
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2528 (defun ediff-place-flags-in-buffer1 (buf-type ctl-buffer diff-no)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2529 (let* ((curr-overl (ediff-eval-in-buffer ctl-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2530 (ediff-get-diff-overlay diff-no buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2531 (before (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2532 after beg-of-line flag)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2533
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2534 ;; insert flag before the difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2535 (goto-char before)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2536 (setq beg-of-line (bolp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2537
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2538 (setq flag (ediff-eval-in-buffer ctl-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2539 (if (eq ediff-highlighting-style 'ascii)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2540 (if beg-of-line
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2541 ediff-before-flag-bol ediff-before-flag-mol))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2542
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2543 ;; insert the flag itself
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2544 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2545 (ediff-overlay-put curr-overl 'begin-glyph flag)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2546 (ediff-overlay-put curr-overl 'before-string flag))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2547
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2548 ;; insert the flag after the difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2549 ;; `after' must be set here, after the before-flag was inserted
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2550 (setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2551 (goto-char after)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2552 (setq beg-of-line (bolp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2553
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2554 (setq flag (ediff-eval-in-buffer ctl-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2555 (if (eq ediff-highlighting-style 'ascii)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2556 (if beg-of-line
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2557 ediff-after-flag-eol ediff-after-flag-mol))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2558
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2559 ;; insert the flag itself
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2560 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2561 (ediff-overlay-put curr-overl 'end-glyph flag)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2562 (ediff-overlay-put curr-overl 'after-string flag))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2563 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2564
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2565
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2566 (defun ediff-get-diff-posn (buf-type pos &optional n control-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2567 "Returns positions of difference sectors in the BUF-TYPE buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2568 BUF-TYPE should be a symbol--either `A' or `B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2569 POS is either `beg' or `end'--it specifies whether you want the position at the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2570 beginning of a difference or at the end.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2571
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2572 The optional argument N says which difference \(default:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2573 `ediff-current-difference'\). The optional argument CONTROL-BUF says
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2574 which control buffer is in effect in case it is not the current
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2575 buffer."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2576 (let (diff-overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2577 (or control-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2578 (setq control-buf (current-buffer)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2579
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2580 (ediff-eval-in-buffer control-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2581 (or n (setq n ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2582 (if (or (< n 0) (>= n ediff-number-of-differences))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2583 (if (> ediff-number-of-differences 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2584 (error "There is no diff %d. Valid diffs are 1 to %d"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2585 (1+ n) ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2586 (error "No differences found")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2587 (setq diff-overlay (ediff-get-diff-overlay n buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2588
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2589 (if (eq pos 'beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2590 (ediff-overlay-start diff-overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2591 (ediff-overlay-end diff-overlay))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2592 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2593
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2594
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2595
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2596 (defun ediff-highlight-diff-in-one-buffer (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2597 (if (ediff-buffer-live-p (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2598 (let* ((buff (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2599 (last (ediff-eval-in-buffer buff (point-max)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2600 (begin (ediff-get-diff-posn buf-type 'beg n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2601 (end (ediff-get-diff-posn buf-type 'end n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2602 (xtra (if (equal begin end) 1 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2603 (end-hilit (min last (+ end xtra)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2604 (current-diff-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2605 (symbol-value
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2606 (intern (format "ediff-current-diff-overlay-%S" buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2607 (odd-diff-face
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2608 (symbol-value
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2609 (intern (format "ediff-odd-diff-face-%S" buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2610 (even-diff-face
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2611 (symbol-value
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2612 (intern (format "ediff-even-diff-face-%S" buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2613 (odd-diff-face-var
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2614 (intern (format "ediff-odd-diff-face-%S-var" buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2615 (even-diff-face-var
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2616 (intern (format "ediff-even-diff-face-%S-var" buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2617 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2618
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2619 (if ediff-xemacs-p
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2620 (ediff-move-overlay current-diff-overlay begin end-hilit)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2621 (ediff-move-overlay current-diff-overlay begin end-hilit buff))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2622 ;; giving priority of 0 and then changing it may look funny, but
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2623 ;; this overcomes an obscure Emacs bug.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2624 (ediff-overlay-put current-diff-overlay 'priority 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2625 (ediff-overlay-put current-diff-overlay 'priority
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2626 (ediff-highest-priority begin end-hilit buff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2627
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2628 (or (face-differs-from-default-p odd-diff-face-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2629 (not ediff-highlight-all-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2630 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2631 (copy-face odd-diff-face odd-diff-face-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2632 (copy-face even-diff-face even-diff-face-var)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2633
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2634 ;; unhighlight the background overlay for diff n so they won't
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2635 ;; interfere with the current diff overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2636 (ediff-overlay-put (ediff-get-diff-overlay n buf-type) 'face nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2637 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2638
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2639
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2640 (defun ediff-unhighlight-diff-in-one-buffer (buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2641 (if (ediff-buffer-live-p (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2642 (let ((current-diff-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2643 (symbol-value
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2644 (intern (format "ediff-current-diff-overlay-%S" buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2645 (odd-diff-face-var
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2646 (intern (format "ediff-odd-diff-face-%S-var" buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2647 (even-diff-face-var
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2648 (intern (format "ediff-even-diff-face-%S-var" buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2649 (overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2650 (ediff-get-diff-overlay ediff-current-difference buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2651 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2652
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2653 (ediff-move-overlay current-diff-overlay 1 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2654
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2655 ;; rehighlight the overlay in the background of the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2656 ;; current difference region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2657 (ediff-overlay-put overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2658 'face (if (ediff-odd-p ediff-current-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2659 odd-diff-face-var
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2660 even-diff-face-var))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2661 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2662
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2663 (defun ediff-unhighlight-diffs-totally-in-one-buffer (buf-type)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2664 (ediff-unselect-and-select-difference -1)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2665 (if (and (ediff-window-display-p) ediff-use-faces)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2666 (let* ((inhibit-quit t)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2667 (current-diff-overlay-var
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2668 (intern (format "ediff-current-diff-overlay-%S" buf-type)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2669 (current-diff-overlay (symbol-value current-diff-overlay-var))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2670 (odd-diff-face-var
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2671 (intern (format "ediff-odd-diff-face-%S-var" buf-type)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2672 (even-diff-face-var
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2673 (intern (format "ediff-even-diff-face-%S-var" buf-type))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2674 (if (face-differs-from-default-p odd-diff-face-var)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2675 (progn
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2676 (copy-face 'default odd-diff-face-var)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2677 (copy-face 'default even-diff-face-var)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2678 (if (ediff-overlayp current-diff-overlay)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2679 (ediff-delete-overlay current-diff-overlay))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2680 (set current-diff-overlay-var nil)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2681 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2682
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2683
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2684 ;; null out difference overlays so they won't slow down future
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2685 ;; editing operations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2686 ;; VEC is either a difference vector or a fine-diff vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2687 (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2688 (if (vectorp (symbol-value vec-var))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2689 (mapcar (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2690 (lambda (elt)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2691 (ediff-delete-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2692 (ediff-get-diff-overlay-from-diff-record elt))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2693 (if fine-diffs-also
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2694 (ediff-clear-fine-diff-vector elt))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2695 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2696 (symbol-value vec-var)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2697 ;; allow them to be garbage collected
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2698 (set vec-var nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2699
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2700
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2701
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2702 ;;; Misc
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2703
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2704 ;; These two functions are here to neutralize XEmacs unwillingless to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2705 ;; handle overlays whose buffers were deleted.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2706 (defun ediff-move-overlay (overlay beg end &optional buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2707 "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2708 Checks if overlay's buffer exists before actually doing the move."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2709 (let ((buf (and overlay (ediff-overlay-buffer overlay))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2710 (if (ediff-buffer-live-p buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2711 (if ediff-xemacs-p
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2712 (set-extent-endpoints overlay beg end)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2713 (move-overlay overlay beg end buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2714 ;; buffer's dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2715 (if overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2716 (ediff-delete-overlay overlay)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2717
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2718 (defun ediff-overlay-put (overlay prop value)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2719 "Calls `overlay-put' or `set-extent-property' depending on Emacs version.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2720 Checks if overlay's buffer exists."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2721 (if (ediff-buffer-live-p (ediff-overlay-buffer overlay))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2722 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2723 (set-extent-property overlay prop value)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2724 (overlay-put overlay prop value))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2725 (ediff-delete-overlay overlay)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2726
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2727
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2728 ;; In Emacs, this just makes overlay. In the future, when Emacs will start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2729 ;; supporting sticky overlays, this function will make a sticky overlay.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2730 ;; BEG and END are expressions telling where overlay starts.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2731 ;; If they are numbers or buffers, then all is well. Otherwise, they must
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2732 ;; be expressions to be evaluated in buffer BUF in order to get the overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2733 ;; bounds.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2734 ;; If BUFF is not a live buffer, then return nil; otherwise, return the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2735 ;; newly created overlay.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2736 (defun ediff-make-bullet-proof-overlay (beg end buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2737 (if (ediff-buffer-live-p buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2738 (let (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2739 (ediff-eval-in-buffer buff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2740 (or (number-or-marker-p beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2741 (setq beg (eval beg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2742 (or (number-or-marker-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2743 (setq end (eval end)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2744 (setq overl (ediff-make-overlay beg end buff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2745
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2746 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2747 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2748 ;; take precautions against detached extents
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2749 (ediff-overlay-put overl 'detachable nil)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2750 ;; chars inserted at both ends will be inside extent
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2751 (ediff-overlay-put overl 'start-open nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2752 (ediff-overlay-put overl 'end-open nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2753 (ediff-overlay-put overl 'ediff-diff-num 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2754 ;;(ediff-overlay-put overl 'insert-in-front-hooks
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2755 ;; (list 'ediff-capture-inserts-in-front))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2756 ;;(ediff-overlay-put overl 'insert-behind-hooks
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2757 ;; (list 'ediff-capture-inserts-behind))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2758 ;; These two are not yet implemented in Emacs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2759 ;;(ediff-overlay-put overl 'rear-sticky t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2760 ;;(ediff-overlay-put overl 'front-sticky t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2761 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2762 overl))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2763
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2764 (defsubst ediff-overlay-start (overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2765 (if (ediff-overlayp overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2766 (if ediff-emacs-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2767 (overlay-start overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2768 (extent-start-position overl))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2769
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2770 (defsubst ediff-overlay-end (overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2771 (if (ediff-overlayp overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2772 (if ediff-emacs-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2773 (overlay-end overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2774 (extent-end-position overl))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2775
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2776
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2777 ;; Like other-buffer, but prefers visible buffers and ignores temporary or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2778 ;; other insignificant buffers (those beginning with "^[ *]").
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2779 ;; Gets one arg--buffer name or a list of buffer names (it won't return
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2780 ;; these buffers).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2781 (defun ediff-other-buffer (buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2782 (if (not (listp buff)) (setq buff (list buff)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2783 (let* ((frame-buffers (buffer-list))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2784 (significant-buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2785 (mapcar
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2786 (function (lambda (x)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2787 (cond ((member (buffer-name x) buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2788 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2789 ((not (ediff-get-visible-buffer-window x))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2790 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2791 ((string-match "^ " (buffer-name x))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2792 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2793 (t x))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2794 frame-buffers))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2795 (buffers (delq nil significant-buffers))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2796 less-significant-buffers)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2797
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2798 (cond (buffers (car buffers))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2799 ;; try also buffers that are not displayed in windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2800 ((setq less-significant-buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2801 (delq nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2802 (mapcar
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2803 (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2804 (lambda (x)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2805 (cond ((member (buffer-name x) buff) nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2806 ((string-match "^[ *]" (buffer-name x)) nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2807 (t x))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2808 frame-buffers)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2809 (car less-significant-buffers))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2810 (t (other-buffer (current-buffer))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2811 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2812
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2813
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2814 ;; Construct a unique buffer name.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2815 ;; The first one tried is prefixsuffix, then prefix<2>suffix,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2816 ;; prefix<3>suffix, etc.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2817 (defun ediff-unique-buffer-name (prefix suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2818 (if (null (get-buffer (concat prefix suffix)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2819 (concat prefix suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2820 (let ((n 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2821 (while (get-buffer (format "%s<%d>%s" prefix n suffix))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2822 (setq n (1+ n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2823 (format "%s<%d>%s" prefix n suffix))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2824
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2825
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2826 (defun ediff-submit-report ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2827 "Submit bug report on Ediff."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2828 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2829 (let ((reporter-prompt-for-summary-p t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2830 (ctl-buf ediff-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2831 (ediff-device-type (ediff-device-type))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2832 varlist salutation buffer-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2833 (setq varlist '(ediff-diff-program ediff-diff-options
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2834 ediff-patch-program ediff-patch-options
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2835 ediff-shell
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2836 ediff-use-faces
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2837 ediff-auto-refine ediff-highlighting-style
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2838 ediff-buffer-A ediff-buffer-B ediff-control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2839 ediff-forward-word-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2840 ediff-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2841 ediff-control-frame-parameters
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2842 ediff-control-frame-position-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2843 ediff-prefer-iconified-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2844 ediff-window-setup-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2845 ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2846 ediff-job-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2847 ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2848 buffer-name
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2849 ediff-device-type
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2850 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2851 (setq salutation "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2852 Congratulations! You may have unearthed a bug in Ediff!
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2853
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2854 Please make a concise and accurate summary of what happened
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2855 and mail it to the address above.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2856 -----------------------------------------------------------
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2857 ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2858
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2859 (ediff-skip-unsuitable-frames)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2860 (ediff-reset-mouse)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2861
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2862 (switch-to-buffer ediff-msg-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2863 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2864 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2865 (insert "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2866 Please read this first:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2867 ----------------------
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2868
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2869 Some ``bugs'' may actually be no bugs at all. For instance, if you are
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2870 reporting that certain difference regions are not matched as you think they
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2871 should, this is most likely due to the way Unix diff program decides what
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2872 constitutes a difference region. Ediff is an Emacs interface to diff, and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2873 it has nothing to do with those decisions---it only takes the output from
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2874 diff and presents it in a way that is better suited for human browsing and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2875 manipulation.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2876
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2877 If Emacs happens to dump core, this is NOT an Ediff problem---it is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2878 an Emacs bug. Report this to Emacs maintainers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2879
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2880 Another popular topic for reports is compilation messages. Because Ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2881 interfaces to several other packages and runs under Emacs and XEmacs,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2882 byte-compilation may produce output like this:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2883
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2884 While compiling toplevel forms in file ediff.el:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2885 ** reference to free variable pm-color-alist
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2886 ........................
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2887 While compiling the end of the data:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2888 ** The following functions are not known to be defined:
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2889 ediff-valid-color-p, ediff-set-face,
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2890 ........................
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2891
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2892 These are NOT errors, but inevitable warnings, which ought to be ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2893
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2894 Please do not report those and similar things. However, comments and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2895 suggestions are always welcome.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2896
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2897 Mail anyway? (y or n) ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2898
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2899 (if (y-or-n-p "Mail anyway? ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2900 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2901 (if (ediff-buffer-live-p ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2902 (set-buffer ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2903 (setq buffer-name (buffer-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2904 (require 'reporter)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2905 (reporter-submit-bug-report "kifer@cs.sunysb.edu"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2906 (ediff-version)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2907 varlist
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2908 nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2909 'delete-other-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2910 salutation))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2911 (bury-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2912 (beep 1)(message "Bug report aborted")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2913 (if (ediff-buffer-live-p ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2914 (ediff-eval-in-buffer ctl-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2915 (ediff-recenter 'no-rehighlight))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2916 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2917
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2918
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2919 (defun ediff-union (list1 list2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2920 "Combine LIST1 and LIST2 using a set-union operation.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2921 The result list contains all items that appear in either LIST1 or LIST2.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2922 This is a non-destructive function; it makes a copy of the data if necessary
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2923 to avoid corrupting the original LIST1 and LIST2.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2924 This is a slightly simplified version from `cl-seq.el'. Added here to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2925 avoid loading cl-*."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2926 (cond ((null list1) list2) ((null list2) list1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2927 ((equal list1 list2) list1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2928 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2929 (or (>= (length list1) (length list2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2930 (setq list1 (prog1 list2 (setq list2 list1))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2931 (while list2
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2932 (or (memq (car list2) list1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2933 (setq list1 (cons (car list2) list1)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2934 (setq list2 (cdr list2)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2935 list1)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2936
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2937 (defun ediff-deactivate-mark ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2938 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2939 (zmacs-deactivate-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2940 (deactivate-mark)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2941
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2942 (cond ((fboundp 'nuke-selective-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2943 ;; XEmacs 19.12 has nuke-selective-display
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2944 (fset 'ediff-nuke-selective-display 'nuke-selective-display))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2945 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2946 (defun ediff-nuke-selective-display ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2947 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2948 (save-restriction
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2949 (widen)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2950 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2951 (let ((mod-p (buffer-modified-p))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2952 buffer-read-only end)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2953 (and (eq t selective-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2954 (while (search-forward "\^M" nil t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2955 (end-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2956 (setq end (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2957 (beginning-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2958 (while (search-forward "\^M" end t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2959 (delete-char -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2960 (insert "\^J"))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2961 (set-buffer-modified-p mod-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2962 (setq selective-display nil)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2963 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2964
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2965
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2966 ;; The next two are modified versions from emerge.el.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2967 ;; VARS must be a list of symbols
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2968 ;; ediff-save-variables returns an association list: ((var . val) ...)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2969 (defsubst ediff-save-variables (vars)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2970 (mapcar (function (lambda (v) (cons v (symbol-value v))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2971 vars))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2972 ;; VARS is a list of variable symbols.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2973 (defun ediff-restore-variables (vars assoc-list)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2974 (while vars
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2975 (set (car vars) (cdr (assoc (car vars) assoc-list)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2976 (setq vars (cdr vars))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2977 (defun ediff-change-saved-variable (var value buf-type)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2978 (let* ((assoc-list
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2979 (symbol-value (intern
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2980 (concat "ediff-buffer-values-orig-"
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2981 (symbol-name buf-type)))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2982 (assoc-elt (assoc var assoc-list)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2983 (if assoc-elt
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2984 (setcdr assoc-elt value))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2985
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2986
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2987 ;; must execute in control buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2988 (defun ediff-save-protected-variables ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2989 (setq ediff-buffer-values-orig-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2990 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2991 (ediff-save-variables ediff-protected-variables)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2992 (setq ediff-buffer-values-orig-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2993 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2994 (ediff-save-variables ediff-protected-variables)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2995 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2996 (setq ediff-buffer-values-orig-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2997 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2998 (ediff-save-variables ediff-protected-variables)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2999
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3000 ;; must execute in control buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3001 (defun ediff-restore-protected-variables ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3002 (let ((values-A ediff-buffer-values-orig-A)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3003 (values-B ediff-buffer-values-orig-B)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3004 (values-C ediff-buffer-values-orig-C))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3005 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3006 (ediff-restore-variables ediff-protected-variables values-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3007 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3008 (ediff-restore-variables ediff-protected-variables values-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3009 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3010 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3011 (ediff-restore-variables ediff-protected-variables values-C)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3012
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3013
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3014 ;;; Debug
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3015
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3016 (ediff-defvar-local ediff-command-begin-time '(0 0 0) "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3017
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3018 ;; calculate time used by command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3019 (defun ediff-calc-command-time ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3020 (let ((end (current-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3021 micro sec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3022 (setq micro
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3023 (if (>= (nth 2 end) (nth 2 ediff-command-begin-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3024 (- (nth 2 end) (nth 2 ediff-command-begin-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3025 (+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3026 (setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3027 (or (equal ediff-command-begin-time '(0 0 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3028 (message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3029
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3030 (defsubst ediff-save-time ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3031 (setq ediff-command-begin-time (current-time)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3032
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3033 (defun ediff-profile ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3034 "Toggle profiling Ediff commands."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3035 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3036 (or (ediff-buffer-live-p ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3037 (error "This command runs only out of Ediff Control Buffer"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3038 (make-local-variable 'pre-command-hook)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3039 (make-local-variable 'post-command-hook)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3040 (if (memq 'ediff-save-time pre-command-hook)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3041 (progn (remove-hook 'pre-command-hook 'ediff-save-time)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3042 (remove-hook 'post-command-hook 'ediff-calc-command-time)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3043 (setq ediff-command-begin-time '(0 0 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3044 (message "Ediff profiling disabled"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3045 (add-hook 'pre-command-hook 'ediff-save-time t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3046 (add-hook 'post-command-hook 'ediff-calc-command-time)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3047 (message "Ediff profiling enabled")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3048
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3049 (defun ediff-print-diff-vector (diff-vector-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3050 (princ (format "\n*** %S ***\n" diff-vector-var))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3051 (mapcar (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3052 (lambda (overl-vec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3053 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3054 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3055 "Diff %d: \tOverlay: %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3056 \t\tFine diffs: %s
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3057 \t\tNo-fine-diff-flag: %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3058 \t\tState-of-diff:\t %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3059 \t\tState-of-merge:\t %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3060 "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3061 (1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3062 (aref overl-vec 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3063 ;; fine-diff-vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3064 (if (= (length (aref overl-vec 1)) 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3065 "none\n"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3066 (mapconcat 'prin1-to-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3067 (aref overl-vec 1) "\n\t\t\t "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3068 (aref overl-vec 2) ; no fine diff flag
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3069 (aref overl-vec 3) ; state-of-diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3070 (aref overl-vec 4) ; state-of-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3071 ))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3072 (eval diff-vector-var)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3073
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3074
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3075
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3076 (defun ediff-debug-info ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3077 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3078 (or (ediff-buffer-live-p ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3079 (error "This command runs only out of Ediff Control Buffer"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3080 (with-output-to-temp-buffer ediff-debug-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3081 (princ (format "\nCtl buffer: %S\n" ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3082 (ediff-print-diff-vector (intern (concat "ediff-difference-vector-" "A")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3083 (ediff-print-diff-vector (intern (concat "ediff-difference-vector-" "B")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3084 (ediff-print-diff-vector (intern (concat "ediff-difference-vector-" "C")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3085 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3086
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3087 ;; don't report error if version control package wasn't found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3088 ;;(ediff-load-version-control 'silent)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3089
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3090 (run-hooks 'ediff-load-hooks)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3091
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3092
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3093 ;;; Local Variables:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3094 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3095 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3096 ;;; End:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3097
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3098 (provide 'ediff-util)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3099
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3100 ;;; ediff-util.el ends here