annotate lisp/ediff-util.el @ 97958:dae412744e36

* isearch.el (isearch-highlight-regexp): Fix last change, quoting non-alphabetical characters properly.
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 03 Sep 2008 00:01:10 +0000
parents c3512b2085a0
children 8559c6826b7e
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
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
2
62727
79e4354d107b (ediff-mode): Use run-mode-hooks.
Lute Kamstra <lute@gnu.org>
parents: 54090
diff changeset
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
79721
73661ddc7ac7 Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
4 ;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
5
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
7
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
9
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94604
diff changeset
10 ;; GNU Emacs is free software: you can redistribute it and/or modify
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94604
diff changeset
12 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94604
diff changeset
13 ;; (at your option) any later version.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
14
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
19
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94604
diff changeset
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
22
38422
7a94f1c588c4 Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 36857
diff changeset
23 ;;; Commentary:
7a94f1c588c4 Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 36857
diff changeset
24
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
25 ;;; Code:
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
26
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
27
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
28 (provide 'ediff-util)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
29
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
30 ;; Compiler pacifier
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
31 (defvar ediff-use-toolbar-p)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
32 (defvar ediff-toolbar-height)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
33 (defvar ediff-toolbar)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
34 (defvar ediff-toolbar-3way)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
35 (defvar bottom-toolbar)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
36 (defvar bottom-toolbar-visible-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
37 (defvar bottom-toolbar-height)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
38 (defvar mark-active)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
39
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
40 (defvar ediff-after-quit-hook-internal nil)
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
41
87691
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
42 (eval-and-compile
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
43 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
44
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
45 (eval-when-compile
94604
c0dfa9027738 Simplify compilation requirements.
Glenn Morris <rgm@gnu.org>
parents: 93773
diff changeset
46 (require 'ediff))
c0dfa9027738 Simplify compilation requirements.
Glenn Morris <rgm@gnu.org>
parents: 93773
diff changeset
47
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
48 ;; end pacifier
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
49
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
50
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
51 (require 'ediff-init)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
52 (require 'ediff-help)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
53 (require 'ediff-mult)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
54 (require 'ediff-wind)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
55 (require 'ediff-diff)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
56 (require 'ediff-merg)
93773
d7554c14325c 2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 93652
diff changeset
57 ;; for compatibility with current stable version of xemacs
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
58 (if (featurep 'xemacs)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
59 (require 'ediff-tbar))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
60
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
61
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
62 ;;; Functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
63
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
64 (defun ediff-mode ()
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
65 "Ediff mode controls all operations in a single Ediff session.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
66 This mode is entered through one of the following commands:
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
67 `ediff'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
68 `ediff-files'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
69 `ediff-buffers'
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
70 `ebuffers'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
71 `ediff3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
72 `ediff-files3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
73 `ediff-buffers3'
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
74 `ebuffers3'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
75 `ediff-merge'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
76 `ediff-merge-files'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
77 `ediff-merge-files-with-ancestor'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
78 `ediff-merge-buffers'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
79 `ediff-merge-buffers-with-ancestor'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
80 `ediff-merge-revisions'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
81 `ediff-merge-revisions-with-ancestor'
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
82 `ediff-windows-wordwise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
83 `ediff-windows-linewise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
84 `ediff-regions-wordwise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
85 `ediff-regions-linewise'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
86 `epatch'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
87 `ediff-patch-file'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
88 `ediff-patch-buffer'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
89 `epatch-buffer'
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
90 `erevision'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
91 `ediff-revision'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
92
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
93 Commands:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
94 \\{ediff-mode-map}"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
95 (kill-all-local-variables)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
96 (setq major-mode 'ediff-mode)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
97 (setq mode-name "Ediff")
64215
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64091
diff changeset
98 ;; We use run-hooks instead of run-mode-hooks for two reasons.
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64091
diff changeset
99 ;; The ediff control buffer is read-only and it is not supposed to be
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64091
diff changeset
100 ;; modified by minor modes and such. So, run-mode-hooks doesn't do anything
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64091
diff changeset
101 ;; useful here on top of what run-hooks does.
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64091
diff changeset
102 ;; Second, changing run-hooks to run-mode-hooks would require an
84864
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
103 ;; if-statement, since XEmacs doesn't have this.
64215
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64091
diff changeset
104 (run-hooks 'ediff-mode-hook))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
105
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
106
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
107
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
108 ;;; Build keymaps
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
109
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
110 (ediff-defvar-local ediff-mode-map nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
111 "Local keymap used in Ediff mode.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
112 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
113 to invocation.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
114
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
115 ;; Set up the keymap in the control buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
116 (defun ediff-set-keys ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
117 "Set up Ediff keymap, if necessary."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
118 (if (null ediff-mode-map)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
119 (ediff-setup-keymap))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
120 (use-local-map ediff-mode-map))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
121
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
122 ;; Reload Ediff keymap. For debugging only.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
123 (defun ediff-reload-keymap ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
124 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
125 (setq ediff-mode-map nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
126 (ediff-set-keys))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
127
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
128
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
129 (defun ediff-setup-keymap ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
130 "Set up the keymap used in the control buffer of Ediff."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
131 (setq ediff-mode-map (make-sparse-keymap))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
132 (suppress-keymap ediff-mode-map)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
133
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
134 (define-key ediff-mode-map
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
135 (if (featurep 'emacs) [mouse-2] [button2]) 'ediff-help-for-quick-help)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
136 (define-key ediff-mode-map "\C-m" 'ediff-help-for-quick-help)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
137
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
138 (define-key ediff-mode-map "p" 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
139 (define-key ediff-mode-map "\C-?" 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
140 (define-key ediff-mode-map [delete] 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
141 (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
142 'ediff-previous-difference nil))
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
143 ;; must come after C-h, or else C-h wipes out backspace's binding in XEmacs
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
144 (define-key ediff-mode-map [backspace] 'ediff-previous-difference)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
145 (define-key ediff-mode-map "n" 'ediff-next-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
146 (define-key ediff-mode-map " " 'ediff-next-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
147 (define-key ediff-mode-map "j" 'ediff-jump-to-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
148 (define-key ediff-mode-map "g" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
149 (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
150 (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
151 (define-key ediff-mode-map "q" 'ediff-quit)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
152 (define-key ediff-mode-map "D" 'ediff-show-diff-output)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
153 (define-key ediff-mode-map "z" 'ediff-suspend)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
154 (define-key ediff-mode-map "\C-l" 'ediff-recenter)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
155 (define-key ediff-mode-map "|" 'ediff-toggle-split)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
156 (define-key ediff-mode-map "h" 'ediff-toggle-hilit)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
157 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
158 (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
159 (if ediff-narrow-job
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
160 (define-key ediff-mode-map "%" 'ediff-toggle-narrow-region))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
161 (define-key ediff-mode-map "~" 'ediff-swap-buffers)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
162 (define-key ediff-mode-map "v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
163 (define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
164 (define-key ediff-mode-map "^" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
165 (define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
166 (define-key ediff-mode-map "V" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
167 (define-key ediff-mode-map "<" 'ediff-scroll-horizontally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
168 (define-key ediff-mode-map ">" 'ediff-scroll-horizontally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
169 (define-key ediff-mode-map "i" 'ediff-status-info)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
170 (define-key ediff-mode-map "E" 'ediff-documentation)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
171 (define-key ediff-mode-map "?" 'ediff-toggle-help)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
172 (define-key ediff-mode-map "!" 'ediff-update-diffs)
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
173 (define-key ediff-mode-map "M" 'ediff-show-current-session-meta-buffer)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
174 (define-key ediff-mode-map "R" 'ediff-show-registry)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
175 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
176 (define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
177 (define-key ediff-mode-map "a" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
178 (define-key ediff-mode-map "b" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
179 (define-key ediff-mode-map "r" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
180 (cond (ediff-merge-job
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
181 ;; Will barf if no ancestor
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
182 (define-key ediff-mode-map "/" 'ediff-show-ancestor)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
183 ;; In merging, we allow only A->C and B->C copying.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
184 (define-key ediff-mode-map "a" 'ediff-copy-A-to-C)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
185 (define-key ediff-mode-map "b" 'ediff-copy-B-to-C)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
186 (define-key ediff-mode-map "r" 'ediff-restore-diff-in-merge-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
187 (define-key ediff-mode-map "s" 'ediff-shrink-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
188 (define-key ediff-mode-map "+" 'ediff-combine-diffs)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
189 (define-key ediff-mode-map "$" nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
190 (define-key ediff-mode-map "$$" 'ediff-toggle-show-clashes-only)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
191 (define-key ediff-mode-map "$*" 'ediff-toggle-skip-changed-regions)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
192 (define-key ediff-mode-map "&" 'ediff-re-merge))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
193 (ediff-3way-comparison-job
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
194 (define-key ediff-mode-map "ab" 'ediff-copy-A-to-B)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
195 (define-key ediff-mode-map "ba" 'ediff-copy-B-to-A)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
196 (define-key ediff-mode-map "ac" 'ediff-copy-A-to-C)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
197 (define-key ediff-mode-map "bc" 'ediff-copy-B-to-C)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
198 (define-key ediff-mode-map "c" nil)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
199 (define-key ediff-mode-map "ca" 'ediff-copy-C-to-A)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
200 (define-key ediff-mode-map "cb" 'ediff-copy-C-to-B)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
201 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
202 (define-key ediff-mode-map "rb" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
203 (define-key ediff-mode-map "rc" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
204 (define-key ediff-mode-map "C" 'ediff-toggle-read-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
205 (t ; 2-way comparison
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
206 (define-key ediff-mode-map "a" 'ediff-copy-A-to-B)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
207 (define-key ediff-mode-map "b" 'ediff-copy-B-to-A)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
208 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
209 (define-key ediff-mode-map "rb" 'ediff-restore-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
210 ) ; cond
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
211 (define-key ediff-mode-map "G" 'ediff-submit-report)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
212 (define-key ediff-mode-map "#" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
213 (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
214 (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match)
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68651
diff changeset
215 (define-key ediff-mode-map "#c" 'ediff-toggle-ignore-case)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
216 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
217 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
218 (define-key ediff-mode-map "o" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
219 (define-key ediff-mode-map "A" 'ediff-toggle-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
220 (define-key ediff-mode-map "B" 'ediff-toggle-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
221 (define-key ediff-mode-map "w" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
222 (define-key ediff-mode-map "wa" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
223 (define-key ediff-mode-map "wb" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
224 (define-key ediff-mode-map "wd" 'ediff-save-buffer)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
225 (define-key ediff-mode-map "=" 'ediff-inferior-compare-regions)
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
226 (if (and (fboundp 'ediff-show-patch-diagnostics) (ediff-patch-job))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
227 (define-key ediff-mode-map "P" 'ediff-show-patch-diagnostics))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
228 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
229 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
230 (define-key ediff-mode-map "wc" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
231 (define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
232 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
233
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
234 (define-key ediff-mode-map "m" 'ediff-toggle-wide-display)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
235
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
236 ;; Allow ediff-mode-map to be referenced indirectly
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
237 (fset 'ediff-mode-map ediff-mode-map)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
238 (run-hooks 'ediff-keymap-setup-hook))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
239
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
240
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
241 ;;; Setup functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
242
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
243 ;; Common startup entry for all Ediff functions It now returns control buffer
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
244 ;; so other functions can do post-processing SETUP-PARAMETERS is a list of the
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
245 ;; form ((param .val) (param . val)...) This serves a similar purpose to
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
246 ;; STARTUP-HOOKS, but these parameters are set in the new control buffer right
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
247 ;; after this buf is created and before any windows are set and such.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
248 (defun ediff-setup (buffer-A file-A buffer-B file-B buffer-C file-C
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
249 startup-hooks setup-parameters
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
250 &optional merge-buffer-file)
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
251 (run-hooks 'ediff-before-setup-hook)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
252 ;; ediff-convert-standard-filename puts file names in the form appropriate
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
253 ;; for the OS at hand.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
254 (setq file-A (ediff-convert-standard-filename (expand-file-name file-A)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
255 (setq file-B (ediff-convert-standard-filename (expand-file-name file-B)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
256 (if (stringp file-C)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
257 (setq file-C
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
258 (ediff-convert-standard-filename (expand-file-name file-C))))
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
259 (if (stringp merge-buffer-file)
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
260 (progn
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
261 (setq merge-buffer-file
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
262 (ediff-convert-standard-filename
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
263 (expand-file-name merge-buffer-file)))
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
264 ;; check the directory exists
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
265 (or (file-exists-p (file-name-directory merge-buffer-file))
38422
7a94f1c588c4 Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 36857
diff changeset
266 (error "Directory %s given as place to save the merge doesn't exist"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
267 (abbreviate-file-name
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
268 (file-name-directory merge-buffer-file))))
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
269 (if (and (file-exists-p merge-buffer-file)
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
270 (file-directory-p merge-buffer-file))
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
271 (error "The merge buffer file %s must not be a directory"
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
272 (abbreviate-file-name merge-buffer-file)))
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
273 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
274 (let* ((control-buffer-name
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
275 (ediff-unique-buffer-name "*Ediff Control Panel" "*"))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
276 (control-buffer (ediff-with-current-buffer buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
277 (get-buffer-create control-buffer-name))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
278 (ediff-with-current-buffer control-buffer
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
279 (ediff-mode)
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
280
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
281 (make-local-variable 'ediff-use-long-help-message)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
282 (make-local-variable 'ediff-prefer-iconified-control-frame)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
283 (make-local-variable 'ediff-split-window-function)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
284 (make-local-variable 'ediff-default-variant)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
285 (make-local-variable 'ediff-merge-window-share)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
286 (make-local-variable 'ediff-window-setup-function)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
287 (make-local-variable 'ediff-keep-variants)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
288
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
289 (make-local-variable 'window-min-height)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
290 (setq window-min-height 2)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
291
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
292 (if (featurep 'xemacs)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
293 (make-local-hook 'ediff-after-quit-hook-internal))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
294
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
295 ;; unwrap set up parameters passed as argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
296 (while setup-parameters
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
297 (set (car (car setup-parameters)) (cdr (car setup-parameters)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
298 (setq setup-parameters (cdr setup-parameters)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
299
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
300 ;; set variables classifying the current ediff job
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
301 ;; must come AFTER setup-parameters
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
302 (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
303 ediff-merge-job (ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
304 ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
305 ediff-3way-job (ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
306 ediff-diff3-job (ediff-diff3-job)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
307 ediff-narrow-job (ediff-narrow-job)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
308 ediff-windows-job (ediff-windows-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
309 ediff-word-mode-job (ediff-word-mode-job))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
310
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
311 ;; Don't delete variants in case of ediff-buffer-* jobs without asking.
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65689
diff changeset
312 ;; This is because one may loose work---dangerous.
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
313 (if (string-match "buffer" (symbol-name ediff-job-name))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
314 (setq ediff-keep-variants t))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
315
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
316 (if (featurep 'xemacs)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
317 (make-local-hook 'pre-command-hook))
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
318
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
319 (if (ediff-window-display-p)
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
320 (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil 'local))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
321 (setq ediff-mouse-pixel-position (mouse-pixel-position))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
322
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
323 ;; adjust for merge jobs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
324 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
325 (let ((buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
326 ;; If default variant is `combined', the right stuff is
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
327 ;; inserted by ediff-do-merge
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
328 ;; Note: at some point, we tried to put ancestor buffer here
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
329 ;; (which is currently buffer C. This didn't work right
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
330 ;; because the merge buffer will contain lossage: diff regions
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
331 ;; in the ancestor, which correspond to revisions that agree
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
332 ;; in both buf A and B.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
333 (cond ((eq ediff-default-variant 'default-B)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
334 buffer-B)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
335 (t buffer-A))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
336
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
337 (setq ediff-split-window-function
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
338 ediff-merge-split-window-function)
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
339
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
340 ;; remember the ancestor buffer, if any
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
341 (setq ediff-ancestor-buffer buffer-C)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
342
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
343 (setq buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
344 (get-buffer-create
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
345 (ediff-unique-buffer-name "*ediff-merge" "*")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
346 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
347 (set-buffer buffer-C)
65627
511f8e9d22ca 2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65582
diff changeset
348 (insert-buffer-substring buf)
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65689
diff changeset
349 (goto-char (point-min))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
350 (funcall (ediff-with-current-buffer buf major-mode))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
351 (widen) ; merge buffer is always widened
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
352 (add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
353 )))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
354 (setq buffer-read-only nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
355 ediff-buffer-A buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
356 ediff-buffer-B buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
357 ediff-buffer-C buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
358 ediff-control-buffer control-buffer)
36857
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
359
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
360 (ediff-choose-syntax-table)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
361
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
362 (setq ediff-control-buffer-suffix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
363 (if (string-match "<[0-9]*>" control-buffer-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
364 (substring control-buffer-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
365 (match-beginning 0) (match-end 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
366 "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
367 ediff-control-buffer-number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
368 (max
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
369 0
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
370 (1-
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
371 (string-to-number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
372 (substring
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
373 ediff-control-buffer-suffix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
374 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
375 (string-match "[0-9]+" ediff-control-buffer-suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
376 0))))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
377
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
378 (setq ediff-error-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
379 (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*")))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
380
87009
2039ff581b31 * ediff-util.el (ediff-setup):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86465
diff changeset
381 (with-current-buffer ediff-error-buffer
2039ff581b31 * ediff-util.el (ediff-setup):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86465
diff changeset
382 (setq buffer-undo-list t))
2039ff581b31 * ediff-util.el (ediff-setup):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86465
diff changeset
383
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
384 (ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
385 (ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
386 (if ediff-3way-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
387 (ediff-with-current-buffer buffer-C (ediff-strip-mode-line-format)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
388 (if (ediff-buffer-live-p ediff-ancestor-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
389 (ediff-with-current-buffer ediff-ancestor-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
390 (ediff-strip-mode-line-format)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
391
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
392 (ediff-save-protected-variables) ; save variables to be restored on exit
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
393
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
394 ;; ediff-setup-diff-regions-function must be set after setup
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
395 ;; parameters are processed.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
396 (setq ediff-setup-diff-regions-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
397 (if ediff-diff3-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
398 'ediff-setup-diff-regions3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
399 'ediff-setup-diff-regions))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
400
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
401 (setq ediff-wide-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
402 (list (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
403 '(point-min) '(point-max) ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
404 (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
405 '(point-min) '(point-max) ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
406 (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
407 '(point-min) '(point-max) ediff-buffer-C)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
408
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
409 ;; This has effect only on ediff-windows/regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
410 ;; In all other cases, ediff-visible-region sets visibility bounds to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
411 ;; ediff-wide-bounds, and ediff-narrow-bounds are ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
412 (if ediff-start-narrowed
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
413 (setq ediff-visible-bounds ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
414 (setq ediff-visible-bounds ediff-wide-bounds))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
415
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
416 (ediff-set-keys) ; comes after parameter setup
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
417
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
418 ;; set up ediff-narrow-bounds, if not set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
419 (or ediff-narrow-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
420 (setq ediff-narrow-bounds ediff-wide-bounds))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
421
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
422 ;; All these must be inside ediff-with-current-buffer control-buffer,
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
423 ;; since these vars are local to control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
424 ;; These won't run if there are errors in diff
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
425 (ediff-with-current-buffer ediff-buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
426 (ediff-nuke-selective-display)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
427 (run-hooks 'ediff-prepare-buffer-hook)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
428 (if (ediff-with-current-buffer control-buffer ediff-merge-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
429 (setq buffer-read-only t))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
430 ;; 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
431 ;; be used again in the future
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
432 (or (memq control-buffer ediff-this-buffer-ediff-sessions)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
433 (setq ediff-this-buffer-ediff-sessions
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
434 (cons control-buffer ediff-this-buffer-ediff-sessions)))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
435 (if ediff-make-buffers-readonly-at-startup
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
436 (setq buffer-read-only t))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
437 )
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
438
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
439 (ediff-with-current-buffer ediff-buffer-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
440 (ediff-nuke-selective-display)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
441 (run-hooks 'ediff-prepare-buffer-hook)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
442 (if (ediff-with-current-buffer control-buffer ediff-merge-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
443 (setq buffer-read-only t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
444 ;; add control-buffer to the list of sessions
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
445 (or (memq control-buffer ediff-this-buffer-ediff-sessions)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
446 (setq ediff-this-buffer-ediff-sessions
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
447 (cons control-buffer ediff-this-buffer-ediff-sessions)))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
448 (if ediff-make-buffers-readonly-at-startup
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
449 (setq buffer-read-only t))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
450 )
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
451
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
452 (if ediff-3way-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
453 (ediff-with-current-buffer ediff-buffer-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
454 (ediff-nuke-selective-display)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
455 ;; the merge bufer should never be narrowed
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
456 ;; (it can happen if it is on rmail-mode or similar)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
457 (if (ediff-with-current-buffer control-buffer ediff-merge-job)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
458 (widen))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
459 (run-hooks 'ediff-prepare-buffer-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
460 ;; add control-buffer to the list of sessions
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
461 (or (memq control-buffer ediff-this-buffer-ediff-sessions)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
462 (setq ediff-this-buffer-ediff-sessions
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
463 (cons control-buffer
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
464 ediff-this-buffer-ediff-sessions)))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
465 (if ediff-make-buffers-readonly-at-startup
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
466 (setq buffer-read-only t)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
467 (setq buffer-read-only nil))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
468 ))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
469
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
470 (if (ediff-buffer-live-p ediff-ancestor-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
471 (ediff-with-current-buffer ediff-ancestor-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
472 (ediff-nuke-selective-display)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
473 (setq buffer-read-only t)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
474 (run-hooks 'ediff-prepare-buffer-hook)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
475 (or (memq control-buffer ediff-this-buffer-ediff-sessions)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
476 (setq ediff-this-buffer-ediff-sessions
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
477 (cons control-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
478 ediff-this-buffer-ediff-sessions)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
479 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
480
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
481 ;; the following must be after setting up ediff-narrow-bounds AND after
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
482 ;; nuking selective display
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
483 (funcall ediff-setup-diff-regions-function file-A file-B file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
484 (setq ediff-number-of-differences (length ediff-difference-vector-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
485 (setq ediff-current-difference -1)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
486
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
487 (ediff-make-current-diff-overlay 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
488 (ediff-make-current-diff-overlay 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
489 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
490 (ediff-make-current-diff-overlay 'C))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
491 (if ediff-merge-with-ancestor-job
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
492 (ediff-make-current-diff-overlay 'Ancestor))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
493
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
494 (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
495
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
496 (let ((shift-A (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
497 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
498 'A ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
499 (shift-B (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
500 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
501 'B ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
502 (shift-C (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
503 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
504 'C ediff-narrow-bounds))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
505 ;; position point in buf A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
506 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
507 (select-window ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
508 (goto-char shift-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
509 ;; position point in buf B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
510 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
511 (select-window ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
512 (goto-char shift-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
513 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
514 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
515 (select-window ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
516 (goto-char shift-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
517 )
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
518
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
519 (select-window ediff-control-window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
520 (ediff-visible-region)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
521
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
522 (run-hooks 'startup-hooks)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
523 (ediff-arrange-autosave-in-merge-jobs merge-buffer-file)
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
524
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
525 (ediff-refresh-mode-lines)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
526 (setq buffer-read-only t)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
527 (setq ediff-session-registry
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
528 (cons control-buffer ediff-session-registry))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
529 (ediff-update-registry)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
530 (if (ediff-buffer-live-p ediff-meta-buffer)
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
531 (ediff-update-meta-buffer
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
532 ediff-meta-buffer nil ediff-meta-session-number))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
533 (run-hooks 'ediff-startup-hook)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
534 ) ; eval in control-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
535 control-buffer))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
536
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
537
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
538 ;; This function assumes that we are in the window where control buffer is
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
539 ;; to reside.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
540 (defun ediff-setup-control-buffer (ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
541 "Set up window for control buffer."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
542 (if (window-dedicated-p (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
543 (set-buffer ctl-buf) ; we are in control frame but just in case
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
544 (switch-to-buffer ctl-buf))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
545 (let ((window-min-height 2))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
546 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
547 (ediff-set-help-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
548 (insert ediff-help-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
549 (shrink-window-if-larger-than-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
550 (or (ediff-multiframe-setup-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
551 (ediff-indent-help-message))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
552 (ediff-set-help-overlays)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
553
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
554 (set-buffer-modified-p nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
555 (ediff-refresh-mode-lines)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
556 (setq ediff-control-window (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
557 (setq ediff-window-config-saved
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
558 (format "%S%S%S%S%S%S%S"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
559 ediff-control-window
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
560 ediff-window-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
561 ediff-window-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
562 ediff-window-C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
563 ediff-split-window-function
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
564 (ediff-multiframe-setup-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
565 ediff-wide-display-p))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
566
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
567 (set-window-dedicated-p (selected-window) t)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
568 ;; In multiframe, toolbar is set in ediff-setup-control-frame
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
569 (if (not (ediff-multiframe-setup-p))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
570 (ediff-make-bottom-toolbar)) ; this checks if toolbar is requested
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
571 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
572 (skip-chars-forward ediff-whitespace)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
573
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
574 ;; This executes in control buffer and sets auto-save, visited file name, etc,
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
575 ;; in the merge buffer
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
576 (defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file)
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
577 (if (not ediff-merge-job)
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
578 ()
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
579 (if (stringp merge-buffer-file)
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
580 (setq ediff-autostore-merges t
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
581 ediff-merge-store-file merge-buffer-file))
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
582 (if (stringp ediff-merge-store-file)
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
583 (progn
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
584 ;; save before leaving ctl buffer
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
585 (ediff-verify-file-merge-buffer ediff-merge-store-file)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
586 (setq merge-buffer-file ediff-merge-store-file)
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
587 (ediff-with-current-buffer ediff-buffer-C
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
588 (set-visited-file-name merge-buffer-file))))
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
589 (ediff-with-current-buffer ediff-buffer-C
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
590 (setq buffer-offer-save t) ; ask before killing buffer
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
591 ;; make sure the contents is auto-saved
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
592 (auto-save-mode 1))
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
593 ))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
594
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
595
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
596 ;;; Commands for working with Ediff
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
597
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
598 (defun ediff-update-diffs ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
599 "Recompute difference regions in buffers A, B, and C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
600 Buffers are not synchronized with their respective files, so changes done
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
601 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
602 if necessary."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
603 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
604 (ediff-barf-if-not-control-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
605 (if (and (ediff-buffer-live-p ediff-ancestor-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
606 (not
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
607 (y-or-n-p
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
608 "Ancestor buffer will not be used. Recompute diffs anyway? ")))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
609 (error "Recomputation of differences canceled"))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
610
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
611 (let ((point-A (ediff-with-current-buffer ediff-buffer-A (point)))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
612 ;;(point-B (ediff-with-current-buffer ediff-buffer-B (point)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
613 (tmp-buffer (get-buffer-create ediff-tmp-buffer))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
614 (buf-A-file-name (buffer-file-name ediff-buffer-A))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
615 (buf-B-file-name (buffer-file-name ediff-buffer-B))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
616 ;; (null ediff-buffer-C) is no problem, as we later check if
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
617 ;; ediff-buffer-C is alive
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
618 (buf-C-file-name (buffer-file-name ediff-buffer-C))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
619 (overl-A (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
620 'A ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
621 (overl-B (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
622 'B ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
623 (overl-C (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
624 'C ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
625 beg-A end-A beg-B end-B beg-C end-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
626 file-A file-B file-C)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
627
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
628 (if (stringp buf-A-file-name)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
629 (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
630 (if (stringp buf-B-file-name)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
631 (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
632 (if (stringp buf-C-file-name)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
633 (setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
634
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
635 (ediff-unselect-and-select-difference -1)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
636
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
637 (setq beg-A (ediff-overlay-start overl-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
638 beg-B (ediff-overlay-start overl-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
639 beg-C (ediff-overlay-start overl-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
640 end-A (ediff-overlay-end overl-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
641 end-B (ediff-overlay-end overl-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
642 end-C (ediff-overlay-end overl-C))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
643
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
644 (if ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
645 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
646 (ediff-wordify beg-A end-A ediff-buffer-A tmp-buffer)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
647 (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
648 (ediff-wordify beg-B end-B ediff-buffer-B tmp-buffer)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
649 (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
650 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
651 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
652 (ediff-wordify beg-C end-C ediff-buffer-C tmp-buffer)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
653 (setq file-C (ediff-make-temp-file tmp-buffer "regC"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
654 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
655 ;; not word-mode
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
656 (setq file-A (ediff-make-temp-file ediff-buffer-A buf-A-file-name))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
657 (setq file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
658 (if ediff-3way-job
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
659 (setq file-C (ediff-make-temp-file ediff-buffer-C buf-C-file-name)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
660 )
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
661
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
662 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
663 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
664 (ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
665 (ediff-clear-diff-vector
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
666 'ediff-difference-vector-Ancestor 'fine-diffs-also)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
667 ;; let them garbage collect. we can't use the ancestor after recomputing
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
668 ;; the diffs.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
669 (setq ediff-difference-vector-Ancestor nil
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
670 ediff-ancestor-buffer nil
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
671 ediff-state-of-merge nil)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
672
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
673 (setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
674
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
675 ;; In case of merge job, fool it into thinking that it is just doing
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
676 ;; comparison
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
677 (let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
678 (ediff-3way-comparison-job ediff-3way-comparison-job)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
679 (ediff-merge-job ediff-merge-job)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
680 (ediff-merge-with-ancestor-job ediff-merge-with-ancestor-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
681 (ediff-job-name ediff-job-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
682 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
683 (setq ediff-setup-diff-regions-function 'ediff-setup-diff-regions3
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
684 ediff-3way-comparison-job t
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
685 ediff-merge-job nil
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
686 ediff-merge-with-ancestor-job nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
687 ediff-job-name 'ediff-files3))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
688 (funcall ediff-setup-diff-regions-function file-A file-B file-C))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
689
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
690 (setq ediff-number-of-differences (length ediff-difference-vector-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
691 (delete-file file-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
692 (delete-file file-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
693 (if file-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
694 (delete-file file-C))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
695
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
696 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
697 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
698
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
699 (ediff-jump-to-difference (ediff-diff-at-point 'A point-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
700 (message "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
701 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
702
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
703 ;; Not bound to any key---to dangerous. A user can do it if necessary.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
704 (defun ediff-revert-buffers-then-recompute-diffs (noconfirm)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
705 "Revert buffers A, B and C. Then rerun Ediff on file A and file B."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
706 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
707 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
708 (let ((bufA ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
709 (bufB ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
710 (bufC ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
711 (ctl-buf ediff-control-buffer)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
712 (keep-variants ediff-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
713 (ancestor-buf ediff-ancestor-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
714 (ancestor-job ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
715 (merge ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
716 (comparison ediff-3way-comparison-job))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
717 (ediff-with-current-buffer bufA
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
718 (revert-buffer t noconfirm))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
719 (ediff-with-current-buffer bufB
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
720 (revert-buffer t noconfirm))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
721 ;; this should only be executed in a 3way comparison, not in merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
722 (if comparison
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
723 (ediff-with-current-buffer bufC
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
724 (revert-buffer t noconfirm)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
725 (if merge
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 (set-buffer ctl-buf)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
728 ;; the argument says whether to reverse the meaning of
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
729 ;; ediff-keep-variants, i.e., ediff-really-quit runs here with
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
730 ;; variants kept.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
731 (ediff-really-quit (not keep-variants))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
732 (kill-buffer bufC)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
733 (if ancestor-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
734 (ediff-merge-buffers-with-ancestor bufA bufB ancestor-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
735 (ediff-merge-buffers bufA bufB)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
736 (ediff-update-diffs))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
737
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
738
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
739 ;; optional NO-REHIGHLIGHT says to not rehighlight buffers
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
740 (defun ediff-recenter (&optional no-rehighlight)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
741 "Bring the highlighted region of all buffers being compared into view.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
742 Reestablish the default three-window display."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
743 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
744 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
745 (let (buffer-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
746 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
747 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
748 (or (not ediff-3way-job)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
749 (ediff-buffer-live-p ediff-buffer-C)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
750 (ediff-setup-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
751 ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
752 (or (eq this-command 'ediff-quit)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
753 (message ediff-KILLED-VITAL-BUFFER
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
754 (beep 1)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
755 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
756
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
757 ;; set visibility range appropriate to this invocation of Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
758 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
759 ;; raise
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
760 (if (and (ediff-window-display-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
761 (symbolp this-command)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
762 (symbolp last-command)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
763 ;; Either one of the display-changing commands
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
764 (or (memq this-command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
765 '(ediff-recenter
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
766 ediff-dir-action ediff-registry-action
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
767 ediff-patch-action
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
768 ediff-toggle-wide-display ediff-toggle-multiframe))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
769 ;; Or one of the movement cmds and prev cmd was an Ediff cmd
14040
187735b53d52 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13605
diff changeset
770 ;; This avoids raising frames unnecessarily.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
771 (and (memq this-command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
772 '(ediff-next-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
773 ediff-previous-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
774 ediff-jump-to-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
775 ediff-jump-to-difference-at-point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
776 (not (string-match "^ediff-" (symbol-name last-command)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
777 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
778 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
779 (if (window-live-p ediff-window-A)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
780 (raise-frame (window-frame ediff-window-A)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
781 (if (window-live-p ediff-window-B)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
782 (raise-frame (window-frame ediff-window-B)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
783 (if (window-live-p ediff-window-C)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
784 (raise-frame (window-frame ediff-window-C)))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
785 (if (and (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
786 (frame-live-p ediff-control-frame)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
787 (not ediff-use-long-help-message)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
788 (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
789 (raise-frame ediff-control-frame))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
790
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
791 ;; Redisplay whatever buffers are showing, if there is a selected difference
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
792 (let ((control-frame ediff-control-frame)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
793 (control-buf ediff-control-buffer))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
794 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
795 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
796 (or (not ediff-3way-job)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
797 (ediff-buffer-live-p ediff-buffer-C)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
798 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
799 (or no-rehighlight
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
800 (ediff-select-difference ediff-current-difference))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
801
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
802 (ediff-recenter-one-window 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
803 (ediff-recenter-one-window 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
804 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
805 (ediff-recenter-one-window 'C))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
806
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
807 (ediff-with-current-buffer control-buf
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
808 (ediff-recenter-ancestor) ; check if ancestor is alive
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
809
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
810 (if (and (ediff-multiframe-setup-p)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
811 (not ediff-use-long-help-message)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
812 (not (ediff-frame-iconified-p ediff-control-frame)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
813 ;; never grab mouse on quit in this place
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
814 (ediff-reset-mouse
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
815 control-frame
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
816 (eq this-command 'ediff-quit))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
817 ))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
818
52828
d08ef8842be1 2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
819 (or no-rehighlight
d08ef8842be1 2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
820 (ediff-restore-highlighting))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
821 (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
822 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
823
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
824 ;; this function returns to the window it was called from
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
825 ;; (which was the control window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
826 (defun ediff-recenter-one-window (buf-type)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
827 (if (ediff-valid-difference-p)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
828 ;; context must be saved before switching to windows A/B/C
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
829 (let* ((ctl-wind (selected-window))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
830 (shift (ediff-overlay-start
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
831 (ediff-get-value-according-to-buffer-type
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
832 buf-type ediff-narrow-bounds)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
833 (job-name ediff-job-name)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
834 (control-buf ediff-control-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
835 (window-name (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
836 buf-type ediff-window-alist))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
837 (window (if (window-live-p (symbol-value window-name))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
838 (symbol-value window-name))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
839
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
840 (if (and window ediff-windows-job)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
841 (set-window-start window shift))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
842 (if window
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
843 (progn
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
844 (select-window window)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
845 (ediff-deactivate-mark)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
846 (ediff-position-region
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
847 (ediff-get-diff-posn buf-type 'beg nil control-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
848 (ediff-get-diff-posn buf-type 'end nil control-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
849 (ediff-get-diff-posn buf-type 'beg nil control-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
850 job-name
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
851 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
852 (select-window ctl-wind)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
853 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
854
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
855 (defun ediff-recenter-ancestor ()
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
856 ;; do half-hearted job by recentering the ancestor buffer, if it is alive and
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
857 ;; visible.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
858 (if (and (ediff-buffer-live-p ediff-ancestor-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
859 (ediff-valid-difference-p))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
860 (let ((window (ediff-get-visible-buffer-window ediff-ancestor-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
861 (ctl-wind (selected-window))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
862 (job-name ediff-job-name)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
863 (ctl-buf ediff-control-buffer))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
864 (ediff-with-current-buffer ediff-ancestor-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
865 (goto-char (ediff-get-diff-posn 'Ancestor 'beg nil ctl-buf))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
866 (if window
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
867 (progn
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
868 (select-window window)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
869 (ediff-position-region
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
870 (ediff-get-diff-posn 'Ancestor 'beg nil ctl-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
871 (ediff-get-diff-posn 'Ancestor 'end nil ctl-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
872 (ediff-get-diff-posn 'Ancestor 'beg nil ctl-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
873 job-name))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
874 (select-window ctl-wind)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
875 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
876
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
877
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
878 ;; This will have to be refined for 3way jobs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
879 (defun ediff-toggle-split ()
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
880 "Toggle vertical/horizontal window split.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
881 Does nothing if file-A and file-B are in different frames."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
882 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
883 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
884 (let* ((wind-A (if (window-live-p ediff-window-A) ediff-window-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
885 (wind-B (if (window-live-p ediff-window-B) ediff-window-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
886 (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
887 (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
888 (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
889 (frame-C (if wind-C (window-frame wind-C))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
890 (if (or (eq frame-A frame-B)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
891 (not (frame-live-p frame-A))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
892 (not (frame-live-p frame-B))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
893 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
894 (or (not (frame-live-p frame-C))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
895 (eq frame-A frame-C) (eq frame-B frame-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
896 (setq ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
897 (if (eq ediff-split-window-function 'split-window-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
898 'split-window-horizontally
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
899 'split-window-vertically))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
900 (message "Buffers being compared are in different frames"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
901 (ediff-recenter 'no-rehighlight)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
902
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
903 (defun ediff-toggle-hilit ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
904 "Switch between highlighting using ASCII flags and highlighting using faces.
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
905 On a dumb terminal, switches between ASCII highlighting and no highlighting."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
906 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
907 (ediff-barf-if-not-control-buffer)
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
908
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
909 (ediff-unselect-and-select-difference
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
910 ediff-current-difference 'unselect-only)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
911 ;; cycle through highlighting
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
912 (cond ((and ediff-use-faces
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
913 (ediff-has-face-support-p)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
914 ediff-highlight-all-diffs)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
915 (message "Unhighlighting unselected difference regions")
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
916 (setq ediff-highlight-all-diffs nil
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
917 ediff-highlighting-style 'face))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
918 ((or (and ediff-use-faces (ediff-has-face-support-p)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
919 (eq ediff-highlighting-style 'face)) ; has face support
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
920 (and (not (ediff-has-face-support-p)) ; no face support
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
921 (eq ediff-highlighting-style 'off)))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
922 (message "Highlighting with ASCII flags")
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
923 (setq ediff-highlighting-style 'ascii
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
924 ediff-highlight-all-diffs nil
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
925 ediff-use-faces nil))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
926 ((eq ediff-highlighting-style 'ascii)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
927 (message "ASCII highlighting flags removed")
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
928 (setq ediff-highlighting-style 'off
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
929 ediff-highlight-all-diffs nil))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
930 ((ediff-has-face-support-p) ; catch-all for cases with face support
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
931 (message "Re-highlighting all difference regions")
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
932 (setq ediff-use-faces t
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
933 ediff-highlighting-style 'face
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
934 ediff-highlight-all-diffs t)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
935
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
936 (if (and ediff-use-faces ediff-highlight-all-diffs)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
937 (ediff-paint-background-regions)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
938 (ediff-paint-background-regions 'unhighlight))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
939
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
940 (ediff-unselect-and-select-difference
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
941 ediff-current-difference 'select-only))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
942
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
943
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
944 (defun ediff-toggle-autorefine ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
945 "Toggle auto-refine mode."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
946 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
947 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
948 (if ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
949 (error "No fine differences in this mode"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
950 (cond ((eq ediff-auto-refine 'nix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
951 (setq ediff-auto-refine 'on)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
952 (ediff-make-fine-diffs ediff-current-difference 'noforce)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
953 (message "Auto-refining is ON"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
954 ((eq ediff-auto-refine 'on)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
955 (message "Auto-refining is OFF")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
956 (setq ediff-auto-refine 'off))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
957 (t ;; nix 'em
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
958 (ediff-set-fine-diff-properties ediff-current-difference 'default)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
959 (message "Refinements are HIDDEN")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
960 (setq ediff-auto-refine 'nix))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
961 ))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
962
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
963 (defun ediff-show-ancestor ()
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
964 "Show the ancestor buffer in a suitable window."
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
965 (interactive)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
966 (ediff-recenter)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
967 (or (ediff-buffer-live-p ediff-ancestor-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
968 (if ediff-merge-with-ancestor-job
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
969 (error "Lost connection to ancestor buffer...sorry")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
970 (error "Not merging with ancestor")))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
971 (let (wind)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
972 (cond ((setq wind (ediff-get-visible-buffer-window ediff-ancestor-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
973 (raise-frame (window-frame wind)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
974 (t (set-window-buffer ediff-window-C ediff-ancestor-buffer)))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
975
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
976 (defun ediff-make-or-kill-fine-diffs (arg)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
977 "Compute fine diffs. With negative prefix arg, kill fine diffs.
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
978 In both cases, operates on the current difference region."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
979 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
980 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
981 (cond ((eq arg '-)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
982 (ediff-clear-fine-differences ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
983 ((and (numberp arg) (< arg 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
984 (ediff-clear-fine-differences ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
985 (t (ediff-make-fine-diffs))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
986
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
987
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
988 (defun ediff-toggle-help ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
989 "Toggle short/long help message."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
990 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
991 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
992 (let (buffer-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
993 (erase-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
994 (setq ediff-use-long-help-message (not ediff-use-long-help-message))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
995 (ediff-set-help-message))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
996 ;; remember the icon status of the control frame when the user requested
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
997 ;; full control message
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
998 (if (and ediff-use-long-help-message (ediff-multiframe-setup-p))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
999 (setq ediff-prefer-iconified-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1000 (ediff-frame-iconified-p ediff-control-frame)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1001
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1002 (setq ediff-window-config-saved "") ; force redisplay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1003 (ediff-recenter 'no-rehighlight))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1004
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1005
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1006 ;; 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
1007 (defun ediff-toggle-read-only (&optional buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1008 "Toggle read-only in current buffer.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1009 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
1010 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
1011 of the current buffer."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1012 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1013 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1014 (let ((ctl-buf (if (null buf) (current-buffer)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1015 (buf-type (ediff-char-to-buftype last-command-char)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1016 (or buf (ediff-recenter))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1017 (or buf
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1018 (setq buf (ediff-get-buffer buf-type)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1019
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1020 (ediff-with-current-buffer buf ; eval in buf A/B/C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1021 (let* ((file (buffer-file-name buf))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1022 (file-writable (and file
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1023 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1024 (file-writable-p file)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1025 (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
1026 ((ediff-file-checked-out-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1027 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1028 (file-writable 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1029 (t (key-binding "\C-x\C-q")))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1030 ;; If the file is checked in, make sure we don't make buffer modifiable
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1031 ;; without warning the user. The user can fool our checks by making the
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1032 ;; buffer non-RO without checking the file out. We regard this as a
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1033 ;; user problem.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1034 (if (and (ediff-file-checked-in-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1035 ;; 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
1036 ;; 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
1037 ctl-buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1038 (cond ((not buffer-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1039 (setq toggle-ro-cmd 'toggle-read-only))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1040 ((and (or (beep 1) t) ; always beep
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1041 (y-or-n-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1042 (format
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1043 "File %s is under version control. Check it out? "
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1044 (ediff-abbreviate-file-name file))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1045 ;; 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
1046 ;; 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
1047 ;; 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
1048 ;; 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
1049 ;; is checked in.
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1050 (ediff-with-current-buffer ctl-buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1051 (ediff-change-saved-variable
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1052 'buffer-read-only nil buf-type)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1053 (t
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1054 (setq toggle-ro-cmd 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1055 (beep 1) (beep 1)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1056 (message
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1057 "Boy, this is risky! Don't modify this file...")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1058 (sit-for 3)))) ; let the user see the warning
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1059 (if (and toggle-ro-cmd
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1060 (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
1061 (save-excursion
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1062 (save-window-excursion
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1063 (select-window (ediff-get-visible-buffer-window buf))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1064 (command-execute toggle-ro-cmd)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1065 (error "Don't know how to toggle read-only in buffer %S" buf))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1066
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1067 ;; 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
1068 ;; Signal a warning in this case.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1069 (if (and file (not buffer-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1070 (eq this-command 'ediff-toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1071 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1072 (not (file-writable-p file)))
53865
6a6dc234f296 (ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents: 52828
diff changeset
1073 (progn
6a6dc234f296 (ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents: 52828
diff changeset
1074 (beep 1)
6a6dc234f296 (ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents: 52828
diff changeset
1075 (message "Warning: file %s is read-only"
6a6dc234f296 (ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents: 52828
diff changeset
1076 (ediff-abbreviate-file-name file))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1077 ))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1078
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1079 ;; checkout if visited file is checked in
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1080 (defun ediff-maybe-checkout (buf)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1081 (let ((file (expand-file-name (buffer-file-name buf)))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1082 (checkout-function (key-binding "\C-x\C-q")))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1083 (if (and (ediff-file-checked-in-p file)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1084 (or (beep 1) t)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1085 (y-or-n-p
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1086 (format
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1087 "File %s is under version control. Check it out? "
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1088 (ediff-abbreviate-file-name file))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1089 (ediff-with-current-buffer buf
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1090 (command-execute checkout-function)))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1091
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1092
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1093 ;; This is a simple-minded check for whether a file is under version control.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1094 ;; 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
1095 ;; 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
1096 ;; able to read such a file anyway).
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1097 ;; FILE is a string representing file name
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1098 ;;(defun ediff-file-under-version-control (file)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1099 ;; (let* ((filedir (file-name-directory file))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1100 ;; (file-nondir (file-name-nondirectory file))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1101 ;; (trial (concat file-nondir ",v"))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1102 ;; (full-trial (concat filedir trial))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1103 ;; (full-rcs-trial (concat filedir "RCS/" trial)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1104 ;; (and (stringp file)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1105 ;; (file-exists-p file)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1106 ;; (or
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1107 ;; (and
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1108 ;; (file-exists-p full-trial)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1109 ;; ;; in FAT FS, `file,v' and `file' may turn out to be the same!
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1110 ;; ;; don't be fooled by this!
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1111 ;; (not (equal (file-attributes file)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1112 ;; (file-attributes full-trial))))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1113 ;; ;; check if a version is in RCS/ directory
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1114 ;; (file-exists-p full-rcs-trial)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1115 ;; ))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1116
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1117
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68651
diff changeset
1118 (defun ediff-file-checked-out-p (file)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1119 (or (not (featurep 'vc-hooks))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1120 (and (vc-backend file)
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38422
diff changeset
1121 (if (fboundp 'vc-state)
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38422
diff changeset
1122 (or (memq (vc-state file) '(edited needs-merge))
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38422
diff changeset
1123 (stringp (vc-state file)))
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38422
diff changeset
1124 ;; XEmacs has no vc-state
85838
6852207d73f3 (ediff-file-checked-out-p)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 84864
diff changeset
1125 (when (featurep 'xemacs) (vc-locking-user file)))
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38422
diff changeset
1126 )))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1127
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68651
diff changeset
1128 (defun ediff-file-checked-in-p (file)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1129 (and (featurep 'vc-hooks)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1130 ;; CVS files are considered not checked in
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1131 (not (memq (vc-backend file) '(nil CVS)))
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38422
diff changeset
1132 (if (fboundp 'vc-state)
47846
8e6ed5c1f142 2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 47520
diff changeset
1133 (and
8e6ed5c1f142 2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 47520
diff changeset
1134 (not (memq (vc-state file) '(edited needs-merge)))
8e6ed5c1f142 2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 47520
diff changeset
1135 (not (stringp (vc-state file))))
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38422
diff changeset
1136 ;; XEmacs has no vc-state
85838
6852207d73f3 (ediff-file-checked-out-p)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 84864
diff changeset
1137 (when (featurep 'xemacs) (not (vc-locking-user file))))
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38422
diff changeset
1138 ))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1139
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1140 (defun ediff-file-compressed-p (file)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1141 (condition-case nil
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1142 (require 'jka-compr)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1143 (error))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1144 (if (featurep 'jka-compr)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1145 (string-match (jka-compr-build-file-regexp) file)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1146
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1147
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1148 (defun ediff-swap-buffers ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1149 "Rotate the display of buffers A, B, and C."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1150 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1151 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1152 (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
1153 (let ((buf ediff-buffer-A)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1154 (values ediff-buffer-values-orig-A)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1155 (diff-vec ediff-difference-vector-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1156 (hide-regexp ediff-regexp-hide-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1157 (focus-regexp ediff-regexp-focus-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1158 (wide-visibility-p (eq ediff-visible-bounds ediff-wide-bounds))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1159 (overlay (if (ediff-has-face-support-p)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1160 ediff-current-diff-overlay-A)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1161 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1162 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1163 (set-window-buffer ediff-window-A ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1164 (set-window-buffer ediff-window-B ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1165 (set-window-buffer ediff-window-C ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1166 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1167 (set-window-buffer ediff-window-A ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1168 (set-window-buffer ediff-window-B ediff-buffer-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1169 ;; swap diff buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1170 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1171 (setq ediff-buffer-A ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1172 ediff-buffer-C ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1173 ediff-buffer-B buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1174 (setq ediff-buffer-A ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1175 ediff-buffer-B buf))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1176
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1177 ;; swap saved buffer characteristics
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1178 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1179 (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
1180 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
1181 ediff-buffer-values-orig-B values)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1182 (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
1183 ediff-buffer-values-orig-B values))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1184
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1185 ;; swap diff vectors
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1186 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1187 (setq ediff-difference-vector-A ediff-difference-vector-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1188 ediff-difference-vector-C ediff-difference-vector-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1189 ediff-difference-vector-B diff-vec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1190 (setq ediff-difference-vector-A ediff-difference-vector-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1191 ediff-difference-vector-B diff-vec))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1192
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1193 ;; swap hide/focus regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1194 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1195 (setq ediff-regexp-hide-A ediff-regexp-hide-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1196 ediff-regexp-hide-C ediff-regexp-hide-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1197 ediff-regexp-hide-B hide-regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1198 ediff-regexp-focus-A ediff-regexp-focus-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1199 ediff-regexp-focus-C ediff-regexp-focus-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1200 ediff-regexp-focus-B focus-regexp)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1201 (setq ediff-regexp-hide-A ediff-regexp-hide-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1202 ediff-regexp-hide-B hide-regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1203 ediff-regexp-focus-A ediff-regexp-focus-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1204 ediff-regexp-focus-B focus-regexp))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1205
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1206 ;; The following is needed for XEmacs, since there one can't move
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1207 ;; overlay to another buffer. In Emacs, this swap is redundant.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1208 (if (ediff-has-face-support-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1209 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1210 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1211 ediff-current-diff-overlay-C ediff-current-diff-overlay-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1212 ediff-current-diff-overlay-B overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1213 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1214 ediff-current-diff-overlay-B overlay)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1215
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1216 ;; swap wide bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1217 (setq ediff-wide-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1218 (cond (ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1219 (list (nth 2 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1220 (nth 0 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1221 (nth 1 ediff-wide-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1222 (ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1223 (list (nth 1 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1224 (nth 0 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1225 (nth 2 ediff-wide-bounds)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1226 (t
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1227 (list (nth 1 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1228 (nth 0 ediff-wide-bounds)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1229 ;; swap narrow bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1230 (setq ediff-narrow-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1231 (cond (ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1232 (list (nth 2 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1233 (nth 0 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1234 (nth 1 ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1235 (ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1236 (list (nth 1 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1237 (nth 0 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1238 (nth 2 ediff-narrow-bounds)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1239 (t
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1240 (list (nth 1 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1241 (nth 0 ediff-narrow-bounds)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1242 (if wide-visibility-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1243 (setq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1244 (setq ediff-visible-bounds ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1245 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1246 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1247 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1248 (ediff-recenter 'no-rehighlight)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1249 )
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1250
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1251
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1252 (defun ediff-toggle-wide-display ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1253 "Toggle wide/regular display.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1254 This is especially useful when comparing buffers side-by-side."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1255 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1256 (ediff-barf-if-not-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1257 (or (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1258 (error "%sEmacs is not running as a window application"
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
1259 (if (featurep 'emacs) "" "X")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1260 (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1261 (let ((ctl-buf ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1262 (setq ediff-wide-display-p (not ediff-wide-display-p))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1263 (if (not ediff-wide-display-p)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1264 (ediff-with-current-buffer ctl-buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1265 (modify-frame-parameters
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1266 ediff-wide-display-frame ediff-wide-display-orig-parameters)
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
1267 ;;(sit-for (if (featurep 'xemacs) 0.4 0))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1268 ;; restore control buf, since ctl window may have been deleted
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1269 ;; during resizing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1270 (set-buffer ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1271 (setq ediff-wide-display-orig-parameters nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1272 ediff-window-B nil) ; force update of window config
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1273 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1274 (funcall ediff-make-wide-display-function)
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
1275 ;;(sit-for (if (featurep 'xemacs) 0.4 0))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1276 (ediff-with-current-buffer ctl-buf
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1277 (setq ediff-window-B nil) ; force update of window config
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1278 (ediff-recenter 'no-rehighlight)))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1279
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1280 ;;;###autoload
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1281 (defun ediff-toggle-multiframe ()
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1282 "Switch from multiframe display to single-frame display and back.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1283 To change the default, set the variable `ediff-window-setup-function',
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1284 which see."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1285 (interactive)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1286 (let (window-setup-func)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1287 (or (ediff-window-display-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1288 (error "%sEmacs is not running as a window application"
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
1289 (if (featurep 'emacs) "" "X")))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1290
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1291 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1292 (setq ediff-multiframe nil)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1293 (setq window-setup-func 'ediff-setup-windows-plain))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1294 ((eq ediff-window-setup-function 'ediff-setup-windows-plain)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1295 (if (ediff-in-control-buffer-p)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1296 (ediff-kill-bottom-toolbar))
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1297 (if (ediff-buffer-live-p ediff-control-buffer)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1298 (set-window-dedicated-p ediff-control-window nil))
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1299 (setq ediff-multiframe t)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1300 (setq window-setup-func 'ediff-setup-windows-multiframe))
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1301 (t
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1302 (if (ediff-buffer-live-p ediff-control-buffer)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1303 (set-window-dedicated-p ediff-control-window nil))
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1304 (setq ediff-multiframe t)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1305 (setq window-setup-func 'ediff-setup-windows-multiframe))
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
1306 )
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1307
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1308 ;; change default
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1309 (setq-default ediff-window-setup-function window-setup-func)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1310 ;; change in all active ediff sessions
84864
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1311 (mapc (lambda(buf) (ediff-with-current-buffer buf
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1312 (setq ediff-window-setup-function window-setup-func
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1313 ediff-window-B nil)))
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1314 ediff-session-registry)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1315 (if (ediff-in-control-buffer-p)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1316 (ediff-recenter 'no-rehighlight))))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1317
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1318
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1319 ;;;###autoload
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1320 (defun ediff-toggle-use-toolbar ()
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1321 "Enable or disable Ediff toolbar.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1322 Works only in versions of Emacs that support toolbars.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1323 To change the default, set the variable `ediff-use-toolbar-p', which see."
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1324 (interactive)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1325 (if (featurep 'ediff-tbar)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1326 (progn
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1327 (or (ediff-window-display-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1328 (error "%sEmacs is not running as a window application"
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
1329 (if (featurep 'emacs) "" "X")))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1330 (if (ediff-use-toolbar-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1331 (ediff-kill-bottom-toolbar))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1332 ;; do this only after killing the toolbar
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1333 (setq ediff-use-toolbar-p (not ediff-use-toolbar-p))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1334
84864
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1335 (mapc (lambda(buf)
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1336 (ediff-with-current-buffer buf
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1337 ;; force redisplay
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1338 (setq ediff-window-config-saved "")
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1339 ))
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
1340 ediff-session-registry)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1341 (if (ediff-in-control-buffer-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1342 (ediff-recenter 'no-rehighlight)))))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1343
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1344
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1345 ;; if was using toolbar, kill it
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1346 (defun ediff-kill-bottom-toolbar ()
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1347 ;; Using ctl-buffer or ediff-control-window for LOCALE does not
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1348 ;; work properly in XEmacs 19.14: we have to use
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1349 ;;(selected-frame).
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1350 ;; The problem with this is that any previous bottom-toolbar
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1351 ;; will not re-appear after our cleanup here. Is there a way
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1352 ;; to do "push" and "pop" toolbars ? --marcpa
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1353 (if (featurep 'xemacs)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1354 (when (ediff-use-toolbar-p)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1355 (set-specifier bottom-toolbar (list (selected-frame) nil))
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1356 (set-specifier bottom-toolbar-visible-p (list (selected-frame) nil)))))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1357
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1358 ;; If wants to use toolbar, make it.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1359 ;; If not, zero the toolbar for XEmacs.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1360 ;; Do nothing for Emacs.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1361 (defun ediff-make-bottom-toolbar (&optional frame)
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1362 (when (ediff-window-display-p)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1363 (setq frame (or frame (selected-frame)))
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1364 (if (featurep 'xemacs)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1365 (cond ((ediff-use-toolbar-p) ; this checks for XEmacs
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1366 (set-specifier
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1367 bottom-toolbar
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1368 (list frame (if (ediff-3way-comparison-job)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1369 ediff-toolbar-3way ediff-toolbar)))
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1370 (set-specifier bottom-toolbar-visible-p (list frame t))
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1371 (set-specifier bottom-toolbar-height
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1372 (list frame ediff-toolbar-height)))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1373 ((ediff-has-toolbar-support-p)
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
1374 (set-specifier bottom-toolbar-height (list frame 0)))))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1375
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1376 ;; Merging
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1377
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1378 (defun ediff-toggle-show-clashes-only ()
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1379 "Toggle the mode that shows only the merge regions where both variants differ from the ancestor."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1380 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1381 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1382 (if (not ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1383 (error "This command makes sense only when merging with an ancestor"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1384 (setq ediff-show-clashes-only (not ediff-show-clashes-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1385 (if ediff-show-clashes-only
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1386 (message "Focus on regions where both buffers differ from the ancestor")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1387 (message "Canceling focus on regions where changes clash")))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1388
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1389 (defun ediff-toggle-skip-changed-regions ()
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1390 "Toggle the mode that skips the merge regions that differ from the default."
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1391 (interactive)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1392 (ediff-barf-if-not-control-buffer)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1393 (setq ediff-skip-merge-regions-that-differ-from-default
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1394 (not ediff-skip-merge-regions-that-differ-from-default))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1395 (if ediff-skip-merge-regions-that-differ-from-default
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1396 (message "Skipping regions that differ from default setting")
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1397 (message "Showing regions that differ from default setting")))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1398
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1399
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1400
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1401 ;; Widening/narrowing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1402
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1403 (defun ediff-toggle-narrow-region ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1404 "Toggle narrowing in buffers A, B, and C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1405 Used in ediff-windows/regions only."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1406 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1407 (if (eq ediff-buffer-A ediff-buffer-B)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1408 (error ediff-NO-DIFFERENCES))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1409 (if (eq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1410 (setq ediff-visible-bounds ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1411 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1412 (ediff-recenter 'no-rehighlight))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1413
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1414 ;; Narrow bufs A/B/C to ediff-visible-bounds. If this is currently set to
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1415 ;; ediff-wide-bounds, then this actually widens.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1416 ;; This function does nothing if job-name is not
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1417 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1418 ;; Does nothing if buffer-A = buffer-B since we can't narrow
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1419 ;; to two different regions in one buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1420 (defun ediff-visible-region ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1421 (if (or (eq ediff-buffer-A ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1422 (eq ediff-buffer-A ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1423 (eq ediff-buffer-C ediff-buffer-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1424 ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1425 ;; If ediff-*-regions/windows, ediff-visible-bounds is already set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1426 ;; Otherwise, always use full range.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1427 (if (not ediff-narrow-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1428 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1429 (let ((overl-A (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1430 'A ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1431 (overl-B (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1432 'B ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1433 (overl-C (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1434 'C ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1435 )
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1436 (ediff-with-current-buffer ediff-buffer-A
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1437 (if (ediff-overlay-buffer overl-A)
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1438 (narrow-to-region
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1439 (ediff-overlay-start overl-A) (ediff-overlay-end overl-A))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1440 (ediff-with-current-buffer ediff-buffer-B
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1441 (if (ediff-overlay-buffer overl-B)
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1442 (narrow-to-region
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1443 (ediff-overlay-start overl-B) (ediff-overlay-end overl-B))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1444
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1445 (if (and ediff-3way-job (ediff-overlay-buffer overl-C))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1446 (ediff-with-current-buffer ediff-buffer-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1447 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1448 (ediff-overlay-start overl-C) (ediff-overlay-end overl-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1449 )))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1450
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1451
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1452 ;; Window scrolling operations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1453
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1454 ;; Performs some operation on the two file windows (if they are showing).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1455 ;; Traps all errors on the operation in windows A/B/C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1456 ;; Usually, errors come from scrolling off the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1457 ;; beginning or end of the buffer, and this gives error messages.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1458 (defun ediff-operate-on-windows (operation arg)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1459
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1460 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1461 (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
1462 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1463 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1464 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1465 (or (not ediff-3way-job) ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1466 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1467 (error ediff-KILLED-VITAL-BUFFER))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1468
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1469 (let* ((wind (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1470 (wind-A ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1471 (wind-B ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1472 (wind-C ediff-window-C)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1473 (coefA (ediff-get-region-size-coefficient 'A operation))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1474 (coefB (ediff-get-region-size-coefficient 'B operation))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1475 (three-way ediff-3way-job)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1476 (coefC (if three-way
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1477 (ediff-get-region-size-coefficient 'C operation))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1478
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1479 (select-window wind-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1480 (condition-case nil
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1481 (funcall operation (round (* coefA arg)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1482 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1483 (select-window wind-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1484 (condition-case nil
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1485 (funcall operation (round (* coefB arg)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1486 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1487 (if three-way
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1488 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1489 (select-window wind-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1490 (condition-case nil
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1491 (funcall operation (round (* coefC arg)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1492 (error))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1493 (select-window wind)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1494
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1495 (defun ediff-scroll-vertically (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1496 "Vertically scroll buffers A, B \(and C if appropriate\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1497 With optional argument ARG, scroll ARG lines; otherwise scroll by nearly
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1498 the one half of the height of window-A."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1499 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1500 (ediff-barf-if-not-control-buffer)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1501
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1502 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1503 (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
1504 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1505 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1506 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1507 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1508 (ediff-buffer-live-p ediff-buffer-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1509 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1510 (error ediff-KILLED-VITAL-BUFFER))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1511
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1512 (ediff-operate-on-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1513 (if (memq last-command-char '(?v ?\C-v))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1514 'scroll-up
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1515 'scroll-down)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1516 ;; calculate argument to scroll-up/down
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1517 ;; if there is an explicit argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1518 (if (and arg (not (equal arg '-)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1519 ;; use it
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1520 (prefix-numeric-value arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1521 ;; if not, see if we can determine a default amount (the window height)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1522 (let (default-amount)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1523 (setq default-amount
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1524 (- (/ (min (window-height ediff-window-A)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1525 (window-height ediff-window-B)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1526 (if ediff-3way-job
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1527 (window-height ediff-window-C)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1528 500)) ; some large number
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1529 2)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1530 1 next-screen-context-lines))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1531 ;; window found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1532 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1533 ;; C-u as argument means half of default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1534 (/ default-amount 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1535 ;; no argument means default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1536 default-amount)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1537
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1538
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1539 (defun ediff-scroll-horizontally (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1540 "Horizontally scroll buffers A, B \(and C if appropriate\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1541 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
1542 the width of the A/B/C windows."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1543 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1544 (ediff-barf-if-not-control-buffer)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1545
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1546 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1547 (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
1548 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1549 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1550 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1551 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1552 (ediff-buffer-live-p ediff-buffer-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1553 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1554 (error ediff-KILLED-VITAL-BUFFER))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1555
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1556 (ediff-operate-on-windows
36456
1474cd438ac1 (ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents: 36043
diff changeset
1557 ;; Arrange for scroll-left and scroll-right being called
1474cd438ac1 (ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents: 36043
diff changeset
1558 ;; interactively so that they set the window's min_hscroll.
1474cd438ac1 (ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents: 36043
diff changeset
1559 ;; Otherwise, automatic hscrolling will undo the effect of
1474cd438ac1 (ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents: 36043
diff changeset
1560 ;; hscrolling.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1561 (if (= last-command-char ?<)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1562 (lambda (arg)
36456
1474cd438ac1 (ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents: 36043
diff changeset
1563 (let ((prefix-arg arg))
1474cd438ac1 (ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents: 36043
diff changeset
1564 (call-interactively 'scroll-left)))
1474cd438ac1 (ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents: 36043
diff changeset
1565 (lambda (arg)
1474cd438ac1 (ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents: 36043
diff changeset
1566 (let ((prefix-arg arg))
1474cd438ac1 (ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents: 36043
diff changeset
1567 (call-interactively 'scroll-right))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1568 ;; calculate argument to scroll-left/right
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1569 ;; if there is an explicit argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1570 (if (and arg (not (equal arg '-)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1571 ;; use it
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1572 (prefix-numeric-value arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1573 ;; if not, see if we can determine a default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1574 ;; (half the window width)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1575 (if (null ediff-control-window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1576 ;; no control window, use nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1577 nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1578 (let ((default-amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1579 (- (/ (min (window-width ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1580 (window-width ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1581 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1582 (window-width ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1583 500) ; some large number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1584 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1585 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1586 3)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1587 ;; window found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1588 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1589 ;; C-u as argument means half of default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1590 (/ default-amount 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1591 ;; no argument means default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1592 default-amount))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1593
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1594
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1595 ;;BEG, END show the region to be positioned.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1596 ;;JOB-NAME holds ediff-job-name. The ediff-windows job positions regions
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1597 ;;differently.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1598 (defun ediff-position-region (beg end pos job-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1599 (if (> end (point-max))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1600 (setq end (point-max)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1601 (if ediff-windows-job
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1602 (if (pos-visible-in-window-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1603 () ; do nothing, wind is already positioned
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1604 ;; at this point, windows are positioned at the beginning of the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1605 ;; file regions (not diff-regions) being compared.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1606 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1607 (move-to-window-line (- (window-height) 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1608 (let ((amount (+ 2 (count-lines (point) end))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1609 (scroll-up amount))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1610 (set-window-start (selected-window) beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1611 (if (pos-visible-in-window-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1612 ;; 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
1613 (let ((lines 0)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1614 (prev-point 0))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1615 (while ( and (> end (progn
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1616 (move-to-window-line lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1617 (point)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1618 ;; `end' may be beyond the window bottom, so check
14040
187735b53d52 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13605
diff changeset
1619 ;; that we are making progress
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1620 (< prev-point (point)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1621 (setq prev-point (point))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1622 (setq lines (1+ lines)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1623 ;; And position the beginning on the right line
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1624 (goto-char beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1625 (recenter (/ (1+ (max (- (1- (window-height (selected-window)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1626 lines)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1627 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1628 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1629 2))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1630 (goto-char pos)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1631 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1632
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1633 ;; get number of lines from window start to region end
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1634 (defun ediff-get-lines-to-region-end (buf-type &optional n ctl-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1635 (or n (setq n ediff-current-difference))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1636 (or ctl-buf (setq ctl-buf ediff-control-buffer))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1637 (ediff-with-current-buffer ctl-buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1638 (let* ((buf (ediff-get-buffer buf-type))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1639 (wind (eval (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1640 buf-type ediff-window-alist)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1641 (beg (window-start wind))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1642 (end (ediff-get-diff-posn buf-type 'end))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1643 lines)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1644 (ediff-with-current-buffer buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1645 (if (< beg end)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1646 (setq lines (count-lines beg end))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1647 (setq lines 0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1648 lines
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1649 ))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1650
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1651 ;; Calculate the number of lines from window end to the start of diff region
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1652 (defun ediff-get-lines-to-region-start (buf-type &optional diff-num ctl-buf)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1653 (or diff-num (setq diff-num ediff-current-difference))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1654 (or ctl-buf (setq ctl-buf ediff-control-buffer))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1655 (ediff-with-current-buffer ctl-buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1656 (let* ((buf (ediff-get-buffer buf-type))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1657 (wind (eval (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1658 buf-type ediff-window-alist)))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1659 (end (or (window-end wind) (window-end wind t)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1660 (beg (ediff-get-diff-posn buf-type 'beg diff-num)))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1661 (ediff-with-current-buffer buf
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1662 (if (< beg end)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
1663 (count-lines (max beg (point-min)) (min end (point-max))) 0))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1664 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1665
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1666
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1667 ;; region size coefficient is a coefficient by which to adjust scrolling
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1668 ;; up/down of the window displaying buffer of type BUFTYPE.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1669 ;; The purpose of this coefficient is to make the windows scroll in sync, so
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1670 ;; that it won't happen that one diff region is scrolled off while the other is
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1671 ;; still seen.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1672 ;;
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1673 ;; If the difference region is invalid, the coefficient is 1
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1674 (defun ediff-get-region-size-coefficient (buf-type op &optional n ctl-buf)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1675 (ediff-with-current-buffer (or ctl-buf ediff-control-buffer)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1676 (if (ediff-valid-difference-p n)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1677 (let* ((func (cond ((eq op 'scroll-down)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1678 'ediff-get-lines-to-region-start)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1679 ((eq op 'scroll-up)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1680 'ediff-get-lines-to-region-end)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1681 (t '(lambda (a b c) 0))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1682 (max-lines (max (funcall func 'A n ctl-buf)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1683 (funcall func 'B n ctl-buf)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1684 (if (ediff-buffer-live-p ediff-buffer-C)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1685 (funcall func 'C n ctl-buf)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1686 0))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1687 ;; this covers the horizontal coefficient as well:
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1688 ;; if max-lines = 0 then coef = 1
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1689 (if (> max-lines 0)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1690 (/ (+ (funcall func buf-type n ctl-buf) 0.0)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1691 (+ max-lines 0.0))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1692 1))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1693 1)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1694
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1695
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1696 (defun ediff-next-difference (&optional arg)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1697 "Advance to the next difference.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1698 With a prefix argument, go forward that many differences."
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1699 (interactive "p")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1700 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1701 (if (< ediff-current-difference ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1702 (let ((n (min ediff-number-of-differences
23017
3261e4a5f472 (ediff-next-difference, ediff-previous-difference): Handle nil as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21940
diff changeset
1703 (+ ediff-current-difference (or arg 1))))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1704 non-clash-skip skip-changed regexp-skip)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1705
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1706 (ediff-visible-region)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1707 (or (>= n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1708 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1709 ;; this won't exec if regexp-skip is t
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65689
diff changeset
1710 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1711 skip-changed
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1712 (ediff-skip-merge-region-if-changed-from-default-p n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1713 (ediff-install-fine-diff-if-necessary n))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1714 ;; Skip loop
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1715 (while (and (< n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1716 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1717 ;; regexp skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1718 regexp-skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1719 ;; skip clashes, if necessary
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1720 non-clash-skip
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1721 ;; skip processed regions
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1722 skip-changed
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1723 ;; skip difference regions that differ in white space
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1724 (and ediff-ignore-similar-regions
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65689
diff changeset
1725 (ediff-merge-region-is-non-clash n)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1726 (or (eq (ediff-no-fine-diffs-p n) t)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1727 (and (ediff-merge-job)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1728 (eq (ediff-no-fine-diffs-p n) 'C)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1729 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1730 (setq n (1+ n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1731 (if (= 0 (mod n 20))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1732 (message "Skipped over region %d and counting ..." n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1733 (or (>= n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1734 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1735 ;; this won't exec if regexp-skip is t
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65689
diff changeset
1736 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1737 skip-changed
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1738 (ediff-skip-merge-region-if-changed-from-default-p n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1739 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1740 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1741 (message "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1742 (ediff-unselect-and-select-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1743 ) ; let
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1744 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1745 (error "At end of the difference list")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1746
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1747 (defun ediff-previous-difference (&optional arg)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1748 "Go to the previous difference.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1749 With a prefix argument, go back that many differences."
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1750 (interactive "p")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1751 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1752 (if (> ediff-current-difference -1)
23017
3261e4a5f472 (ediff-next-difference, ediff-previous-difference): Handle nil as arg.
Richard M. Stallman <rms@gnu.org>
parents: 21940
diff changeset
1753 (let ((n (max -1 (- ediff-current-difference (or arg 1))))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1754 non-clash-skip skip-changed regexp-skip)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1755
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1756 (ediff-visible-region)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1757 (or (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1758 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1759 ;; this won't exec if regexp-skip is t
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65689
diff changeset
1760 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1761 skip-changed
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1762 (ediff-skip-merge-region-if-changed-from-default-p n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1763 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1764 (while (and (> n -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1765 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1766 ;; regexp skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1767 regexp-skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1768 ;; skip clashes, if necessary
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1769 non-clash-skip
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1770 ;; skipp changed regions
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1771 skip-changed
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1772 ;; skip difference regions that differ in white space
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1773 (and ediff-ignore-similar-regions
66687
26faad662ac6 2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65856
diff changeset
1774 (ediff-merge-region-is-non-clash n)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1775 (or (eq (ediff-no-fine-diffs-p n) t)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1776 (and (ediff-merge-job)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1777 (eq (ediff-no-fine-diffs-p n) 'C)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1778 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1779 (if (= 0 (mod (1+ n) 20))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1780 (message "Skipped over region %d and counting ..." (1+ n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1781 (setq n (1- n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1782 (or (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1783 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1784 ;; this won't exec if regexp-skip is t
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65689
diff changeset
1785 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1786 skip-changed
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1787 (ediff-skip-merge-region-if-changed-from-default-p n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1788 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1789 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1790 (message "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1791 (ediff-unselect-and-select-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1792 ) ; let
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1793 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1794 (error "At beginning of the difference list")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1795
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1796 ;; The diff number is as perceived by the user (i.e., 1+ the internal
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1797 ;; representation)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1798 (defun ediff-jump-to-difference (difference-number)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1799 "Go to the difference specified as a prefix argument.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1800 If the prefix is negative, count differences from the end."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1801 (interactive "p")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1802 (ediff-barf-if-not-control-buffer)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1803 (setq difference-number
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1804 (cond ((< difference-number 0)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1805 (+ ediff-number-of-differences difference-number))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1806 ((> difference-number 0) (1- difference-number))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1807 (t -1)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1808 ;; -1 is allowed by ediff-unselect-and-select-difference --- it is the
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1809 ;; position before the first one.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1810 (if (and (>= difference-number -1)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1811 (<= difference-number ediff-number-of-differences))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1812 (ediff-unselect-and-select-difference difference-number)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1813 (error ediff-BAD-DIFF-NUMBER
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1814 this-command (1+ difference-number) ediff-number-of-differences)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1815
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1816 (defun ediff-jump-to-difference-at-point (arg)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1817 "Go to difference closest to the point in buffer A, B, or C.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1818 The buffer depends on last command character \(a, b, or c\) that invoked this
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1819 command. For instance, if the command was `ga' then the point value in buffer
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1820 A is used.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1821 With a prefix argument, synchronize all files around the current point position
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1822 in the specified buffer."
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1823 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1824 (ediff-barf-if-not-control-buffer)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1825 (let* ((buf-type (ediff-char-to-buftype last-command-char))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1826 (buffer (ediff-get-buffer buf-type))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1827 (pt (ediff-with-current-buffer buffer (point)))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1828 (diff-no (ediff-diff-at-point buf-type nil (if arg 'after)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1829 (past-last-diff (< ediff-number-of-differences diff-no))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1830 (beg (if past-last-diff
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1831 (ediff-with-current-buffer buffer (point-max))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1832 (ediff-get-diff-posn buf-type 'beg (1- diff-no))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1833 ctl-wind wind-A wind-B wind-C
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1834 shift)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1835 (if past-last-diff
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1836 (ediff-jump-to-difference -1)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1837 (ediff-jump-to-difference diff-no))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1838 (setq ctl-wind (selected-window)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1839 wind-A ediff-window-A
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1840 wind-B ediff-window-B
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1841 wind-C ediff-window-C)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1842 (if arg
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1843 (progn
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1844 (ediff-with-current-buffer buffer
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1845 (setq shift (- beg pt)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1846 (select-window wind-A)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1847 (if past-last-diff (goto-char (point-max)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1848 (condition-case nil
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1849 (backward-char shift) ; noerror, if beginning of buffer
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1850 (error))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1851 (recenter)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1852 (select-window wind-B)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1853 (if past-last-diff (goto-char (point-max)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1854 (condition-case nil
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1855 (backward-char shift) ; noerror, if beginning of buffer
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1856 (error))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1857 (recenter)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1858 (if (window-live-p wind-C)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1859 (progn
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1860 (select-window wind-C)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1861 (if past-last-diff (goto-char (point-max)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1862 (condition-case nil
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1863 (backward-char shift) ; noerror, if beginning of buffer
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1864 (error))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1865 (recenter)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1866 ))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1867 (select-window ctl-wind)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1868 ))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1869 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1870
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1871
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1872 ;; find region most related to the current point position (or POS, if given)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1873 ;; returns diff number as seen by the user (i.e., 1+ the internal
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1874 ;; representation)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1875 ;; The optional argument WHICH-DIFF can be `after' or `before'. If `after',
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1876 ;; find the diff after the point. If `before', find the diff before the
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1877 ;; point. If the point is inside a diff, return that diff.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1878 (defun ediff-diff-at-point (buf-type &optional pos which-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1879 (let ((buffer (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1880 (ctl-buffer ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1881 (max-dif-num (1- ediff-number-of-differences))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1882 (diff-no -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1883 (prev-beg 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1884 (prev-end 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1885 (beg 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1886 (end 0))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1887
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1888 (ediff-with-current-buffer buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1889 (setq pos (or pos (point)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1890 (while (and (or (< pos prev-beg) (> pos beg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1891 (< diff-no max-dif-num))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1892 (setq diff-no (1+ diff-no))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1893 (setq prev-beg beg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1894 prev-end end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1895 (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1896 end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1897 )
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1898
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1899 ;; boost diff-no by 1, if past the last diff region
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1900 (if (and (memq which-diff '(after before))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1901 (> pos beg) (= diff-no max-dif-num))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1902 (setq diff-no (1+ diff-no)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1903
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1904 (cond ((eq which-diff 'after) (1+ diff-no))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1905 ((eq which-diff 'before) diff-no)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1906 ((< (abs (count-lines pos (max 1 prev-end)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1907 (abs (count-lines pos (max 1 beg))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1908 diff-no) ; choose prev difference
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1909 (t
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1910 (1+ diff-no))) ; choose next difference
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1911 )))
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 ;;; Copying diffs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1915
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1916 (defun ediff-diff-to-diff (arg &optional keys)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1917 "Copy buffer-X'th difference region to buffer Y \(X,Y are A, B, or C\).
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1918 If numerical prefix argument, copy the difference specified in the arg.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1919 Otherwise, copy the difference given by `ediff-current-difference'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1920 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
1921 `ac', etc., which is used to determine the types of buffers to be used for
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1922 copying difference regions. The first character in the sequence specifies
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1923 the source buffer and the second specifies the target.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1924
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1925 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
1926 determine the source and the target buffers instead of the command keys."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1927 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1928 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1929 (or keys (setq keys (this-command-keys)))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1930 (if (eq arg '-) (setq arg -1)) ; translate neg arg to -1
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1931 (if (numberp arg) (ediff-jump-to-difference arg))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1932
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1933 (let* ((key1 (aref keys 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1934 (key2 (aref keys 1))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
1935 (char1 (ediff-event-key key1))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
1936 (char2 (ediff-event-key key2))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1937 ediff-verbose-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1938 (ediff-copy-diff ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1939 (ediff-char-to-buftype char1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1940 (ediff-char-to-buftype char2))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1941 ;; recenter with rehighlighting, but no messages
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1942 (ediff-recenter)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1943
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1944 (defun ediff-copy-A-to-B (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1945 "Copy ARGth difference region from buffer A to B.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1946 ARG is a prefix argument. If nil, copy the current difference region."
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1947 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1948 (ediff-diff-to-diff arg "ab"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1949
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1950 (defun ediff-copy-B-to-A (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1951 "Copy ARGth difference region from buffer B to A.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1952 ARG is a prefix argument. If nil, copy the current difference region."
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1953 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1954 (ediff-diff-to-diff arg "ba"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1955
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1956 (defun ediff-copy-A-to-C (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1957 "Copy ARGth difference region from buffer A to buffer C.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1958 ARG is a prefix argument. If nil, copy the current difference region."
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1959 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1960 (ediff-diff-to-diff arg "ac"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1961
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1962 (defun ediff-copy-B-to-C (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1963 "Copy ARGth difference region from buffer B to buffer C.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1964 ARG is a prefix argument. If nil, copy the current difference region."
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1965 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1966 (ediff-diff-to-diff arg "bc"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1967
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1968 (defun ediff-copy-C-to-B (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1969 "Copy ARGth difference region from buffer C to B.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1970 ARG is a prefix argument. If nil, copy the current difference region."
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1971 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1972 (ediff-diff-to-diff arg "cb"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1973
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1974 (defun ediff-copy-C-to-A (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1975 "Copy ARGth difference region from buffer C to A.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1976 ARG is a prefix argument. If nil, copy the current difference region."
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1977 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1978 (ediff-diff-to-diff arg "ca"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1979
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1980
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1981
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1982 ;; 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
1983 ;; If optional DO-NOT-SAVE is non-nil, do not save the old value of the
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
1984 ;; target diff. This is used in merging, when constructing the merged
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1985 ;; version.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1986 (defun ediff-copy-diff (n from-buf-type to-buf-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1987 &optional batch-invocation reg-to-copy)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1988 (let* ((to-buf (ediff-get-buffer to-buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1989 ;;(from-buf (if (not reg-to-copy) (ediff-get-buffer from-buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1990 (ctrl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1991 (saved-p t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1992 (three-way ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1993 messg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1994 ediff-verbose-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1995 reg-to-delete reg-to-delete-beg reg-to-delete-end)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
1996
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1997 (setq reg-to-delete-beg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1998 (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1999 (setq reg-to-delete-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2000 (ediff-get-diff-posn to-buf-type 'end n ctrl-buf))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2001
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2002 (if reg-to-copy
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2003 (setq from-buf-type nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2004 (setq reg-to-copy (ediff-get-region-contents n from-buf-type ctrl-buf)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2005
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2006 (setq reg-to-delete (ediff-get-region-contents
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2007 n to-buf-type ctrl-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2008 reg-to-delete-beg reg-to-delete-end))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2009
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2010 (if (string= reg-to-delete reg-to-copy)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2011 (setq saved-p nil) ; don't copy identical buffers
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2012 ;; seems ok to copy
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2013 (if (or batch-invocation (ediff-test-save-region n to-buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2014 (condition-case conds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2015 (progn
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2016 (ediff-with-current-buffer to-buf
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2017 ;; 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
2018 (let ((inhibit-read-only (null buffer-read-only)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2019
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2020 (goto-char reg-to-delete-end)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2021 (insert reg-to-copy)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2022
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2023 (if (> reg-to-delete-end reg-to-delete-beg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2024 (kill-region reg-to-delete-beg reg-to-delete-end))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2025 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2026 (or batch-invocation
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2027 (setq
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2028 messg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2029 (ediff-save-diff-region n to-buf-type reg-to-delete))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2030 (error (message "ediff-copy-diff: %s %s"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2031 (car conds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2032 (mapconcat 'prin1-to-string (cdr conds) " "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2033 (beep 1)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2034 (sit-for 2) ; let the user see the error msg
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2035 (setq saved-p nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2036 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2037 )
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2038
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2039 ;; adjust state of difference in case 3-way and diff was copied ok
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2040 (if (and saved-p three-way)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2041 (ediff-set-state-of-diff-in-all-buffers n ctrl-buf))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2043 (if batch-invocation
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2044 (ediff-clear-fine-differences n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2045 ;; If diff3 job, we should recompute fine diffs so we clear them
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2046 ;; before reinserting flags (and thus before ediff-recenter).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2047 (if (and saved-p three-way)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2048 (ediff-clear-fine-differences n))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2049
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2050 (ediff-refresh-mode-lines)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2051
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2052 ;; For diff2 jobs, don't recompute fine diffs, since we know there
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2053 ;; aren't any. So we clear diffs after ediff-recenter.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2054 (if (and saved-p (not three-way))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2055 (ediff-clear-fine-differences n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2056 ;; Make sure that the message about saving and how to restore is seen
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2057 ;; by the user
65582
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 64762
diff changeset
2058 (message "%s" messg))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2059 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2060
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2061 ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2062 ;; 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
2063 ;; 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
2064 ;; convenience.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2065 (defun ediff-save-diff-region (n buf-type reg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2066 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2067 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2068 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2069
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2070 (if this-buf-n-th-diff-saved
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2071 ;; either nothing saved for n-th diff and buffer or we OK'ed
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2072 ;; overriding
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2073 (setcdr this-buf-n-th-diff-saved reg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2074 (if n-th-diff-saved ;; n-th diff saved, but for another buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2075 (nconc n-th-diff-saved (list (cons buf reg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2076 (setq ediff-killed-diffs-alist ;; create record for n-th diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2077 (cons (list n (cons buf reg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2078 ediff-killed-diffs-alist))))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2079 (message "Saving old diff region #%d of buffer %S. To recover, type `r%s'"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2080 (1+ n) buf-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2081 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2082 "" (downcase (symbol-name buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2083 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2084
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2085 ;; Test if saving Nth difference region of buffer BUF-TYPE is possible.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2086 (defun ediff-test-save-region (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2087 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2088 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2089 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2090
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2091 (if this-buf-n-th-diff-saved
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2092 (if (yes-or-no-p
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2093 (format
65689
96187e7edd1b 2005-09-25 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 65680
diff changeset
2094 "You've previously copied diff region %d to buffer %S. Confirm? "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2095 (1+ n) buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2096 t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2097 (error "Quit"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2098 t)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2099
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2100 (defun ediff-pop-diff (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2101 "Pop last killed Nth diff region from buffer BUF-TYPE."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2102 (let* ((n-th-record (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2103 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2104 (saved-rec (assoc buf (cdr n-th-record)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2105 (three-way ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2106 (ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2107 ediff-verbose-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2108 saved-diff reg-beg reg-end recovered)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2109
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2110 (if (cdr saved-rec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2111 (setq saved-diff (cdr saved-rec))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2112 (if (> ediff-number-of-differences 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2113 (error "Nothing saved for diff %d in buffer %S" (1+ n) buf-type)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2114 (error ediff-NO-DIFFERENCES)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2115
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2116 (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
2117 (setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2118
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2119 (condition-case conds
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2120 (ediff-with-current-buffer buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2121 (let ((inhibit-read-only (null buffer-read-only)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2122
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2123 (goto-char reg-end)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2124 (insert saved-diff)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2125
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2126 (if (> reg-end reg-beg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2127 (kill-region reg-beg reg-end))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2128
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2129 (setq recovered t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2130 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2131 (error (message "ediff-pop-diff: %s %s"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2132 (car conds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2133 (mapconcat 'prin1-to-string (cdr conds) " "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2134 (beep 1)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2135
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2136 ;; Clearing fine diffs is necessary for
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2137 ;; ediff-unselect-and-select-difference to properly recompute them. We
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2138 ;; 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
2139 ;; 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
2140 ;; fine diffs.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2141 (if recovered
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2142 (ediff-clear-fine-differences n))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2143
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2144 ;; adjust state of difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2145 (if (and three-way recovered)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2146 (ediff-set-state-of-diff-in-all-buffers n ctl-buf))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2147
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2148 (ediff-refresh-mode-lines)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2149
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2150 (if recovered
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2151 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2152 (setq n-th-record (delq saved-rec n-th-record))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2153 (message "Diff region %d in buffer %S restored" (1+ n) buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2154 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2155 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2156
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2157 (defun ediff-restore-diff (arg &optional key)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2158 "Restore ARGth diff from `ediff-killed-diffs-alist'.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2159 ARG is a prefix argument. If ARG is nil, restore the current-difference.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2160 If the second optional argument, a character, is given, use it to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2161 determine the target buffer instead of last-command-char"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2162 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2163 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2164 (if (numberp arg)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2165 (ediff-jump-to-difference arg))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2166 (ediff-pop-diff ediff-current-difference
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2167 (ediff-char-to-buftype (or key last-command-char)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2168 ;; recenter with rehighlighting, but no messages
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2169 (let (ediff-verbose-p)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2170 (ediff-recenter)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2171
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2172 (defun ediff-restore-diff-in-merge-buffer (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2173 "Restore ARGth diff in the merge buffer.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2174 ARG is a prefix argument. If nil, restore the current diff."
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2175 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2176 (ediff-restore-diff arg ?c))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2177
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2178
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2179 (defun ediff-toggle-regexp-match ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2180 "Toggle between focusing and hiding of difference regions that match
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2181 a regular expression typed in by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2182 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2183 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2184 (let ((regexp-A "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2185 (regexp-B "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2186 (regexp-C "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2187 msg-connective alt-msg-connective alt-connective)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2188 (cond
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2189 ((or (and (eq ediff-skip-diff-region-function
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2190 ediff-focus-on-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2191 (eq last-command-char ?f))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2192 (and (eq ediff-skip-diff-region-function
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2193 ediff-hide-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2194 (eq last-command-char ?h)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2195 (message "Selective browsing by regexp turned off")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2196 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2197 ((eq last-command-char ?h)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2198 (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2199 regexp-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2200 (read-string
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2201 (format
65680
ed770a0a7846 2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents: 65627
diff changeset
2202 "Ignore A-regions matching this regexp (default %s): "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2203 ediff-regexp-hide-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2204 regexp-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2205 (read-string
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2206 (format
65680
ed770a0a7846 2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents: 65627
diff changeset
2207 "Ignore B-regions matching this regexp (default %s): "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2208 ediff-regexp-hide-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2209 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2210 (setq regexp-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2211 (read-string
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2212 (format
65680
ed770a0a7846 2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents: 65627
diff changeset
2213 "Ignore C-regions matching this regexp (default %s): "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2214 ediff-regexp-hide-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2215 (if (eq ediff-hide-regexp-connective 'and)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2216 (setq msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2217 alt-msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2218 alt-connective 'or)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2219 (setq msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2220 alt-msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2221 alt-connective 'and))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2222 (if (y-or-n-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2223 (format
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2224 "Ignore regions that match %s regexps, OK? "
53865
6a6dc234f296 (ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents: 52828
diff changeset
2225 msg-connective))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2226 (message "Will ignore regions that match %s regexps" msg-connective)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2227 (setq ediff-hide-regexp-connective alt-connective)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2228 (message "Will ignore regions that match %s regexps"
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2229 alt-msg-connective))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2230
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2231 (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2232 (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2233 (or (string= regexp-C "") (setq ediff-regexp-hide-C regexp-C)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2234
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2235 ((eq last-command-char ?f)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2236 (setq ediff-skip-diff-region-function
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2237 ediff-focus-on-regexp-matches-function
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2238 regexp-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2239 (read-string
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2240 (format
65680
ed770a0a7846 2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents: 65627
diff changeset
2241 "Focus on A-regions matching this regexp (default %s): "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2242 ediff-regexp-focus-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2243 regexp-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2244 (read-string
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2245 (format
65680
ed770a0a7846 2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents: 65627
diff changeset
2246 "Focus on B-regions matching this regexp (default %s): "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2247 ediff-regexp-focus-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2248 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2249 (setq regexp-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2250 (read-string
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2251 (format
65680
ed770a0a7846 2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents: 65627
diff changeset
2252 "Focus on C-regions matching this regexp (default %s): "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2253 ediff-regexp-focus-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2254 (if (eq ediff-focus-regexp-connective 'and)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2255 (setq msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2256 alt-msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2257 alt-connective 'or)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2258 (setq msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2259 alt-msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2260 alt-connective 'and))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2261 (if (y-or-n-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2262 (format
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2263 "Focus on regions that match %s regexps, OK? "
53865
6a6dc234f296 (ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents: 52828
diff changeset
2264 msg-connective))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2265 (message "Will focus on regions that match %s regexps"
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2266 msg-connective)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2267 (setq ediff-focus-regexp-connective alt-connective)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2268 (message "Will focus on regions that match %s regexps"
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2269 alt-msg-connective))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2270
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2271 (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2272 (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2273 (or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C))))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2274
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2275 (defun ediff-toggle-skip-similar ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2276 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2277 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2278 (if (not (eq ediff-auto-refine 'on))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2279 (error
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2280 "Can't skip over whitespace regions: first turn auto-refining on"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2281 (setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2282 (if ediff-ignore-similar-regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2283 (message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2284 "Skipping regions that differ only in white space & line breaks")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2285 (message "Skipping over white-space differences turned off")))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2286
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2287 (defun ediff-focus-on-regexp-matches (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2288 "Focus on diffs that match regexp `ediff-regexp-focus-A/B'.
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2289 Regions to be ignored according to this function are those where
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2290 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
2291 doesn't match `ediff-regexp-focus-B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2292 This function returns nil if the region number N (specified as
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2293 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
2294
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2295 N is a region number used by Ediff internally. It is 1 less
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2296 the number seen by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2297 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2298 (let* ((ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2299 (regex-A ediff-regexp-focus-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2300 (regex-B ediff-regexp-focus-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2301 (regex-C ediff-regexp-focus-C)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2302 (reg-A-match (ediff-with-current-buffer ediff-buffer-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2303 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2304 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2305 (ediff-get-diff-posn 'A 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2306 (ediff-get-diff-posn 'A 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2307 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2308 (re-search-forward regex-A nil t))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2309 (reg-B-match (ediff-with-current-buffer ediff-buffer-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2310 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2311 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2312 (ediff-get-diff-posn 'B 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2313 (ediff-get-diff-posn 'B 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2314 (re-search-forward regex-B nil t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2315 (reg-C-match (if ediff-3way-comparison-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2316 (ediff-with-current-buffer ediff-buffer-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2317 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2318 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2319 (ediff-get-diff-posn 'C 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2320 (ediff-get-diff-posn 'C 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2321 (re-search-forward regex-C nil t))))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2322 (not (eval (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2323 (list ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2324 reg-A-match reg-B-match reg-C-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2325 (list ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2326 reg-A-match reg-B-match))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2327 )))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2328
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2329 (defun ediff-hide-regexp-matches (n)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2330 "Hide diffs that match regexp `ediff-regexp-hide-A/B/C'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2331 Regions to be ignored are those where buf A region matches
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2332 `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2333 This function returns nil if the region number N (specified as
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2334 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
2335
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2336 N is a region number used by Ediff internally. It is 1 less
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2337 the number seen by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2338 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2339 (let* ((ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2340 (regex-A ediff-regexp-hide-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2341 (regex-B ediff-regexp-hide-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2342 (regex-C ediff-regexp-hide-C)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2343 (reg-A-match (ediff-with-current-buffer ediff-buffer-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2344 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2345 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2346 (ediff-get-diff-posn 'A 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2347 (ediff-get-diff-posn 'A 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2348 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2349 (re-search-forward regex-A nil t))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2350 (reg-B-match (ediff-with-current-buffer ediff-buffer-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2351 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2352 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2353 (ediff-get-diff-posn 'B 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2354 (ediff-get-diff-posn 'B 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2355 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2356 (re-search-forward regex-B nil t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2357 (reg-C-match (if ediff-3way-comparison-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2358 (ediff-with-current-buffer ediff-buffer-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2359 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2360 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2361 (ediff-get-diff-posn 'C 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2362 (ediff-get-diff-posn 'C 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2363 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2364 (re-search-forward regex-C nil t))))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2365 (eval (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2366 (list ediff-hide-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2367 reg-A-match reg-B-match reg-C-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2368 (list ediff-hide-regexp-connective reg-A-match reg-B-match)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2369 )))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2370
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2371
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2372
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2373 ;;; Quitting, suspending, etc.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2374
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2375 (defun ediff-quit (reverse-default-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2376 "Finish an Ediff session and exit Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2377 Unselects the selected difference, if any, restores the read-only and modified
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2378 flags of the compared file buffers, kills Ediff buffers for this session
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2379 \(but not buffers A, B, C\).
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2380
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2381 If `ediff-keep-variants' is nil, the user will be asked whether the buffers
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2382 containing the variants should be removed \(if they haven't been modified\).
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2383 If it is t, they will be preserved unconditionally. A prefix argument,
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2384 temporarily reverses the meaning of this variable."
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2385 (interactive "P")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2386 (ediff-barf-if-not-control-buffer)
87678
ae3fe9150b36 2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87649
diff changeset
2387 (let ((ctl-buf (current-buffer))
ae3fe9150b36 2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87649
diff changeset
2388 (ctl-frm (selected-frame))
ae3fe9150b36 2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87649
diff changeset
2389 (minibuffer-auto-raise t))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2390 (if (y-or-n-p (format "Quit this Ediff session%s? "
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2391 (if (ediff-buffer-live-p ediff-meta-buffer)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2392 " & show containing session group" "")))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2393 (progn
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2394 (message "")
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2395 (set-buffer ctl-buf)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2396 (ediff-really-quit reverse-default-keep-variants))
87678
ae3fe9150b36 2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87649
diff changeset
2397 (select-frame ctl-frm)
ae3fe9150b36 2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87649
diff changeset
2398 (raise-frame ctl-frm)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2399 (message ""))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2400
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2401
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2402 ;; Perform the quit operations.
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2403 (defun ediff-really-quit (reverse-default-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2404 (ediff-unhighlight-diffs-totally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2405 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2406 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2407 (ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2408 (ediff-clear-diff-vector 'ediff-difference-vector-Ancestor 'fine-diffs-also)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2409
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2410 (ediff-delete-temp-files)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2411
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2412 ;; Restore the visibility range. This affects only ediff-*-regions/windows.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2413 ;; Since for other job names ediff-visible-region sets
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2414 ;; ediff-visible-bounds to ediff-wide-bounds, the settings below are
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2415 ;; ignored for such jobs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2416 (if ediff-quit-widened
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2417 (setq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2418 (setq ediff-visible-bounds ediff-narrow-bounds))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2419
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2420 ;; Apply selective display to narrow or widen
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2421 (ediff-visible-region)
84864
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
2422 (mapc (lambda (overl)
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
2423 (if (ediff-overlayp overl)
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
2424 (ediff-delete-overlay overl)))
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
2425 ediff-wide-bounds)
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
2426 (mapc (lambda (overl)
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
2427 (if (ediff-overlayp overl)
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
2428 (ediff-delete-overlay overl)))
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
2429 ediff-narrow-bounds)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2430
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2431 ;; restore buffer mode line id's in buffer-A/B/C
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2432 (let ((control-buffer ediff-control-buffer)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2433 (meta-buffer ediff-meta-buffer)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2434 (after-quit-hook-internal ediff-after-quit-hook-internal)
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2435 (session-number ediff-meta-session-number)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2436 ;; suitable working frame
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2437 (warp-frame (if (and (ediff-window-display-p) (eq ediff-grab-mouse t))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2438 (cond ((window-live-p ediff-window-A)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2439 (window-frame ediff-window-A))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2440 ((window-live-p ediff-window-B)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2441 (window-frame ediff-window-B))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2442 (t (next-frame))))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2443 (condition-case nil
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2444 (ediff-with-current-buffer ediff-buffer-A
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2445 (setq ediff-this-buffer-ediff-sessions
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2446 (delq control-buffer ediff-this-buffer-ediff-sessions))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2447 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2448 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2449 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2450 (error))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2451
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2452 (condition-case nil
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2453 (ediff-with-current-buffer ediff-buffer-B
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2454 (setq ediff-this-buffer-ediff-sessions
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2455 (delq control-buffer ediff-this-buffer-ediff-sessions))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2456 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2457 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2458 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2459 (error))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2460
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2461 (condition-case nil
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2462 (ediff-with-current-buffer ediff-buffer-C
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2463 (setq ediff-this-buffer-ediff-sessions
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2464 (delq control-buffer ediff-this-buffer-ediff-sessions))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2465 (kill-local-variable 'mode-line-buffer-identification)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2466 (kill-local-variable 'mode-line-format)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2467 )
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2468 (error))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2469
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2470 (condition-case nil
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2471 (ediff-with-current-buffer ediff-ancestor-buffer
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2472 (setq ediff-this-buffer-ediff-sessions
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2473 (delq control-buffer ediff-this-buffer-ediff-sessions))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2474 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2475 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2476 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2477 (error))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2478
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2479 (setq ediff-session-registry
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2480 (delq ediff-control-buffer ediff-session-registry))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2481 (ediff-update-registry)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2482 ;; restore state of buffers to what it was before ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2483 (ediff-restore-protected-variables)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2484
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2485 ;; If the user interrupts (canceling saving the merge buffer), continue
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2486 ;; normally.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2487 (condition-case nil
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2488 (if (ediff-merge-job)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2489 (run-hooks 'ediff-quit-merge-hook))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2490 (quit))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2491
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2492 (run-hooks 'ediff-cleanup-hook)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2493
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2494 (ediff-janitor
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2495 'ask
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2496 ;; reverse-default-keep-variants is t if the user quits with a prefix arg
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2497 (if reverse-default-keep-variants
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2498 (not ediff-keep-variants)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2499 ediff-keep-variants))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2500
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2501 ;; one hook here is ediff-cleanup-mess, which kills the control buffer and
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2502 ;; other auxiliary buffers. we made it into a hook to let the users do their
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2503 ;; own cleanup, if needed.
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2504 (run-hooks 'ediff-quit-hook)
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2505 (ediff-update-meta-buffer meta-buffer nil session-number)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2506
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2507 ;; warp mouse into a working window
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2508 (setq warp-frame ; if mouse is over a reasonable frame, use it
19870
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2509 (cond ((ediff-good-frame-under-mouse))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2510 (t warp-frame)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2511 (if (and (ediff-window-display-p) (frame-live-p warp-frame) ediff-grab-mouse)
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
2512 (set-mouse-position (if (featurep 'emacs)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2513 warp-frame
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2514 (frame-selected-window warp-frame))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2515 2 1))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2516
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2517 (run-hooks 'after-quit-hook-internal)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2518 ))
19870
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2519
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2520 ;; Returns frame under mouse, if this frame is not a minibuffer
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2521 ;; frame. Otherwise: nil
19870
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2522 (defun ediff-good-frame-under-mouse ()
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2523 (let ((frame-or-win (car (mouse-position)))
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2524 (buf-name "")
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2525 frame obj-ok)
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2526 (setq obj-ok
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
2527 (if (featurep 'emacs)
19870
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2528 (frame-live-p frame-or-win)
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2529 (window-live-p frame-or-win)))
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2530 (if obj-ok
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
2531 (setq frame (if (featurep 'emacs) frame-or-win (window-frame frame-or-win))
19870
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2532 buf-name
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2533 (buffer-name (window-buffer (frame-selected-window frame)))))
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2534 (if (string-match "Minibuf" buf-name)
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2535 nil
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2536 frame)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2537
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2538
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2539 (defun ediff-delete-temp-files ()
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2540 (if (and (stringp ediff-temp-file-A) (file-exists-p ediff-temp-file-A))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2541 (delete-file ediff-temp-file-A))
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2542 (if (and (stringp ediff-temp-file-B) (file-exists-p ediff-temp-file-B))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2543 (delete-file ediff-temp-file-B))
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2544 (if (and (stringp ediff-temp-file-C) (file-exists-p ediff-temp-file-C))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2545 (delete-file ediff-temp-file-C)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2546
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 ;; Kill control buffer, other auxiliary Ediff buffers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2549 ;; Leave one of the frames split between buffers A/B/C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2550 (defun ediff-cleanup-mess ()
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2551 (let* ((buff-A ediff-buffer-A)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2552 (buff-B ediff-buffer-B)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2553 (buff-C ediff-buffer-C)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2554 (ctl-buf ediff-control-buffer)
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
2555 (ctl-wind (ediff-get-visible-buffer-window ctl-buf))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2556 (ctl-frame ediff-control-frame)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2557 (three-way-job ediff-3way-job)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2558 (main-frame (cond ((window-live-p ediff-window-A)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2559 (window-frame ediff-window-A))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2560 ((window-live-p ediff-window-B)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2561 (window-frame ediff-window-B)))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2562
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2563 (ediff-kill-buffer-carefully ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2564 (ediff-kill-buffer-carefully ediff-custom-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2565 (ediff-kill-buffer-carefully ediff-fine-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2566 (ediff-kill-buffer-carefully ediff-tmp-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2567 (ediff-kill-buffer-carefully ediff-error-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2568 (ediff-kill-buffer-carefully ediff-msg-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2569 (ediff-kill-buffer-carefully ediff-debug-buffer)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2570 (if (boundp 'ediff-patch-diagnostics)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2571 (ediff-kill-buffer-carefully ediff-patch-diagnostics))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2572
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
2573 ;; delete control frame or window
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
2574 (cond ((and (ediff-window-display-p) (frame-live-p ctl-frame))
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
2575 (delete-frame ctl-frame))
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
2576 ((window-live-p ctl-wind)
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
2577 (delete-window ctl-wind)))
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
2578
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2579 ;; Hide bottom toolbar. --marcpa
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2580 (if (not (ediff-multiframe-setup-p))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2581 (ediff-kill-bottom-toolbar))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2582
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2583 (ediff-kill-buffer-carefully ctl-buf)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2584
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2585 (if (frame-live-p main-frame)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2586 (select-frame main-frame))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2587
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2588 ;; display only if not visible
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2589 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2590 (or (ediff-get-visible-buffer-window buff-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2591 (switch-to-buffer buff-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2592 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2593 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2594 (or (ediff-get-visible-buffer-window buff-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2595 (progn
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2596 (if (and (ediff-get-visible-buffer-window buff-B)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2597 (ediff-buffer-live-p buff-A))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2598 (funcall ediff-split-window-function))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2599 (switch-to-buffer buff-A)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2600 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2601 (if three-way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2602 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2603 (or (ediff-get-visible-buffer-window buff-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2604 (progn
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2605 (if (and (or (ediff-get-visible-buffer-window buff-A)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2606 (ediff-get-visible-buffer-window buff-B))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2607 (ediff-buffer-live-p buff-C))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2608 (funcall ediff-split-window-function))
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
2609 (switch-to-buffer buff-C)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2610 (error)))
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
2611 (balance-windows)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2612 (message "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2613 ))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2614
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2615 (defun ediff-janitor (ask keep-variants)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2616 "Kill buffers A, B, and, possibly, C, if these buffers aren't modified.
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2617 In merge jobs, buffer C is not deleted here, but rather according to
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2618 ediff-quit-merge-hook.
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2619 A side effect of cleaning up may be that you should be careful when comparing
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2620 the same buffer in two separate Ediff sessions: quitting one of them might
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2621 delete this buffer in another session as well."
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2622 (ediff-dispose-of-variant-according-to-user
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2623 ediff-buffer-A 'A ask keep-variants)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2624 (ediff-dispose-of-variant-according-to-user
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2625 ediff-buffer-B 'B ask keep-variants)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2626 (if ediff-merge-job ; don't del buf C if merging--del ancestor buf instead
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2627 (ediff-dispose-of-variant-according-to-user
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2628 ediff-ancestor-buffer 'Ancestor ask keep-variants)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2629 (ediff-dispose-of-variant-according-to-user
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2630 ediff-buffer-C 'C ask keep-variants)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2631 ))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2632
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2633 ;; Kill the variant buffer, according to user directives (ask, kill
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2634 ;; unconditionaly, keep)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2635 ;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2636 (defun ediff-dispose-of-variant-according-to-user (buff bufftype ask keep-variants)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2637 ;; if this is indirect buffer, kill it and substitute with direct buf
43220
69c91aaa067a 2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42602
diff changeset
2638 (if (and (ediff-buffer-live-p buff)
69c91aaa067a 2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42602
diff changeset
2639 (ediff-with-current-buffer buff ediff-temp-indirect-buffer))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2640 (let ((wind (ediff-get-visible-buffer-window buff))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2641 (base (buffer-base-buffer buff))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2642 (modified-p (buffer-modified-p buff)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2643 (if (and (window-live-p wind) (ediff-buffer-live-p base))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2644 (set-window-buffer wind base))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2645 ;; Kill indirect buffer even if it is modified, because the base buffer
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2646 ;; is still there. Note that if the base buffer is dead then so will be
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2647 ;; the indirect buffer
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2648 (ediff-with-current-buffer buff
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2649 (set-buffer-modified-p nil))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2650 (ediff-kill-buffer-carefully buff)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2651 (ediff-with-current-buffer base
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2652 (set-buffer-modified-p modified-p)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2653 ;; otherwise, ask or use the value of keep-variants
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2654 (or (not (ediff-buffer-live-p buff))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2655 keep-variants
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2656 (buffer-modified-p buff)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2657 (and ask
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2658 (not (y-or-n-p (format "Kill buffer %S [%s]? "
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2659 bufftype (buffer-name buff)))))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2660 (ediff-kill-buffer-carefully buff))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2661 ))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2662
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2663 (defun ediff-maybe-save-and-delete-merge (&optional save-and-continue)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2664 "Default hook to run on quitting a merge job.
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2665 This can also be used to save merge buffer in the middle of an Ediff session.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2666
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2667 If the optional SAVE-AND-CONTINUE argument is non-nil, save merge buffer and
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2668 continue. Otherwise:
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2669 If `ediff-autostore-merges' is nil, this does nothing.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2670 If it is t, it saves the merge buffer in the file `ediff-merge-store-file'
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2671 or asks the user, if the latter is nil. It then asks the user whether to
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2672 delete the merge buffer.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2673 If `ediff-autostore-merges' is neither nil nor t, the merge buffer is saved
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2674 only if this merge job is part of a group, i.e., was invoked from within
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2675 `ediff-merge-directories', `ediff-merge-directory-revisions', and such."
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2676 (let ((merge-store-file ediff-merge-store-file)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2677 (ediff-autostore-merges ; fake ediff-autostore-merges, if necessary
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2678 (if save-and-continue t ediff-autostore-merges)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2679 (if ediff-autostore-merges
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2680 (cond ((stringp merge-store-file)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2681 ;; store, ask to delete
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2682 (ediff-write-merge-buffer-and-maybe-kill
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2683 ediff-buffer-C merge-store-file 'show-file save-and-continue))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2684 ((eq ediff-autostore-merges t)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2685 ;; ask for file name
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2686 (setq merge-store-file
51072
52709955c5a5 2003-05-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 49588
diff changeset
2687 (read-file-name "Save the result of the merge in file: "))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2688 (ediff-write-merge-buffer-and-maybe-kill
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2689 ediff-buffer-C merge-store-file nil save-and-continue))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2690 ((and (ediff-buffer-live-p ediff-meta-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2691 (ediff-with-current-buffer ediff-meta-buffer
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2692 (ediff-merge-metajob)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2693 ;; The parent metajob passed nil as the autostore file.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2694 nil)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2695 ))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2696
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2697 ;; write merge buffer. If the optional argument save-and-continue is non-nil,
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2698 ;; then don't kill the merge buffer
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2699 (defun ediff-write-merge-buffer-and-maybe-kill (buf file
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2700 &optional
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2701 show-file save-and-continue)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2702 (if (not (eq (find-buffer-visiting file) buf))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2703 (let ((warn-message
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2704 (format "Another buffer is visiting file %s. Too dangerous to save the merge buffer"
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2705 file)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2706 (beep)
65582
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 64762
diff changeset
2707 (message "%s" warn-message)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2708 (with-output-to-temp-buffer ediff-msg-buffer
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2709 (princ "\n\n")
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2710 (princ warn-message)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2711 (princ "\n\n")
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2712 )
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2713 (sit-for 2))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2714 (ediff-with-current-buffer buf
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2715 (if (or (not (file-exists-p file))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2716 (y-or-n-p (format "File %s exists, overwrite? " file)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2717 (progn
95366
52e3cee99f90 * progmodes/flymake.el (flymake-save-buffer-in-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
2718 ;;(write-region nil nil file)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2719 (ediff-with-current-buffer buf
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2720 (set-visited-file-name file)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2721 (save-buffer))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2722 (if show-file
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2723 (progn
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2724 (message "Merge buffer saved in: %s" file)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2725 (set-buffer-modified-p nil)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2726 (sit-for 3)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2727 (if (and
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2728 (not save-and-continue)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2729 (y-or-n-p "Merge buffer saved. Now kill the buffer? "))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2730 (ediff-kill-buffer-carefully buf)))))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2731 ))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2732
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2733 ;; The default way of suspending Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2734 ;; Buries Ediff buffers, kills all windows.
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2735 (defun ediff-default-suspend-function ()
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2736 (let* ((buf-A ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2737 (buf-B ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2738 (buf-C ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2739 (buf-A-wind (ediff-get-visible-buffer-window buf-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2740 (buf-B-wind (ediff-get-visible-buffer-window buf-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2741 (buf-C-wind (ediff-get-visible-buffer-window buf-C))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2742 (buf-patch (if (boundp 'ediff-patchbufer) ediff-patchbufer nil))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2743 (buf-patch-diag (if (boundp 'ediff-patch-diagnostics)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2744 ediff-patch-diagnostics nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2745 (buf-err ediff-error-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2746 (buf-diff ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2747 (buf-custom-diff ediff-custom-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2748 (buf-fine-diff ediff-fine-diff-buffer))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2749
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2750 ;; hide the control panel
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2751 (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
2752 (iconify-frame ediff-control-frame)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2753 (bury-buffer))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2754 (if buf-err (bury-buffer buf-err))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2755 (if buf-diff (bury-buffer buf-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2756 (if buf-custom-diff (bury-buffer buf-custom-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2757 (if buf-fine-diff (bury-buffer buf-fine-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2758 (if buf-patch (bury-buffer buf-patch))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2759 (if buf-patch-diag (bury-buffer buf-patch-diag))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2760 (if (window-live-p buf-A-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2761 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2762 (select-window buf-A-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2763 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2764 (bury-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2765 (if (ediff-buffer-live-p buf-A)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2766 (progn
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2767 (set-buffer buf-A)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2768 (bury-buffer))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2769 (if (window-live-p buf-B-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2770 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2771 (select-window buf-B-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2772 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2773 (bury-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2774 (if (ediff-buffer-live-p buf-B)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2775 (progn
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2776 (set-buffer buf-B)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2777 (bury-buffer))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2778 (if (window-live-p buf-C-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2779 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2780 (select-window buf-C-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2781 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2782 (bury-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2783 (if (ediff-buffer-live-p buf-C)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2784 (progn
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2785 (set-buffer buf-C)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2786 (bury-buffer))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2787 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2788
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2789
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2790 (defun ediff-suspend ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2791 "Suspend Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2792 To resume, switch to the appropriate `Ediff Control Panel'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2793 buffer and then type \\[ediff-recenter]. Ediff will automatically set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2794 up an appropriate window config."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2795 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2796 (ediff-barf-if-not-control-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2797 (run-hooks 'ediff-suspend-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2798 (message
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2799 "To resume, type M-x eregistry and select the desired Ediff session"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2800
87058
20301f27964f (ediff-version): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents: 87009
diff changeset
2801 ;; ediff-barf-if-not-control-buffer ensures only called from ediff.
87691
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
2802 (declare-function ediff-version "ediff" ())
87058
20301f27964f (ediff-version): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents: 87009
diff changeset
2803
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2804 (defun ediff-status-info ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2805 "Show the names of the buffers or files being operated on by Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2806 Hit \\[ediff-recenter] to reset the windows afterward."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2807 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2808 (ediff-barf-if-not-control-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2809 (save-excursion
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2810 (ediff-skip-unsuitable-frames))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2811 (with-output-to-temp-buffer ediff-msg-buffer
33392
25fb6fc4f66b (ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents: 33019
diff changeset
2812 (ediff-with-current-buffer standard-output
25fb6fc4f66b (ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents: 33019
diff changeset
2813 (fundamental-mode))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2814 (raise-frame (selected-frame))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2815 (princ (ediff-version))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2816 (princ "\n\n")
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2817 (ediff-with-current-buffer ediff-buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2818 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2819 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2820 (format "File A = %S\n" buffer-file-name))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2821 (princ
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2822 (format "Buffer A = %S\n" (buffer-name)))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2823 (ediff-with-current-buffer ediff-buffer-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2824 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2825 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2826 (format "File B = %S\n" buffer-file-name))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2827 (princ
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2828 (format "Buffer B = %S\n" (buffer-name)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2829 (if ediff-3way-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2830 (ediff-with-current-buffer ediff-buffer-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2831 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2832 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2833 (format "File C = %S\n" buffer-file-name))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2834 (princ
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2835 (format "Buffer C = %S\n" (buffer-name))))))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2836 (princ (format "Customized diff output %s\n"
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2837 (if (ediff-buffer-live-p ediff-custom-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2838 (concat "\tin buffer "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2839 (buffer-name ediff-custom-diff-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2840 " is not available")))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2841 (princ (format "Plain diff output %s\n"
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2842 (if (ediff-buffer-live-p ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2843 (concat "\tin buffer "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2844 (buffer-name ediff-diff-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2845 " is not available")))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2846
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2847 (let* ((A-line (ediff-with-current-buffer ediff-buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2848 (1+ (count-lines (point-min) (point)))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2849 (B-line (ediff-with-current-buffer ediff-buffer-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2850 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2851 C-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2852 (princ (format "\Buffer A's point is on line %d\n" A-line))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2853 (princ (format "Buffer B's point is on line %d\n" B-line))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2854 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2855 (progn
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2856 (setq C-line (ediff-with-current-buffer ediff-buffer-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2857 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2858 (princ (format "Buffer C's point is on line %d\n" C-line)))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2859
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2860 (princ (format "\nCurrent difference number = %S\n"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2861 (cond ((< ediff-current-difference 0) 'start)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2862 ((>= ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2863 ediff-number-of-differences) 'end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2864 (t (1+ ediff-current-difference)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2865
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2866 (princ
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2867 (format "\n%s regions that differ in white space & line breaks only"
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2868 (if ediff-ignore-similar-regions
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2869 "Ignoring" "Showing")))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2870 (if (and ediff-merge-job ediff-show-clashes-only)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2871 (princ
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2872 "\nFocusing on regions where both buffers differ from the ancestor"))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2873 (if (and ediff-skip-merge-regions-that-differ-from-default ediff-merge-job)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2874 (princ
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
2875 "\nSkipping merge regions that differ from default setting"))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2876
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2877 (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2878 (princ "\nSelective browsing by regexp is off\n"))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2879 ((eq ediff-skip-diff-region-function
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2880 ediff-hide-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2881 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2882 "\nIgnoring regions that match")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2883 (princ
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2884 (format
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2885 "\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
2886 ediff-regexp-hide-A ediff-hide-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2887 ediff-regexp-hide-B)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2888 ((eq ediff-skip-diff-region-function
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2889 ediff-focus-on-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2890 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2891 "\nFocusing on regions that match")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2892 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2893 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2894 "\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
2895 ediff-regexp-focus-A ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2896 ediff-regexp-focus-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2897 (t (princ "\nSelective browsing via a user-defined method.\n")))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2898
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2899 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2900 (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2901 (substitute-command-keys "\\[ediff-submit-report]")))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2902 ) ; with output
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2903 (if (frame-live-p ediff-control-frame)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2904 (ediff-reset-mouse ediff-control-frame))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2905 (if (window-live-p ediff-control-window)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2906 (select-window ediff-control-window)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2907
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2908
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2909
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2910
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2911 ;;; Support routines
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2912
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2913 ;; Select a difference by placing the ASCII flags around the appropriate
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2914 ;; group of lines in the A, B buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2915 ;; 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
2916 (defun ediff-select-difference (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2917 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2918 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2919 (ediff-valid-difference-p n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2920 (progn
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2921 (cond
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2922 ((and (ediff-has-face-support-p) ediff-use-faces)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2923 (ediff-highlight-diff n))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2924 ((eq ediff-highlighting-style 'ascii)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2925 (ediff-place-flags-in-buffer
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2926 'A ediff-buffer-A ediff-control-buffer n)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2927 (ediff-place-flags-in-buffer
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2928 'B ediff-buffer-B ediff-control-buffer n)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2929 (if ediff-3way-job
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2930 (ediff-place-flags-in-buffer
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2931 'C ediff-buffer-C ediff-control-buffer n))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2932 (if (ediff-buffer-live-p ediff-ancestor-buffer)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2933 (ediff-place-flags-in-buffer
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2934 'Ancestor ediff-ancestor-buffer
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2935 ediff-control-buffer n))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2936 ))
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2937
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2938 (ediff-install-fine-diff-if-necessary n)
52828
d08ef8842be1 2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
2939 ;; set current difference here so the hook will be able to refer to it
d08ef8842be1 2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
2940 (setq ediff-current-difference n)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2941 (run-hooks 'ediff-select-hook))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2942
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2943
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2944 ;; Unselect a difference by removing the ASCII flags in the buffers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2945 ;; 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
2946 (defun ediff-unselect-difference (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2947 (if (ediff-valid-difference-p n)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2948 (progn
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2949 (cond ((and (ediff-has-face-support-p) ediff-use-faces)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2950 (ediff-unhighlight-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2951 ((eq ediff-highlighting-style 'ascii)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2952 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2953 ediff-buffer-A
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2954 (ediff-get-diff-overlay n 'A))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2955 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2956 ediff-buffer-B
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2957 (ediff-get-diff-overlay n 'B))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2958 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2959 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2960 ediff-buffer-C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2961 (ediff-get-diff-overlay n 'C)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2962 (if (ediff-buffer-live-p ediff-ancestor-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2963 (ediff-remove-flags-from-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2964 ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2965 (ediff-get-diff-overlay n 'Ancestor)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2966 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2967
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2968 ;; unhighlight fine diffs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2969 (ediff-set-fine-diff-properties ediff-current-difference 'default)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2970 (run-hooks 'ediff-unselect-hook))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2971
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2972
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2973 ;; 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
2974 ;; 'select-only or 'unselect-only. If FLAG is 'select-only, the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2975 ;; next difference is selected, but the current selection is not
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2976 ;; unselected. If FLAG is 'unselect-only then the current selection is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2977 ;; 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
2978 ;; don't recenter buffers after selecting/unselecting.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2979 (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
2980 (let ((ediff-current-difference n))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2981 (or no-recenter
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2982 (ediff-recenter 'no-rehighlight)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2983
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2984 (let ((control-buf ediff-control-buffer))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2985 (unwind-protect
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2986 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2987 (or (eq flag 'select-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2988 (ediff-unselect-difference ediff-current-difference))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2989
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2990 (or (eq flag 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2991 (ediff-select-difference n))
52828
d08ef8842be1 2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
2992 ;; need to set current diff here even though it is also set in
d08ef8842be1 2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
2993 ;; ediff-select-difference because ediff-select-difference might not
d08ef8842be1 2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
2994 ;; be called if unselect-only is specified
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2995 (setq ediff-current-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2996 ) ; end protected section
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
2997
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2998 (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines)))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
2999 ))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3000
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3001
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3002
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3003 (defun ediff-highlight-diff-in-one-buffer (n buf-type)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3004 (if (ediff-buffer-live-p (ediff-get-buffer buf-type))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3005 (let* ((buff (ediff-get-buffer buf-type))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3006 (last (ediff-with-current-buffer buff (point-max)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3007 (begin (ediff-get-diff-posn buf-type 'beg n))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3008 (end (ediff-get-diff-posn buf-type 'end n))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3009 (xtra (if (equal begin end) 1 0))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3010 (end-hilit (min last (+ end xtra)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3011 (current-diff-overlay
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3012 (symbol-value
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3013 (ediff-get-symbol-from-alist
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3014 buf-type ediff-current-diff-overlay-alist))))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3015
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
3016 (if (featurep 'xemacs)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3017 (ediff-move-overlay current-diff-overlay begin end-hilit)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3018 (ediff-move-overlay current-diff-overlay begin end-hilit buff))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3019 (ediff-overlay-put current-diff-overlay 'priority
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3020 (ediff-highest-priority begin end-hilit buff))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3021 (ediff-overlay-put current-diff-overlay 'ediff-diff-num n)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3022
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3023 ;; unhighlight the background overlay for diff n so it won't
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3024 ;; interfere with the current diff overlay
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3025 (ediff-set-overlay-face (ediff-get-diff-overlay n buf-type) nil)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3026 )))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3027
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3028
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3029 (defun ediff-unhighlight-diff-in-one-buffer (buf-type)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3030 (if (ediff-buffer-live-p (ediff-get-buffer buf-type))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3031 (let ((current-diff-overlay
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3032 (symbol-value
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3033 (ediff-get-symbol-from-alist
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3034 buf-type ediff-current-diff-overlay-alist)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3035 (overlay
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3036 (ediff-get-diff-overlay ediff-current-difference buf-type))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3037 )
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3038
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3039 (ediff-move-overlay current-diff-overlay 1 1)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3040
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3041 ;; rehighlight the overlay in the background of the
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3042 ;; current difference region
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3043 (ediff-set-overlay-face
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3044 overlay
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3045 (if (and (ediff-has-face-support-p)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3046 ediff-use-faces ediff-highlight-all-diffs)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3047 (ediff-background-face buf-type ediff-current-difference)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3048 )))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3049
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3050 (defun ediff-unhighlight-diffs-totally-in-one-buffer (buf-type)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3051 (ediff-unselect-and-select-difference -1)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3052 (if (and (ediff-has-face-support-p) ediff-use-faces)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3053 (let* ((inhibit-quit t)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3054 (current-diff-overlay-var
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3055 (ediff-get-symbol-from-alist
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3056 buf-type ediff-current-diff-overlay-alist))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3057 (current-diff-overlay (symbol-value current-diff-overlay-var)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3058 (ediff-paint-background-regions 'unhighlight)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3059 (if (ediff-overlayp current-diff-overlay)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3060 (ediff-delete-overlay current-diff-overlay))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3061 (set current-diff-overlay-var nil)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3062 )))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3063
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3064
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68651
diff changeset
3065 (defun ediff-highlight-diff (n)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3066 "Put face on diff N. Invoked for X displays only."
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3067 (ediff-highlight-diff-in-one-buffer n 'A)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3068 (ediff-highlight-diff-in-one-buffer n 'B)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3069 (ediff-highlight-diff-in-one-buffer n 'C)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3070 (ediff-highlight-diff-in-one-buffer n 'Ancestor)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3071 )
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3072
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3073
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68651
diff changeset
3074 (defun ediff-unhighlight-diff ()
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3075 "Remove overlays from buffers A, B, and C."
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3076 (ediff-unhighlight-diff-in-one-buffer 'A)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3077 (ediff-unhighlight-diff-in-one-buffer 'B)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3078 (ediff-unhighlight-diff-in-one-buffer 'C)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3079 (ediff-unhighlight-diff-in-one-buffer 'Ancestor)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3080 )
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3081
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3082 ;; delete highlighting overlays, restore faces to their original form
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68651
diff changeset
3083 (defun ediff-unhighlight-diffs-totally ()
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3084 (ediff-unhighlight-diffs-totally-in-one-buffer 'A)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3085 (ediff-unhighlight-diffs-totally-in-one-buffer 'B)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3086 (ediff-unhighlight-diffs-totally-in-one-buffer 'C)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3087 (ediff-unhighlight-diffs-totally-in-one-buffer 'Ancestor)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3088 )
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3089
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3090
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3091 ;; This is adapted from a similar function in `emerge.el'.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3092 ;; PROMPT should not have a trailing ': ', so that it can be modified
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3093 ;; according to context.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3094 ;; If DEFAULT-FILE is set, it should be used as the default value.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3095 ;; If DEFAULT-DIR is non-nil, use it as the default directory.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3096 ;; Otherwise, use the value of Emacs' variable `default-directory.'
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3097 (defun ediff-read-file-name (prompt default-dir default-file &optional no-dirs)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3098 ;; hack default-dir if it is not set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3099 (setq default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3100 (file-name-as-directory
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3101 (ediff-abbreviate-file-name
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3102 (expand-file-name (or default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3103 (and default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3104 (file-name-directory default-file))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3105 default-directory)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3106
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3107 ;; strip the directory from default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3108 (if default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3109 (setq default-file (file-name-nondirectory default-file)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3110 (if (string= default-file "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3111 (setq default-file nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3112
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3113 (let (f)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3114 (setq f (expand-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3115 (read-file-name
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3116 (format "%s%s "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3117 prompt
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3118 (cond (default-file
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3119 (concat " (default " default-file "):"))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3120 (t (concat " (default " default-dir "):"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3121 default-dir
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3122 (or default-file default-dir)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3123 t ; must match, no-confirm
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3124 (if default-file (file-name-directory default-file))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3125 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3126 default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3127 ))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3128 ;; If user entered a directory name, expand the default file in that
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3129 ;; directory. This allows the user to enter a directory name for the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3130 ;; B-file and diff against the default-file in that directory instead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3131 ;; of a DIRED listing!
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3132 (if (and (file-directory-p f) default-file)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3133 (setq f (expand-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3134 (file-name-nondirectory default-file) f)))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3135 (if (and no-dirs (file-directory-p f))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3136 (error "File %s is a directory" f))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3137 f))
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3138
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3139 ;; If PREFIX is given, then it is used as a prefix for the temp file
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3140 ;; name. Otherwise, `ediff' is used. If FILE is given, use this
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3141 ;; file and don't create a new one.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3142 ;; In MS-DOS, make sure the prefix isn't too long, or else
23674
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3143 ;; `make-temp-name' isn't guaranteed to return a unique filename.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3144 ;; 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
3145 ;; START defaults to (point-min), END to (point-max)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3146 (defun ediff-make-temp-file (buff &optional prefix given-file start end)
23674
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3147 (let* ((p (ediff-convert-standard-filename (or prefix "ediff")))
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3148 (short-p p)
82467
ff85cbd27ee2 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 82140
diff changeset
3149 (coding-system-for-write
ff85cbd27ee2 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 82140
diff changeset
3150 (ediff-with-current-buffer buff
ff85cbd27ee2 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 82140
diff changeset
3151 (if (boundp 'buffer-file-coding-system)
ff85cbd27ee2 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 82140
diff changeset
3152 buffer-file-coding-system
ff85cbd27ee2 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 82140
diff changeset
3153 ediff-coding-system-for-write)))
23674
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3154 f short-f)
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3155 (if (and (fboundp 'msdos-long-file-names)
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3156 (not (msdos-long-file-names))
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3157 (> (length p) 2))
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3158 (setq short-p (substring p 0 2)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3159
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3160 (setq f (concat ediff-temp-file-prefix p)
23674
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3161 short-f (concat ediff-temp-file-prefix short-p)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3162 f (cond (given-file)
66894
0b958d61a229 2005-11-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 66687
diff changeset
3163 ((find-file-name-handler f 'insert-file-contents)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3164 ;; to thwart file handlers in write-region, e.g., if file
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3165 ;; name ends with .Z or .gz
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3166 ;; This is needed so that patches produced by ediff will
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3167 ;; have more meaningful names
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3168 (ediff-make-empty-tmp-file short-f))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3169 (prefix
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3170 ;; Prefix is most often the same as the file name for the
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3171 ;; variant. Here we are trying to use the original file
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3172 ;; name but in the temp directory.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3173 (ediff-make-empty-tmp-file f 'keep-name))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3174 (t
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3175 ;; If don't care about name, add some random stuff
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3176 ;; to proposed file name.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3177 (ediff-make-empty-tmp-file short-f))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3178
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3179 ;; create the file
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3180 (ediff-with-current-buffer buff
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3181 (write-region (if start start (point-min))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3182 (if end end (point-max))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3183 f
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3184 nil ; don't append---erase
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3185 'no-message)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3186 (set-file-modes f ediff-temp-file-mode)
23674
4b1d22478c9f (ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents: 23381
diff changeset
3187 (expand-file-name f))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3188
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3189 ;; Create a temporary file.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3190 ;; The returned file name (created by appending some random characters at the
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3191 ;; end of PROPOSED-NAME is guaranteed to point to a newly created empty file.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3192 ;; This is a replacement for make-temp-name, which eliminates a security hole.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3193 ;; If KEEP-PROPOSED-NAME isn't nil, try to keep PROPOSED-NAME, unless such file
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3194 ;; already exists.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3195 ;; It is a modified version of make-temp-file in emacs 20.5
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3196 (defun ediff-make-empty-tmp-file (proposed-name &optional keep-proposed-name)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3197 (let ((file proposed-name))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3198 (while (condition-case ()
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3199 (progn
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3200 (if (or (file-exists-p file) (not keep-proposed-name))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3201 (setq file (make-temp-name proposed-name)))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3202 ;; the with-temp-buffer thing is a workaround for an XEmacs
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3203 ;; bug: write-region complains that we are trying to visit a
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3204 ;; file in an indirect buffer, failing to notice that the
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3205 ;; VISIT flag is unset and that we are actually writing from a
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3206 ;; string and not from any buffer.
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3207 (with-temp-buffer
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3208 (write-region "" nil file nil 'silent nil 'excl))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3209 nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3210 (file-already-exists t))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3211 ;; the file was somehow created by someone else between
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3212 ;; `make-temp-name' and `write-region', let's try again.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3213 nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3214 file))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3215
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3216
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3217 ;; Quote metacharacters (using \) when executing diff in Unix, but not in
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3218 ;; EMX OS/2
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3219 ;;(defun ediff-protect-metachars (str)
97142
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95366
diff changeset
3220 ;; (or (memq system-type '(emx))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3221 ;; (let ((limit 0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3222 ;; (while (string-match ediff-metachars str limit)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3223 ;; (setq str (concat (substring str 0 (match-beginning 0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3224 ;; "\\"
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3225 ;; (substring str (match-beginning 0))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3226 ;; (setq limit (1+ (match-end 0))))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3227 ;; str)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3228
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3229 ;; 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
3230 ;; file on disk, and attempt to remedy the situation if not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3231 ;; 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
3232 ;; to do what is necessary to make them the same.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3233 ;; Also, Ediff always offers to revert obsolete buffers, whether they
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3234 ;; are modified or not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3235 (defun ediff-verify-file-buffer (&optional file-magic)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3236 ;; First check if the file has been modified since the buffer visited it.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3237 (if (verify-visited-file-modtime (current-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3238 (if (buffer-modified-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3239 ;; If buffer is not obsolete and is modified, offer to save
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3240 (if (yes-or-no-p
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3241 (format "Buffer %s has been modified. Save it in file %s? "
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3242 (buffer-name)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3243 buffer-file-name))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3244 (condition-case nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3245 (save-buffer)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3246 (error
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3247 (beep)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3248 (message "Couldn't save %s" buffer-file-name)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3249 (error "Buffer is out of sync for file %s" buffer-file-name))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3250 ;; If buffer is not obsolete and is not modified, do nothing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3251 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3252 ;; If buffer is obsolete, offer to revert
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3253 (if (yes-or-no-p
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3254 (format "File %s was modified since visited by buffer %s. REVERT file %s? "
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3255 buffer-file-name
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3256 (buffer-name)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3257 buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3258 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3259 (if file-magic
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3260 (erase-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3261 (revert-buffer t t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3262 (error "Buffer out of sync for file %s" buffer-file-name))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3263
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3264 ;; if there is another buffer visiting the file of the merge buffer, offer to
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3265 ;; save and delete the buffer; else bark
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3266 (defun ediff-verify-file-merge-buffer (file)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3267 (let ((buff (if (stringp file) (find-buffer-visiting file)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3268 warn-message)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3269 (or (null buff)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3270 (progn
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3271 (setq warn-message
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3272 (format "Buffer %s is visiting %s. Save and kill the buffer? "
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3273 (buffer-name buff) file))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3274 (with-output-to-temp-buffer ediff-msg-buffer
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3275 (princ "\n\n")
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3276 (princ warn-message)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3277 (princ "\n\n"))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3278 (if (y-or-n-p
65582
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 64762
diff changeset
3279 (message "%s" warn-message))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3280 (with-current-buffer buff
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3281 (save-buffer)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3282 (kill-buffer (current-buffer)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3283 (error "Too dangerous to merge versions of a file visited by another buffer"))))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3284 ))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3285
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3286
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3287
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3288 (defun ediff-filename-magic-p (file)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3289 (or (ediff-file-compressed-p file)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3290 (ediff-file-remote-p file)))
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3291
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3292
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3293 (defun ediff-save-buffer (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3294 "Safe way of saving buffers A, B, C, and the diff output.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3295 `wa' saves buffer A, `wb' saves buffer B, `wc' saves buffer C,
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3296 and `wd' saves the diff output.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3297
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3298 With prefix argument, `wd' saves plain diff output.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3299 Without an argument, it saves customized diff argument, if available
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3300 \(and plain output, if customized output was not generated\)."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3301 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3302 (ediff-barf-if-not-control-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3303 (ediff-compute-custom-diffs-maybe)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3304 (ediff-with-current-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3305 (cond ((memq last-command-char '(?a ?b ?c))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3306 (ediff-get-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3307 (ediff-char-to-buftype last-command-char)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3308 ((eq last-command-char ?d)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3309 (message "Saving diff output ...")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3310 (sit-for 1) ; let the user see the message
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3311 (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3312 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3313 ((ediff-buffer-live-p ediff-custom-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3314 ediff-custom-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3315 ((ediff-buffer-live-p ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3316 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3317 (t (error "Output from `diff' not found"))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3318 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3319 (save-buffer)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3320
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3321
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3322 ;; idea suggested by Hannu Koivisto <azure@iki.fi>
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3323 (defun ediff-clone-buffer-for-region-comparison (buff region-name)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3324 (let ((cloned-buff (ediff-make-cloned-buffer buff region-name))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3325 (pop-up-windows t)
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3326 wind
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3327 other-wind
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3328 msg-buf)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3329 (ediff-with-current-buffer cloned-buff
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3330 (setq ediff-temp-indirect-buffer t))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3331 (pop-to-buffer cloned-buff)
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3332 (setq wind (ediff-get-visible-buffer-window cloned-buff))
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3333 (select-window wind)
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3334 (delete-other-windows)
75389
11ae87f329da 2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 75347
diff changeset
3335 (ediff-activate-mark)
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3336 (split-window-vertically)
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3337 (ediff-select-lowest-window)
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3338 (setq other-wind (selected-window))
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3339 (with-temp-buffer
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3340 (erase-buffer)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3341 (insert
75389
11ae87f329da 2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 75347
diff changeset
3342 (format "\n ******* Mark a region in buffer %s (or confirm the existing one) *******\n"
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3343 (buffer-name cloned-buff)))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3344 (insert
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3345 (ediff-with-current-buffer buff
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3346 (format "\n\t When done, type %s Use %s to abort\n "
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3347 (ediff-format-bindings-of 'exit-recursive-edit)
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3348 (ediff-format-bindings-of 'abort-recursive-edit))))
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3349 (goto-char (point-min))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3350 (setq msg-buf (current-buffer))
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3351 (set-window-buffer other-wind msg-buf)
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3352 (shrink-window-if-larger-than-buffer)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3353 (if (window-live-p wind)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3354 (select-window wind))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3355 (condition-case nil
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3356 (recursive-edit)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3357 (quit
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3358 (ediff-kill-buffer-carefully cloned-buff)))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3359 )
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3360 cloned-buff))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3361
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3362
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3363 (defun ediff-clone-buffer-for-window-comparison (buff wind region-name)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3364 (let ((cloned-buff (ediff-make-cloned-buffer buff region-name)))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3365 (ediff-with-current-buffer cloned-buff
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3366 (setq ediff-temp-indirect-buffer t))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3367 (set-window-buffer wind cloned-buff)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3368 cloned-buff))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3369
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3370 (defun ediff-clone-buffer-for-current-diff-comparison (buff buf-type reg-name)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3371 (let ((cloned-buff (ediff-make-cloned-buffer buff reg-name))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3372 (reg-start (ediff-get-diff-posn buf-type 'beg))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3373 (reg-end (ediff-get-diff-posn buf-type 'end)))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3374 (ediff-with-current-buffer cloned-buff
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3375 ;; set region to be the current diff region
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3376 (goto-char reg-start)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3377 (set-mark reg-end)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3378 (setq ediff-temp-indirect-buffer t))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3379 cloned-buff))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3380
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3381
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3382
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3383 (defun ediff-make-cloned-buffer (buff region-name)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3384 (ediff-make-indirect-buffer
44615
a1448e19a9f8 * viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 44028
diff changeset
3385 buff (generate-new-buffer-name
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3386 (concat (if (stringp buff) buff (buffer-name buff)) region-name))))
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3387
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3388
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3389 (defun ediff-make-indirect-buffer (base-buf indirect-buf-name)
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3390 (if (featurep 'xemacs)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3391 (make-indirect-buffer base-buf indirect-buf-name)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3392 (make-indirect-buffer base-buf indirect-buf-name 'clone)))
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3393
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3394
43714
1c34b0b56515 * ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43220
diff changeset
3395 ;; This function operates only from an ediff control buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3396 (defun ediff-compute-custom-diffs-maybe ()
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3397 (let ((buf-A-file-name (buffer-file-name ediff-buffer-A))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3398 (buf-B-file-name (buffer-file-name ediff-buffer-B))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3399 file-A file-B)
91483
5fc145fcebe2 * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote files.
Michael Albinus <michael.albinus@gmx.de>
parents: 87691
diff changeset
3400 (unless (and buf-A-file-name
5fc145fcebe2 * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote files.
Michael Albinus <michael.albinus@gmx.de>
parents: 87691
diff changeset
3401 (file-exists-p buf-A-file-name)
5fc145fcebe2 * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote files.
Michael Albinus <michael.albinus@gmx.de>
parents: 87691
diff changeset
3402 (not (ediff-file-remote-p buf-A-file-name)))
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
3403 (setq file-A (ediff-make-temp-file ediff-buffer-A)))
91483
5fc145fcebe2 * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote files.
Michael Albinus <michael.albinus@gmx.de>
parents: 87691
diff changeset
3404 (unless (and buf-B-file-name
5fc145fcebe2 * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote files.
Michael Albinus <michael.albinus@gmx.de>
parents: 87691
diff changeset
3405 (file-exists-p buf-B-file-name)
5fc145fcebe2 * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote files.
Michael Albinus <michael.albinus@gmx.de>
parents: 87691
diff changeset
3406 (not (ediff-file-remote-p buf-B-file-name)))
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
3407 (setq file-B (ediff-make-temp-file ediff-buffer-B)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3408 (or (ediff-buffer-live-p ediff-custom-diff-buffer)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3409 (setq ediff-custom-diff-buffer
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3410 (get-buffer-create
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3411 (ediff-unique-buffer-name "*ediff-custom-diff" "*"))))
43714
1c34b0b56515 * ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43220
diff changeset
3412 (ediff-with-current-buffer ediff-custom-diff-buffer
54090
e83349d94786 * ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 53865
diff changeset
3413 (setq buffer-read-only nil)
e83349d94786 * ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 53865
diff changeset
3414 (erase-buffer))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3415 (ediff-exec-process
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3416 ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
54090
e83349d94786 * ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 53865
diff changeset
3417 ediff-custom-diff-options
e83349d94786 * ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 53865
diff changeset
3418 ;; repetition of buf-A-file-name is needed so it'll return a file
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
3419 (or (and buf-A-file-name (file-exists-p buf-A-file-name) buf-A-file-name)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
3420 file-A)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
3421 (or (and buf-B-file-name (file-exists-p buf-B-file-name) buf-B-file-name)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
3422 file-B))
36043
5d6b76d28b83 2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 35411
diff changeset
3423 ;; put the diff file in diff-mode, if it is available
5d6b76d28b83 2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 35411
diff changeset
3424 (if (fboundp 'diff-mode)
5d6b76d28b83 2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 35411
diff changeset
3425 (with-current-buffer ediff-custom-diff-buffer
5d6b76d28b83 2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 35411
diff changeset
3426 (diff-mode)))
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
3427 (and file-A (file-exists-p file-A) (delete-file file-A))
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
3428 (and file-B (file-exists-p file-B) (delete-file file-B))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3429 ))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3430
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3431 (defun ediff-show-diff-output (arg)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3432 (interactive "P")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3433 (ediff-barf-if-not-control-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3434 (ediff-compute-custom-diffs-maybe)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3435 (save-excursion
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3436 (ediff-skip-unsuitable-frames ' ok-unsplittable))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3437 (let ((buf (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3438 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3439 ((ediff-buffer-live-p ediff-custom-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3440 ediff-custom-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3441 ((ediff-buffer-live-p ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3442 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3443 (t
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3444 (beep)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3445 (message "Output from `diff' not found")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3446 nil))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3447 (if buf
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3448 (progn
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3449 (ediff-with-current-buffer buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3450 (goto-char (point-min)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3451 (switch-to-buffer buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3452 (raise-frame (selected-frame)))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3453 (if (frame-live-p ediff-control-frame)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3454 (ediff-reset-mouse ediff-control-frame))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3455 (if (window-live-p ediff-control-window)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3456 (select-window ediff-control-window)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3457
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3458
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3459 (defun ediff-inferior-compare-regions ()
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3460 "Compare regions in an active Ediff session.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3461 Like ediff-regions-linewise but is called from under an active Ediff session on
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3462 the files that belong to that session.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3463
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3464 After quitting the session invoked via this function, type C-l to the parent
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3465 Ediff Control Panel to restore highlighting."
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3466 (interactive)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3467 (let ((answer "")
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3468 (possibilities (list ?A ?B ?C))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3469 (zmacs-regions t)
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3470 use-current-diff-p
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3471 begA begB endA endB bufA bufB)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3472
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3473 (if (ediff-valid-difference-p ediff-current-difference)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3474 (progn
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3475 (ediff-set-fine-diff-properties ediff-current-difference 'default)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3476 (ediff-unhighlight-diff)))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3477 (ediff-paint-background-regions 'unhighlight)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3478
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3479 (cond ((ediff-merge-job)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3480 (setq bufB ediff-buffer-C)
43714
1c34b0b56515 * ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43220
diff changeset
3481 ;; ask which buffer to compare to the merge buffer
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3482 (while (cond ((eq answer ?A)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3483 (setq bufA ediff-buffer-A
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3484 possibilities '(?B))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3485 nil)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3486 ((eq answer ?B)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3487 (setq bufA ediff-buffer-B
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3488 possibilities '(?A))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3489 nil)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3490 ((equal answer ""))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3491 (t (beep 1)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3492 (message "Valid values are A or B")
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3493 (sit-for 2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3494 t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3495 (let ((cursor-in-echo-area t))
43714
1c34b0b56515 * ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43220
diff changeset
3496 (message
1c34b0b56515 * ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43220
diff changeset
3497 "Which buffer to compare to the merge buffer (A or B)? ")
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3498 (setq answer (capitalize (read-char-exclusive))))))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3499
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3500 ((ediff-3way-comparison-job)
43714
1c34b0b56515 * ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43220
diff changeset
3501 ;; ask which two buffers to compare
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3502 (while (cond ((memq answer possibilities)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3503 (setq possibilities (delq answer possibilities))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3504 (setq bufA
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3505 (eval
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3506 (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3507 answer ediff-buffer-alist)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3508 nil)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3509 ((equal answer ""))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3510 (t (beep 1)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3511 (message
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3512 "Valid values are %s"
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3513 (mapconcat 'char-to-string possibilities " or "))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3514 (sit-for 2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3515 t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3516 (let ((cursor-in-echo-area t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3517 (message "Enter the 1st buffer you want to compare (%s): "
43714
1c34b0b56515 * ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43220
diff changeset
3518 (mapconcat 'char-to-string possibilities " or "))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3519 (setq answer (capitalize (read-char-exclusive)))))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3520 (setq answer "") ; silence error msg
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3521 (while (cond ((memq answer possibilities)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3522 (setq possibilities (delq answer possibilities))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3523 (setq bufB
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3524 (eval
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3525 (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3526 answer ediff-buffer-alist)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3527 nil)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3528 ((equal answer ""))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3529 (t (beep 1)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3530 (message
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3531 "Valid values are %s"
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3532 (mapconcat 'char-to-string possibilities " or "))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3533 (sit-for 2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3534 t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3535 (let ((cursor-in-echo-area t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3536 (message "Enter the 2nd buffer you want to compare (%s): "
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3537 (mapconcat 'char-to-string possibilities "/"))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3538 (setq answer (capitalize (read-char-exclusive))))))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3539 (t ; 2way comparison
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3540 (setq bufA ediff-buffer-A
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3541 bufB ediff-buffer-B
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3542 possibilities nil)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3543
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3544 (if (and (ediff-valid-difference-p ediff-current-difference)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3545 (y-or-n-p "Compare currently highlighted difference regions? "))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3546 (setq use-current-diff-p t))
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3547
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3548 (setq bufA (if use-current-diff-p
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3549 (ediff-clone-buffer-for-current-diff-comparison
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3550 bufA 'A "-Region.A-")
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3551 (ediff-clone-buffer-for-region-comparison bufA "-Region.A-")))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3552 (ediff-with-current-buffer bufA
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3553 (setq begA (region-beginning)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3554 endA (region-end))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3555 (goto-char begA)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3556 (beginning-of-line)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3557 (setq begA (point))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3558 (goto-char endA)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3559 (end-of-line)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3560 (or (eobp) (forward-char)) ; include the newline char
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3561 (setq endA (point)))
43714
1c34b0b56515 * ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43220
diff changeset
3562
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3563 (setq bufB (if use-current-diff-p
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3564 (ediff-clone-buffer-for-current-diff-comparison
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3565 bufB 'B "-Region.B-")
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3566 (ediff-clone-buffer-for-region-comparison bufB "-Region.B-")))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3567 (ediff-with-current-buffer bufB
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3568 (setq begB (region-beginning)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3569 endB (region-end))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3570 (goto-char begB)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3571 (beginning-of-line)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3572 (setq begB (point))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3573 (goto-char endB)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3574 (end-of-line)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3575 (or (eobp) (forward-char)) ; include the newline char
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3576 (setq endB (point)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3577
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3578
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3579 (ediff-regions-internal
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3580 bufA begA endA bufB begB endB
44028
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3581 nil ; setup-hook
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3582 (if use-current-diff-p ; job name
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3583 'ediff-regions-wordwise
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3584 'ediff-regions-linewise)
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3585 (if use-current-diff-p ; word mode, if diffing current diff
182881d68883 * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43714
diff changeset
3586 t nil)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3587 ;; setup param to pass to ediff-setup
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3588 (list (cons 'ediff-split-window-function ediff-split-window-function)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3589 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3590
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3591
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3592
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3593 (defun ediff-remove-flags-from-buffer (buffer overlay)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3594 (ediff-with-current-buffer buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3595 (let ((inhibit-read-only t))
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
3596 (if (featurep 'xemacs)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3597 (ediff-overlay-put overlay 'begin-glyph nil)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3598 (ediff-overlay-put overlay 'before-string nil))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3599
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
3600 (if (featurep 'xemacs)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3601 (ediff-overlay-put overlay 'end-glyph nil)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3602 (ediff-overlay-put overlay 'after-string nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3603 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3604
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3605
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3606
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3607 (defun ediff-place-flags-in-buffer (buf-type buffer ctl-buffer diff)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3608 (ediff-with-current-buffer buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3609 (ediff-place-flags-in-buffer1 buf-type ctl-buffer diff)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3610
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3611
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3612 (defun ediff-place-flags-in-buffer1 (buf-type ctl-buffer diff-no)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3613 (let* ((curr-overl (ediff-with-current-buffer ctl-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3614 (ediff-get-diff-overlay diff-no buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3615 (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
3616 after beg-of-line flag)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3617
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3618 ;; insert flag before the difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3619 (goto-char before)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3620 (setq beg-of-line (bolp))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3621
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3622 (setq flag (ediff-with-current-buffer ctl-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3623 (if (eq ediff-highlighting-style 'ascii)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3624 (if beg-of-line
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3625 ediff-before-flag-bol ediff-before-flag-mol))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3626
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3627 ;; insert the flag itself
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
3628 (if (featurep 'xemacs)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3629 (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
3630 (ediff-overlay-put curr-overl 'before-string flag))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3631
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3632 ;; insert the flag after the difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3633 ;; `after' must be set here, after the before-flag was inserted
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3634 (setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3635 (goto-char after)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3636 (setq beg-of-line (bolp))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3637
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3638 (setq flag (ediff-with-current-buffer ctl-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3639 (if (eq ediff-highlighting-style 'ascii)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3640 (if beg-of-line
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3641 ediff-after-flag-eol ediff-after-flag-mol))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3642
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3643 ;; insert the flag itself
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
3644 (if (featurep 'xemacs)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3645 (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
3646 (ediff-overlay-put curr-overl 'after-string flag))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3647 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3648
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3649
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3650 ;;; Some diff region tests
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3651
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3652 ;; t if diff region is empty.
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3653 ;; In case of buffer C, t also if it is not a 3way
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3654 ;; comparison job (merging jobs return t as well).
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3655 (defun ediff-empty-diff-region-p (n buf-type)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3656 (if (eq buf-type 'C)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3657 (or (not ediff-3way-comparison-job)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3658 (= (ediff-get-diff-posn 'C 'beg n)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3659 (ediff-get-diff-posn 'C 'end n)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3660 (= (ediff-get-diff-posn buf-type 'beg n)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3661 (ediff-get-diff-posn buf-type 'end n))))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3662
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3663 ;; Test if diff region is white space only.
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3664 ;; If 2-way job and buf-type = C, then returns t.
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3665 (defun ediff-whitespace-diff-region-p (n buf-type)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3666 (or (and (eq buf-type 'C) (not ediff-3way-job))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3667 (ediff-empty-diff-region-p n buf-type)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3668 (let ((beg (ediff-get-diff-posn buf-type 'beg n))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3669 (end (ediff-get-diff-posn buf-type 'end n)))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3670 (ediff-with-current-buffer (ediff-get-buffer buf-type)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3671 (save-excursion
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3672 (goto-char beg)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3673 (skip-chars-forward ediff-whitespace)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3674 (>= (point) end))))))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3675
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3676
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68651
diff changeset
3677 (defun ediff-get-region-contents (n buf-type ctrl-buf &optional start end)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3678 (ediff-with-current-buffer
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3679 (ediff-with-current-buffer ctrl-buf (ediff-get-buffer buf-type))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3680 (buffer-substring
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3681 (or start (ediff-get-diff-posn buf-type 'beg n ctrl-buf))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3682 (or end (ediff-get-diff-posn buf-type 'end n ctrl-buf)))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3683
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3684 ;; Returns positions of difference sectors in the BUF-TYPE buffer.
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3685 ;; BUF-TYPE should be a symbol -- `A', `B', or `C'.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3686 ;; POS is either `beg' or `end'--it specifies whether you want the position at
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3687 ;; the beginning of a difference or at the end.
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3688 ;;
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3689 ;; The optional argument N says which difference (default:
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3690 ;; `ediff-current-difference'). N is the internal difference number (1- what
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3691 ;; the user sees). The optional argument CONTROL-BUF says
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3692 ;; which control buffer is in effect in case it is not the current
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3693 ;; buffer.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3694 (defun ediff-get-diff-posn (buf-type pos &optional n control-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3695 (let (diff-overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3696 (or control-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3697 (setq control-buf (current-buffer)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3698
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3699 (ediff-with-current-buffer control-buf
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3700 (or n (setq n ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3701 (if (or (< n 0) (>= n ediff-number-of-differences))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3702 (if (> ediff-number-of-differences 0)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3703 (error ediff-BAD-DIFF-NUMBER
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3704 this-command (1+ n) ediff-number-of-differences)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3705 (error ediff-NO-DIFFERENCES)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3706 (setq diff-overlay (ediff-get-diff-overlay n buf-type)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3707 (if (not (ediff-buffer-live-p (ediff-overlay-buffer diff-overlay)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3708 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3709 (if (eq pos 'beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3710 (ediff-overlay-start diff-overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3711 (ediff-overlay-end diff-overlay))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3712 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3713
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3714
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3715 ;; Restore highlighting to what it should be according to ediff-use-faces,
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3716 ;; ediff-highlighting-style, and ediff-highlight-all-diffs variables.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3717 (defun ediff-restore-highlighting (&optional ctl-buf)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3718 (ediff-with-current-buffer (or ctl-buf (current-buffer))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3719 (if (and (ediff-has-face-support-p)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3720 ediff-use-faces
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3721 ediff-highlight-all-diffs)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3722 (ediff-paint-background-regions))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3723 (ediff-select-difference ediff-current-difference)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3724
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3725
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3726
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3727 ;; null out difference overlays so they won't slow down future
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3728 ;; editing operations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3729 ;; VEC is either a difference vector or a fine-diff vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3730 (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3731 (if (vectorp (symbol-value vec-var))
84864
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
3732 (mapc (lambda (elt)
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
3733 (ediff-delete-overlay
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
3734 (ediff-get-diff-overlay-from-diff-record elt))
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
3735 (if fine-diffs-also
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
3736 (ediff-clear-fine-diff-vector elt))
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
3737 )
cac94194ce6d (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents: 82467
diff changeset
3738 (symbol-value vec-var)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3739 ;; allow them to be garbage collected
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3740 (set vec-var nil))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3741
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3742
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3743
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3744 ;;; Misc
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3745
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3746 ;; In Emacs, this just makes overlay. In the future, when Emacs will start
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3747 ;; supporting sticky overlays, this function will make a sticky overlay.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3748 ;; BEG and END are expressions telling where overlay starts.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3749 ;; If they are numbers or buffers, then all is well. Otherwise, they must
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3750 ;; 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
3751 ;; bounds.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3752 ;; If BUFF is not a live buffer, then return nil; otherwise, return the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3753 ;; newly created overlay.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3754 (defun ediff-make-bullet-proof-overlay (beg end buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3755 (if (ediff-buffer-live-p buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3756 (let (overl)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3757 (ediff-with-current-buffer buff
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3758 (or (number-or-marker-p beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3759 (setq beg (eval beg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3760 (or (number-or-marker-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3761 (setq end (eval end)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3762 (setq overl
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3763 (if (featurep 'xemacs)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3764 (make-extent beg end buff)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3765 ;; advance front and rear of the overlay
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3766 (make-overlay beg end buff nil 'rear-advance)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3767
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3768 ;; never detach
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3769 (ediff-overlay-put
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
3770 overl (if (featurep 'emacs) 'evaporate 'detachable) nil)
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38422
diff changeset
3771 ;; make overlay open-ended
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3772 ;; In emacs, it is made open ended at creation time
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3773 (when (featurep 'xemacs)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3774 (ediff-overlay-put overl 'start-open nil)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
3775 (ediff-overlay-put overl 'end-open nil))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3776 (ediff-overlay-put overl 'ediff-diff-num 0)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3777 overl))))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3778
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3779
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3780 (defun ediff-make-current-diff-overlay (type)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3781 (if (ediff-has-face-support-p)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3782 (let ((overlay (ediff-get-symbol-from-alist
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3783 type ediff-current-diff-overlay-alist))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3784 (buffer (ediff-get-buffer type))
85890
d505125b0b46 2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 85847
diff changeset
3785 (face (ediff-get-symbol-from-alist
d505125b0b46 2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 85847
diff changeset
3786 type ediff-current-diff-face-alist)))
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3787 (set overlay
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3788 (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3789 (ediff-set-overlay-face (symbol-value overlay) face)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3790 (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
3791 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3792
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3793
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3794 ;; Like other-buffer, but prefers visible buffers and ignores temporary or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3795 ;; other insignificant buffers (those beginning with "^[ *]").
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3796 ;; 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
3797 ;; these buffers).
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3798 ;; EXCL-BUFF-LIST is an exclusion list.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3799 (defun ediff-other-buffer (excl-buff-lst)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3800 (or (listp excl-buff-lst) (setq excl-buff-lst (list excl-buff-lst)))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3801 (let* ((all-buffers (nconc (ediff-get-selected-buffers) (buffer-list)))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3802 ;; we compute this the second time because we need to do memq on it
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3803 ;; later, and nconc above will break it. Either this or use slow
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3804 ;; append instead of nconc
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3805 (selected-buffers (ediff-get-selected-buffers))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3806 (prefered-buffer (car all-buffers))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3807 visible-dired-buffers
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3808 (excl-buff-name-list
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3809 (mapcar
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3810 (lambda (b) (cond ((stringp b) b)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3811 ((bufferp b) (buffer-name b))))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3812 excl-buff-lst))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3813 ;; if at least one buffer on the exclusion list is dired, then force
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3814 ;; all others to be dired. This is because this means that the user
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3815 ;; has already chosen a dired buffer before
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3816 (use-dired-major-mode
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3817 (cond ((null (ediff-buffer-live-p (car excl-buff-lst))) 'unknown)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3818 ((eq (ediff-with-current-buffer (car excl-buff-lst) major-mode)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3819 'dired-mode)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3820 'yes)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3821 (t 'no)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3822 ;; significant-buffers must be visible and not belong
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3823 ;; to the exclusion list `buff-list'
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3824 ;; We also exclude temporary buffers, but keep mail and gnus buffers
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3825 ;; Furthermore, we exclude dired buffers, unless they are the only
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3826 ;; ones visible (and there are at least two of them).
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3827 ;; Also, any visible window not on the exclusion list that is first in
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3828 ;; the buffer list is chosen regardless. (This is because the user
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3829 ;; clicked on it or did something to distinguish it).
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3830 (significant-buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3831 (mapcar
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3832 (lambda (x)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3833 (cond ((member (buffer-name x) excl-buff-name-list) nil)
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3834 ((memq x selected-buffers) x)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3835 ((not (ediff-get-visible-buffer-window x)) nil)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3836 ((eq x prefered-buffer) x)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3837 ;; if prev selected buffer is dired, look only at
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3838 ;; dired.
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3839 ((eq use-dired-major-mode 'yes)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3840 (if (eq (ediff-with-current-buffer x major-mode)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3841 'dired-mode)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3842 x nil))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3843 ((eq (ediff-with-current-buffer x major-mode)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3844 'dired-mode)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3845 (if (null use-dired-major-mode)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3846 ;; don't know if we must enforce dired.
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3847 ;; Remember this buffer in case
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3848 ;; dired buffs are the only ones visible.
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3849 (setq visible-dired-buffers
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3850 (cons x visible-dired-buffers)))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3851 ;; skip, if dired is not forced
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3852 nil)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3853 ((memq (ediff-with-current-buffer x major-mode)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3854 '(rmail-mode
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3855 vm-mode
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3856 gnus-article-mode
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3857 mh-show-mode))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3858 x)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3859 ((string-match "^[ *]" (buffer-name x)) nil)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3860 ((string= "*scratch*" (buffer-name x)) nil)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3861 (t x)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3862 all-buffers))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3863 (clean-significant-buffers (delq nil significant-buffers))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3864 less-significant-buffers)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3865
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3866 (if (and (null clean-significant-buffers)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3867 (> (length visible-dired-buffers) 0))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3868 (setq clean-significant-buffers visible-dired-buffers))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3869
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3870 (cond (clean-significant-buffers (car clean-significant-buffers))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3871 ;; try also buffers that are not displayed in windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3872 ((setq less-significant-buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3873 (delq nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3874 (mapcar
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3875 (lambda (x)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3876 (cond ((member (buffer-name x) excl-buff-name-list)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3877 nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3878 ((eq use-dired-major-mode 'yes)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3879 (if (eq (ediff-with-current-buffer
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3880 x major-mode)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3881 'dired-mode)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3882 x nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3883 ((eq (ediff-with-current-buffer x major-mode)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3884 'dired-mode)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3885 nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3886 ((string-match "^[ *]" (buffer-name x)) nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3887 ((string= "*scratch*" (buffer-name x)) nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3888 (t x)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3889 all-buffers)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3890 (car less-significant-buffers))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3891 (t "*scratch*"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3892 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3893
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3894
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3895 ;; If current buffer is a Buffer-menu buffer, then take the selected buffers
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3896 ;; and append the buffer at the cursor to the end.
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3897 ;; This list would be the preferred list.
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3898 (defun ediff-get-selected-buffers ()
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3899 (if (eq major-mode 'Buffer-menu-mode)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3900 (let ((lis (condition-case nil
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3901 (list (Buffer-menu-buffer t))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3902 (error))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3903 ))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3904 (save-excursion
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3905 (goto-char (point-max))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3906 (while (search-backward "\n>" nil t)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3907 (forward-char 1)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3908 (setq lis (cons (Buffer-menu-buffer t) lis)))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3909 lis))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
3910 ))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3911
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3912 ;; Construct a unique buffer name.
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3913 ;; The first one tried is prefixsuffix, then prefix<2>suffix,
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3914 ;; prefix<3>suffix, etc.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3915 (defun ediff-unique-buffer-name (prefix suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3916 (if (null (get-buffer (concat prefix suffix)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3917 (concat prefix suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3918 (let ((n 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3919 (while (get-buffer (format "%s<%d>%s" prefix n suffix))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3920 (setq n (1+ n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3921 (format "%s<%d>%s" prefix n suffix))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3922
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3923
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3924 (defun ediff-submit-report ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3925 "Submit bug report on Ediff."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3926 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3927 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3928 (let ((reporter-prompt-for-summary-p t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3929 (ctl-buf ediff-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3930 (ediff-device-type (ediff-device-type))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3931 varlist salutation buffer-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3932 (setq varlist '(ediff-diff-program ediff-diff-options
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68651
diff changeset
3933 ediff-diff3-program ediff-diff3-options
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3934 ediff-patch-program ediff-patch-options
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3935 ediff-shell
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3936 ediff-use-faces
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3937 ediff-auto-refine ediff-highlighting-style
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3938 ediff-buffer-A ediff-buffer-B ediff-control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3939 ediff-forward-word-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3940 ediff-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3941 ediff-control-frame-parameters
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3942 ediff-control-frame-position-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3943 ediff-prefer-iconified-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3944 ediff-window-setup-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3945 ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3946 ediff-job-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3947 ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3948 buffer-name
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3949 ediff-device-type
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3950 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3951 (setq salutation "
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3952 Congratulations! You may have unearthed a bug in Ediff!
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3953
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3954 Please make a concise and accurate summary of what happened
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3955 and mail it to the address above.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3956 -----------------------------------------------------------
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3957 ")
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3958
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3959 (ediff-skip-unsuitable-frames)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3960 (ediff-reset-mouse)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3961
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3962 (switch-to-buffer ediff-msg-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3963 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3964 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3965 (insert "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3966 Please read this first:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3967 ----------------------
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3968
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3969 Some ``bugs'' may actually be no bugs at all. For instance, if you are
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3970 reporting that certain difference regions are not matched as you think they
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3971 should, this is most likely due to the way Unix diff program decides what
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3972 constitutes a difference region. Ediff is an Emacs interface to diff, and
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3973 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
3974 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
3975 manipulation.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3976
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3977 If Emacs happens to dump core, this is NOT an Ediff problem---it is
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
3978 an Emacs bug. Report this to Emacs maintainers.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3979
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3980 Another popular topic for reports is compilation messages. Because Ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3981 interfaces to several other packages and runs under Emacs and XEmacs,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3982 byte-compilation may produce output like this:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3983
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3984 While compiling toplevel forms in file ediff.el:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3985 ** reference to free variable pm-color-alist
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3986 ........................
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3987 While compiling the end of the data:
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3988 ** 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
3989 ediff-valid-color-p, ediff-set-face,
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3990 ........................
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3991
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3992 These are NOT errors, but inevitable warnings, which ought to be ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3993
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3994 Please do not report those and similar things. However, comments and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3995 suggestions are always welcome.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3996
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3997 Mail anyway? (y or n) ")
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
3998
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3999 (if (y-or-n-p "Mail anyway? ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4000 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4001 (if (ediff-buffer-live-p ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4002 (set-buffer ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4003 (setq buffer-name (buffer-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4004 (require 'reporter)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4005 (reporter-submit-bug-report "kifer@cs.stonybrook.edu"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4006 (ediff-version)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4007 varlist
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4008 nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4009 'delete-other-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4010 salutation))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4011 (bury-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4012 (beep 1)(message "Bug report aborted")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4013 (if (ediff-buffer-live-p ctl-buf)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4014 (ediff-with-current-buffer ctl-buf
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4015 (ediff-recenter 'no-rehighlight))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4016 ))
36857
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4017
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4018
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4019 ;; Find an appropriate syntax table for everyone to use
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4020 ;; If buffer B is not fundamental or text mode, use its syntax table
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4021 ;; Otherwise, use buffer B's.
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4022 ;; The syntax mode is used in ediff-forward-word-function
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4023 ;; The important thing is that every buffer should use the same syntax table
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4024 ;; during the refinement operation
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4025 (defun ediff-choose-syntax-table ()
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4026 (setq ediff-syntax-table
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4027 (ediff-with-current-buffer ediff-buffer-A
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4028 (if (not (memq major-mode
36857
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4029 '(fundamental-mode text-mode indented-text-mode)))
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4030 (syntax-table))))
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4031 (if (not ediff-syntax-table)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4032 (setq ediff-syntax-table
36857
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4033 (ediff-with-current-buffer ediff-buffer-B
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4034 (syntax-table))))
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4035 )
f6386773ce30 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 36456
diff changeset
4036
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4037
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4038 (defun ediff-deactivate-mark ()
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
4039 (if (featurep 'xemacs)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
4040 (zmacs-deactivate-region)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
4041 (deactivate-mark)))
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
4042
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
4043 (defun ediff-activate-mark ()
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
4044 (if (featurep 'xemacs)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
4045 (zmacs-activate-region)
93652
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
4046 (make-local-variable 'transient-mark-mode)
6523ed37006c 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92505
diff changeset
4047 (setq mark-active t transient-mark-mode t)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4048
85847
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4049 (defun ediff-nuke-selective-display ()
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4050 (if (featurep 'xemacs)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4051 (nuke-selective-display)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4052 (save-excursion
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4053 (save-restriction
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4054 (widen)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4055 (goto-char (point-min))
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4056 (let ((mod-p (buffer-modified-p))
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4057 buffer-read-only end)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4058 (and (eq t selective-display)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4059 (while (search-forward "\^M" nil t)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4060 (end-of-line)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4061 (setq end (point))
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4062 (beginning-of-line)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4063 (while (search-forward "\^M" end t)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4064 (delete-char -1)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4065 (insert "\^J"))))
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4066 (set-buffer-modified-p mod-p)
baa28899f76f * ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85838
diff changeset
4067 (setq selective-display nil))))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4068
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4069
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4070 ;; The next two are modified versions from emerge.el.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4071 ;; VARS must be a list of symbols
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4072 ;; 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
4073 (defsubst ediff-save-variables (vars)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4074 (mapcar (lambda (v) (cons v (symbol-value v)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4075 vars))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4076 ;; VARS is a list of variable symbols.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4077 (defun ediff-restore-variables (vars assoc-list)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4078 (while vars
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4079 (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
4080 (setq vars (cdr vars))))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4081
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4082 (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
4083 (let* ((assoc-list
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4084 (symbol-value (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4085 buf-type
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4086 ediff-buffer-values-orig-alist)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4087 (assoc-elt (assoc var assoc-list)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4088 (if assoc-elt
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4089 (setcdr assoc-elt value))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4090
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4091
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4092 ;; must execute in control buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4093 (defun ediff-save-protected-variables ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4094 (setq ediff-buffer-values-orig-A
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4095 (ediff-with-current-buffer ediff-buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4096 (ediff-save-variables ediff-protected-variables)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4097 (setq ediff-buffer-values-orig-B
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4098 (ediff-with-current-buffer ediff-buffer-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4099 (ediff-save-variables ediff-protected-variables)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4100 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4101 (setq ediff-buffer-values-orig-C
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4102 (ediff-with-current-buffer ediff-buffer-C
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4103 (ediff-save-variables ediff-protected-variables))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4104 (if (ediff-buffer-live-p ediff-ancestor-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4105 (setq ediff-buffer-values-orig-Ancestor
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4106 (ediff-with-current-buffer ediff-ancestor-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4107 (ediff-save-variables ediff-protected-variables)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4108
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4109 ;; must execute in control buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4110 (defun ediff-restore-protected-variables ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4111 (let ((values-A ediff-buffer-values-orig-A)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4112 (values-B ediff-buffer-values-orig-B)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4113 (values-C ediff-buffer-values-orig-C)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4114 (values-Ancestor ediff-buffer-values-orig-Ancestor))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4115 (ediff-with-current-buffer ediff-buffer-A
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4116 (ediff-restore-variables ediff-protected-variables values-A))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4117 (ediff-with-current-buffer ediff-buffer-B
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4118 (ediff-restore-variables ediff-protected-variables values-B))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4119 (if ediff-3way-comparison-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4120 (ediff-with-current-buffer ediff-buffer-C
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4121 (ediff-restore-variables ediff-protected-variables values-C)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4122 (if (ediff-buffer-live-p ediff-ancestor-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4123 (ediff-with-current-buffer ediff-ancestor-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4124 (ediff-restore-variables ediff-protected-variables values-Ancestor)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4125 ))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4126
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4127 ;; save BUFFER in FILE. used in hooks.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4128 (defun ediff-save-buffer-in-file (buffer file)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
4129 (ediff-with-current-buffer buffer
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4130 (write-file file)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4131
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4132
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4133 ;;; Debug
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4134
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4135 (ediff-defvar-local ediff-command-begin-time '(0 0 0) "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4136
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4137 ;; calculate time used by command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4138 (defun ediff-calc-command-time ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4139 (let ((end (current-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4140 micro sec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4141 (setq micro
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4142 (if (>= (nth 2 end) (nth 2 ediff-command-begin-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4143 (- (nth 2 end) (nth 2 ediff-command-begin-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4144 (+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4145 (setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4146 (or (equal ediff-command-begin-time '(0 0 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4147 (message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4148
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4149 (defsubst ediff-save-time ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4150 (setq ediff-command-begin-time (current-time)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4151
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4152 (defun ediff-profile ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4153 "Toggle profiling Ediff commands."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4154 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4155 (ediff-barf-if-not-control-buffer)
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
4156
92505
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
4157 (if (featurep 'xemacs)
9c0d69f69d95 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 91483
diff changeset
4158 (make-local-hook 'post-command-hook))
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
4159
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4160 (let ((pre-hook 'pre-command-hook)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4161 (post-hook 'post-command-hook))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4162 (if (not (equal ediff-command-begin-time '(0 0 0)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4163 (progn (remove-hook pre-hook 'ediff-save-time)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4164 (remove-hook post-hook 'ediff-calc-command-time)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4165 (setq ediff-command-begin-time '(0 0 0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4166 (message "Ediff profiling disabled"))
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
4167 (add-hook pre-hook 'ediff-save-time t 'local)
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
4168 (add-hook post-hook 'ediff-calc-command-time nil 'local)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4169 (message "Ediff profiling enabled"))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4170
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4171 (defun ediff-print-diff-vector (diff-vector-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4172 (princ (format "\n*** %S ***\n" diff-vector-var))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4173 (mapcar (lambda (overl-vec)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4174 (princ
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4175 (format
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4176 "Diff %d: \tOverlay: %S
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4177 \t\tFine diffs: %s
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4178 \t\tNo-fine-diff-flag: %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4179 \t\tState-of-diff:\t %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4180 \t\tState-of-merge:\t %S
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4181 "
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4182 (1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4183 (aref overl-vec 0)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4184 ;; fine-diff-vector
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4185 (if (= (length (aref overl-vec 1)) 0)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4186 "none\n"
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4187 (mapconcat 'prin1-to-string
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4188 (aref overl-vec 1) "\n\t\t\t "))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4189 (aref overl-vec 2) ; no fine diff flag
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4190 (aref overl-vec 3) ; state-of-diff
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4191 (aref overl-vec 4) ; state-of-merge
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4192 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4193 (eval diff-vector-var)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4194
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4195
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4196
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4197 (defun ediff-debug-info ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4198 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4199 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4200 (with-output-to-temp-buffer ediff-debug-buffer
33392
25fb6fc4f66b (ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents: 33019
diff changeset
4201 (ediff-with-current-buffer standard-output
25fb6fc4f66b (ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents: 33019
diff changeset
4202 (fundamental-mode))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4203 (princ (format "\nCtl buffer: %S\n" ediff-control-buffer))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4204 (ediff-print-diff-vector (intern "ediff-difference-vector-A"))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4205 (ediff-print-diff-vector (intern "ediff-difference-vector-B"))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4206 (ediff-print-diff-vector (intern "ediff-difference-vector-C"))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4207 (ediff-print-diff-vector (intern "ediff-difference-vector-Ancestor"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4208 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4209
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4210
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4211 ;;; General utilities
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4212
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4213 ;; this uses comparison-func to decide who is a member
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4214 (defun ediff-member (elt lis comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4215 (while (and lis (not (funcall comparison-func (car lis) elt)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4216 (setq lis (cdr lis)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4217 lis)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4218
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4219 ;; Make a readable representation of the invocation sequence for FUNC-DEF.
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4220 ;; It would either be a key or M-x something.
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4221 (defun ediff-format-bindings-of (func-def)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4222 (let ((desc (car (where-is-internal func-def
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4223 overriding-local-map
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4224 nil nil))))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4225 (if desc
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4226 (key-description desc)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4227 (format "M-x %s" func-def))))
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
4228
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4229 ;; this uses comparison-func to decide who is a member, and this determines how
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4230 ;; intersection looks like
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4231 (defun ediff-intersection (lis1 lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4232 (let ((result (list 'a)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4233 (while lis1
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4234 (if (ediff-member (car lis1) lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4235 (nconc result (list (car lis1))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4236 (setq lis1 (cdr lis1)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4237 (cdr result)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4238
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4239
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4240 ;; eliminates duplicates using comparison-func
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4241 (defun ediff-union (lis1 lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4242 (let ((result (list 'a)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4243 (while lis1
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4244 (or (ediff-member (car lis1) (cdr result) comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4245 (nconc result (list (car lis1))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4246 (setq lis1 (cdr lis1)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4247 (while lis2
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4248 (or (ediff-member (car lis2) (cdr result) comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4249 (nconc result (list (car lis2))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4250 (setq lis2 (cdr lis2)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4251 (cdr result)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4252
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4253 ;; eliminates duplicates using comparison-func
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4254 (defun ediff-set-difference (lis1 lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4255 (let ((result (list 'a)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4256 (while lis1
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4257 (or (ediff-member (car lis1) (cdr result) comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4258 (ediff-member (car lis1) lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4259 (nconc result (list (car lis1))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4260 (setq lis1 (cdr lis1)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4261 (cdr result)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4262
72974
54ea774c3eed * viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
4263 (defun ediff-add-to-history (history-var newelt)
54ea774c3eed * viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
4264 (if (fboundp 'add-to-history)
54ea774c3eed * viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
4265 (add-to-history history-var newelt)
54ea774c3eed * viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
4266 (set history-var (cons newelt (symbol-value history-var)))))
54ea774c3eed * viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
4267
85890
d505125b0b46 2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 85847
diff changeset
4268 (defalias 'ediff-copy-list 'copy-sequence)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26039
diff changeset
4269
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
4270
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4271 ;; don't report error if version control package wasn't found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4272 ;;(ediff-load-version-control 'silent)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4273
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
4274 (run-hooks 'ediff-load-hook)
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47846
diff changeset
4275
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
4276
81077
eaa1a54ec3ee Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75389
diff changeset
4277 ;; Local Variables:
eaa1a54ec3ee Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75389
diff changeset
4278 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
eaa1a54ec3ee Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75389
diff changeset
4279 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
eaa1a54ec3ee Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75389
diff changeset
4280 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
eaa1a54ec3ee Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75389
diff changeset
4281 ;; End:
eaa1a54ec3ee Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75389
diff changeset
4282
eaa1a54ec3ee Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75389
diff changeset
4283 ;; arch-tag: f51099b6-ef4b-470f-88a1-3a0e0b03a879
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4284 ;;; ediff-util.el ends here