annotate lisp/ediff-util.el @ 14603:b9daaf52fc01

(nnheader-insert-head): Make sure the entire head of the article is inserted.
author Karl Heuer <kwzh@gnu.org>
date Tue, 20 Feb 1996 19:17:30 +0000
parents c768f6d7daaa
children 43a3308fcf61
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
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
3 ;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
6
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
8
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
12 ;; any later version.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
13
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
17 ;; GNU General Public License for more details.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
18
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
22 ;; Boston, MA 02111-1307, USA.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
23
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
24 ;;; Code:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
25
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
26 (require 'ediff-init)
13605
41b7a38d7d8c Require ediff-mult.
Richard M. Stallman <rms@gnu.org>
parents: 13216
diff changeset
27 (require 'ediff-mult)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
28
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
29
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
30 ;;; Functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
31
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
32 (defun ediff-mode ()
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
33 "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
34 This mode is entered through one of the following commands:
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
35 `ediff'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
36 `ediff-files'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
37 `ediff-buffers'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
38 `ediff3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
39 `ediff-files3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
40 `ediff-buffers3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
41 `ediff-merge'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
42 `ediff-merge-files'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
43 `ediff-merge-files-with-ancestor'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
44 `ediff-merge-buffers'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
45 `ediff-merge-buffers-with-ancestor'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
46 `ediff-merge-revisions'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
47 `ediff-merge-revisions-with-ancestor'
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
48 `ediff-windows-wordwise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
49 `ediff-windows-linewise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
50 `ediff-regions-wordwise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
51 `ediff-regions-linewise'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
52 `epatch'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
53 `ediff-patch-file'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
54 `ediff-patch-buffer'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
55 `epatch-buffer'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
56 `ediff-revision'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
57
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
58 Commands:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
59 \\{ediff-mode-map}"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
60 (kill-all-local-variables)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
61 (setq major-mode 'ediff-mode)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
62 (setq mode-name "Ediff")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
63 (run-hooks 'ediff-mode-hook))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
64
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
65
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
66 (require 'ediff-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
67 (require 'ediff-merg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
68
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
69
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
70 ;;; Build keymaps
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
71
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
72 (ediff-defvar-local ediff-mode-map nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
73 "Local keymap used in Ediff mode.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
74 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
75 to invocation.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
76
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
77 ;; Set up the keymap in the control buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
78 (defun ediff-set-keys ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
79 "Set up Ediff keymap, if necessary."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
80 (if (null ediff-mode-map)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
81 (ediff-setup-keymap))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
82 (use-local-map ediff-mode-map))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
83
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
84 ;; Reload Ediff keymap. For debugging only.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
85 (defun ediff-reload-keymap ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
86 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
87 (setq ediff-mode-map nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
88 (ediff-set-keys))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
89
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
90
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
91 (defun ediff-setup-keymap ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
92 "Set up the keymap used in the control buffer of Ediff."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
93 (setq ediff-mode-map (make-sparse-keymap))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
94 (suppress-keymap ediff-mode-map)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
95
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
96 (define-key ediff-mode-map "p" 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
97 (define-key ediff-mode-map "\C-?" 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
98 (define-key ediff-mode-map [backspace] 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
99 (define-key ediff-mode-map [delete] 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
100 (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
101 'ediff-previous-difference nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
102 (define-key ediff-mode-map "n" 'ediff-next-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
103 (define-key ediff-mode-map " " 'ediff-next-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
104 (define-key ediff-mode-map "j" 'ediff-jump-to-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
105 (define-key ediff-mode-map "g" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
106 (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
107 (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
108 (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
109 (define-key ediff-mode-map "D" 'ediff-show-diff-output)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
110 (define-key ediff-mode-map "z" 'ediff-suspend)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
111 (define-key ediff-mode-map "\C-l" 'ediff-recenter)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
112 (define-key ediff-mode-map "|" 'ediff-toggle-split)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
113 (define-key ediff-mode-map "h" 'ediff-toggle-hilit)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
114 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
115 (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
116 (if ediff-narrow-job
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
117 (define-key ediff-mode-map "%" 'ediff-toggle-narrow-region))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
118 (define-key ediff-mode-map "~" 'ediff-swap-buffers)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
119 (define-key ediff-mode-map "v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
120 (define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
121 (define-key ediff-mode-map "^" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
122 (define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
123 (define-key ediff-mode-map "V" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
124 (define-key ediff-mode-map "<" 'ediff-scroll-horizontally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
125 (define-key ediff-mode-map ">" 'ediff-scroll-horizontally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
126 (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
127 (define-key ediff-mode-map "E" 'ediff-documentation)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
128 (define-key ediff-mode-map "?" 'ediff-toggle-help)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
129 (define-key ediff-mode-map "!" 'ediff-update-diffs)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
130 (define-key ediff-mode-map "M" 'ediff-show-meta-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
131 (define-key ediff-mode-map "R" 'ediff-show-registry)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
132 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
133 (define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
134 (define-key ediff-mode-map "a" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
135 (define-key ediff-mode-map "b" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
136 (define-key ediff-mode-map "r" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
137 (cond (ediff-merge-job
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
138 ;; Will barf if no ancestor
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
139 (define-key ediff-mode-map "/" 'ediff-show-ancestor)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
140 ;; 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
141 (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
142 (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
143 (define-key ediff-mode-map "r" 'ediff-restore-diff-in-merge-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
144 (define-key ediff-mode-map "s" 'ediff-shrink-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
145 (define-key ediff-mode-map "+" 'ediff-combine-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
146 (define-key ediff-mode-map "$" 'ediff-toggle-show-clashes-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
147 (define-key ediff-mode-map "&" 'ediff-re-merge))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
148 (ediff-3way-comparison-job
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
149 (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
150 (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
151 (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
152 (define-key ediff-mode-map "bc" 'ediff-copy-B-to-C)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
153 (define-key ediff-mode-map "c" nil)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
154 (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
155 (define-key ediff-mode-map "cb" 'ediff-copy-C-to-B)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
156 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
157 (define-key ediff-mode-map "rb" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
158 (define-key ediff-mode-map "rc" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
159 (define-key ediff-mode-map "C" 'ediff-toggle-read-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
160 (t ; 2-way comparison
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
161 (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
162 (define-key ediff-mode-map "b" 'ediff-copy-B-to-A)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
163 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
164 (define-key ediff-mode-map "rb" 'ediff-restore-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
165 ) ; cond
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
166 (define-key ediff-mode-map "G" 'ediff-submit-report)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
167 (define-key ediff-mode-map "#" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
168 (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
169 (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
170 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
171 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
172 (define-key ediff-mode-map "o" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
173 (define-key ediff-mode-map "A" 'ediff-toggle-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
174 (define-key ediff-mode-map "B" 'ediff-toggle-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
175 (define-key ediff-mode-map "w" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
176 (define-key ediff-mode-map "wa" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
177 (define-key ediff-mode-map "wb" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
178 (define-key ediff-mode-map "wd" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
179 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
180 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
181 (define-key ediff-mode-map "wc" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
182 (define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
183 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
184
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
185 (define-key ediff-mode-map "m" 'ediff-toggle-wide-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
186
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
187 ;; Allow ediff-mode-map to be referenced indirectly
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
188 (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
189 (run-hooks 'ediff-keymap-setup-hook))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
190
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
191
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
192 ;;; Setup functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
193
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
194 (require 'ediff-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
195
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
196 ;; No longer needed: XEmacs has surrogate minibuffers now.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
197 ;;(or (boundp 'synchronize-minibuffers)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
198 ;; (defvar synchronize-minibuffers nil))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
199
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
200 ;; Common startup entry for all Ediff functions
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
201 ;; It now returns control buffer so other functions can do post-processing
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
202 (defun ediff-setup (buffer-A file-A buffer-B file-B buffer-C file-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
203 startup-hooks setup-parameters)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
204 (setq file-A (expand-file-name file-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
205 (setq file-B (expand-file-name file-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
206 (if (stringp file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
207 (setq file-C (expand-file-name file-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
208 (let* ((control-buffer-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
209 (ediff-unique-buffer-name "*Ediff Control Panel" "*"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
210 (control-buffer (ediff-eval-in-buffer buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
211 (get-buffer-create control-buffer-name))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
212 (ediff-eval-in-buffer control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
213 (ediff-mode)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
214
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
215 ;; unwrap set up parameters passed as argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
216 (while setup-parameters
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
217 (set (car (car setup-parameters)) (cdr (car setup-parameters)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
218 (setq setup-parameters (cdr setup-parameters)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
219
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
220 ;; set variables classifying the current ediff job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
221 (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
222 ediff-merge-job (ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
223 ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
224 ediff-3way-job (ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
225 ediff-diff3-job (ediff-diff3-job)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
226 ediff-narrow-job (ediff-narrow-job)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
227 ediff-windows-job (ediff-windows-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
228 ediff-word-mode-job (ediff-word-mode-job))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
229
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
230 (make-local-variable 'ediff-use-long-help-message)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
231 (make-local-variable 'ediff-prefer-iconified-control-frame)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
232 (make-local-variable 'ediff-split-window-function)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
233 (make-local-variable 'ediff-default-variant)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
234 (make-local-variable 'ediff-merge-window-share)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
235 (make-local-variable 'ediff-window-setup-function)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
236 (make-local-variable 'ediff-keep-variants)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
237
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
238 ;; Don't delete variants in case of ediff-buffer-* jobs without asking.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
239 ;; This is because u may loose work---dangerous.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
240 (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
241 (setq ediff-keep-variants t))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
242
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
243 (make-local-hook 'pre-command-hook)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
244 (if (ediff-window-display-p)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
245 (add-hook 'pre-command-hook 'ediff-spy-after-mouse))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
246 (setq ediff-mouse-pixel-position (mouse-pixel-position))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
247
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
248 ;; adjust for merge jobs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
249 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
250 (let ((buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
251 ;; If default variant is `combined', the right stuff is
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
252 ;; 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
253 ;; Note: at some point, we tried to put ancestor buffer here
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
254 ;; (which is currently buffer C. This didn't work right
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
255 ;; 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
256 ;; 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
257 ;; 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
258 (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
259 buffer-B)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
260 (t buffer-A))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
261
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
262 (setq ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
263 ediff-merge-split-window-function)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
264
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
265 ;; remember the ancestor buffer, if any
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
266 (setq ediff-ancestor-buffer buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
267
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
268 (setq buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
269 (get-buffer-create
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
270 (ediff-unique-buffer-name "*ediff-merge" "*")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
271 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
272 (set-buffer buffer-C)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
273 (insert-buffer buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
274 (funcall (ediff-eval-in-buffer buf major-mode))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
275 ;; after Stig@hackvan.com
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
276 (add-hook 'local-write-file-hooks 'ediff-set-merge-mode)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
277 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
278 (setq buffer-read-only nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
279 ediff-buffer-A buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
280 ediff-buffer-B buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
281 ediff-buffer-C buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
282 ediff-control-buffer control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
283
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
284 (setq ediff-control-buffer-suffix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
285 (if (string-match "<[0-9]*>" control-buffer-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
286 (substring control-buffer-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
287 (match-beginning 0) (match-end 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
288 "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
289 ediff-control-buffer-number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
290 (max
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
291 0
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
292 (1-
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
293 (string-to-number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
294 (substring
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
295 ediff-control-buffer-suffix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
296 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
297 (string-match "[0-9]+" ediff-control-buffer-suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
298 0))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
299
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
300 (setq ediff-error-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
301 (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
302
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
303 (ediff-eval-in-buffer buffer-A (ediff-strip-mode-line-format))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
304 (ediff-eval-in-buffer buffer-B (ediff-strip-mode-line-format))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
305 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
306 (ediff-eval-in-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
307 (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
308 (ediff-eval-in-buffer ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
309 (ediff-strip-mode-line-format)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
310
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
311 (ediff-save-protected-variables) ; save variables to be restored on exit
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
312
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
313 ;; ediff-setup-diff-regions-function must be set after setup
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
314 ;; parameters are processed.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
315 (setq ediff-setup-diff-regions-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
316 (if ediff-diff3-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
317 'ediff-setup-diff-regions3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
318 'ediff-setup-diff-regions))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
319
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
320 (setq ediff-wide-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
321 (list (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
322 '(point-min) '(point-max) ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
323 (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
324 '(point-min) '(point-max) ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
325 (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
326 '(point-min) '(point-max) ediff-buffer-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
327
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
328 ;; This has effect only on ediff-windows/regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
329 ;; In all other cases, ediff-visible-region sets visibility bounds to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
330 ;; ediff-wide-bounds, and ediff-narrow-bounds are ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
331 (if ediff-start-narrowed
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
332 (setq ediff-visible-bounds ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
333 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
334
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
335 (ediff-set-keys) ; comes after parameter setup
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
336
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
337 ;; set up ediff-narrow-bounds, if not set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
338 (or ediff-narrow-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
339 (setq ediff-narrow-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
340
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
341 ;; All these must be inside ediff-eval-in-buffer control-buffer,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
342 ;; since these vars are local to control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
343 ;; These won't run if there are errors in diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
344 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
345 (ediff-nuke-selective-display)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
346 (run-hooks 'ediff-prepare-buffer-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
347 (if (ediff-eval-in-buffer control-buffer ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
348 (setq buffer-read-only t))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
349 ;; 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
350 ;; 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
351 (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
352 (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
353 (cons control-buffer ediff-this-buffer-ediff-sessions)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
354 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
355 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
356 (ediff-nuke-selective-display)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
357 (run-hooks 'ediff-prepare-buffer-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
358 (if (ediff-eval-in-buffer control-buffer ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
359 (setq buffer-read-only t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
360 ;; 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
361 (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
362 (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
363 (cons control-buffer ediff-this-buffer-ediff-sessions)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
364 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
365 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
366 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
367 (ediff-nuke-selective-display)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
368 (run-hooks 'ediff-prepare-buffer-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
369 ;; 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
370 (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
371 (setq ediff-this-buffer-ediff-sessions
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
372 (cons control-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
373 ediff-this-buffer-ediff-sessions)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
374 ))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
375
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
376 (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
377 (ediff-eval-in-buffer ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
378 (ediff-nuke-selective-display)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
379 (setq buffer-read-only t)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
380 (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
381 (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
382 (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
383 (cons control-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
384 ediff-this-buffer-ediff-sessions)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
385 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
386
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
387 ;; must come after setting up ediff-narrow-bounds AND after
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
388 ;; nuking selective display
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
389 (funcall ediff-setup-diff-regions-function file-A file-B file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
390 (setq ediff-number-of-differences (length ediff-difference-vector-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
391 (setq ediff-current-difference -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
392
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
393 (ediff-make-current-diff-overlay 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
394 (ediff-make-current-diff-overlay 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
395 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
396 (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
397 (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
398 (ediff-make-current-diff-overlay 'Ancestor))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
399
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
400 (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
401
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
402 (let ((shift-A (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
403 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
404 'A ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
405 (shift-B (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
406 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
407 'B ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
408 (shift-C (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
409 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
410 'C ediff-narrow-bounds))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
411 ;; position point in buf A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
412 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
413 (select-window ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
414 (goto-char shift-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
415 ;; position point in buf B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
416 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
417 (select-window ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
418 (goto-char shift-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
419 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
420 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
421 (select-window ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
422 (goto-char shift-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
423 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
424
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
425 (select-window ediff-control-window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
426 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
427
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
428 (run-hooks 'startup-hooks)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
429 (ediff-refresh-mode-lines)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
430 (setq buffer-read-only t)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
431 (setq ediff-session-registry
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
432 (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
433 (ediff-update-registry)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
434 (if (ediff-buffer-live-p ediff-meta-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
435 (ediff-update-meta-buffer ediff-meta-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
436 (run-hooks 'ediff-startup-hook)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
437 ) ; eval in control-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
438 control-buffer))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
439
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
440
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
441 ;; This function assumes that we are in the window where control buffer is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
442 ;; to reside.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
443 (defun ediff-setup-control-buffer (ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
444 "Set up window for control buffer."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
445 (if (window-dedicated-p (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
446 (set-buffer ctl-buf) ; we are in control frame but just in case
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
447 (switch-to-buffer ctl-buf))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
448 (let ((window-min-height 2))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
449 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
450 (ediff-set-help-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
451 (insert ediff-help-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
452 (shrink-window-if-larger-than-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
453 (or (ediff-multiframe-setup-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
454 (ediff-indent-help-message))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
455 (set-buffer-modified-p nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
456 (ediff-refresh-mode-lines)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
457 (setq ediff-control-window (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
458 (setq ediff-window-config-saved
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
459 (format "%S%S%S%S%S%S%S"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
460 ediff-control-window
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
461 ediff-window-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
462 ediff-window-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
463 ediff-window-C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
464 ediff-split-window-function
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
465 (ediff-multiframe-setup-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
466 ediff-wide-display-p))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
467 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
468 (skip-chars-forward ediff-whitespace)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
469
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
470 ;; assuming we are in control window, calculate length of the first line in
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
471 ;; help message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
472 (defun ediff-help-message-line-length ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
473 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
474 (goto-char (point-min))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
475 (if ediff-use-long-help-message
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
476 (next-line 1))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
477 (end-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
478 (current-column)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
479
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
480
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
481 (defun ediff-indent-help-message ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
482 (let* ((shift (/ (max 0 (- (window-width (selected-window))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
483 (ediff-help-message-line-length)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
484 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
485 (str (make-string shift ?\ )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
486 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
487 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
488 (while (< (point) (point-max))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
489 (insert str)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
490 (beginning-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
491 (forward-line 1)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
492
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
493
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
494 (defun ediff-set-help-message ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
495 (setq ediff-long-help-message
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
496 (cond ((and ediff-long-help-message-function
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
497 (or (symbolp ediff-long-help-message-function)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
498 (consp ediff-long-help-message-function)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
499 (funcall ediff-long-help-message-function))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
500 (ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
501 (concat ediff-long-help-message-head
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
502 ediff-long-help-message-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
503 ediff-long-help-message-tail))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
504 (ediff-narrow-job
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
505 (concat ediff-long-help-message-head
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
506 ediff-long-help-message-narrow2
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
507 ediff-long-help-message-tail))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
508 (ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
509 (concat ediff-long-help-message-head
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
510 ediff-long-help-message-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
511 ediff-long-help-message-tail))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
512 (ediff-diff3-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
513 (concat ediff-long-help-message-head
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
514 ediff-long-help-message-compare3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
515 ediff-long-help-message-tail))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
516 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
517 (concat ediff-long-help-message-head
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
518 ediff-long-help-message-compare2
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
519 ediff-long-help-message-tail))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
520 (setq ediff-brief-help-message
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
521 (cond ((and ediff-brief-help-message-function
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
522 (or (symbolp ediff-brief-help-message-function)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
523 (consp ediff-brief-help-message-function)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
524 (funcall ediff-brief-help-message-function))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
525 ((stringp ediff-brief-help-message-function)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
526 ediff-brief-help-message-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
527 ((ediff-multiframe-setup-p) ediff-brief-message-string)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
528 (t ; long brief msg, not multiframe --- put in the middle
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
529 ediff-brief-message-string)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
530 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
531 (setq ediff-help-message (if ediff-use-long-help-message
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
532 ediff-long-help-message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
533 ediff-brief-help-message))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
534 (run-hooks 'ediff-display-help-hook))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
535
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
536
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
537
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
538 ;;; Commands for working with Ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
539
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
540 (defun ediff-update-diffs ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
541 "Recompute difference regions in buffers A, B, and C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
542 Buffers are not synchronized with their respective files, so changes done
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
543 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
544 if necessary."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
545 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
546 (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
547 (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
548 (not (y-or-n-p "Recompute differences during merge, really? ")))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
549 (error "God forbid!"))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
550
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
551 (let ((point-A (ediff-eval-in-buffer ediff-buffer-A (point)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
552 ;;(point-B (ediff-eval-in-buffer ediff-buffer-B (point)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
553 (tmp-buffer (get-buffer-create ediff-tmp-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
554 (buf-A-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
555 (file-name-nondirectory (or (buffer-file-name ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
556 (buffer-name ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
557 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
558 (buf-B-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
559 (file-name-nondirectory (or (buffer-file-name ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
560 (buffer-name ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
561 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
562 (buf-C-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
563 (file-name-nondirectory (or (buffer-file-name ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
564 ;; if (null ediff-buffer-C), there is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
565 ;; no danger, since we later check if
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
566 ;; ediff-buffer-C is alive
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
567 (buffer-name ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
568 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
569 (overl-A (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
570 'A ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
571 (overl-B (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
572 'B ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
573 (overl-C (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
574 'C ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
575 beg-A end-A beg-B end-B beg-C end-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
576 file-A file-B file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
577 (ediff-unselect-and-select-difference -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
578
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
579 (setq beg-A (ediff-overlay-start overl-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
580 beg-B (ediff-overlay-start overl-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
581 beg-C (ediff-overlay-start overl-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
582 end-A (ediff-overlay-end overl-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
583 end-B (ediff-overlay-end overl-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
584 end-C (ediff-overlay-end overl-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
585
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
586 (if ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
587 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
588 (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
589 (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
590 (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
591 (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
592 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
593 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
594 (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
595 (setq file-C (ediff-make-temp-file tmp-buffer "regC"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
596 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
597 ;; not word-mode
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
598 (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
599 (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
600 (if ediff-3way-job
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
601 (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
602 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
603
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
604 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
605 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
606 (ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
607 (ediff-clear-diff-vector
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
608 '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
609 ;; let them garbage collect. we can't use the ancestor after recomputing
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
610 ;; the diffs.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
611 (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
612 ediff-ancestor-buffer nil
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
613 ediff-state-of-merge nil)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
614
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
615 (setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
616
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
617 ;; 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
618 ;; comparison
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
619 (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
620 (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
621 (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
622 (ediff-merge-with-ancestor-job ediff-merge-with-ancestor-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
623 (ediff-job-name ediff-job-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
624 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
625 (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
626 ediff-3way-comparison-job t
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
627 ediff-merge-job nil
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
628 ediff-merge-with-ancestor-job nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
629 ediff-job-name 'ediff-files3))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
630 (funcall ediff-setup-diff-regions-function file-A file-B file-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
631
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
632 (setq ediff-number-of-differences (length ediff-difference-vector-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
633 (delete-file file-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
634 (delete-file file-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
635 (if file-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
636 (delete-file file-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
637
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
638 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
639 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
640
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
641 (ediff-jump-to-difference (ediff-diff-at-point 'A point-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
642 (message "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
643 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
644
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
645 ;; Not bound to any key---to dangerous. A user can do it if necessary.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
646 (defun ediff-revert-buffers-then-recompute-diffs (noconfirm)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
647 "Revert buffers A, B and C. Then rerun Ediff on file A and file B."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
648 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
649 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
650 (let ((bufA ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
651 (bufB ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
652 (bufC ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
653 (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
654 (keep-variants ediff-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
655 (ancestor-buf ediff-ancestor-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
656 (ancestor-job ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
657 (merge ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
658 (comparison ediff-3way-comparison-job))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
659 (ediff-eval-in-buffer bufA
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
660 (revert-buffer t noconfirm))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
661 (ediff-eval-in-buffer bufB
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
662 (revert-buffer t noconfirm))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
663 ;; this should only be executed in a 3way comparison, not in merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
664 (if comparison
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
665 (ediff-eval-in-buffer bufC
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
666 (revert-buffer t noconfirm)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
667 (if merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
668 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
669 (set-buffer ctl-buf)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
670 ;; 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
671 ;; 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
672 ;; variants kept.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
673 (ediff-really-quit (not keep-variants))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
674 (kill-buffer bufC)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
675 (if ancestor-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
676 (ediff-merge-buffers-with-ancestor bufA bufB ancestor-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
677 (ediff-merge-buffers bufA bufB)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
678 (ediff-update-diffs))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
679
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
680
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
681 ;; optional NO-REHIGHLIGHT says to not rehighlight buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
682 (defun ediff-recenter (&optional no-rehighlight)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
683 "Bring the highlighted region of all buffers being compared into view.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
684 Reestablish the default three-window display."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
685 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
686 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
687
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
688 ;; ;; No longer needed: XEmacs has surrogate minibuffers now.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
689 ;; (if ediff-xemacs-p (setq synchronize-minibuffers t))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
690
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
691 (let (buffer-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
692 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
693 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
694 (or (not ediff-3way-job)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
695 (ediff-buffer-live-p ediff-buffer-C)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
696 (ediff-setup-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
697 ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
698 (or (eq this-command 'ediff-quit)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
699 (message ediff-KILLED-VITAL-BUFFER
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
700 (beep 1)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
701 ))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
702
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
703 ;; set visibility range appropriate to this invocation of Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
704 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
705 ;; raise
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
706 (if (and (ediff-window-display-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
707 (symbolp this-command)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
708 (symbolp last-command)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
709 ;; Either one of the display-changing commands
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
710 (or (memq this-command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
711 '(ediff-recenter
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
712 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
713 ediff-patch-action
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
714 ediff-toggle-wide-display ediff-toggle-multiframe))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
715 ;; 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
716 ;; This avoids raising frames unnecessarily.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
717 (and (memq this-command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
718 '(ediff-next-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
719 ediff-previous-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
720 ediff-jump-to-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
721 ediff-jump-to-difference-at-point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
722 (not (string-match "^ediff-" (symbol-name last-command)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
723 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
724 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
725 (if (window-live-p ediff-window-A)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
726 (raise-frame (window-frame ediff-window-A)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
727 (if (window-live-p ediff-window-B)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
728 (raise-frame (window-frame ediff-window-B)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
729 (if (window-live-p ediff-window-C)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
730 (raise-frame (window-frame ediff-window-C)))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
731 (if (and (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
732 (frame-live-p ediff-control-frame)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
733 (not ediff-use-long-help-message)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
734 (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
735 (raise-frame ediff-control-frame))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
736
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
737 ;; 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
738 (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
739 (control-buf ediff-control-buffer))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
740 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
741 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
742 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
743 (ediff-buffer-live-p ediff-buffer-C))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
744 )
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
745 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
746 (or no-rehighlight
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
747 (ediff-select-difference ediff-current-difference))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
748
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
749 (ediff-recenter-one-window 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
750 (ediff-recenter-one-window 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
751 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
752 (ediff-recenter-one-window 'C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
753
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
754 (ediff-eval-in-buffer control-buf
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
755 (ediff-recenter-ancestor) ; check if ancestor is alive
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
756
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
757 (if (and (ediff-multiframe-setup-p)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
758 (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
759 (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
760 ;; 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
761 (ediff-reset-mouse
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
762 control-frame
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
763 (eq this-command 'ediff-quit))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
764 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
765 (ediff-eval-in-buffer control-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
766 (ediff-refresh-mode-lines))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
767 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
768
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
769 ;; this function returns to the window it was called from
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
770 ;; (which was the control window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
771 (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
772 (if (ediff-valid-difference-p)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
773 ;; 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
774 (let* ((ctl-wind (selected-window))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
775 (shift (ediff-overlay-start
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
776 (ediff-get-value-according-to-buffer-type
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
777 buf-type ediff-narrow-bounds)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
778 (job-name ediff-job-name)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
779 (control-buf ediff-control-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
780 (window-name (intern (format "ediff-window-%S" buf-type)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
781 (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
782 (symbol-value window-name))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
783
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
784 (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
785 (set-window-start window shift))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
786 (if window
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
787 (progn
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
788 (select-window window)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
789 (ediff-deactivate-mark)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
790 (ediff-position-region
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
791 (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
792 (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
793 (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
794 job-name
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
795 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
796 (select-window ctl-wind)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
797 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
798
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
799 (defun ediff-recenter-ancestor ()
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
800 ;; 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
801 ;; visible.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
802 (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
803 (ediff-valid-difference-p))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
804 (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
805 (ctl-wind (selected-window))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
806 (job-name ediff-job-name)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
807 (ctl-buf ediff-control-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
808 (ediff-eval-in-buffer ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
809 (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
810 (if window
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
811 (progn
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
812 (select-window window)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
813 (ediff-position-region
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
814 (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
815 (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
816 (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
817 job-name))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
818 (select-window ctl-wind)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
819 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
820
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
821
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
822 ;; This will have to be refined for 3way jobs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
823 (defun ediff-toggle-split ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
824 "Toggle vertical/horizontal window split.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
825 Does nothing if file-A and file-B are in different frames."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
826 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
827 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
828 (let* ((wind-A (if (window-live-p ediff-window-A) ediff-window-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
829 (wind-B (if (window-live-p ediff-window-B) ediff-window-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
830 (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
831 (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
832 (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
833 (frame-C (if wind-C (window-frame wind-C))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
834 (if (or (eq frame-A frame-B)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
835 (not (frame-live-p frame-A))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
836 (not (frame-live-p frame-B))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
837 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
838 (or (not (frame-live-p frame-C))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
839 (eq frame-A frame-C) (eq frame-B frame-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
840 (setq ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
841 (if (eq ediff-split-window-function 'split-window-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
842 'split-window-horizontally
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
843 'split-window-vertically))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
844 (message "Buffers being compared are in different frames"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
845 (ediff-recenter 'no-rehighlight)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
846
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
847 (defun ediff-toggle-hilit ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
848 "Switch between highlighting using ASCII flags and highlighting using faces.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
849 On a dumb terminal, switches between ASCII highlighting and no highlighting."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
850 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
851 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
852 (if (not (ediff-has-face-support-p))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
853 (if (eq ediff-highlighting-style 'ascii)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
854 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
855 (message "ASCII highlighting flags removed")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
856 (ediff-unselect-and-select-difference ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
857 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
858 (setq ediff-highlighting-style 'off))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
859 (ediff-unselect-and-select-difference ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
860 'select-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
861 (ediff-unselect-and-select-difference ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
862 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
863 ;; cycle through highlighting
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
864 (cond ((and ediff-use-faces ediff-highlight-all-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
865 (message "Unhighlighting unselected difference regions")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
866 (setq ediff-highlight-all-diffs nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
867 (ediff-use-faces
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
868 (message "Highlighting with ASCII flags")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
869 (setq ediff-use-faces nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
870 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
871 (message "Re-highlighting all difference regions")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
872 (setq ediff-use-faces t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
873 ediff-highlight-all-diffs t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
874
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
875 (if (and ediff-use-faces ediff-highlight-all-diffs)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
876 (ediff-color-background-regions)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
877 (ediff-color-background-regions 'unhighlight))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
878
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
879 (ediff-unselect-and-select-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
880 ediff-current-difference 'select-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
881 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
882
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
883 (defun ediff-toggle-autorefine ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
884 "Toggle auto-refine mode."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
885 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
886 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
887 (if ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
888 (error "No fine differences in this mode"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
889 (cond ((eq ediff-auto-refine 'nix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
890 (setq ediff-auto-refine 'on)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
891 (ediff-make-fine-diffs ediff-current-difference 'noforce)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
892 (message "Auto-refining is ON"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
893 ((eq ediff-auto-refine 'on)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
894 (message "Auto-refining is OFF")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
895 (setq ediff-auto-refine 'off))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
896 (t ;; nix 'em
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
897 (ediff-set-fine-diff-properties ediff-current-difference 'default)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
898 (message "Refinements are HIDDEN")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
899 (setq ediff-auto-refine 'nix))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
900 ))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
901
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
902 (defun ediff-show-ancestor ()
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
903 "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
904 (interactive)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
905 (ediff-recenter)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
906 (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
907 (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
908 (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
909 (error "Not merging with ancestor")))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
910 (let (wind)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
911 (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
912 (raise-frame (window-frame wind)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
913 (t (set-window-buffer ediff-window-C ediff-ancestor-buffer)))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
914
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
915 (defun ediff-make-or-kill-fine-diffs (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
916 "Compute fine diffs. With negative prefix arg, kill fine diffs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
917 In both cases, operates on the currrent difference region."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
918 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
919 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
920 (cond ((eq arg '-)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
921 (ediff-clear-fine-differences ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
922 ((and (numberp arg) (< arg 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
923 (ediff-clear-fine-differences ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
924 (t (ediff-make-fine-diffs))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
925
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
926
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
927 (defun ediff-toggle-help ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
928 "Toggle short/long help message."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
929 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
930 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
931 (let (buffer-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
932 (erase-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
933 (setq ediff-use-long-help-message (not ediff-use-long-help-message))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
934 (ediff-set-help-message))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
935 ;; remember the icon status of the control frame when the user requested
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
936 ;; full control message
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
937 (if (and ediff-use-long-help-message (ediff-multiframe-setup-p))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
938 (setq ediff-prefer-iconified-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
939 (ediff-frame-iconified-p ediff-control-frame)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
940
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
941 (setq ediff-window-config-saved "") ; force redisplay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
942 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
943
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
944
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
945 ;; 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
946 (defun ediff-toggle-read-only (&optional buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
947 "Toggle read-only in current buffer.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
948 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
949 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
950 of the current buffer."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
951 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
952 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
953 (let ((ctl-buf (if (null buf) (current-buffer)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
954 (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
955 (or buf (ediff-recenter))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
956 (or buf
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
957 (setq buf (ediff-get-buffer buf-type)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
958
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
959 (ediff-eval-in-buffer buf ; eval in buf A/B/C
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
960 (let* ((file (buffer-file-name buf))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
961 (file-writable (and file
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
962 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
963 (file-writable-p file)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
964 (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
965 ((ediff-file-checked-out-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
966 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
967 (file-writable 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
968 (t (key-binding "\C-x\C-q")))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
969 ;; If the file is checked in, make sure we don't make buffer modifiable
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
970 ;; without warning the user. The user can fool our checks by making the
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
971 ;; buffer non-RO without checking the file out. We regard this as a
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
972 ;; user problem.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
973 (if (and (ediff-file-checked-in-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
974 ;; 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
975 ;; 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
976 ctl-buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
977 (cond ((not buffer-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
978 (setq toggle-ro-cmd 'toggle-read-only))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
979 ((and (or (beep 1) t) ; always beep
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
980 (y-or-n-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
981 (format
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
982 "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
983 (ediff-abbreviate-file-name file))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
984 ;; 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
985 ;; 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
986 ;; 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
987 ;; 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
988 ;; is checked in.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
989 (ediff-eval-in-buffer ctl-buf
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
990 (ediff-change-saved-variable
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
991 'buffer-read-only nil buf-type)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
992 (t
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
993 (setq toggle-ro-cmd 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
994 (beep 1) (beep 1)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
995 (message
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
996 "Boy, this is risky! Better don't change this file...")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
997 (sit-for 3)))) ; let the user see the warning
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
998 (if (and toggle-ro-cmd
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
999 (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
1000 (save-excursion
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1001 (save-window-excursion
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1002 (command-execute toggle-ro-cmd)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1003 (error "Don't know how to toggle read-only in buffer %S" buf))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1004
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1005 ;; 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
1006 ;; Signal a warning in this case.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1007 (if (and file (not buffer-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1008 (eq this-command 'ediff-toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1009 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1010 (not (file-writable-p file)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1011 (message "Warning: file %s is read-only"
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1012 (ediff-abbreviate-file-name file) (beep 1)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1013 ))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1014
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1015
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1016 ;; This is a simple-minded check for whether a file is under version control
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1017 ;; and is checked out.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1018 ;; 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
1019 ;; 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
1020 ;; able to read such a file anyway).
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1021 ;; FILE is a string representing file name
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1022 (defun ediff-file-checked-out-p (file)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1023 (and (stringp file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1024 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1025 (file-writable-p file)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1026 (or
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1027 (file-exists-p (concat file ",v"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1028 (file-exists-p (concat "RCS/" file ",v")))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1029 ))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1030 (defun ediff-file-checked-in-p (file)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1031 (and (stringp file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1032 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1033 (not (file-writable-p file))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1034 (or
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1035 (file-exists-p (concat file ",v"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1036 (file-exists-p (concat "RCS/" file ",v")))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1037 ))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1038
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1039 (defun ediff-swap-buffers ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1040 "Rotate the display of buffers A, B, and C."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1041 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1042 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1043 (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
1044 (let ((buf ediff-buffer-A)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1045 (values ediff-buffer-values-orig-A)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1046 (diff-vec ediff-difference-vector-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1047 (hide-regexp ediff-regexp-hide-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1048 (focus-regexp ediff-regexp-focus-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1049 (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
1050 (overlay (if (ediff-has-face-support-p)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1051 ediff-current-diff-overlay-A)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1052 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1053 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1054 (set-window-buffer ediff-window-A ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1055 (set-window-buffer ediff-window-B ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1056 (set-window-buffer ediff-window-C ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1057 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1058 (set-window-buffer ediff-window-A ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1059 (set-window-buffer ediff-window-B ediff-buffer-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1060 ;; swap diff buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1061 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1062 (setq ediff-buffer-A ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1063 ediff-buffer-C ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1064 ediff-buffer-B buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1065 (setq ediff-buffer-A ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1066 ediff-buffer-B buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1067
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1068 ;; swap saved buffer characteristics
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1069 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1070 (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
1071 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
1072 ediff-buffer-values-orig-B values)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1073 (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
1074 ediff-buffer-values-orig-B values))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1075
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1076 ;; swap diff vectors
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1077 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1078 (setq ediff-difference-vector-A ediff-difference-vector-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1079 ediff-difference-vector-C ediff-difference-vector-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1080 ediff-difference-vector-B diff-vec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1081 (setq ediff-difference-vector-A ediff-difference-vector-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1082 ediff-difference-vector-B diff-vec))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1083
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1084 ;; swap hide/focus regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1085 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1086 (setq ediff-regexp-hide-A ediff-regexp-hide-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1087 ediff-regexp-hide-C ediff-regexp-hide-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1088 ediff-regexp-hide-B hide-regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1089 ediff-regexp-focus-A ediff-regexp-focus-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1090 ediff-regexp-focus-C ediff-regexp-focus-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1091 ediff-regexp-focus-B focus-regexp)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1092 (setq ediff-regexp-hide-A ediff-regexp-hide-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1093 ediff-regexp-hide-B hide-regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1094 ediff-regexp-focus-A ediff-regexp-focus-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1095 ediff-regexp-focus-B focus-regexp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1096
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1097 ;; The following is needed for XEmacs, since there one can't move
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1098 ;; 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
1099 (if (ediff-has-face-support-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1100 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1101 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1102 ediff-current-diff-overlay-C ediff-current-diff-overlay-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1103 ediff-current-diff-overlay-B overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1104 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1105 ediff-current-diff-overlay-B overlay)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1106
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1107 ;; swap wide bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1108 (setq ediff-wide-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1109 (cond (ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1110 (list (nth 2 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1111 (nth 0 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1112 (nth 1 ediff-wide-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1113 (ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1114 (list (nth 1 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1115 (nth 0 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1116 (nth 2 ediff-wide-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1117 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1118 (list (nth 1 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1119 (nth 0 ediff-wide-bounds)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1120 ;; swap narrow bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1121 (setq ediff-narrow-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1122 (cond (ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1123 (list (nth 2 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1124 (nth 0 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1125 (nth 1 ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1126 (ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1127 (list (nth 1 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1128 (nth 0 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1129 (nth 2 ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1130 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1131 (list (nth 1 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1132 (nth 0 ediff-narrow-bounds)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1133 (if wide-visibility-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1134 (setq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1135 (setq ediff-visible-bounds ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1136 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1137 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1138 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1139 (ediff-recenter 'no-rehighlight)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1140 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1141
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1142
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1143 (defun ediff-toggle-wide-display ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1144 "Toggle wide/regular display.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1145 This is especially useful when comparing buffers side-by-side."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1146 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1147 (ediff-barf-if-not-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1148 (or (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1149 (error "%sEmacs is not running as a window application"
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1150 (if ediff-emacs-p "" "X")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1151 (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1152 (let ((ctl-buf ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1153 (setq ediff-wide-display-p (not ediff-wide-display-p))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1154 (if (not ediff-wide-display-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1155 (ediff-eval-in-buffer ctl-buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1156 (modify-frame-parameters
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1157 ediff-wide-display-frame ediff-wide-display-orig-parameters)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1158 ;;(sit-for (if ediff-xemacs-p 0.4 0))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1159 ;; restore control buf, since ctl window may have been deleted
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1160 ;; during resizing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1161 (set-buffer ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1162 (setq ediff-wide-display-orig-parameters nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1163 ediff-window-B nil) ; force update of window config
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1164 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1165 (funcall ediff-make-wide-display-function)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1166 ;;(sit-for (if ediff-xemacs-p 0.4 0))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1167 (ediff-eval-in-buffer ctl-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1168 (setq ediff-window-B nil) ; force update of window config
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1169 (ediff-recenter 'no-rehighlight)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1170
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1171 (defun ediff-toggle-multiframe ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1172 "Switch from the multiframe display to single-frame display and back.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1173 This is primarily for debugging, but one can use it for fun, too."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1174 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1175 (ediff-barf-if-not-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1176 (or (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1177 (error "%sEmacs is not running as a window application"
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1178 (if ediff-emacs-p "" "X")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1179 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1180 (setq ediff-window-setup-function 'ediff-setup-windows-plain))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1181 ((eq ediff-window-setup-function 'ediff-setup-windows-plain)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1182 (setq ediff-window-setup-function 'ediff-setup-windows-multiframe)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1183 (setq ediff-window-B nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1184 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1185
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1186 ;; Merging
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1187
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1188 (defun ediff-toggle-show-clashes-only ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1189 "Toggle the mode where only the regions where both buffers differ with the ancestor are shown."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1190 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1191 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1192 (if (not ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1193 (error "This command makes sense only when merging with an ancestor"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1194 (setq ediff-show-clashes-only (not ediff-show-clashes-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1195 (if ediff-show-clashes-only
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1196 (message "Focus on regions where both buffers differ from the ancestor")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1197 (message "Canceling focus on regions where changes clash")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1198
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1199 ;; Widening/narrowing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1200
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1201 (defun ediff-toggle-narrow-region ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1202 "Toggle narrowing in buffers A, B, and C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1203 Used in ediff-windows/regions only."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1204 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1205 (if (eq ediff-buffer-A ediff-buffer-B)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1206 (error ediff-NO-DIFFERENCES))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1207 (if (eq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1208 (setq ediff-visible-bounds ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1209 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1210 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1211
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1212 ;; Narrow bufs A/B/C to ediff-visible-bounds. If this is currently set to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1213 ;; ediff-wide-bounds, then this actually widens.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1214 ;; This function does nothing if job-name is not
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1215 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1216 ;; Does nothing if buffer-A = buffer-B since we can't narrow
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1217 ;; to two different regions in one buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1218 (defun ediff-visible-region ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1219 (if (or (eq ediff-buffer-A ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1220 (eq ediff-buffer-A ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1221 (eq ediff-buffer-C ediff-buffer-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1222 ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1223 ;; If ediff-*-regions/windows, ediff-visible-bounds is already set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1224 ;; Otherwise, always use full range.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1225 (if (not ediff-narrow-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1226 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1227 (let ((overl-A (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1228 'A ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1229 (overl-B (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1230 'B ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1231 (overl-C (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1232 'C ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1233 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1234 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1235 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1236 (ediff-overlay-start overl-A) (ediff-overlay-end overl-A)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1237 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1238 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1239 (ediff-overlay-start overl-B) (ediff-overlay-end overl-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1240
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1241 (if ediff-3way-comparison-job
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1242 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1243 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1244 (ediff-overlay-start overl-C) (ediff-overlay-end overl-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1245 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1246
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1247
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1248 ;; Window scrolling operations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1249
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1250 ;; Performs some operation on the two file windows (if they are showing).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1251 ;; Traps all errors on the operation in windows A/B/C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1252 ;; Usually, errors come from scrolling off the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1253 ;; beginning or end of the buffer, and this gives error messages.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1254 (defun ediff-operate-on-windows (operation arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1255
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1256 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1257 (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
1258 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1259 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1260 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1261 (or (not ediff-3way-job) ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1262 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1263 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1264
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1265 (let* ((wind (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1266 (wind-A ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1267 (wind-B ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1268 (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
1269 (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
1270 (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
1271 (three-way ediff-3way-job)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1272 (coefC (if three-way
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1273 (ediff-get-region-size-coefficient 'C operation))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1274
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1275 (select-window wind-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1276 (condition-case nil
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1277 (funcall operation (round (* coefA arg)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1278 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1279 (select-window wind-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1280 (condition-case nil
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1281 (funcall operation (round (* coefB arg)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1282 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1283 (if three-way
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1284 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1285 (select-window wind-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1286 (condition-case nil
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1287 (funcall operation (round (* coefC arg)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1288 (error))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1289 (select-window wind)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1290
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1291 (defun ediff-scroll-vertically (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1292 "Vertically scroll buffers A, B \(and C if appropriate\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1293 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
1294 the one half of the height of window-A."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1295 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1296 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1297
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1298 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1299 (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
1300 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1301 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1302 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1303 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1304 (ediff-buffer-live-p ediff-buffer-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1305 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1306 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1307
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1308 (ediff-operate-on-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1309 (if (memq last-command-char '(?v ?\C-v))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1310 'scroll-up
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1311 'scroll-down)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1312 ;; calculate argument to scroll-up/down
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1313 ;; if there is an explicit argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1314 (if (and arg (not (equal arg '-)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1315 ;; use it
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1316 (prefix-numeric-value arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1317 ;; 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
1318 (let (default-amount)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1319 (setq default-amount
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1320 (- (/ (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
1321 (window-height ediff-window-B)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1322 (if ediff-3way-job
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1323 (window-height ediff-window-C)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1324 500)) ; some large number
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1325 2)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1326 1 next-screen-context-lines))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1327 ;; window found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1328 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1329 ;; C-u as argument means half of default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1330 (/ default-amount 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1331 ;; no argument means default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1332 default-amount)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1333
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1334
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1335 (defun ediff-scroll-horizontally (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1336 "Horizontally scroll buffers A, B \(and C if appropriate\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1337 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
1338 the width of the A/B/C windows."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1339 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1340 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1341
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1342 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1343 (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
1344 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1345 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1346 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1347 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1348 (ediff-buffer-live-p ediff-buffer-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1349 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1350 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1351
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1352 (ediff-operate-on-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1353 (if (= last-command-char ?<)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1354 'scroll-left
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1355 'scroll-right)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1356 ;; calculate argument to scroll-left/right
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1357 ;; if there is an explicit argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1358 (if (and arg (not (equal arg '-)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1359 ;; use it
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1360 (prefix-numeric-value arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1361 ;; if not, see if we can determine a default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1362 ;; (half the window width)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1363 (if (null ediff-control-window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1364 ;; no control window, use nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1365 nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1366 (let ((default-amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1367 (- (/ (min (window-width ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1368 (window-width ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1369 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1370 (window-width ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1371 500) ; some large number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1372 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1373 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1374 3)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1375 ;; window found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1376 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1377 ;; C-u as argument means half of default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1378 (/ default-amount 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1379 ;; no argument means default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1380 default-amount))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1381
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1382
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1383 ;;BEG, END show the region to be positioned.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1384 ;;JOB-NAME holds ediff-job-name. Ediff-windows job positions regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1385 ;;differently.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1386 (defun ediff-position-region (beg end pos job-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1387 (if (> end (point-max))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1388 (setq end (point-max)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1389 (if ediff-windows-job
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1390 (if (pos-visible-in-window-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1391 () ; do nothing, wind is already positioned
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1392 ;; at this point, windows are positioned at the beginning of the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1393 ;; file regions (not diff-regions) being compared.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1394 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1395 (move-to-window-line (- (window-height) 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1396 (let ((amount (+ 2 (count-lines (point) end))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1397 (scroll-up amount))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1398 (set-window-start (selected-window) beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1399 (if (pos-visible-in-window-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1400 ;; 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
1401 (let ((lines 0)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1402 (prev-point 0))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1403 (while ( and (> end (progn
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1404 (move-to-window-line lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1405 (point)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1406 ;; `end' may be beyond the window bottom, so check
14040
187735b53d52 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13605
diff changeset
1407 ;; that we are making progress
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1408 (< prev-point (point)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1409 (setq prev-point (point))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1410 (setq lines (1+ lines)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1411 ;; And position the beginning on the right line
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1412 (goto-char beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1413 (recenter (/ (1+ (max (- (1- (window-height (selected-window)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1414 lines)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1415 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1416 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1417 2))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1418 (goto-char pos)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1419 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1420
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1421 ;; 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
1422 (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
1423 (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
1424 (or ctl-buf (setq ctl-buf ediff-control-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1425 (ediff-eval-in-buffer ctl-buf
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1426 (let* ((buf (ediff-get-buffer buf-type))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1427 (wind (eval (intern (format "ediff-window-%S" buf-type))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1428 (beg (window-start wind))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1429 (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
1430 lines)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1431 (ediff-eval-in-buffer buf
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1432 (if (< beg end)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1433 (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
1434 (setq lines 0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1435 lines
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1436 ))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1437
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1438 ;; get number of lines from window end to region start
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1439 (defun ediff-get-lines-to-region-start (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
1440 (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
1441 (or ctl-buf (setq ctl-buf ediff-control-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1442 (ediff-eval-in-buffer ctl-buf
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1443 (let* ((buf (ediff-get-buffer buf-type))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1444 (wind (eval (intern (format "ediff-window-%S" buf-type))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1445 (end (window-end wind))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1446 (beg (ediff-get-diff-posn buf-type 'beg)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1447 (ediff-eval-in-buffer buf
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1448 (if (< beg end) (count-lines beg end) 0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1449 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1450
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1451
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1452 (defun ediff-get-region-size-coefficient (buf-type op &optional n ctl-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1453 (ediff-eval-in-buffer (or ctl-buf ediff-control-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1454 (let* ((func (cond ((eq op 'scroll-down) 'ediff-get-lines-to-region-start)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1455 ((eq op 'scroll-up) 'ediff-get-lines-to-region-end)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1456 (t '(lambda (a b c) 0))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1457 (max-lines (max (funcall func 'A n ctl-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1458 (funcall func 'B n ctl-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1459 (if (ediff-buffer-live-p ediff-buffer-C)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1460 (funcall func 'C n ctl-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1461 0))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1462 ;; this covers the horizontal coefficient as well:
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1463 ;; if max-lines = 0 then coef = 1
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1464 (if (> max-lines 0)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1465 (/ (+ (funcall func buf-type n ctl-buf) 0.0)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1466 (+ max-lines 0.0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1467 1)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1468 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1469
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1470
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1471 (defun ediff-next-difference (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1472 "Advance to the next difference.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1473 With a prefix argument, go back that many differences."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1474 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1475 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1476 (if (< ediff-current-difference ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1477 (let ((n (min ediff-number-of-differences
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1478 (+ ediff-current-difference (if arg arg 1))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1479 regexp-skip)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1480
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1481 (or (>= n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1482 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1483 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1484 (while (and (< n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1485 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1486 ;; regexp skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1487 regexp-skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1488 ;; skip clashes, if necessary
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1489 (and ediff-show-clashes-only
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1490 (string-match "prefer"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1491 (or (ediff-get-state-of-merge n) "")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1492 ;; skip difference regions that differ in white space
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1493 (and ediff-ignore-similar-regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1494 (ediff-no-fine-diffs-p n))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1495 (setq n (1+ n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1496 (if (= 0 (mod n 20))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1497 (message "Skipped over region %d and counting ..." n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1498 (or (>= n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1499 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1500 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1501 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1502 (message "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1503 (ediff-unselect-and-select-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1504 ) ; let
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1505 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1506 (error "At end of the difference list")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1507
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1508 (defun ediff-previous-difference (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1509 "Go to the previous difference.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1510 With a prefix argument, go back that many differences."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1511 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1512 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1513 (if (> ediff-current-difference -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1514 (let ((n (max -1 (- ediff-current-difference (if arg arg 1))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1515 regexp-skip)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1516
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1517 (or (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1518 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1519 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1520 (while (and (> n -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1521 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1522 ;; regexp skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1523 regexp-skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1524 ;; skip clashes, if necessary
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1525 (and ediff-show-clashes-only
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1526 (string-match "prefer"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1527 (or (ediff-get-state-of-merge n) "")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1528 ;; skip difference regions that differ in white space
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1529 (and ediff-ignore-similar-regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1530 (ediff-no-fine-diffs-p n))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1531 (if (= 0 (mod (1+ n) 20))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1532 (message "Skipped over region %d and counting ..." (1+ n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1533 (setq n (1- n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1534 (or (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1535 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1536 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1537 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1538 (message "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1539 (ediff-unselect-and-select-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1540 ) ; let
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1541 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1542 (error "At beginning of the difference list")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1543
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1544 (defun ediff-jump-to-difference (difference-number)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1545 "Go to the difference specified as a prefix argument."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1546 (interactive "p")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1547 (ediff-barf-if-not-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1548 (setq difference-number (1- difference-number))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1549 (if (and (>= difference-number -1)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1550 (< difference-number (1+ ediff-number-of-differences)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1551 (ediff-unselect-and-select-difference difference-number)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1552 (error "Bad difference number, %d. Valid numbers are 1 to %d"
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1553 (1+ difference-number) ediff-number-of-differences)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1554
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1555 (defun ediff-jump-to-difference-at-point ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1556 "Go to difference closest to the point in buffer A, B, or C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1557 The type of buffer depends on last command character \(a, b, or c\) that
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1558 invoked this command."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1559 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1560 (ediff-barf-if-not-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1561 (let ((buf-type (ediff-char-to-buftype last-command-char)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1562 (ediff-jump-to-difference (ediff-diff-at-point buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1563
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1564
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1565 ;; find region most related to the current point position (or POS, if given)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1566 (defun ediff-diff-at-point (buf-type &optional pos)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1567 (let ((buffer (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1568 (ctl-buffer ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1569 (max-dif-num (1- ediff-number-of-differences))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1570 (diff-no -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1571 (prev-beg 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1572 (prev-end 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1573 (beg 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1574 (end 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1575
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1576 (ediff-eval-in-buffer buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1577 (setq pos (or pos (point)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1578 (while (and (or (< pos prev-beg) (> pos beg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1579 (< diff-no max-dif-num))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1580 (setq diff-no (1+ diff-no))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1581 (setq prev-beg beg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1582 prev-end end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1583 (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1584 end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1585 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1586
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1587 (if (< (abs (- pos prev-end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1588 (abs (- pos beg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1589 diff-no
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1590 (1+ diff-no)) ; jump-to-diff works with diff nums higher by 1
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1591 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1592
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1593
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1594 ;;; Copying diffs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1595
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1596 (defun ediff-diff-to-diff (arg &optional keys)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1597 "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
1598 If numerical prefix argument, copy the difference specified in the arg.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1599 Otherwise, copy the difference given by `ediff-current-difference'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1600 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
1601 `ac', etc., which is used to determine the types of buffers to be used for
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1602 copying difference regions. The first character in the sequence specifies
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1603 the source buffer and the second specifies the target.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1604
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1605 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
1606 determine the source and the target buffers instead of the command keys."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1607 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1608 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1609 (or keys (setq keys (this-command-keys)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1610 (if (numberp arg)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1611 (ediff-jump-to-difference arg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1612 (let* ((key1 (aref keys 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1613 (key2 (aref keys 1))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1614 (char1 (if (and ediff-xemacs-p (eventp key1)) (event-key key1) key1))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1615 (char2 (if (and ediff-xemacs-p (eventp key1)) (event-key key2) key2))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1616 ediff-verbose-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1617 (ediff-copy-diff ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1618 (ediff-char-to-buftype char1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1619 (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
1620 ;; 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
1621 (ediff-recenter)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1622
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1623 (defun ediff-copy-A-to-B (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1624 "Copy ARGth difference region from buffer A to B.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1625 ARG is a prefix argument. If nil, copy the current difference region."
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1626 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1627 (ediff-diff-to-diff arg "ab"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1628
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1629 (defun ediff-copy-B-to-A (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1630 "Copy ARGth difference region from buffer B to A.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1631 ARG is a prefix argument. If nil, copy the current difference region."
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1632 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1633 (ediff-diff-to-diff arg "ba"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1634
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1635 (defun ediff-copy-A-to-C (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1636 "Copy ARGth difference region from buffer A to buffer C.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1637 ARG is a prefix argument. If nil, copy the current difference region."
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1638 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1639 (ediff-diff-to-diff arg "ac"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1640
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1641 (defun ediff-copy-B-to-C (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1642 "Copy ARGth difference region from buffer B to buffer C.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1643 ARG is a prefix argument. If nil, copy the current difference region."
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1644 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1645 (ediff-diff-to-diff arg "bc"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1646
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1647 (defun ediff-copy-C-to-B (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1648 "Copy ARGth difference region from buffer C to B.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1649 ARG is a prefix argument. If nil, copy the current difference region."
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1650 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1651 (ediff-diff-to-diff arg "cb"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1652
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1653 (defun ediff-copy-C-to-A (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1654 "Copy ARGth difference region from buffer C to A.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1655 ARG is a prefix argument. If nil, copy the current difference region."
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1656 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1657 (ediff-diff-to-diff arg "ca"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1658
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1659
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1660
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1661 ;; 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
1662 ;; If optional DO-NOT-SAVE is non-nil, do not save the old value of the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1663 ;; target diff. This is used in merging, when constructing the merged
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1664 ;; version.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1665 (defun ediff-copy-diff (n from-buf-type to-buf-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1666 &optional batch-invocation reg-to-copy)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1667 (let* ((to-buf (ediff-get-buffer to-buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1668 ;;(from-buf (if (not reg-to-copy) (ediff-get-buffer from-buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1669 (ctrl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1670 (saved-p t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1671 (three-way ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1672 messg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1673 ediff-verbose-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1674 reg-to-delete reg-to-delete-beg reg-to-delete-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1675
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1676 (setq reg-to-delete-beg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1677 (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1678 (setq reg-to-delete-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1679 (ediff-get-diff-posn to-buf-type 'end n ctrl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1680
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1681 (if reg-to-copy
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1682 (setq from-buf-type nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1683 (setq reg-to-copy (ediff-get-region-contents n from-buf-type ctrl-buf)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1684
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1685 (setq reg-to-delete (ediff-get-region-contents
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1686 n to-buf-type ctrl-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1687 reg-to-delete-beg reg-to-delete-end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1688
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1689 (if (string= reg-to-delete reg-to-copy)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1690 (setq saved-p nil) ; don't copy identical buffers
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1691 ;; seems ok to copy
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1692 (if (or batch-invocation (ediff-test-save-region n to-buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1693 (condition-case conds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1694 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1695 (ediff-eval-in-buffer to-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1696 ;; 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
1697 (let ((inhibit-read-only (null buffer-read-only)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1698
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1699 (goto-char reg-to-delete-end)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1700 (insert reg-to-copy)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1701
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1702 (if (> reg-to-delete-end reg-to-delete-beg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1703 (kill-region reg-to-delete-beg reg-to-delete-end))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1704 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1705 (or batch-invocation
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1706 (setq
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1707 messg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1708 (ediff-save-diff-region n to-buf-type reg-to-delete))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1709 (error (message "ediff-copy-diff: %s %s"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1710 (car conds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1711 (mapconcat 'prin1-to-string (cdr conds) " "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1712 (beep 1)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1713 (sit-for 2) ; let the user see the error msg
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1714 (setq saved-p nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1715 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1716 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1717
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1718 ;; adjust state of difference in case 3-way and diff was copied ok
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1719 (if (and saved-p three-way)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1720 (ediff-set-state-of-diff-in-all-buffers n ctrl-buf))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1721
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1722 (if batch-invocation
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1723 (ediff-clear-fine-differences n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1724 ;; If diff3 job, we should recompute fine diffs so we clear them
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1725 ;; before reinserting flags (and thus before ediff-recenter).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1726 (if (and saved-p three-way)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1727 (ediff-clear-fine-differences n))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1728
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1729 (ediff-refresh-mode-lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1730
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1731 ;; For diff2 jobs, don't recompute fine diffs, since we know there
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1732 ;; aren't any. So we clear diffs after ediff-recenter.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1733 (if (and saved-p (not three-way))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1734 (ediff-clear-fine-differences n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1735 ;; Make sure that the message about saving and how to restore is seen
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1736 ;; by the user
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1737 (message messg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1738 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1739
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1740 ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1741 ;; 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
1742 ;; 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
1743 ;; convenience.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1744 (defun ediff-save-diff-region (n buf-type reg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1745 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1746 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1747 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1748
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1749 (if this-buf-n-th-diff-saved
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1750 ;; either nothing saved for n-th diff and buffer or we OK'ed
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1751 ;; overriding
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1752 (setcdr this-buf-n-th-diff-saved reg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1753 (if n-th-diff-saved ;; n-th diff saved, but for another buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1754 (nconc n-th-diff-saved (list (cons buf reg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1755 (setq ediff-killed-diffs-alist ;; create record for n-th diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1756 (cons (list n (cons buf reg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1757 ediff-killed-diffs-alist))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1758 (message "Saving old diff region #%d of buffer %S. To recover, type `r%s'"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1759 (1+ n) buf-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1760 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1761 "" (downcase (symbol-name buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1762 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1763
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1764 ;; Test if saving Nth difference region of buffer BUF-TYPE is possible.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1765 (defun ediff-test-save-region (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1766 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1767 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1768 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1769
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1770 (if this-buf-n-th-diff-saved
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1771 (if (yes-or-no-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1772 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1773 "You've previously copied diff region %d to buffer %S. Confirm "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1774 (1+ n) buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1775 t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1776 (error "Quit"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1777 t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1778
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1779 (defun ediff-pop-diff (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1780 "Pop last killed Nth diff region from buffer BUF-TYPE."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1781 (let* ((n-th-record (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1782 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1783 (saved-rec (assoc buf (cdr n-th-record)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1784 (three-way ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1785 (ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1786 ediff-verbose-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1787 saved-diff reg-beg reg-end recovered)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1788
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1789 (if (cdr saved-rec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1790 (setq saved-diff (cdr saved-rec))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1791 (if (> ediff-number-of-differences 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1792 (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
1793 (error ediff-NO-DIFFERENCES)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1794
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1795 (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
1796 (setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1797
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1798 (condition-case conds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1799 (ediff-eval-in-buffer buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1800 (let ((inhibit-read-only (null buffer-read-only)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1801
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1802 (goto-char reg-end)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1803 (insert saved-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1804
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1805 (if (> reg-end reg-beg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1806 (kill-region reg-beg reg-end))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1807
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1808 (setq recovered t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1809 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1810 (error (message "ediff-pop-diff: %s %s"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1811 (car conds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1812 (mapconcat 'prin1-to-string (cdr conds) " "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1813 (beep 1)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1814
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1815 ;; Clearing fine diffs is necessary for
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1816 ;; ediff-unselect-and-select-difference to properly recompute them. We
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1817 ;; 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
1818 ;; 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
1819 ;; fine diffs.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1820 (if recovered
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1821 (ediff-clear-fine-differences n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1822
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1823 ;; adjust state of difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1824 (if (and three-way recovered)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1825 (ediff-set-state-of-diff-in-all-buffers n ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1826
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1827 (ediff-refresh-mode-lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1828
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1829 (if recovered
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1830 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1831 (setq n-th-record (delq saved-rec n-th-record))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1832 (message "Diff region %d in buffer %S restored" (1+ n) buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1833 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1834 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1835
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1836 (defun ediff-restore-diff (arg &optional key)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1837 "Restore ARGth diff from `ediff-killed-diffs-alist'.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1838 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
1839 If the second optional argument, a character, is given, use it to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1840 determine the target buffer instead of last-command-char"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1841 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1842 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1843 (if (numberp arg)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1844 (ediff-jump-to-difference arg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1845 (ediff-pop-diff ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1846 (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
1847 ;; 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
1848 (let (ediff-verbose-p)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1849 (ediff-recenter)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1850
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1851 (defun ediff-restore-diff-in-merge-buffer (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1852 "Restore ARGth diff in the merge buffer.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1853 ARG is a prefix argument. If nil, restore the current diff."
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1854 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1855 (ediff-restore-diff arg ?c))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1856
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1857
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1858 (defun ediff-toggle-regexp-match ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1859 "Toggle between focusing and hiding of difference regions that match
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1860 a regular expression typed in by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1861 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1862 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1863 (let ((regexp-A "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1864 (regexp-B "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1865 (regexp-C "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1866 msg-connective alt-msg-connective alt-connective)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1867 (cond
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1868 ((or (and (eq ediff-skip-diff-region-function
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1869 'ediff-focus-on-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1870 (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
1871 (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
1872 ediff-hide-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1873 (eq last-command-char ?h)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1874 (message "Selective browsing by regexp turned off")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1875 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1876 ((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
1877 (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1878 regexp-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1879 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1880 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1881 "Ignore A-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1882 ediff-regexp-hide-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1883 regexp-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1884 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1885 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1886 "Ignore B-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1887 ediff-regexp-hide-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1888 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1889 (setq regexp-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1890 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1891 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1892 "Ignore C-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1893 ediff-regexp-hide-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1894 (if (eq ediff-hide-regexp-connective 'and)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1895 (setq msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1896 alt-msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1897 alt-connective 'or)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1898 (setq msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1899 alt-msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1900 alt-connective 'and))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1901 (if (y-or-n-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1902 (format
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1903 "Ignore regions that match %s regexps, OK? "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1904 msg-connective alt-msg-connective))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1905 (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
1906 (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
1907 (message "Will ignore regions that match %s regexps"
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1908 alt-msg-connective))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1909
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1910 (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1911 (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1912 (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
1913
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1914 ((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
1915 (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
1916 ediff-focus-on-regexp-matches-function
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1917 regexp-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1918 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1919 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1920 "Focus on A-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1921 ediff-regexp-focus-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1922 regexp-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1923 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1924 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1925 "Focus on B-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1926 ediff-regexp-focus-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1927 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1928 (setq regexp-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1929 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1930 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1931 "Focus on C-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1932 ediff-regexp-focus-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1933 (if (eq ediff-focus-regexp-connective 'and)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1934 (setq msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1935 alt-msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1936 alt-connective 'or)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1937 (setq msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1938 alt-msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1939 alt-connective 'and))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1940 (if (y-or-n-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1941 (format
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1942 "Focus on regions that match %s regexps, OK? "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1943 msg-connective alt-msg-connective))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1944 (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
1945 msg-connective)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1946 (setq ediff-focus-regexp-connective alt-connective)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1947 (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
1948 alt-msg-connective))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1949
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1950 (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1951 (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1952 (or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1953
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1954 (defun ediff-toggle-skip-similar ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1955 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1956 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1957 (if (not (eq ediff-auto-refine 'on))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1958 (error
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1959 "Can't skip over whitespace regions: first turn auto-refining on"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1960 (setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1961 (if ediff-ignore-similar-regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1962 (message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1963 "Skipping regions that differ only in white space & line breaks")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1964 (message "Skipping over white-space differences turned off")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1965
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1966 (defun ediff-focus-on-regexp-matches (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1967 "Focus on diffs that match regexp `ediff-regexp-focus-A/B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1968 Regions to be ignored according to this function are those where
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1969 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
1970 doesn't match `ediff-regexp-focus-B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1971 This function returns nil if the region number N (specified as
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1972 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
1973
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1974 N is a region number used by Ediff internally. It is 1 less
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1975 the number seen by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1976 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1977 (let* ((ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1978 (regex-A ediff-regexp-focus-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1979 (regex-B ediff-regexp-focus-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1980 (regex-C ediff-regexp-focus-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1981 (reg-A-match (ediff-eval-in-buffer ediff-buffer-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1982 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1983 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1984 (ediff-get-diff-posn 'A 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1985 (ediff-get-diff-posn 'A 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1986 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1987 (re-search-forward regex-A nil t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1988 (reg-B-match (ediff-eval-in-buffer ediff-buffer-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1989 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1990 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1991 (ediff-get-diff-posn 'B 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1992 (ediff-get-diff-posn 'B 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1993 (re-search-forward regex-B nil t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1994 (reg-C-match (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1995 (ediff-eval-in-buffer ediff-buffer-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1996 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1997 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1998 (ediff-get-diff-posn 'C 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1999 (ediff-get-diff-posn 'C 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2000 (re-search-forward regex-C nil t))))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2001 (not (eval (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2002 (list ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2003 reg-A-match reg-B-match reg-C-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2004 (list ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2005 reg-A-match reg-B-match))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2006 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2007
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2008 (defun ediff-hide-regexp-matches (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2009 "Hide diffs that match regexp `ediff-regexp-hide-A/B/C'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2010 Regions to be ignored are those where buf A region matches
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2011 `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2012 This function returns nil if the region number N (specified as
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2013 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
2014
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2015 N is a region number used by Ediff internally. It is 1 less
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2016 the number seen by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2017 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2018 (let* ((ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2019 (regex-A ediff-regexp-hide-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2020 (regex-B ediff-regexp-hide-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2021 (regex-C ediff-regexp-hide-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2022 (reg-A-match (ediff-eval-in-buffer ediff-buffer-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2023 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2024 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2025 (ediff-get-diff-posn 'A 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2026 (ediff-get-diff-posn 'A 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2027 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2028 (re-search-forward regex-A nil t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2029 (reg-B-match (ediff-eval-in-buffer ediff-buffer-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2030 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2031 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2032 (ediff-get-diff-posn 'B 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2033 (ediff-get-diff-posn 'B 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2034 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2035 (re-search-forward regex-B nil t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2036 (reg-C-match (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2037 (ediff-eval-in-buffer ediff-buffer-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2038 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2039 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2040 (ediff-get-diff-posn 'C 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2041 (ediff-get-diff-posn 'C 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2042 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2043 (re-search-forward regex-C nil t))))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2044 (eval (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2045 (list ediff-hide-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2046 reg-A-match reg-B-match reg-C-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2047 (list ediff-hide-regexp-connective reg-A-match reg-B-match)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2048 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2049
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2050
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2051
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2052 ;;; Quitting, suspending, etc.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2053
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2054 (defun ediff-quit (reverse-default-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2055 "Finish an Ediff session and exit Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2056 Unselects the selected difference, if any, restores the read-only and modified
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2057 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
2058 \(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
2059
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2060 If `ediff-keep-variants' is nil, the user will be asked whether the buffers
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2061 containing the variants should be removed \(if they haven't been modified\).
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2062 If it is t, they will be preserved unconditionally. A prefix argument,
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2063 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
2064 (interactive "P")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2065 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2066 (if (prog1
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2067 (y-or-n-p
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2068 (format "Quit this Ediff session%s? "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2069 (if (ediff-buffer-live-p ediff-meta-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2070 " & show containing session group" "")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2071 (message ""))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2072 (ediff-really-quit reverse-default-keep-variants)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2073
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2074
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2075 ;; Perform the quit operations.
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2076 (defun ediff-really-quit (reverse-default-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2077 (ediff-unhighlight-diffs-totally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2078 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2079 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2080 (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
2081 (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
2082
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2083 (ediff-delete-temp-files)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2084
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2085 ;; Restore visibility range. This affects only ediff-*-regions/windows.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2086 ;; Since for other job names ediff-visible-region sets
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2087 ;; ediff-visible-bounds to ediff-wide-bounds, the settings below are
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2088 ;; ignored for such jobs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2089 (if ediff-quit-widened
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2090 (setq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2091 (setq ediff-visible-bounds ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2092
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2093 ;; Apply selective display to narrow or widen
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2094 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2095 (mapcar (function (lambda (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2096 (if (ediff-overlayp overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2097 (ediff-delete-overlay overl))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2098 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2099 (mapcar (function (lambda (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2100 (if (ediff-overlayp overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2101 (ediff-delete-overlay overl))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2102 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2103
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2104 ;; 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
2105 (let ((control-buffer ediff-control-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2106 (meta-buffer ediff-meta-buffer))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2107 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2108 (ediff-eval-in-buffer ediff-buffer-A
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2109 (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
2110 (delq control-buffer ediff-this-buffer-ediff-sessions))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2111 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2112 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2113 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2114 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2115
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2116 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2117 (ediff-eval-in-buffer ediff-buffer-B
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2118 (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
2119 (delq control-buffer ediff-this-buffer-ediff-sessions))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2120 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2121 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2122 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2123 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2124
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2125 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2126 (ediff-eval-in-buffer ediff-buffer-C
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2127 (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
2128 (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
2129 (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
2130 (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
2131 )
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2132 (error))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2133
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2134 (condition-case nil
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2135 (ediff-eval-in-buffer ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2136 (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
2137 (delq control-buffer ediff-this-buffer-ediff-sessions))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2138 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2139 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2140 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2141 (error))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2142
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2143 (setq ediff-session-registry
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2144 (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
2145 (ediff-update-registry)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2146 ;; restore state of buffers to what it was before ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2147 (ediff-restore-protected-variables)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2148 ;; good place to kill buffers A/B/C
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2149 (run-hooks 'ediff-cleanup-hook)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2150 (let ((ediff-keep-variants ediff-keep-variants))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2151 (if reverse-default-keep-variants
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2152 (setq ediff-keep-variants (not ediff-keep-variants)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2153 (or ediff-keep-variants (ediff-janitor 'ask)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2154
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2155 (run-hooks 'ediff-quit-hook)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2156 (ediff-cleanup-meta-buffer meta-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2157 (if (ediff-buffer-live-p meta-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2158 (ediff-show-meta-buffer meta-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2159 ))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2160
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2161
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2162 (defun ediff-delete-temp-files ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2163 (if (stringp ediff-temp-file-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2164 (delete-file ediff-temp-file-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2165 (if (stringp ediff-temp-file-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2166 (delete-file ediff-temp-file-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2167 (if (stringp ediff-temp-file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2168 (delete-file ediff-temp-file-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2169
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2170
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2171 ;; Kill control buffer, other auxiliary Ediff buffers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2172 ;; Leave one of the frames split between buffers A/B/C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2173 (defun ediff-cleanup-mess ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2174 (let ((buff-A ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2175 (buff-B ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2176 (buff-C ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2177 (ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2178 (ctl-frame ediff-control-frame)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2179 (three-way-job ediff-3way-job))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2180
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2181 (ediff-kill-buffer-carefully ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2182 (ediff-kill-buffer-carefully ediff-custom-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2183 (ediff-kill-buffer-carefully ediff-fine-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2184 (ediff-kill-buffer-carefully ediff-tmp-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2185 (ediff-kill-buffer-carefully ediff-error-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2186 (ediff-kill-buffer-carefully ediff-patch-diagnostics)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2187 (ediff-kill-buffer-carefully ediff-msg-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2188 (ediff-kill-buffer-carefully ediff-debug-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2189
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2190 (if (and (ediff-window-display-p) (frame-live-p ctl-frame))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2191 (delete-frame ctl-frame))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2192 (ediff-kill-buffer-carefully ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2193
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2194 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2195
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2196 ;; display only if not visible
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2197 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2198 (or (ediff-get-visible-buffer-window buff-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2199 (switch-to-buffer buff-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2200 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2201 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2202 (or (ediff-get-visible-buffer-window buff-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2203 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2204 (if (ediff-get-visible-buffer-window buff-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2205 (split-window-vertically))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2206 (switch-to-buffer buff-A)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2207 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2208 (if three-way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2209 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2210 (or (ediff-get-visible-buffer-window buff-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2211 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2212 (if (or (ediff-get-visible-buffer-window buff-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2213 (ediff-get-visible-buffer-window buff-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2214 (split-window-vertically))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2215 (switch-to-buffer buff-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2216 (balance-windows)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2217 (error)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2218 (message "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2219 ))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2220
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2221 (defun ediff-janitor (&optional ask)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2222 "Kill buffers A, B, and, possibly, C, if these buffers aren't modified.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2223 In merge jobs, buffer C is never deleted.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2224 However, the side effect of cleaning up may be that you cannot compare the same
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2225 buffer in two separate Ediff sessions: quitting one of them will delete this
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2226 buffer in another session as well."
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2227 (or (not (ediff-buffer-live-p ediff-buffer-A))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2228 (buffer-modified-p ediff-buffer-A)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2229 (and ask
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2230 (not (y-or-n-p (format "Kill buffer A [%s]? "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2231 (buffer-name ediff-buffer-A)))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2232 (ediff-kill-buffer-carefully ediff-buffer-A))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2233 (or (not (ediff-buffer-live-p ediff-buffer-B))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2234 (buffer-modified-p ediff-buffer-B)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2235 (and ask
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2236 (not (y-or-n-p (format "Kill buffer B [%s]? "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2237 (buffer-name ediff-buffer-B)))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2238 (ediff-kill-buffer-carefully ediff-buffer-B))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2239 (if ediff-merge-job ; don't del buf C if merging--del ancestor buf instead
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2240 (or (not (ediff-buffer-live-p ediff-ancestor-buffer))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2241 (buffer-modified-p ediff-ancestor-buffer)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2242 (and ask
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2243 (not (y-or-n-p (format "Kill the ancestor buffer [%s]? "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2244 (buffer-name ediff-ancestor-buffer)))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2245 (ediff-kill-buffer-carefully ediff-ancestor-buffer))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2246 (or (not (ediff-buffer-live-p ediff-buffer-C))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2247 (buffer-modified-p ediff-buffer-C)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2248 (and ask (not (y-or-n-p (format "Kill buffer C [%s]? "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2249 (buffer-name ediff-buffer-C)))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2250 (ediff-kill-buffer-carefully ediff-buffer-C))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2251
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2252 ;; The default way of suspending Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2253 ;; 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
2254 (defun ediff-default-suspend-function ()
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2255 (let* ((buf-A ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2256 (buf-B ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2257 (buf-C ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2258 (buf-A-wind (ediff-get-visible-buffer-window buf-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2259 (buf-B-wind (ediff-get-visible-buffer-window buf-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2260 (buf-C-wind (ediff-get-visible-buffer-window buf-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2261 (buf-patch ediff-patch-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2262 (buf-patch-diag ediff-patch-diagnostics)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2263 (buf-err ediff-error-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2264 (buf-diff ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2265 (buf-custom-diff ediff-custom-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2266 (buf-fine-diff ediff-fine-diff-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2267
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2268 ;; hide the control panel
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2269 (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
2270 (iconify-frame ediff-control-frame)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2271 (bury-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2272 (if buf-err (bury-buffer buf-err))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2273 (if buf-diff (bury-buffer buf-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2274 (if buf-custom-diff (bury-buffer buf-custom-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2275 (if buf-fine-diff (bury-buffer buf-fine-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2276 (if buf-patch (bury-buffer buf-patch))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2277 (if buf-patch-diag (bury-buffer buf-patch-diag))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2278 (if (window-live-p buf-A-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2279 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2280 (select-window buf-A-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2281 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2282 (bury-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2283 (if (ediff-buffer-live-p buf-A) (bury-buffer buf-A)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2284 (if (window-live-p buf-B-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2285 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2286 (select-window buf-B-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2287 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2288 (bury-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2289 (if (ediff-buffer-live-p buf-B) (bury-buffer buf-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2290 (if (window-live-p buf-C-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2291 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2292 (select-window buf-C-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2293 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2294 (bury-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2295 (if (ediff-buffer-live-p buf-C) (bury-buffer buf-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2296
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2297 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2298
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2299
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2300 (defun ediff-suspend ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2301 "Suspend Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2302 To resume, switch to the appropriate `Ediff Control Panel'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2303 buffer and then type \\[ediff-recenter]. Ediff will automatically set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2304 up an appropriate window config."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2305 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2306 (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
2307 (run-hooks 'ediff-suspend-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2308 (message
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2309 "To resume, type M-x eregistry and select the desired Ediff session"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2310
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2311
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2312 (defun ediff-status-info ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2313 "Show the names of the buffers or files being operated on by Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2314 Hit \\[ediff-recenter] to reset the windows afterward."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2315 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2316 (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
2317 (save-excursion
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2318 (ediff-skip-unsuitable-frames))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2319 (with-output-to-temp-buffer " *ediff-info*"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2320 (princ (ediff-version))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2321 (princ "\n\n")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2322 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2323 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2324 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2325 (format "File A = %S\n" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2326 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2327 (format "Buffer A = %S\n" (buffer-name)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2328 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2329 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2330 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2331 (format "File B = %S\n" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2332 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2333 (format "Buffer B = %S\n" (buffer-name)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2334 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2335 (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2336 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2337 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2338 (format "File C = %S\n" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2339 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2340 (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
2341 (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
2342 (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
2343 (concat "\tin buffer "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2344 (buffer-name ediff-custom-diff-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2345 "is not available")))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2346 (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
2347 (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
2348 (concat "\tin buffer "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2349 (buffer-name ediff-diff-buffer))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2350 "is not available")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2351
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2352 (let* ((A-line (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2353 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2354 (B-line (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2355 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2356 C-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2357 (princ (format "\Buffer A's point is on line %d\n" A-line))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2358 (princ (format "Buffer B's point is on line %d\n" B-line))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2359 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2360 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2361 (setq C-line (ediff-eval-in-buffer ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2362 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2363 (princ (format "Buffer C's point is on line %d\n" C-line)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2364
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2365 (princ (format "\nCurrent difference number = %S\n"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2366 (cond ((< ediff-current-difference 0) 'start)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2367 ((>= ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2368 ediff-number-of-differences) 'end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2369 (t (1+ ediff-current-difference)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2370
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2371 (princ
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2372 (format "\n%s regions that differ only in white space & line breaks"
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2373 (if ediff-ignore-similar-regions
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2374 "Skipping" "Not skipping")))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2375 (if (and ediff-merge-job ediff-show-clashes-only)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2376 (princ
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2377 "\nFocusing on regions where both buffers differ from the ancestor"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2378
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2379 (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
2380 (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
2381 ((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
2382 ediff-hide-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2383 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2384 "\nIgnoring regions that match")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2385 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2386 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2387 "\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
2388 ediff-regexp-hide-A ediff-hide-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2389 ediff-regexp-hide-B)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2390 ((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
2391 ediff-focus-on-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2392 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2393 "\nFocusing on regions that match")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2394 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2395 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2396 "\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
2397 ediff-regexp-focus-A ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2398 ediff-regexp-focus-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2399 (t (princ "\nSelective browsing via a user-defined method.\n")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2400
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2401 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2402 (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2403 (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
2404 ) ; with output
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2405 (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
2406 (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
2407 (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
2408 (select-window ediff-control-window)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2409
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2410
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2411
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2412
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2413 ;;; Support routines
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2414
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2415 ;; Select a difference by placing the ASCII flags around the appropriate
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2416 ;; group of lines in the A, B buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2417 ;; 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
2418 (defun ediff-select-difference (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2419 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2420 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2421 (ediff-valid-difference-p n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2422 (progn
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2423 (if (and (ediff-has-face-support-p) ediff-use-faces)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2424 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2425 (ediff-highlight-diff n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2426 (setq ediff-highlighting-style 'face))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2427 (setq ediff-highlighting-style 'ascii)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2428 (ediff-place-flags-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2429 'A ediff-buffer-A ediff-control-buffer n)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2430 (ediff-place-flags-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2431 'B ediff-buffer-B ediff-control-buffer n)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2432 (if ediff-3way-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2433 (ediff-place-flags-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2434 'C ediff-buffer-C ediff-control-buffer n))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2435 (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
2436 (ediff-place-flags-in-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2437 'Ancestor ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2438 ediff-control-buffer n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2439 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2440
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2441 (ediff-install-fine-diff-if-necessary n)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2442 (run-hooks 'ediff-select-hook))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2443
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2444
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2445 ;; Unselect a difference by removing the ASCII flags in the buffers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2446 ;; 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
2447 (defun ediff-unselect-difference (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2448 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2449 (progn
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2450 (cond ((and (ediff-has-face-support-p) ediff-use-faces)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2451 (ediff-unhighlight-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2452 ((eq ediff-highlighting-style 'ascii)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2453 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2454 ediff-buffer-A
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2455 (ediff-get-diff-overlay n 'A))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2456 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2457 ediff-buffer-B
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2458 (ediff-get-diff-overlay n 'B))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2459 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2460 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2461 ediff-buffer-C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2462 (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
2463 (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
2464 (ediff-remove-flags-from-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2465 ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2466 (ediff-get-diff-overlay n 'Ancestor)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2467 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2468 (setq ediff-highlighting-style nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2469
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2470 ;; unhighlight fine diffs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2471 (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
2472 (run-hooks 'ediff-unselect-hook))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2473
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2474
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2475 ;; 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
2476 ;; 'select-only or 'unselect-only. If FLAG is 'select-only, the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2477 ;; next difference is selected, but the current selection is not
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2478 ;; unselected. If FLAG is 'unselect-only then the current selection is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2479 ;; 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
2480 ;; don't recenter buffers after selecting/unselecting.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2481 (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
2482 (let ((ediff-current-difference n))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2483 (or no-recenter
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2484 (ediff-recenter 'no-rehighlight)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2485
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2486 (let ((control-buf ediff-control-buffer))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2487 (unwind-protect
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2488 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2489 (or (eq flag 'select-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2490 (ediff-unselect-difference ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2491
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2492 (or (eq flag 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2493 (ediff-select-difference n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2494 (setq ediff-current-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2495 ) ; end protected section
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2496
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2497 (ediff-eval-in-buffer control-buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2498 (ediff-refresh-mode-lines))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2499 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2500
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2501
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2502 (defun ediff-read-file-name (prompt default-dir default-file)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2503 ; This is a modified version of a similar function in `emerge.el'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2504 ; PROMPT should not have trailing ': ', so that it can be modified
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2505 ; according to context.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2506 ; If default-file is set, it should be used as the default value.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2507 ; If default-dir is non-nil, use it as the default directory.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2508 ; Otherwise, use the value of Emacs' variable `default-directory.'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2509
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2510 ;; hack default-dir if it is not set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2511 (setq default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2512 (file-name-as-directory
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2513 (ediff-abbreviate-file-name
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2514 (expand-file-name (or default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2515 (and default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2516 (file-name-directory default-file))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2517 default-directory)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2518
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2519 ;; strip the directory from default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2520 (if default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2521 (setq default-file (file-name-nondirectory default-file)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2522 (if (string= default-file "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2523 (setq default-file nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2524
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2525 (let (f)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2526 (setq f (expand-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2527 (read-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2528 (format "%s%s: "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2529 prompt
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2530 (if default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2531 (concat " (default " default-file ")")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2532 ""))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2533 default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2534 default-file
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2535 t ; must match, no-confirm
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2536 (if default-file (file-name-directory default-file))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2537 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2538 default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2539 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2540 ;; If user enters a directory name, expand the default file in that
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2541 ;; directory. This allows the user to enter a directory name for the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2542 ;; B-file and diff against the default-file in that directory instead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2543 ;; of a DIRED listing!
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2544 (if (and (file-directory-p f) default-file)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2545 (setq f (expand-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2546 (file-name-nondirectory default-file) f)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2547 f))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2548
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2549 ;; If PREFIX is given, then it is used as a prefix for the temp file
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2550 ;; name. Otherwise, `ediff_' is used. If FILE is given, use this
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2551 ;; file and don't create a new one.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2552 ;; On MS-DOS, make sure the prefix isn't longer than 7 characters, or
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2553 ;; else `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
2554 ;; 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
2555 ;; 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
2556 (defun ediff-make-temp-file (buff &optional prefix given-file start end)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2557 (let ((p (or prefix "ediff"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2558 f)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2559 (if (and (eq system-type 'ms-dos) (> (length p) 7))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2560 (setq p (substring p 0 7)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2561
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2562 (setq f (concat ediff-temp-file-prefix p)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2563 f (cond (given-file)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2564 ((find-file-name-handler f 'find-file-noselect)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2565 ;; 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
2566 ;; name ends with .Z or .gz
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2567 ;; This is needed so that patches produced by ediff will
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2568 ;; have more meaningful names
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2569 (make-temp-name f))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2570 ;; Prefix is most often the same as the file name for the
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2571 ;; variant. Here we are trying to use the original file name
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2572 ;; but in the temp directory.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2573 ((and prefix (not (file-exists-p f))) f)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2574 ;; If a file with the orig name exists, add some random stuff
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2575 ;; to it.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2576 (t (make-temp-name f))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2577
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2578 ;; create the file
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2579 (ediff-eval-in-buffer buff
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2580 (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
2581 (if end end (point-max))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2582 f
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2583 nil ; don't append---erase
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2584 'no-message)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2585 (set-file-modes f ediff-temp-file-mode)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2586 f)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2587
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2588 ;; Quote metacharacters (using \) when executing diff in Unix, but not in
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2589 ;; EMX OS/2
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2590 ;;(defun ediff-protect-metachars (str)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2591 ;; (or (memq system-type '(emx vax-vms axp-vms))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2592 ;; (let ((limit 0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2593 ;; (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
2594 ;; (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
2595 ;; "\\"
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2596 ;; (substring str (match-beginning 0))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2597 ;; (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
2598 ;; str)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2599
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2600 ;; 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
2601 ;; file on disk, and attempt to remedy the situation if not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2602 ;; 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
2603 ;; to do what is necessary to make them the same.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2604 ;; If file has file handlers (indicated by the optional arg), then we
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2605 ;; offer to revert instead of saving. This is one difference with Emerge.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2606 ;; Another is that we always offer to revert obsolete files, whether they
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2607 ;; are modified or not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2608 (defun ediff-verify-file-buffer (&optional file-magic)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2609 ;; First check if the file has been modified since the buffer visited it.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2610 (if (verify-visited-file-modtime (current-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2611 (if (buffer-modified-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2612 ;; If buffer is not obsolete and is modified, offer to save
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2613 (if (yes-or-no-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2614 (format "Buffer out of sync with visited file. %s file %s? "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2615 (if file-magic "Revert" "Save")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2616 buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2617 (if (not file-magic)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2618 (save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2619 ;; for some reason, file-name-handlers append instead of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2620 ;; replacing, so we have to erase first.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2621 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2622 (revert-buffer t t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2623 (error "Buffer out of sync for file %s" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2624 ;; If buffer is not obsolete and is not modified, do nothing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2625 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2626 ;; If buffer is obsolete, offer to revert
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2627 (if (yes-or-no-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2628 (format "Buffer out of sync with visited file. Revert file %s? "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2629 buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2630 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2631 (if file-magic
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2632 (erase-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2633 (revert-buffer t t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2634 (error "Buffer out of sync for file %s" buffer-file-name))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2635
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2636
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2637 (defun ediff-save-buffer (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2638 "Safe way of saving buffers A, B, C, and the diff output.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2639 `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
2640 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
2641
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2642 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
2643 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
2644 \(and plain output, if customized output was not generated\)."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2645 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2646 (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
2647 (ediff-compute-custom-diffs-maybe)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2648 (ediff-eval-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2649 (cond ((memq last-command-char '(?a ?b ?c))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2650 (ediff-get-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2651 (ediff-char-to-buftype last-command-char)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2652 ((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
2653 (message "Saving diff output ...")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2654 (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
2655 (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
2656 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2657 ((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
2658 ediff-custom-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2659 ((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
2660 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2661 (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
2662 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2663 (save-buffer)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2664
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2665 (defun ediff-compute-custom-diffs-maybe ()
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2666 (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
2667 (buf-B-file-name (buffer-file-name ediff-buffer-B))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2668 file-A file-B)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2669 (if (stringp buf-A-file-name)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2670 (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2671 (if (stringp buf-B-file-name)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2672 (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2673 (setq file-A (ediff-make-temp-file ediff-buffer-A buf-A-file-name)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2674 file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2675
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2676 (or (ediff-buffer-live-p ediff-custom-diff-buffer)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2677 (setq ediff-custom-diff-buffer
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2678 (get-buffer-create
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2679 (ediff-unique-buffer-name "*ediff-custom-diff" "*"))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2680 (ediff-exec-process
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2681 ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2682 ediff-custom-diff-options file-A file-B)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2683 (delete-file file-A)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2684 (delete-file file-B)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2685 ))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2686
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2687 (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
2688 (interactive "P")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2689 (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
2690 (ediff-compute-custom-diffs-maybe)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2691 (save-excursion
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2692 (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
2693 (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
2694 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2695 ((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
2696 ediff-custom-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2697 ((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
2698 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2699 (t
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2700 (beep)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2701 (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
2702 nil))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2703 (if buf
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2704 (progn
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2705 (ediff-eval-in-buffer buf
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2706 (goto-char (point-min)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2707 (switch-to-buffer buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2708 (raise-frame (selected-frame)))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2709 (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
2710 (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
2711 (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
2712 (select-window ediff-control-window)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2713
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2714
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2715
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2716 ;; will simplify it in due time, when emacs acquires before/after strings
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2717 (defun ediff-remove-flags-from-buffer (buffer overlay)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2718 (ediff-eval-in-buffer buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2719 (let ((inhibit-read-only t))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2720 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2721 (ediff-overlay-put overlay 'begin-glyph nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2722 ;; before-string is not yet implemented in emacs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2723 ;; when it will be, I will be able to delete much of the rest of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2724 ;; this function
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2725 (ediff-overlay-put overlay 'before-string nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2726
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2727 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2728 (ediff-overlay-put overlay 'end-glyph nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2729 ;; after-string is not yet implemented in emacs.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2730 (ediff-overlay-put overlay 'after-string nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2731 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2732
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2733
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2734
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2735 ;; will simplify it in due time, when emacs acquires before/after strings
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2736 (defun ediff-place-flags-in-buffer (buf-type buffer ctl-buffer diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2737 (ediff-eval-in-buffer buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2738 (ediff-place-flags-in-buffer1 buf-type ctl-buffer diff)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2739
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2740
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2741 (defun ediff-place-flags-in-buffer1 (buf-type ctl-buffer diff-no)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2742 (let* ((curr-overl (ediff-eval-in-buffer ctl-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2743 (ediff-get-diff-overlay diff-no buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2744 (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
2745 after beg-of-line flag)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2746
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2747 ;; insert flag before the difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2748 (goto-char before)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2749 (setq beg-of-line (bolp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2750
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2751 (setq flag (ediff-eval-in-buffer ctl-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2752 (if (eq ediff-highlighting-style 'ascii)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2753 (if beg-of-line
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2754 ediff-before-flag-bol ediff-before-flag-mol))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2755
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2756 ;; insert the flag itself
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2757 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2758 (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
2759 (ediff-overlay-put curr-overl 'before-string flag))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2760
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2761 ;; insert the flag after the difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2762 ;; `after' must be set here, after the before-flag was inserted
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2763 (setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2764 (goto-char after)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2765 (setq beg-of-line (bolp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2766
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2767 (setq flag (ediff-eval-in-buffer ctl-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2768 (if (eq ediff-highlighting-style 'ascii)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2769 (if beg-of-line
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2770 ediff-after-flag-eol ediff-after-flag-mol))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2771
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2772 ;; insert the flag itself
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2773 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2774 (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
2775 (ediff-overlay-put curr-overl 'after-string flag))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2776 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2777
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2778
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2779 (defun ediff-get-diff-posn (buf-type pos &optional n control-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2780 "Returns positions of difference sectors in the BUF-TYPE buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2781 BUF-TYPE should be a symbol--either `A' or `B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2782 POS is either `beg' or `end'--it specifies whether you want the position at the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2783 beginning of a difference or at the end.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2784
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2785 The optional argument N says which difference \(default:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2786 `ediff-current-difference'\). The optional argument CONTROL-BUF says
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2787 which control buffer is in effect in case it is not the current
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2788 buffer."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2789 (let (diff-overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2790 (or control-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2791 (setq control-buf (current-buffer)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2792
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2793 (ediff-eval-in-buffer control-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2794 (or n (setq n ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2795 (if (or (< n 0) (>= n ediff-number-of-differences))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2796 (if (> ediff-number-of-differences 0)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2797 (error "Bad difference number, %d. Valid numbers are 1 to %d"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2798 (1+ n) ediff-number-of-differences)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2799 (error ediff-NO-DIFFERENCES)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2800 (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
2801 (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
2802 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2803 (if (eq pos 'beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2804 (ediff-overlay-start diff-overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2805 (ediff-overlay-end diff-overlay))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2806 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2807
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2808
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2809
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2810 (defun ediff-highlight-diff-in-one-buffer (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2811 (if (ediff-buffer-live-p (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2812 (let* ((buff (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2813 (last (ediff-eval-in-buffer buff (point-max)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2814 (begin (ediff-get-diff-posn buf-type 'beg n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2815 (end (ediff-get-diff-posn buf-type 'end n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2816 (xtra (if (equal begin end) 1 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2817 (end-hilit (min last (+ end xtra)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2818 (current-diff-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2819 (symbol-value
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2820 (intern (format "ediff-current-diff-overlay-%S" buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2821 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2822
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2823 (if ediff-xemacs-p
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2824 (ediff-move-overlay current-diff-overlay begin end-hilit)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2825 (ediff-move-overlay current-diff-overlay begin end-hilit buff))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2826 ;; giving priority of 0 and then changing it may look funny, but
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2827 ;; this overcomes an obscure Emacs bug.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2828 (ediff-overlay-put current-diff-overlay 'priority 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2829 (ediff-overlay-put current-diff-overlay 'priority
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2830 (ediff-highest-priority begin end-hilit buff))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2831 (ediff-overlay-put current-diff-overlay 'ediff-diff-num n)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2832
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2833 ;; unhighlight the background overlay for diff n so it won't
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2834 ;; interfere with the current diff overlay
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2835 (ediff-set-overlay-face (ediff-get-diff-overlay n buf-type) nil)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2836 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2837
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2838
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2839 (defun ediff-unhighlight-diff-in-one-buffer (buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2840 (if (ediff-buffer-live-p (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2841 (let ((current-diff-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2842 (symbol-value
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2843 (intern (format "ediff-current-diff-overlay-%S" buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2844 (overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2845 (ediff-get-diff-overlay ediff-current-difference buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2846 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2847
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2848 (ediff-move-overlay current-diff-overlay 1 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2849
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2850 ;; rehighlight the overlay in the background of the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2851 ;; current difference region
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2852 (ediff-set-overlay-face
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2853 overlay
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2854 (if (and (ediff-has-face-support-p)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2855 ediff-use-faces ediff-highlight-all-diffs)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2856 (ediff-background-face buf-type ediff-current-difference)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2857 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2858
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2859 (defun ediff-unhighlight-diffs-totally-in-one-buffer (buf-type)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2860 (ediff-unselect-and-select-difference -1)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2861 (if (and (ediff-has-face-support-p) ediff-use-faces)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2862 (let* ((inhibit-quit t)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2863 (current-diff-overlay-var
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2864 (intern (format "ediff-current-diff-overlay-%S" buf-type)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2865 (current-diff-overlay (symbol-value current-diff-overlay-var)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2866 (ediff-color-background-regions 'unhighlight)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2867 (if (ediff-overlayp current-diff-overlay)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2868 (ediff-delete-overlay current-diff-overlay))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2869 (set current-diff-overlay-var nil)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2870 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2871
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2872
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2873 ;; null out difference overlays so they won't slow down future
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2874 ;; editing operations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2875 ;; VEC is either a difference vector or a fine-diff vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2876 (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2877 (if (vectorp (symbol-value vec-var))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2878 (mapcar (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2879 (lambda (elt)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2880 (ediff-delete-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2881 (ediff-get-diff-overlay-from-diff-record elt))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2882 (if fine-diffs-also
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2883 (ediff-clear-fine-diff-vector elt))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2884 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2885 (symbol-value vec-var)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2886 ;; allow them to be garbage collected
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2887 (set vec-var nil))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2888
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2889 (defun ediff-color-background-regions (&optional unhighlight)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2890 (ediff-color-background-regions-in-one-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2891 'A unhighlight)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2892 (ediff-color-background-regions-in-one-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2893 'B unhighlight)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2894 (ediff-color-background-regions-in-one-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2895 'C unhighlight)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2896 (ediff-color-background-regions-in-one-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2897 'Ancestor unhighlight))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2898
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2899 (defun ediff-color-background-regions-in-one-buffer (buf-type unhighlight)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2900 (let ((diff-vector
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2901 (eval (intern (format "ediff-difference-vector-%S" buf-type))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2902 overl diff-num)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2903 (mapcar (function
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2904 (lambda (rec)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2905 (setq overl (ediff-get-diff-overlay-from-diff-record rec)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2906 diff-num (ediff-overlay-get overl 'ediff-diff-num))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2907 (ediff-set-overlay-face
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2908 overl
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2909 (if (not unhighlight)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2910 (ediff-background-face buf-type diff-num))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2911 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2912 diff-vector)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2913
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2914
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2915 ;;; Misc
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2916
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2917 ;; These two functions are here to neutralize XEmacs unwillingless to
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2918 ;; handle overlays whose buffers were deleted.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2919 (defun ediff-move-overlay (overlay beg end &optional buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2920 "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2921 Checks if overlay's buffer exists before actually doing the move."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2922 (let ((buf (and overlay (ediff-overlay-buffer overlay))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2923 (if (ediff-buffer-live-p buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2924 (if ediff-xemacs-p
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2925 (set-extent-endpoints overlay beg end)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2926 (move-overlay overlay beg end buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2927 ;; buffer's dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2928 (if overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2929 (ediff-delete-overlay overlay)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2930
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2931 (defun ediff-overlay-put (overlay prop value)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2932 "Calls `overlay-put' or `set-extent-property' depending on Emacs version.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2933 Checks if overlay's buffer exists."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2934 (if (ediff-buffer-live-p (ediff-overlay-buffer overlay))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2935 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2936 (set-extent-property overlay prop value)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2937 (overlay-put overlay prop value))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2938 (ediff-delete-overlay overlay)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2939
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2940
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2941 ;; In Emacs, this just makes overlay. In the future, when Emacs will start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2942 ;; supporting sticky overlays, this function will make a sticky overlay.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2943 ;; BEG and END are expressions telling where overlay starts.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2944 ;; If they are numbers or buffers, then all is well. Otherwise, they must
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2945 ;; 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
2946 ;; bounds.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2947 ;; If BUFF is not a live buffer, then return nil; otherwise, return the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2948 ;; newly created overlay.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2949 (defun ediff-make-bullet-proof-overlay (beg end buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2950 (if (ediff-buffer-live-p buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2951 (let (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2952 (ediff-eval-in-buffer buff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2953 (or (number-or-marker-p beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2954 (setq beg (eval beg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2955 (or (number-or-marker-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2956 (setq end (eval end)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2957 (setq overl
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2958 (if ediff-xemacs-p
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2959 (make-extent beg end buff)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2960 ;; don't advance front, but advance rear
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2961 (make-overlay beg end buff nil 'rear-advance)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2962
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2963 (if ediff-emacs-p
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2964 (ediff-overlay-put overl 'evaporate nil) ; don't detach
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2965 (ediff-overlay-put overl 'detachable nil) ; don't detach
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2966 ;; don't advance front, but advance rear
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2967 (ediff-overlay-put overl 'start-open nil)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2968 (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
2969
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2970 (ediff-overlay-put overl 'ediff-diff-num 0)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2971 overl))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2972
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2973 (defsubst ediff-overlay-start (overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2974 (if (ediff-overlayp overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2975 (if ediff-emacs-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2976 (overlay-start overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2977 (extent-start-position overl))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2978
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2979 (defsubst ediff-overlay-end (overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2980 (if (ediff-overlayp overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2981 (if ediff-emacs-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2982 (overlay-end overl)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2983 (extent-end-position overl))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2984
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2985
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2986 ;; Like other-buffer, but prefers visible buffers and ignores temporary or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2987 ;; other insignificant buffers (those beginning with "^[ *]").
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2988 ;; 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
2989 ;; these buffers).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2990 (defun ediff-other-buffer (buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2991 (if (not (listp buff)) (setq buff (list buff)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2992 (let* ((frame-buffers (buffer-list))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2993 (significant-buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2994 (mapcar
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2995 (function (lambda (x)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2996 (cond ((member (buffer-name x) buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2997 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2998 ((not (ediff-get-visible-buffer-window x))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2999 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3000 ((string-match "^ " (buffer-name x))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3001 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3002 (t x))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3003 frame-buffers))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3004 (buffers (delq nil significant-buffers))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3005 less-significant-buffers)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3006
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3007 (cond (buffers (car buffers))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3008 ;; try also buffers that are not displayed in windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3009 ((setq less-significant-buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3010 (delq nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3011 (mapcar
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3012 (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3013 (lambda (x)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3014 (cond ((member (buffer-name x) buff) nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3015 ((string-match "^[ *]" (buffer-name x)) nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3016 (t x))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3017 frame-buffers)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3018 (car less-significant-buffers))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3019 (t (other-buffer (current-buffer))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3020 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3021
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3022
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3023 ;; Construct a unique buffer name.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3024 ;; The first one tried is prefixsuffix, then prefix<2>suffix,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3025 ;; prefix<3>suffix, etc.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3026 (defun ediff-unique-buffer-name (prefix suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3027 (if (null (get-buffer (concat prefix suffix)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3028 (concat prefix suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3029 (let ((n 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3030 (while (get-buffer (format "%s<%d>%s" prefix n suffix))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3031 (setq n (1+ n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3032 (format "%s<%d>%s" prefix n suffix))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3033
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3034
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3035 ;; splits at a white space, returns a list
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3036 (defun ediff-split-string (string)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3037 (let ((start 0)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3038 (result '())
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3039 substr)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3040 (while (string-match "[ \t]+" string start)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3041 (let ((match (string-match "[ \t]+" string start)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3042 (setq substr (substring string start match))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3043 (if (> (length substr) 0)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3044 (setq result (cons substr result)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3045 (setq start (match-end 0))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3046 (setq substr (substring string start nil))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3047 (if (> (length substr) 0)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3048 (setq result (cons substr result)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3049 (nreverse result)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3050
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3051 (defun ediff-submit-report ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3052 "Submit bug report on Ediff."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3053 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3054 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3055 (let ((reporter-prompt-for-summary-p t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3056 (ctl-buf ediff-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3057 (ediff-device-type (ediff-device-type))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3058 varlist salutation buffer-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3059 (setq varlist '(ediff-diff-program ediff-diff-options
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3060 ediff-patch-program ediff-patch-options
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3061 ediff-shell
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3062 ediff-use-faces
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3063 ediff-auto-refine ediff-highlighting-style
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3064 ediff-buffer-A ediff-buffer-B ediff-control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3065 ediff-forward-word-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3066 ediff-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3067 ediff-control-frame-parameters
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3068 ediff-control-frame-position-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3069 ediff-prefer-iconified-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3070 ediff-window-setup-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3071 ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3072 ediff-job-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3073 ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3074 buffer-name
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3075 ediff-device-type
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3076 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3077 (setq salutation "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3078 Congratulations! You may have unearthed a bug in Ediff!
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3079
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3080 Please make a concise and accurate summary of what happened
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3081 and mail it to the address above.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3082 -----------------------------------------------------------
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3083 ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3084
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3085 (ediff-skip-unsuitable-frames)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3086 (ediff-reset-mouse)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3087
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3088 (switch-to-buffer ediff-msg-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3089 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3090 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3091 (insert "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3092 Please read this first:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3093 ----------------------
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3094
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3095 Some ``bugs'' may actually be no bugs at all. For instance, if you are
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3096 reporting that certain difference regions are not matched as you think they
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3097 should, this is most likely due to the way Unix diff program decides what
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3098 constitutes a difference region. Ediff is an Emacs interface to diff, and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3099 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
3100 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
3101 manipulation.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3102
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3103 If Emacs happens to dump core, this is NOT an Ediff problem---it is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3104 an Emacs bug. Report this to Emacs maintainers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3105
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3106 Another popular topic for reports is compilation messages. Because Ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3107 interfaces to several other packages and runs under Emacs and XEmacs,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3108 byte-compilation may produce output like this:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3109
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3110 While compiling toplevel forms in file ediff.el:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3111 ** reference to free variable pm-color-alist
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3112 ........................
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3113 While compiling the end of the data:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3114 ** 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
3115 ediff-valid-color-p, ediff-set-face,
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3116 ........................
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3117
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3118 These are NOT errors, but inevitable warnings, which ought to be ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3119
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3120 Please do not report those and similar things. However, comments and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3121 suggestions are always welcome.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3122
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3123 Mail anyway? (y or n) ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3124
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3125 (if (y-or-n-p "Mail anyway? ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3126 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3127 (if (ediff-buffer-live-p ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3128 (set-buffer ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3129 (setq buffer-name (buffer-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3130 (require 'reporter)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3131 (reporter-submit-bug-report "kifer@cs.sunysb.edu"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3132 (ediff-version)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3133 varlist
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3134 nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3135 'delete-other-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3136 salutation))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3137 (bury-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3138 (beep 1)(message "Bug report aborted")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3139 (if (ediff-buffer-live-p ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3140 (ediff-eval-in-buffer ctl-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3141 (ediff-recenter 'no-rehighlight))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3142 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3143
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3144
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3145 (defun ediff-deactivate-mark ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3146 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3147 (zmacs-deactivate-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3148 (deactivate-mark)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3149
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3150 (cond ((fboundp 'nuke-selective-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3151 ;; XEmacs 19.12 has nuke-selective-display
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3152 (fset 'ediff-nuke-selective-display 'nuke-selective-display))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3153 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3154 (defun ediff-nuke-selective-display ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3155 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3156 (save-restriction
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3157 (widen)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3158 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3159 (let ((mod-p (buffer-modified-p))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3160 buffer-read-only end)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3161 (and (eq t selective-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3162 (while (search-forward "\^M" nil t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3163 (end-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3164 (setq end (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3165 (beginning-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3166 (while (search-forward "\^M" end t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3167 (delete-char -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3168 (insert "\^J"))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3169 (set-buffer-modified-p mod-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3170 (setq selective-display nil)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3171 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3172
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3173
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3174 ;; The next two are modified versions from emerge.el.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3175 ;; VARS must be a list of symbols
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3176 ;; 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
3177 (defsubst ediff-save-variables (vars)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3178 (mapcar (function (lambda (v) (cons v (symbol-value v))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3179 vars))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3180 ;; VARS is a list of variable symbols.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3181 (defun ediff-restore-variables (vars assoc-list)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3182 (while vars
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3183 (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
3184 (setq vars (cdr vars))))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3185
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3186 (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
3187 (let* ((assoc-list
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3188 (symbol-value (intern
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3189 (concat "ediff-buffer-values-orig-"
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3190 (symbol-name buf-type)))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3191 (assoc-elt (assoc var assoc-list)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3192 (if assoc-elt
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3193 (setcdr assoc-elt value))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3194
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3195
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3196 ;; must execute in control buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3197 (defun ediff-save-protected-variables ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3198 (setq ediff-buffer-values-orig-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3199 (ediff-eval-in-buffer ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3200 (ediff-save-variables ediff-protected-variables)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3201 (setq ediff-buffer-values-orig-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3202 (ediff-eval-in-buffer ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3203 (ediff-save-variables ediff-protected-variables)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3204 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3205 (setq ediff-buffer-values-orig-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3206 (ediff-eval-in-buffer ediff-buffer-C
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3207 (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
3208 (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
3209 (setq ediff-buffer-values-orig-Ancestor
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3210 (ediff-eval-in-buffer ediff-ancestor-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3211 (ediff-save-variables ediff-protected-variables)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3212
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3213 ;; must execute in control buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3214 (defun ediff-restore-protected-variables ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3215 (let ((values-A ediff-buffer-values-orig-A)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3216 (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
3217 (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
3218 (values-Ancestor ediff-buffer-values-orig-Ancestor))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3219 (ediff-eval-in-buffer ediff-buffer-A
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3220 (ediff-restore-variables ediff-protected-variables values-A))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3221 (ediff-eval-in-buffer ediff-buffer-B
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3222 (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
3223 (if ediff-3way-comparison-job
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3224 (ediff-eval-in-buffer ediff-buffer-C
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3225 (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
3226 (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
3227 (ediff-eval-in-buffer ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3228 (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
3229 ))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3230
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3231 ;; save BUFFER in FILE. used in hooks.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3232 (defun ediff-save-buffer-in-file (buffer file)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3233 (ediff-eval-in-buffer buffer
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3234 (write-file file)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3235
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3236
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3237 ;;; Debug
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3238
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3239 (ediff-defvar-local ediff-command-begin-time '(0 0 0) "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3240
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3241 ;; calculate time used by command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3242 (defun ediff-calc-command-time ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3243 (let ((end (current-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3244 micro sec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3245 (setq micro
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3246 (if (>= (nth 2 end) (nth 2 ediff-command-begin-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3247 (- (nth 2 end) (nth 2 ediff-command-begin-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3248 (+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3249 (setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3250 (or (equal ediff-command-begin-time '(0 0 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3251 (message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3252
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3253 (defsubst ediff-save-time ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3254 (setq ediff-command-begin-time (current-time)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3255
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3256 (defun ediff-profile ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3257 "Toggle profiling Ediff commands."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3258 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3259 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3260 (make-local-hook 'post-command-hook)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3261 (let ((pre-hook 'pre-command-hook)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3262 (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
3263 (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
3264 (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
3265 (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
3266 (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
3267 (message "Ediff profiling disabled"))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3268 (add-hook pre-hook 'ediff-save-time t)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3269 (add-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
3270 (message "Ediff profiling enabled"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3271
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3272 (defun ediff-print-diff-vector (diff-vector-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3273 (princ (format "\n*** %S ***\n" diff-vector-var))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3274 (mapcar (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3275 (lambda (overl-vec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3276 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3277 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3278 "Diff %d: \tOverlay: %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3279 \t\tFine diffs: %s
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3280 \t\tNo-fine-diff-flag: %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3281 \t\tState-of-diff:\t %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3282 \t\tState-of-merge:\t %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3283 "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3284 (1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3285 (aref overl-vec 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3286 ;; fine-diff-vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3287 (if (= (length (aref overl-vec 1)) 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3288 "none\n"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3289 (mapconcat 'prin1-to-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3290 (aref overl-vec 1) "\n\t\t\t "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3291 (aref overl-vec 2) ; no fine diff flag
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3292 (aref overl-vec 3) ; state-of-diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3293 (aref overl-vec 4) ; state-of-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3294 ))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3295 (eval diff-vector-var)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3296
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3297
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3298
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3299 (defun ediff-debug-info ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3300 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3301 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3302 (with-output-to-temp-buffer ediff-debug-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3303 (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
3304 (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
3305 (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
3306 (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
3307 (ediff-print-diff-vector (intern "ediff-difference-vector-Ancestor"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3308 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3309
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3310
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3311 ;;; General utilities
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3312
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3313 ;; this uses comparison-func to decide who is a member
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3314 (defun ediff-member (elt lis comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3315 (while (and lis (not (funcall comparison-func (car lis) elt)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3316 (setq lis (cdr lis)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3317 lis)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3318
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3319 ;; 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
3320 ;; intersection looks like
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3321 (defun ediff-intersection (lis1 lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3322 (let ((result (list 'a)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3323 (while lis1
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3324 (if (ediff-member (car lis1) lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3325 (nconc result (list (car lis1))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3326 (setq lis1 (cdr lis1)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3327 (cdr result)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3328
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3329
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3330 ;; eliminates duplicates using comparison-func
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3331 (defun ediff-union (lis1 lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3332 (let ((result (list 'a)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3333 (while lis1
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3334 (or (ediff-member (car lis1) (cdr result) comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3335 (nconc result (list (car lis1))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3336 (setq lis1 (cdr lis1)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3337 (while lis2
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3338 (or (ediff-member (car lis2) (cdr result) comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3339 (nconc result (list (car lis2))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3340 (setq lis2 (cdr lis2)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3341 (cdr result)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3342
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3343 ;; eliminates duplicates using comparison-func
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3344 (defun ediff-set-difference (lis1 lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3345 (let ((result (list 'a)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3346 (while lis1
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3347 (or (ediff-member (car lis1) (cdr result) comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3348 (ediff-member (car lis1) lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3349 (nconc result (list (car lis1))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3350 (setq lis1 (cdr lis1)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3351 (cdr result)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3352
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3353 (defun ediff-copy-list (list)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3354 (if (consp list)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3355 ;;;(let ((res nil))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3356 ;;; (while (consp list) (push (pop list) res))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3357 ;;; (prog1 (nreverse res) (setcdr res list)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3358 (let (res elt)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3359 (while (consp list)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3360 (setq elt (car list)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3361 res (cons elt res)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3362 list (cdr list)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3363 (nreverse res))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3364 (car list)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3365
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3366
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3367 ;; don't report error if version control package wasn't found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3368 ;;(ediff-load-version-control 'silent)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3369
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3370 (run-hooks 'ediff-load-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3371
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3372
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3373 ;;; Local Variables:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3374 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3375 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3376 ;;; End:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3377
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3378 (provide 'ediff-util)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3379
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3380 ;;; ediff-util.el ends here