Mercurial > emacs

annotate lisp/ediff-util.el @ 20031:6b1b51bc8b17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test __OpenBSD__ along with __NetBSD__. (PTY_OPEN): Call sigblock properly. (TEXT_END, COFF, DATA_END): Define them if __NetBSD__ just as if LINUX. (HAVE_TEXT_START): Define, if __NetBSD__ and __ELF__.
author Richard M. Stallman <rms@gnu.org>
date Sat, 11 Oct 1997 03:56:02 +0000 (1997-10-11)
parents 9bc6a4017c8c
children f44ff2c52fac
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
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3 ;; Copyright (C) 1994, 1995, 1996, 1997 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:
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
25
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
26 (provide 'ediff-util)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
27
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
28 ;; Compiler pacifier
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
29 (defvar ediff-patch-diagnostics)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
30 (defvar ediff-patchbufer)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
31 (defvar ediff-toolbar)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
32 (defvar ediff-toolbar-3way)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
33 (defvar bottom-toolbar)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
34 (defvar bottom-toolbar-visible-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
35 (defvar bottom-toolbar-height)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
36 (defvar mark-active)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
37
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
38 (eval-when-compile
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
39 (let ((load-path (cons (expand-file-name ".") load-path)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
40 (or (featurep 'ediff-init)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
41 (load "ediff-init.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
42 (or (featurep 'ediff-help)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
43 (load "ediff-help.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
44 (or (featurep 'ediff-mult)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
45 (load "ediff-mult.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
46 (or (featurep 'ediff-wind)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
47 (load "ediff-wind.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
48 (or (featurep 'ediff-diff)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
49 (load "ediff-diff.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
50 (or (featurep 'ediff-merg)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
51 (load "ediff-merg.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
52 (or (featurep 'ediff)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
53 (load "ediff.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
54 (or (featurep 'ediff-tbar)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
55 (load "ediff-tbar.el" 'noerror nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
56 ))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
57 ;; end pacifier
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
58
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
59 (require 'ediff-init)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
60 (require 'ediff-help)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
61 (require 'ediff-mult)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
62 (require 'ediff-wind)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
63 (require 'ediff-diff)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
64 (require 'ediff-merg)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
65
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
66
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
67 ;; be careful with ediff-tbar
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
68 (if ediff-xemacs-p
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
69 (condition-case nil
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
70 (require 'ediff-tbar)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
71 (error
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
72 (defun ediff-use-toolbar-p () nil)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
73 (defun ediff-use-toolbar-p () nil))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
74
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
75
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
76 ;;; Functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
77
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
78 (defun ediff-mode ()
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
79 "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
80 This mode is entered through one of the following commands:
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
81 `ediff'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
82 `ediff-files'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
83 `ediff-buffers'
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
84 `ebuffers'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
85 `ediff3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
86 `ediff-files3'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
87 `ediff-buffers3'
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
88 `ebuffers3'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
89 `ediff-merge'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
90 `ediff-merge-files'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
91 `ediff-merge-files-with-ancestor'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
92 `ediff-merge-buffers'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
93 `ediff-merge-buffers-with-ancestor'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
94 `ediff-merge-revisions'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
95 `ediff-merge-revisions-with-ancestor'
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
96 `ediff-windows-wordwise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
97 `ediff-windows-linewise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
98 `ediff-regions-wordwise'
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
99 `ediff-regions-linewise'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
100 `epatch'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
101 `ediff-patch-file'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
102 `ediff-patch-buffer'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
103 `epatch-buffer'
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
104 `erevision'
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
105 `ediff-revision'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
106
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
107 Commands:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
108 \\{ediff-mode-map}"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
109 (kill-all-local-variables)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
110 (setq major-mode 'ediff-mode)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
111 (setq mode-name "Ediff")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
112 (run-hooks 'ediff-mode-hook))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
113
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
114
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
115
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
116 ;;; Build keymaps
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
117
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
118 (ediff-defvar-local ediff-mode-map nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
119 "Local keymap used in Ediff mode.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
120 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
121 to invocation.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
122
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
123 ;; Set up the keymap in the control buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
124 (defun ediff-set-keys ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
125 "Set up Ediff keymap, if necessary."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
126 (if (null ediff-mode-map)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
127 (ediff-setup-keymap))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
128 (use-local-map ediff-mode-map))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
129
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
130 ;; Reload Ediff keymap. For debugging only.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
131 (defun ediff-reload-keymap ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
132 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
133 (setq ediff-mode-map nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
134 (ediff-set-keys))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
135
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
136
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
137 (defun ediff-setup-keymap ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
138 "Set up the keymap used in the control buffer of Ediff."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
139 (setq ediff-mode-map (make-sparse-keymap))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
140 (suppress-keymap ediff-mode-map)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
141
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
142 (define-key ediff-mode-map
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
143 (if ediff-emacs-p [mouse-2] [button2]) 'ediff-help-for-quick-help)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
144 (define-key ediff-mode-map "\C-m" 'ediff-help-for-quick-help)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
145
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
146 (define-key ediff-mode-map "p" 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
147 (define-key ediff-mode-map "\C-?" 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
148 (define-key ediff-mode-map [delete] 'ediff-previous-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
149 (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
150 'ediff-previous-difference nil))
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
151 ;; must come after C-h, or else C-h wipes out backspace's binding in XEmacs
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
152 (define-key ediff-mode-map [backspace] 'ediff-previous-difference)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
153 (define-key ediff-mode-map "n" 'ediff-next-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
154 (define-key ediff-mode-map " " 'ediff-next-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
155 (define-key ediff-mode-map "j" 'ediff-jump-to-difference)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
156 (define-key ediff-mode-map "g" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
157 (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
158 (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
159 (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
160 (define-key ediff-mode-map "D" 'ediff-show-diff-output)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
161 (define-key ediff-mode-map "z" 'ediff-suspend)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
162 (define-key ediff-mode-map "\C-l" 'ediff-recenter)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
163 (define-key ediff-mode-map "|" 'ediff-toggle-split)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
164 (define-key ediff-mode-map "h" 'ediff-toggle-hilit)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
165 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
166 (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
167 (if ediff-narrow-job
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
168 (define-key ediff-mode-map "%" 'ediff-toggle-narrow-region))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
169 (define-key ediff-mode-map "~" 'ediff-swap-buffers)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
170 (define-key ediff-mode-map "v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
171 (define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
172 (define-key ediff-mode-map "^" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
173 (define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
174 (define-key ediff-mode-map "V" 'ediff-scroll-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
175 (define-key ediff-mode-map "<" 'ediff-scroll-horizontally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
176 (define-key ediff-mode-map ">" 'ediff-scroll-horizontally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
177 (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
178 (define-key ediff-mode-map "E" 'ediff-documentation)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
179 (define-key ediff-mode-map "?" 'ediff-toggle-help)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
180 (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
181 (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
182 (define-key ediff-mode-map "R" 'ediff-show-registry)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
183 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
184 (define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
185 (define-key ediff-mode-map "a" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
186 (define-key ediff-mode-map "b" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
187 (define-key ediff-mode-map "r" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
188 (cond (ediff-merge-job
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
189 ;; Will barf if no ancestor
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
190 (define-key ediff-mode-map "/" 'ediff-show-ancestor)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
191 ;; 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
192 (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
193 (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
194 (define-key ediff-mode-map "r" 'ediff-restore-diff-in-merge-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
195 (define-key ediff-mode-map "s" 'ediff-shrink-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
196 (define-key ediff-mode-map "+" 'ediff-combine-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
197 (define-key ediff-mode-map "$" 'ediff-toggle-show-clashes-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
198 (define-key ediff-mode-map "&" 'ediff-re-merge))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
199 (ediff-3way-comparison-job
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
200 (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
201 (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
202 (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
203 (define-key ediff-mode-map "bc" 'ediff-copy-B-to-C)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
204 (define-key ediff-mode-map "c" nil)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
205 (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
206 (define-key ediff-mode-map "cb" 'ediff-copy-C-to-B)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
207 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
208 (define-key ediff-mode-map "rb" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
209 (define-key ediff-mode-map "rc" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
210 (define-key ediff-mode-map "C" 'ediff-toggle-read-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
211 (t ; 2-way comparison
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
212 (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
213 (define-key ediff-mode-map "b" 'ediff-copy-B-to-A)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
214 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
215 (define-key ediff-mode-map "rb" 'ediff-restore-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
216 ) ; cond
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
217 (define-key ediff-mode-map "G" 'ediff-submit-report)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
218 (define-key ediff-mode-map "#" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
219 (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
220 (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
221 (or ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
222 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
223 (define-key ediff-mode-map "o" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
224 (define-key ediff-mode-map "A" 'ediff-toggle-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
225 (define-key ediff-mode-map "B" 'ediff-toggle-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
226 (define-key ediff-mode-map "w" nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
227 (define-key ediff-mode-map "wa" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
228 (define-key ediff-mode-map "wb" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
229 (define-key ediff-mode-map "wd" 'ediff-save-buffer)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
230 (define-key ediff-mode-map "=" 'ediff-inferior-compare-regions)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
231 (if (fboundp 'ediff-show-patch-diagnostics)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
232 (define-key ediff-mode-map "P" 'ediff-show-patch-diagnostics))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
233 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
234 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
235 (define-key ediff-mode-map "wc" 'ediff-save-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
236 (define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
237 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
238
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
239 (define-key ediff-mode-map "m" 'ediff-toggle-wide-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
240
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
241 ;; Allow ediff-mode-map to be referenced indirectly
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
242 (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
243 (run-hooks 'ediff-keymap-setup-hook))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
244
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
245
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
246 ;;; Setup functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
247
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
248 ;; Common startup entry for all Ediff functions It now returns control buffer
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
249 ;; so other functions can do post-processing SETUP-PARAMETERS is a list of the
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
250 ;; form ((param .val) (param . val)...) This serves a similar purpose to
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
251 ;; STARTUP-HOOKS, but these parameters are set in the new control buffer right
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
252 ;; after this buf is created and before any windows are set and such.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
253 (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
254 startup-hooks setup-parameters)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
255 ;; ediff-convert-standard-filename puts file names in the form appropriate
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
256 ;; for the OS at hand.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
257 (setq file-A (ediff-convert-standard-filename (expand-file-name file-A)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
258 (setq file-B (ediff-convert-standard-filename (expand-file-name file-B)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
259 (if (stringp file-C)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
260 (setq file-C
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
261 (ediff-convert-standard-filename (expand-file-name file-C))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
262 (let* ((control-buffer-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
263 (ediff-unique-buffer-name "*Ediff Control Panel" "*"))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
264 (control-buffer (ediff-with-current-buffer buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
265 (get-buffer-create control-buffer-name))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
266 (ediff-with-current-buffer control-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
267 (ediff-mode)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
268
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
269 (make-local-variable 'ediff-use-long-help-message)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
270 (make-local-variable 'ediff-prefer-iconified-control-frame)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
271 (make-local-variable 'ediff-split-window-function)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
272 (make-local-variable 'ediff-default-variant)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
273 (make-local-variable 'ediff-merge-window-share)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
274 (make-local-variable 'ediff-window-setup-function)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
275 (make-local-variable 'ediff-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
276
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
277 ;; unwrap set up parameters passed as argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
278 (while setup-parameters
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
279 (set (car (car setup-parameters)) (cdr (car setup-parameters)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
280 (setq setup-parameters (cdr setup-parameters)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
281
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
282 ;; set variables classifying the current ediff job
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
283 ;; must come AFTER setup-parameters
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
284 (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
285 ediff-merge-job (ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
286 ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
287 ediff-3way-job (ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
288 ediff-diff3-job (ediff-diff3-job)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
289 ediff-narrow-job (ediff-narrow-job)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
290 ediff-windows-job (ediff-windows-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
291 ediff-word-mode-job (ediff-word-mode-job))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
292
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
293 ;; 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
294 ;; 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
295 (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
296 (setq ediff-keep-variants t))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
297
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
298 (make-local-hook 'pre-command-hook)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
299 (if (ediff-window-display-p)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
300 (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil t))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
301 (setq ediff-mouse-pixel-position (mouse-pixel-position))
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 ;; adjust for merge jobs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
304 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
305 (let ((buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
306 ;; If default variant is `combined', the right stuff is
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
307 ;; 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
308 ;; 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
309 ;; (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
310 ;; 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
311 ;; 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
312 ;; 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
313 (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
314 buffer-B)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
315 (t buffer-A))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
316
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
317 (setq ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
318 ediff-merge-split-window-function)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
319
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
320 ;; remember the ancestor buffer, if any
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
321 (setq ediff-ancestor-buffer buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
322
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
323 (setq buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
324 (get-buffer-create
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
325 (ediff-unique-buffer-name "*ediff-merge" "*")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
326 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
327 (set-buffer buffer-C)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
328 (insert-buffer buf)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
329 (funcall (ediff-with-current-buffer buf major-mode))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
330 ;; after Stig@hackvan.com
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
331 (add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
332 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
333 (setq buffer-read-only nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
334 ediff-buffer-A buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
335 ediff-buffer-B buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
336 ediff-buffer-C buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
337 ediff-control-buffer control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
338
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
339 (setq ediff-control-buffer-suffix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
340 (if (string-match "<[0-9]*>" control-buffer-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
341 (substring control-buffer-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
342 (match-beginning 0) (match-end 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
343 "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
344 ediff-control-buffer-number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
345 (max
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
346 0
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
347 (1-
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
348 (string-to-number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
349 (substring
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
350 ediff-control-buffer-suffix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
351 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
352 (string-match "[0-9]+" ediff-control-buffer-suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
353 0))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
354
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
355 (setq ediff-error-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
356 (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
357
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
358 (ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
359 (ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
360 (if ediff-3way-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
361 (ediff-with-current-buffer buffer-C (ediff-strip-mode-line-format)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
362 (if (ediff-buffer-live-p ediff-ancestor-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
363 (ediff-with-current-buffer ediff-ancestor-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
364 (ediff-strip-mode-line-format)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
365
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
366 (ediff-save-protected-variables) ; save variables to be restored on exit
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
367
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
368 ;; ediff-setup-diff-regions-function must be set after setup
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
369 ;; parameters are processed.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
370 (setq ediff-setup-diff-regions-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
371 (if ediff-diff3-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
372 'ediff-setup-diff-regions3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
373 'ediff-setup-diff-regions))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
374
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
375 (setq ediff-wide-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
376 (list (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
377 '(point-min) '(point-max) ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
378 (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
379 '(point-min) '(point-max) ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
380 (ediff-make-bullet-proof-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
381 '(point-min) '(point-max) ediff-buffer-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
382
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
383 ;; This has effect only on ediff-windows/regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
384 ;; In all other cases, ediff-visible-region sets visibility bounds to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
385 ;; ediff-wide-bounds, and ediff-narrow-bounds are ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
386 (if ediff-start-narrowed
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
387 (setq ediff-visible-bounds ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
388 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
389
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
390 (ediff-set-keys) ; comes after parameter setup
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
391
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
392 ;; set up ediff-narrow-bounds, if not set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
393 (or ediff-narrow-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
394 (setq ediff-narrow-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
395
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
396 ;; All these must be inside ediff-with-current-buffer control-buffer,
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
397 ;; since these vars are local to control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
398 ;; These won't run if there are errors in diff
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
399 (ediff-with-current-buffer ediff-buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
400 (ediff-nuke-selective-display)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
401 (run-hooks 'ediff-prepare-buffer-hook)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
402 (if (ediff-with-current-buffer control-buffer ediff-merge-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
403 (setq buffer-read-only t))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
404 ;; 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
405 ;; 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
406 (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
407 (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
408 (cons control-buffer ediff-this-buffer-ediff-sessions)))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
409 (if ediff-make-buffers-readonly-at-startup
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
410 (setq buffer-read-only t))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
411 )
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
412
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
413 (ediff-with-current-buffer ediff-buffer-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
414 (ediff-nuke-selective-display)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
415 (run-hooks 'ediff-prepare-buffer-hook)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
416 (if (ediff-with-current-buffer control-buffer ediff-merge-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
417 (setq buffer-read-only t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
418 ;; 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
419 (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
420 (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
421 (cons control-buffer ediff-this-buffer-ediff-sessions)))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
422 (if ediff-make-buffers-readonly-at-startup
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
423 (setq buffer-read-only t))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
424 )
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
425
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
426 (if ediff-3way-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
427 (ediff-with-current-buffer ediff-buffer-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
428 (ediff-nuke-selective-display)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
429 (run-hooks 'ediff-prepare-buffer-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
430 ;; 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
431 (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
432 (setq ediff-this-buffer-ediff-sessions
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
433 (cons control-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
434 ediff-this-buffer-ediff-sessions)))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
435 (if ediff-make-buffers-readonly-at-startup
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
436 (setq buffer-read-only t))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
437 ))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
438
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
439 (if (ediff-buffer-live-p ediff-ancestor-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
440 (ediff-with-current-buffer ediff-ancestor-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
441 (ediff-nuke-selective-display)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
442 (setq buffer-read-only t)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
443 (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
444 (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
445 (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
446 (cons control-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
447 ediff-this-buffer-ediff-sessions)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
448 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
449
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
450 ;; must come after setting up ediff-narrow-bounds AND after
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
451 ;; nuking selective display
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
452 (funcall ediff-setup-diff-regions-function file-A file-B file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
453 (setq ediff-number-of-differences (length ediff-difference-vector-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
454 (setq ediff-current-difference -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
455
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
456 (ediff-make-current-diff-overlay 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
457 (ediff-make-current-diff-overlay 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
458 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
459 (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
460 (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
461 (ediff-make-current-diff-overlay 'Ancestor))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
462
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
463 (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
464
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
465 (let ((shift-A (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
466 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
467 'A ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
468 (shift-B (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
469 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
470 'B ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
471 (shift-C (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
472 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
473 'C ediff-narrow-bounds))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
474 ;; position point in buf A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
475 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
476 (select-window ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
477 (goto-char shift-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
478 ;; position point in buf B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
479 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
480 (select-window ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
481 (goto-char shift-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
482 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
483 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
484 (select-window ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
485 (goto-char shift-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
486 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
487
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
488 (select-window ediff-control-window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
489 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
490
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
491 (run-hooks 'startup-hooks)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
492 (ediff-refresh-mode-lines)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
493 (setq buffer-read-only t)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
494 (setq ediff-session-registry
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
495 (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
496 (ediff-update-registry)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
497 (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
498 (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
499 (run-hooks 'ediff-startup-hook)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
500 ) ; eval in control-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
501 control-buffer))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
502
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
503
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
504 ;; This function assumes that we are in the window where control buffer is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
505 ;; to reside.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
506 (defun ediff-setup-control-buffer (ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
507 "Set up window for control buffer."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
508 (if (window-dedicated-p (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
509 (set-buffer ctl-buf) ; we are in control frame but just in case
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
510 (switch-to-buffer ctl-buf))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
511 (let ((window-min-height 2))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
512 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
513 (ediff-set-help-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
514 (insert ediff-help-message)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
515 (shrink-window-if-larger-than-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
516 (or (ediff-multiframe-setup-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
517 (ediff-indent-help-message))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
518 (ediff-set-help-overlays)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
519
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
520 (set-buffer-modified-p nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
521 (ediff-refresh-mode-lines)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
522 (setq ediff-control-window (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
523 (setq ediff-window-config-saved
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
524 (format "%S%S%S%S%S%S%S"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
525 ediff-control-window
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
526 ediff-window-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
527 ediff-window-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
528 ediff-window-C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
529 ediff-split-window-function
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
530 (ediff-multiframe-setup-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
531 ediff-wide-display-p))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
532
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
533 ;; In multiframe, toolbar is set in ediff-setup-control-frame
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
534 (if (not (ediff-multiframe-setup-p))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
535 (ediff-make-bottom-toolbar)) ; this checks if toolbar is requested
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
536 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
537 (skip-chars-forward ediff-whitespace)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
538
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
539
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
540
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
541
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
542 ;;; Commands for working with Ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
543
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
544 (defun ediff-update-diffs ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
545 "Recompute difference regions in buffers A, B, and C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
546 Buffers are not synchronized with their respective files, so changes done
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
547 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
548 if necessary."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
549 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
550 (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
551 (if (and (ediff-buffer-live-p ediff-ancestor-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
552 (not
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
553 (y-or-n-p
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
554 "Ancestor buffer will not be used. Recompute diffs anyway? ")))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
555 (error "Recomputation of differences canceled"))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
556
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
557 (let ((point-A (ediff-with-current-buffer ediff-buffer-A (point)))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
558 ;;(point-B (ediff-with-current-buffer ediff-buffer-B (point)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
559 (tmp-buffer (get-buffer-create ediff-tmp-buffer))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
560 (buf-A-file-name (buffer-file-name ediff-buffer-A))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
561 (buf-B-file-name (buffer-file-name ediff-buffer-B))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
562 ;; (null ediff-buffer-C) is no problem, as we later check if
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
563 ;; ediff-buffer-C is alive
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
564 (buf-C-file-name (buffer-file-name ediff-buffer-C))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
565 (overl-A (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
566 'A ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
567 (overl-B (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
568 'B ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
569 (overl-C (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
570 'C ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
571 beg-A end-A beg-B end-B beg-C end-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
572 file-A file-B file-C)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
573
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
574 (if (stringp buf-A-file-name)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
575 (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
576 (if (stringp buf-B-file-name)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
577 (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
578 (if (stringp buf-C-file-name)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
579 (setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
580
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
581 (ediff-unselect-and-select-difference -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
582
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
583 (setq beg-A (ediff-overlay-start overl-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
584 beg-B (ediff-overlay-start overl-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
585 beg-C (ediff-overlay-start overl-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
586 end-A (ediff-overlay-end overl-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
587 end-B (ediff-overlay-end overl-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
588 end-C (ediff-overlay-end overl-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
589
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
590 (if ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
591 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
592 (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
593 (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
594 (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
595 (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
596 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
597 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
598 (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
599 (setq file-C (ediff-make-temp-file tmp-buffer "regC"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
600 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
601 ;; not word-mode
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
602 (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
603 (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
604 (if ediff-3way-job
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
605 (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
606 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
607
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
608 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
609 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
610 (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
611 (ediff-clear-diff-vector
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
612 '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
613 ;; 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
614 ;; the diffs.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
615 (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
616 ediff-ancestor-buffer nil
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
617 ediff-state-of-merge nil)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
618
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
619 (setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
620
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
621 ;; 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
622 ;; comparison
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
623 (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
624 (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
625 (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
626 (ediff-merge-with-ancestor-job ediff-merge-with-ancestor-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
627 (ediff-job-name ediff-job-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
628 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
629 (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
630 ediff-3way-comparison-job t
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
631 ediff-merge-job nil
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
632 ediff-merge-with-ancestor-job nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
633 ediff-job-name 'ediff-files3))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
634 (funcall ediff-setup-diff-regions-function file-A file-B file-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
635
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
636 (setq ediff-number-of-differences (length ediff-difference-vector-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
637 (delete-file file-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
638 (delete-file file-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
639 (if file-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
640 (delete-file file-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
641
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
642 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
643 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
644
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
645 (ediff-jump-to-difference (ediff-diff-at-point 'A point-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
646 (message "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
647 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
648
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
649 ;; 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
650 (defun ediff-revert-buffers-then-recompute-diffs (noconfirm)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
651 "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
652 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
653 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
654 (let ((bufA ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
655 (bufB ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
656 (bufC ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
657 (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
658 (keep-variants ediff-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
659 (ancestor-buf ediff-ancestor-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
660 (ancestor-job ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
661 (merge ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
662 (comparison ediff-3way-comparison-job))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
663 (ediff-with-current-buffer bufA
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
664 (revert-buffer t noconfirm))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
665 (ediff-with-current-buffer bufB
11042
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 ;; this should only be executed in a 3way comparison, not in merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
668 (if comparison
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
669 (ediff-with-current-buffer bufC
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
670 (revert-buffer t noconfirm)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
671 (if merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
672 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
673 (set-buffer ctl-buf)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
674 ;; 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
675 ;; 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
676 ;; variants kept.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
677 (ediff-really-quit (not keep-variants))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
678 (kill-buffer bufC)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
679 (if ancestor-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
680 (ediff-merge-buffers-with-ancestor bufA bufB ancestor-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
681 (ediff-merge-buffers bufA bufB)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
682 (ediff-update-diffs))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
683
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
684
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
685 ;; optional NO-REHIGHLIGHT says to not rehighlight buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
686 (defun ediff-recenter (&optional no-rehighlight)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
687 "Bring the highlighted region of all buffers being compared into view.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
688 Reestablish the default three-window display."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
689 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
690 (ediff-barf-if-not-control-buffer)
11042
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)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
743 (ediff-buffer-live-p ediff-buffer-C)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
744 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
745 (or no-rehighlight
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
746 (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
747
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
748 (ediff-recenter-one-window 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
749 (ediff-recenter-one-window 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
750 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
751 (ediff-recenter-one-window 'C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
752
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
753 (ediff-with-current-buffer control-buf
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
754 (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
755
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
756 (if (and (ediff-multiframe-setup-p)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
757 (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
758 (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
759 ;; 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
760 (ediff-reset-mouse
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
761 control-frame
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
762 (eq this-command 'ediff-quit))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
763 ))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
764
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
765 (ediff-restore-highlighting)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
766 (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
11042
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)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
780 (window-name (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
781 buf-type ediff-window-alist))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
782 (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
783 (symbol-value window-name))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
784
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
785 (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
786 (set-window-start window shift))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
787 (if window
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
788 (progn
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
789 (select-window window)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
790 (ediff-deactivate-mark)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
791 (ediff-position-region
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 'beg 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 'end nil control-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
794 (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
795 job-name
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
796 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
797 (select-window ctl-wind)
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
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
800 (defun ediff-recenter-ancestor ()
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
801 ;; 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
802 ;; visible.
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
803 (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
804 (ediff-valid-difference-p))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
805 (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
806 (ctl-wind (selected-window))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
807 (job-name ediff-job-name)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
808 (ctl-buf ediff-control-buffer))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
809 (ediff-with-current-buffer ediff-ancestor-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
810 (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
811 (if window
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
812 (progn
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
813 (select-window window)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
814 (ediff-position-region
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 'beg 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 'end nil ctl-buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
817 (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
818 job-name))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
819 (select-window ctl-wind)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
820 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
821
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
822
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
823 ;; This will have to be refined for 3way jobs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
824 (defun ediff-toggle-split ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
825 "Toggle vertical/horizontal window split.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
826 Does nothing if file-A and file-B are in different frames."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
827 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
828 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
829 (let* ((wind-A (if (window-live-p ediff-window-A) ediff-window-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
830 (wind-B (if (window-live-p ediff-window-B) ediff-window-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
831 (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
832 (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
833 (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
834 (frame-C (if wind-C (window-frame wind-C))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
835 (if (or (eq frame-A frame-B)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
836 (not (frame-live-p frame-A))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
837 (not (frame-live-p frame-B))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
838 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
839 (or (not (frame-live-p frame-C))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
840 (eq frame-A frame-C) (eq frame-B frame-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
841 (setq ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
842 (if (eq ediff-split-window-function 'split-window-vertically)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
843 'split-window-horizontally
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
844 'split-window-vertically))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
845 (message "Buffers being compared are in different frames"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
846 (ediff-recenter 'no-rehighlight)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
847
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
848 (defun ediff-toggle-hilit ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
849 "Switch between highlighting using ASCII flags and highlighting using faces.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
850 On a dumb terminal, switches between ASCII highlighting and no highlighting."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
851 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
852 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
853 (if (not (ediff-has-face-support-p))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
854 (if (eq ediff-highlighting-style 'ascii)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
855 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
856 (message "ASCII highlighting flags removed")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
857 (ediff-unselect-and-select-difference ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
858 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
859 (setq ediff-highlighting-style 'off))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
860 (ediff-unselect-and-select-difference ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
861 'select-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
862 (ediff-unselect-and-select-difference ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
863 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
864 ;; cycle through highlighting
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
865 (cond ((and ediff-use-faces ediff-highlight-all-diffs)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
866 (message "Unhighlighting unselected difference regions")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
867 (setq ediff-highlight-all-diffs nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
868 (ediff-use-faces
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
869 (message "Highlighting with ASCII flags")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
870 (setq ediff-use-faces nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
871 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
872 (message "Re-highlighting all difference regions")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
873 (setq ediff-use-faces t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
874 ediff-highlight-all-diffs t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
875
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
876 (if (and ediff-use-faces ediff-highlight-all-diffs)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
877 (ediff-paint-background-regions)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
878 (ediff-paint-background-regions 'unhighlight))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
879
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
880 (ediff-unselect-and-select-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
881 ediff-current-difference 'select-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
882 )
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
883
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
884
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
885 (defun ediff-toggle-autorefine ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
886 "Toggle auto-refine mode."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
887 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
888 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
889 (if ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
890 (error "No fine differences in this mode"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
891 (cond ((eq ediff-auto-refine 'nix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
892 (setq ediff-auto-refine 'on)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
893 (ediff-make-fine-diffs ediff-current-difference 'noforce)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
894 (message "Auto-refining is ON"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
895 ((eq ediff-auto-refine 'on)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
896 (message "Auto-refining is OFF")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
897 (setq ediff-auto-refine 'off))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
898 (t ;; nix 'em
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
899 (ediff-set-fine-diff-properties ediff-current-difference 'default)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
900 (message "Refinements are HIDDEN")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
901 (setq ediff-auto-refine 'nix))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
902 ))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
903
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
904 (defun ediff-show-ancestor ()
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
905 "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
906 (interactive)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
907 (ediff-recenter)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
908 (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
909 (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
910 (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
911 (error "Not merging with ancestor")))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
912 (let (wind)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
913 (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
914 (raise-frame (window-frame wind)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
915 (t (set-window-buffer ediff-window-C ediff-ancestor-buffer)))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
916
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
917 (defun ediff-make-or-kill-fine-diffs (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
918 "Compute fine diffs. With negative prefix arg, kill fine diffs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
919 In both cases, operates on the currrent difference region."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
920 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
921 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
922 (cond ((eq arg '-)
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 ((and (numberp arg) (< arg 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
925 (ediff-clear-fine-differences ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
926 (t (ediff-make-fine-diffs))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
927
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
928
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
929 (defun ediff-toggle-help ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
930 "Toggle short/long help message."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
931 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
932 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
933 (let (buffer-read-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
934 (erase-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
935 (setq ediff-use-long-help-message (not ediff-use-long-help-message))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
936 (ediff-set-help-message))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
937 ;; remember the icon status of the control frame when the user requested
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
938 ;; full control message
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
939 (if (and ediff-use-long-help-message (ediff-multiframe-setup-p))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
940 (setq ediff-prefer-iconified-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
941 (ediff-frame-iconified-p ediff-control-frame)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
942
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
943 (setq ediff-window-config-saved "") ; force redisplay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
944 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
945
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
946
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
947 ;; 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
948 (defun ediff-toggle-read-only (&optional buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
949 "Toggle read-only in current buffer.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
950 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
951 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
952 of the current buffer."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
953 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
954 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
955 (let ((ctl-buf (if (null buf) (current-buffer)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
956 (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
957 (or buf (ediff-recenter))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
958 (or buf
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
959 (setq buf (ediff-get-buffer buf-type)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
960
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
961 (ediff-with-current-buffer buf ; eval in buf A/B/C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
962 (let* ((file (buffer-file-name buf))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
963 (file-writable (and file
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
964 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
965 (file-writable-p file)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
966 (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
967 ((ediff-file-checked-out-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
968 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
969 (file-writable 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
970 (t (key-binding "\C-x\C-q")))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
971 ;; 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
972 ;; 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
973 ;; 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
974 ;; user problem.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
975 (if (and (ediff-file-checked-in-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
976 ;; 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
977 ;; 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
978 ctl-buf)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
979 (cond ((not buffer-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
980 (setq toggle-ro-cmd 'toggle-read-only))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
981 ((and (or (beep 1) t) ; always beep
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
982 (y-or-n-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
983 (format
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
984 "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
985 (ediff-abbreviate-file-name file))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
986 ;; 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
987 ;; 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
988 ;; 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
989 ;; 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
990 ;; is checked in.
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
991 (ediff-with-current-buffer ctl-buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
992 (ediff-change-saved-variable
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
993 'buffer-read-only nil buf-type)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
994 (t
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
995 (setq toggle-ro-cmd 'toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
996 (beep 1) (beep 1)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
997 (message
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
998 "Boy, this is risky! Don't modify this file...")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
999 (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
1000 (if (and toggle-ro-cmd
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1001 (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
1002 (save-excursion
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1003 (save-window-excursion
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1004 (select-window (ediff-get-visible-buffer-window buf))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1005 (command-execute toggle-ro-cmd)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1006 (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
1007
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1008 ;; 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
1009 ;; Signal a warning in this case.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1010 (if (and file (not buffer-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1011 (eq this-command 'ediff-toggle-read-only)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1012 (file-exists-p file)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1013 (not (file-writable-p file)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1014 (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
1015 (ediff-abbreviate-file-name file) (beep 1)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1016 ))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1017
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1018 ;; checkout if visited file is checked in
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1019 (defun ediff-maybe-checkout (buf)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1020 (let ((file (buffer-file-name buf))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1021 (checkout-function (key-binding "\C-x\C-q")))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1022 (if (and (ediff-file-checked-in-p file)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1023 (or (beep 1) t)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1024 (y-or-n-p
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1025 (format
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1026 "File %s is under version control. Check it out? "
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1027 (ediff-abbreviate-file-name file))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1028 (ediff-with-current-buffer buf
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1029 (command-execute checkout-function)))))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1030
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1031
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1032 ;; This is a simple-minded check for whether a file is under version control.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1033 ;; 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
1034 ;; 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
1035 ;; able to read such a file anyway).
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1036 ;; FILE is a string representing file name
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1037 (defun ediff-file-under-version-control (file)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1038 (let* ((filedir (file-name-directory file))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1039 (file-nondir (file-name-nondirectory file))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1040 (trial (concat file-nondir ",v"))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1041 (full-trial (concat filedir trial))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1042 (full-rcs-trial (concat filedir "RCS/" trial)))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1043 (and (stringp file)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1044 (file-exists-p file)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1045 (or
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1046 (and
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1047 (file-exists-p full-trial)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1048 ;; in FAT FS, `file,v' and `file' may turn out to be the same!
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1049 ;; don't be fooled by this!
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1050 (not (equal (file-attributes file)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1051 (file-attributes full-trial))))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1052 ;; check if a version is in RCS/ directory
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1053 (file-exists-p full-rcs-trial)))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1054 ))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1055
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1056 (defun ediff-file-checked-out-p (file)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1057 (and (ediff-file-under-version-control file)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1058 (file-writable-p file)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1059 (defun ediff-file-checked-in-p (file)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1060 (and (ediff-file-under-version-control file)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1061 (not (file-writable-p file))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1062
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1063 (defun ediff-swap-buffers ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1064 "Rotate the display of buffers A, B, and C."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1065 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1066 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1067 (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
1068 (let ((buf ediff-buffer-A)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1069 (values ediff-buffer-values-orig-A)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1070 (diff-vec ediff-difference-vector-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1071 (hide-regexp ediff-regexp-hide-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1072 (focus-regexp ediff-regexp-focus-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1073 (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
1074 (overlay (if (ediff-has-face-support-p)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1075 ediff-current-diff-overlay-A)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1076 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1077 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1078 (set-window-buffer ediff-window-A ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1079 (set-window-buffer ediff-window-B ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1080 (set-window-buffer ediff-window-C ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1081 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1082 (set-window-buffer ediff-window-A ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1083 (set-window-buffer ediff-window-B ediff-buffer-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1084 ;; swap diff buffers
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-buffer-A ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1087 ediff-buffer-C ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1088 ediff-buffer-B buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1089 (setq ediff-buffer-A ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1090 ediff-buffer-B buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1091
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1092 ;; swap saved buffer characteristics
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1093 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1094 (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
1095 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
1096 ediff-buffer-values-orig-B values)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1097 (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
1098 ediff-buffer-values-orig-B values))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1099
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1100 ;; swap diff vectors
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1101 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1102 (setq ediff-difference-vector-A ediff-difference-vector-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1103 ediff-difference-vector-C ediff-difference-vector-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1104 ediff-difference-vector-B diff-vec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1105 (setq ediff-difference-vector-A ediff-difference-vector-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1106 ediff-difference-vector-B diff-vec))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1107
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1108 ;; swap hide/focus regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1109 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1110 (setq ediff-regexp-hide-A ediff-regexp-hide-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1111 ediff-regexp-hide-C ediff-regexp-hide-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1112 ediff-regexp-hide-B hide-regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1113 ediff-regexp-focus-A ediff-regexp-focus-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1114 ediff-regexp-focus-C ediff-regexp-focus-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1115 ediff-regexp-focus-B focus-regexp)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1116 (setq ediff-regexp-hide-A ediff-regexp-hide-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1117 ediff-regexp-hide-B hide-regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1118 ediff-regexp-focus-A ediff-regexp-focus-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1119 ediff-regexp-focus-B focus-regexp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1120
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1121 ;; The following is needed for XEmacs, since there one can't move
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1122 ;; 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
1123 (if (ediff-has-face-support-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1124 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1125 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1126 ediff-current-diff-overlay-C ediff-current-diff-overlay-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1127 ediff-current-diff-overlay-B overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1128 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1129 ediff-current-diff-overlay-B overlay)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1130
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1131 ;; swap wide bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1132 (setq ediff-wide-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1133 (cond (ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1134 (list (nth 2 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1135 (nth 0 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1136 (nth 1 ediff-wide-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1137 (ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1138 (list (nth 1 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1139 (nth 0 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1140 (nth 2 ediff-wide-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1141 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1142 (list (nth 1 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1143 (nth 0 ediff-wide-bounds)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1144 ;; swap narrow bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1145 (setq ediff-narrow-bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1146 (cond (ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1147 (list (nth 2 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1148 (nth 0 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1149 (nth 1 ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1150 (ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1151 (list (nth 1 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1152 (nth 0 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1153 (nth 2 ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1154 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1155 (list (nth 1 ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1156 (nth 0 ediff-narrow-bounds)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1157 (if wide-visibility-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1158 (setq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1159 (setq ediff-visible-bounds ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1160 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1161 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1162 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1163 (ediff-recenter 'no-rehighlight)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1164 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1165
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1166
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1167 (defun ediff-toggle-wide-display ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1168 "Toggle wide/regular display.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1169 This is especially useful when comparing buffers side-by-side."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1170 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1171 (ediff-barf-if-not-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1172 (or (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1173 (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
1174 (if ediff-emacs-p "" "X")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1175 (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1176 (let ((ctl-buf ediff-control-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1177 (setq ediff-wide-display-p (not ediff-wide-display-p))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1178 (if (not ediff-wide-display-p)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1179 (ediff-with-current-buffer ctl-buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1180 (modify-frame-parameters
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1181 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
1182 ;;(sit-for (if ediff-xemacs-p 0.4 0))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1183 ;; restore control buf, since ctl window may have been deleted
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1184 ;; during resizing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1185 (set-buffer ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1186 (setq ediff-wide-display-orig-parameters nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1187 ediff-window-B nil) ; force update of window config
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1188 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1189 (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
1190 ;;(sit-for (if ediff-xemacs-p 0.4 0))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1191 (ediff-with-current-buffer ctl-buf
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1192 (setq ediff-window-B nil) ; force update of window config
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1193 (ediff-recenter 'no-rehighlight)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1194
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1195 ;;;###autoload
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1196 (defun ediff-toggle-multiframe ()
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1197 "Switch from multiframe display to single-frame display and back.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1198 To change the default, set the variable `ediff-window-setup-function',
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1199 which see."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1200 (interactive)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1201 (let (window-setup-func)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1202 (or (ediff-window-display-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1203 (error "%sEmacs is not running as a window application"
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1204 (if ediff-emacs-p "" "X")))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1205
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1206 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1207 (setq window-setup-func 'ediff-setup-windows-plain))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1208 ((eq ediff-window-setup-function 'ediff-setup-windows-plain)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1209 (if (ediff-in-control-buffer-p)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1210 (ediff-kill-bottom-toolbar))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1211 (setq window-setup-func 'ediff-setup-windows-multiframe)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1212
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1213 ;; change default
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1214 (setq-default ediff-window-setup-function window-setup-func)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1215 ;; change in all active ediff sessions
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1216 (mapcar (function (lambda(buf)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1217 (ediff-with-current-buffer buf
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1218 (setq ediff-window-setup-function window-setup-func
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1219 ediff-window-B nil))))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1220 ediff-session-registry)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1221 (if (ediff-in-control-buffer-p)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1222 (ediff-recenter 'no-rehighlight))))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1223
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1224
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1225 ;;;###autoload
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1226 (defun ediff-toggle-use-toolbar ()
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1227 "Enable or disable Ediff toolbar.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1228 Works only in versions of Emacs that support toolbars.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1229 To change the default, set the variable `ediff-use-toolbar-p', which see."
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1230 (interactive)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1231 (if (featurep 'ediff-tbar)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1232 (progn
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1233 (or (ediff-window-display-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1234 (error "%sEmacs is not running as a window application"
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1235 (if ediff-emacs-p "" "X")))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1236 (if (ediff-use-toolbar-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1237 (ediff-kill-bottom-toolbar))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1238 ;; do this only after killing the toolbar
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1239 (setq ediff-use-toolbar-p (not ediff-use-toolbar-p))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1240
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1241 (mapcar (function (lambda(buf)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1242 (ediff-with-current-buffer buf
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1243 ;; force redisplay
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1244 (setq ediff-window-config-saved "")
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1245 )))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1246 ediff-session-registry)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1247 (if (ediff-in-control-buffer-p)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1248 (ediff-recenter 'no-rehighlight)))))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1249
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1250
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1251 ;; if was using toolbar, kill it
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1252 (defun ediff-kill-bottom-toolbar ()
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1253 ;; Using ctl-buffer or ediff-control-window for LOCALE does not
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1254 ;; work properly in XEmacs 19.14: we have to use
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1255 ;;(selected-frame).
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1256 ;; The problem with this is that any previous bottom-toolbar
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1257 ;; will not re-appear after our cleanup here. Is there a way
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1258 ;; to do "push" and "pop" toolbars ? --marcpa
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1259 (if (ediff-use-toolbar-p)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1260 (progn
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1261 (set-specifier bottom-toolbar (list (selected-frame) nil))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1262 (set-specifier bottom-toolbar-visible-p (list (selected-frame) nil)))))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1263
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1264 ;; If wants to use toolbar, make it.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1265 ;; If not, zero the toolbar for XEmacs.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1266 ;; Do nothing for Emacs.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1267 (defun ediff-make-bottom-toolbar (&optional frame)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1268 (if (ediff-window-display-p)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
1269 (progn
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1270 (setq frame (or frame (selected-frame)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1271 (cond ((ediff-use-toolbar-p) ; this checks for XEmacs
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1272 (set-specifier
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1273 bottom-toolbar
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1274 (list frame (if (ediff-3way-comparison-job)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1275 ediff-toolbar-3way ediff-toolbar)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1276 (set-specifier bottom-toolbar-visible-p (list frame t))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1277 (set-specifier bottom-toolbar-height
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1278 (list frame ediff-toolbar-height)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1279 (ediff-xemacs-p
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1280 (set-specifier bottom-toolbar-height (list frame 0)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1281 ))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1282 ))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1283
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1284 ;; Merging
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1285
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1286 (defun ediff-toggle-show-clashes-only ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1287 "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
1288 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1289 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1290 (if (not ediff-merge-with-ancestor-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1291 (error "This command makes sense only when merging with an ancestor"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1292 (setq ediff-show-clashes-only (not ediff-show-clashes-only))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1293 (if ediff-show-clashes-only
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1294 (message "Focus on regions where both buffers differ from the ancestor")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1295 (message "Canceling focus on regions where changes clash")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1296
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1297 ;; Widening/narrowing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1298
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1299 (defun ediff-toggle-narrow-region ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1300 "Toggle narrowing in buffers A, B, and C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1301 Used in ediff-windows/regions only."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1302 (interactive)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1303 (if (eq ediff-buffer-A ediff-buffer-B)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1304 (error ediff-NO-DIFFERENCES))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1305 (if (eq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1306 (setq ediff-visible-bounds ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1307 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1308 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1309
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1310 ;; 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
1311 ;; ediff-wide-bounds, then this actually widens.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1312 ;; 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
1313 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1314 ;; Does nothing if buffer-A = buffer-B since we can't narrow
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1315 ;; to two different regions in one buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1316 (defun ediff-visible-region ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1317 (if (or (eq ediff-buffer-A ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1318 (eq ediff-buffer-A ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1319 (eq ediff-buffer-C ediff-buffer-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1320 ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1321 ;; If ediff-*-regions/windows, ediff-visible-bounds is already set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1322 ;; Otherwise, always use full range.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1323 (if (not ediff-narrow-job)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1324 (setq ediff-visible-bounds ediff-wide-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1325 (let ((overl-A (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1326 'A ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1327 (overl-B (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1328 'B ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1329 (overl-C (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1330 'C ediff-visible-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1331 )
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1332 (ediff-with-current-buffer ediff-buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1333 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1334 (ediff-overlay-start overl-A) (ediff-overlay-end overl-A)))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1335 (ediff-with-current-buffer ediff-buffer-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1336 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1337 (ediff-overlay-start overl-B) (ediff-overlay-end overl-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1338
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1339 (if ediff-3way-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1340 (ediff-with-current-buffer ediff-buffer-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1341 (narrow-to-region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1342 (ediff-overlay-start overl-C) (ediff-overlay-end overl-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1343 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1344
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1345
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1346 ;; Window scrolling operations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1347
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1348 ;; Performs some operation on the two file windows (if they are showing).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1349 ;; Traps all errors on the operation in windows A/B/C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1350 ;; Usually, errors come from scrolling off the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1351 ;; beginning or end of the buffer, and this gives error messages.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1352 (defun ediff-operate-on-windows (operation arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1353
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1354 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1355 (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
1356 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1357 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1358 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1359 (or (not ediff-3way-job) ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1360 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1361 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1362
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1363 (let* ((wind (selected-window))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1364 (wind-A ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1365 (wind-B ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1366 (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
1367 (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
1368 (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
1369 (three-way ediff-3way-job)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1370 (coefC (if three-way
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1371 (ediff-get-region-size-coefficient 'C operation))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1372
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1373 (select-window wind-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1374 (condition-case nil
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1375 (funcall operation (round (* coefA arg)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1376 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1377 (select-window wind-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1378 (condition-case nil
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1379 (funcall operation (round (* coefB arg)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1380 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1381 (if three-way
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1382 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1383 (select-window wind-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1384 (condition-case nil
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1385 (funcall operation (round (* coefC arg)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1386 (error))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1387 (select-window wind)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1388
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1389 (defun ediff-scroll-vertically (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1390 "Vertically scroll buffers A, B \(and C if appropriate\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1391 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
1392 the one half of the height of window-A."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1393 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1394 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1395
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1396 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1397 (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
1398 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1399 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1400 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1401 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1402 (ediff-buffer-live-p ediff-buffer-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1403 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1404 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1405
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1406 (ediff-operate-on-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1407 (if (memq last-command-char '(?v ?\C-v))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1408 'scroll-up
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1409 'scroll-down)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1410 ;; calculate argument to scroll-up/down
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1411 ;; if there is an explicit argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1412 (if (and arg (not (equal arg '-)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1413 ;; use it
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1414 (prefix-numeric-value arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1415 ;; 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
1416 (let (default-amount)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1417 (setq default-amount
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1418 (- (/ (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
1419 (window-height ediff-window-B)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1420 (if ediff-3way-job
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1421 (window-height ediff-window-C)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1422 500)) ; some large number
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1423 2)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1424 1 next-screen-context-lines))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1425 ;; window found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1426 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1427 ;; C-u as argument means half of default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1428 (/ default-amount 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1429 ;; no argument means default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1430 default-amount)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1431
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1432
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1433 (defun ediff-scroll-horizontally (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1434 "Horizontally scroll buffers A, B \(and C if appropriate\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1435 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
1436 the width of the A/B/C windows."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1437 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1438 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1439
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1440 ;; make sure windows aren't dead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1441 (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
1442 (ediff-recenter 'no-rehighlight))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1443 (if (not (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1444 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1445 (or (not ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1446 (ediff-buffer-live-p ediff-buffer-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1447 ))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1448 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1449
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1450 (ediff-operate-on-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1451 (if (= last-command-char ?<)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1452 'scroll-left
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1453 'scroll-right)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1454 ;; calculate argument to scroll-left/right
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1455 ;; if there is an explicit argument
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1456 (if (and arg (not (equal arg '-)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1457 ;; use it
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1458 (prefix-numeric-value arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1459 ;; if not, see if we can determine a default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1460 ;; (half the window width)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1461 (if (null ediff-control-window)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1462 ;; no control window, use nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1463 nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1464 (let ((default-amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1465 (- (/ (min (window-width ediff-window-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1466 (window-width ediff-window-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1467 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1468 (window-width ediff-window-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1469 500) ; some large number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1470 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1471 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1472 3)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1473 ;; window found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1474 (if arg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1475 ;; C-u as argument means half of default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1476 (/ default-amount 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1477 ;; no argument means default amount
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1478 default-amount))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1479
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1480
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1481 ;;BEG, END show the region to be positioned.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1482 ;;JOB-NAME holds ediff-job-name. The ediff-windows job positions regions
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1483 ;;differently.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1484 (defun ediff-position-region (beg end pos job-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1485 (if (> end (point-max))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1486 (setq end (point-max)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1487 (if ediff-windows-job
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1488 (if (pos-visible-in-window-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1489 () ; do nothing, wind is already positioned
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1490 ;; at this point, windows are positioned at the beginning of the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1491 ;; file regions (not diff-regions) being compared.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1492 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1493 (move-to-window-line (- (window-height) 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1494 (let ((amount (+ 2 (count-lines (point) end))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1495 (scroll-up amount))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1496 (set-window-start (selected-window) beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1497 (if (pos-visible-in-window-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1498 ;; 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
1499 (let ((lines 0)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1500 (prev-point 0))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1501 (while ( and (> end (progn
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1502 (move-to-window-line lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1503 (point)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1504 ;; `end' may be beyond the window bottom, so check
14040
187735b53d52 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13605
diff changeset
1505 ;; that we are making progress
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1506 (< prev-point (point)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1507 (setq prev-point (point))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1508 (setq lines (1+ lines)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1509 ;; And position the beginning on the right line
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1510 (goto-char beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1511 (recenter (/ (1+ (max (- (1- (window-height (selected-window)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1512 lines)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1513 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1514 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1515 2))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1516 (goto-char pos)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1517 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1518
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1519 ;; 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
1520 (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
1521 (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
1522 (or ctl-buf (setq ctl-buf ediff-control-buffer))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1523 (ediff-with-current-buffer ctl-buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1524 (let* ((buf (ediff-get-buffer buf-type))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1525 (wind (eval (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1526 buf-type ediff-window-alist)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1527 (beg (window-start wind))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1528 (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
1529 lines)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1530 (ediff-with-current-buffer buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1531 (if (< beg end)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1532 (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
1533 (setq lines 0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1534 lines
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1535 ))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1536
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1537 ;; 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
1538 (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
1539 (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
1540 (or ctl-buf (setq ctl-buf ediff-control-buffer))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1541 (ediff-with-current-buffer ctl-buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1542 (let* ((buf (ediff-get-buffer buf-type))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1543 (wind (eval (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1544 buf-type ediff-window-alist)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1545 (end (window-end wind))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1546 (beg (ediff-get-diff-posn buf-type 'beg)))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1547 (ediff-with-current-buffer buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1548 (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
1549 )))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1550
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1551
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1552 ;; region size coefficient is a coefficient by which to adjust scrolling
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1553 ;; up/down of the window displaying buffer of type BUFTYPE.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1554 ;; The purpose of this coefficient is to make the windows scroll in sync, so
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1555 ;; that it won't happen that one diff region is scrolled off while the other is
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1556 ;; still seen.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1557 ;;
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1558 ;; If the difference region is invalid, the coefficient is 1
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1559 (defun ediff-get-region-size-coefficient (buf-type op &optional n ctl-buf)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1560 (ediff-with-current-buffer (or ctl-buf ediff-control-buffer)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1561 (if (ediff-valid-difference-p n)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1562 (let* ((func (cond ((eq op 'scroll-down)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1563 'ediff-get-lines-to-region-start)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1564 ((eq op 'scroll-up)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1565 'ediff-get-lines-to-region-end)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1566 (t '(lambda (a b c) 0))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1567 (max-lines (max (funcall func 'A n ctl-buf)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1568 (funcall func 'B n ctl-buf)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1569 (if (ediff-buffer-live-p ediff-buffer-C)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1570 (funcall func 'C n ctl-buf)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1571 0))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1572 ;; this covers the horizontal coefficient as well:
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1573 ;; if max-lines = 0 then coef = 1
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1574 (if (> max-lines 0)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1575 (/ (+ (funcall func buf-type n ctl-buf) 0.0)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1576 (+ max-lines 0.0))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1577 1))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1578 1)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1579
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1580
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1581 (defun ediff-next-difference (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1582 "Advance to the next difference.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1583 With a prefix argument, go forward that many differences."
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1584 (interactive "p")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1585 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1586 (if (< ediff-current-difference ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1587 (let ((n (min ediff-number-of-differences
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1588 (+ ediff-current-difference arg)))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1589 non-clash-skip regexp-skip)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1590
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1591 (ediff-visible-region)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1592 (or (>= n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1593 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1594 ;; this won't exec if regexp-skip is t
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1595 (setq non-clash-skip (ediff-merge-region-is-non-clash n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1596 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1597 (while (and (< n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1598 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1599 ;; regexp skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1600 regexp-skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1601 ;; skip clashes, if necessary
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1602 non-clash-skip
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1603 ;; skip difference regions that differ in white space
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1604 (and ediff-ignore-similar-regions
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1605 (eq (ediff-no-fine-diffs-p n) t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1606 (setq n (1+ n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1607 (if (= 0 (mod n 20))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1608 (message "Skipped over region %d and counting ..." n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1609 (or (>= n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1610 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1611 ;; this won't exec if regexp-skip is t
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1612 (setq non-clash-skip (ediff-merge-region-is-non-clash n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1613 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1614 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1615 (message "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1616 (ediff-unselect-and-select-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1617 ) ; let
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1618 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1619 (error "At end of the difference list")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1620
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1621 (defun ediff-previous-difference (&optional arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1622 "Go to the previous difference.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1623 With a prefix argument, go back that many differences."
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1624 (interactive "p")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1625 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1626 (if (> ediff-current-difference -1)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1627 (let ((n (max -1 (- ediff-current-difference arg)))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1628 non-clash-skip regexp-skip)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1629
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1630 (ediff-visible-region)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1631 (or (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1632 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1633 ;; this won't exec if regexp-skip is t
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1634 (setq non-clash-skip (ediff-merge-region-is-non-clash n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1635 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1636 (while (and (> n -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1637 (or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1638 ;; regexp skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1639 regexp-skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1640 ;; skip clashes, if necessary
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1641 non-clash-skip
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1642 ;; skip difference regions that differ in white space
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1643 (and ediff-ignore-similar-regions
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
1644 (eq (ediff-no-fine-diffs-p n) t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1645 (if (= 0 (mod (1+ n) 20))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1646 (message "Skipped over region %d and counting ..." (1+ n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1647 (setq n (1- n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1648 (or (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1649 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1650 ;; this won't exec if regexp-skip is t
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19870
diff changeset
1651 (setq non-clash-skip (ediff-merge-region-is-non-clash n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1652 (ediff-install-fine-diff-if-necessary n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1653 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1654 (message "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1655 (ediff-unselect-and-select-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1656 ) ; let
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1657 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1658 (error "At beginning of the difference list")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1659
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1660 ;; The diff number is as perceived by the user (i.e., 1+ the internal
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1661 ;; representation)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1662 (defun ediff-jump-to-difference (difference-number)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1663 "Go to the difference specified as a prefix argument.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1664 If the prefix is negative, count differences from the end."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1665 (interactive "p")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1666 (ediff-barf-if-not-control-buffer)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1667 (setq difference-number
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1668 (cond ((< difference-number 0)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1669 (+ ediff-number-of-differences difference-number))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1670 ((> difference-number 0) (1- difference-number))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1671 (t -1)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1672 ;; -1 is allowed by ediff-unselect-and-select-difference --- it is the
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1673 ;; position before the first one.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1674 (if (and (>= difference-number -1)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1675 (<= difference-number ediff-number-of-differences))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1676 (ediff-unselect-and-select-difference difference-number)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1677 (error ediff-BAD-DIFF-NUMBER
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1678 this-command (1+ difference-number) ediff-number-of-differences)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1679
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1680 (defun ediff-jump-to-difference-at-point (arg)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1681 "Go to difference closest to the point in buffer A, B, or C.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1682 The buffer depends on last command character \(a, b, or c\) that invoked this
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1683 command. For instance, if the command was `ga' then the point value in buffer A
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1684 is used.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1685 With a prefix argument, synchronize all files around the current point position
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1686 in the specified buffer."
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1687 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1688 (ediff-barf-if-not-control-buffer)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1689 (let* ((buf-type (ediff-char-to-buftype last-command-char))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1690 (buffer (ediff-get-buffer buf-type))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1691 (pt (ediff-with-current-buffer buffer (point)))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1692 (diff-no (ediff-diff-at-point buf-type nil (if arg 'after)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1693 (past-last-diff (< ediff-number-of-differences diff-no))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1694 (beg (if past-last-diff
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1695 (ediff-with-current-buffer buffer (point-max))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1696 (ediff-get-diff-posn buf-type 'beg (1- diff-no))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1697 ctl-wind wind-A wind-B wind-C
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1698 shift)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1699 (if past-last-diff
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1700 (ediff-jump-to-difference -1)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1701 (ediff-jump-to-difference diff-no))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1702 (setq ctl-wind (selected-window)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1703 wind-A ediff-window-A
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1704 wind-B ediff-window-B
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1705 wind-C ediff-window-C)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1706 (if arg
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1707 (progn
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1708 (ediff-with-current-buffer buffer
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1709 (setq shift (- beg pt)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1710 (select-window wind-A)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1711 (if past-last-diff (goto-char (point-max)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1712 (condition-case nil
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1713 (backward-char shift) ; noerror, if beginning of buffer
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1714 (error))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1715 (recenter)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1716 (select-window wind-B)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1717 (if past-last-diff (goto-char (point-max)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1718 (condition-case nil
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1719 (backward-char shift) ; noerror, if beginning of buffer
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1720 (error))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1721 (recenter)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1722 (if (window-live-p wind-C)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1723 (progn
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1724 (select-window wind-C)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1725 (if past-last-diff (goto-char (point-max)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1726 (condition-case nil
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1727 (backward-char shift) ; noerror, if beginning of buffer
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1728 (error))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1729 (recenter)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1730 ))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1731 (select-window ctl-wind)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1732 ))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1733 ))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1734
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1735
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1736 ;; find region most related to the current point position (or POS, if given)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1737 ;; returns diff number as seen by the user (i.e., 1+ the internal
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1738 ;; representation)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1739 ;; The optional argument WHICH-DIFF can be `after' or `before'. If `after',
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1740 ;; find the diff after the point. If `before', find the diff before the
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1741 ;; point. If the point is inside a diff, return that diff.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1742 (defun ediff-diff-at-point (buf-type &optional pos which-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1743 (let ((buffer (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1744 (ctl-buffer ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1745 (max-dif-num (1- ediff-number-of-differences))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1746 (diff-no -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1747 (prev-beg 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1748 (prev-end 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1749 (beg 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1750 (end 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1751
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1752 (ediff-with-current-buffer buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1753 (setq pos (or pos (point)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1754 (while (and (or (< pos prev-beg) (> pos beg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1755 (< diff-no max-dif-num))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1756 (setq diff-no (1+ diff-no))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1757 (setq prev-beg beg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1758 prev-end end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1759 (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1760 end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1761 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1762
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1763 ;; boost diff-no by 1, if past the last diff region
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1764 (if (and (memq which-diff '(after before))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1765 (> pos beg) (= diff-no max-dif-num))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1766 (setq diff-no (1+ diff-no)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1767
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1768 (cond ((eq which-diff 'after) (1+ diff-no))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1769 ((eq which-diff 'before) diff-no)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1770 ((< (abs (count-lines pos (max 1 prev-end)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1771 (abs (count-lines pos (max 1 beg))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1772 diff-no) ; choose prev difference
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1773 (t
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1774 (1+ diff-no))) ; choose next difference
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1775 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1776
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1777
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1778 ;;; Copying diffs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1779
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1780 (defun ediff-diff-to-diff (arg &optional keys)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1781 "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
1782 If numerical prefix argument, copy the difference specified in the arg.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1783 Otherwise, copy the difference given by `ediff-current-difference'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1784 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
1785 `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
1786 copying difference regions. The first character in the sequence specifies
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1787 the source buffer and the second specifies the target.
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 the second optional argument, a 2-character string, is given, use it to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1790 determine the source and the target buffers instead of the command keys."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1791 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1792 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1793 (or keys (setq keys (this-command-keys)))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1794 (if (eq arg '-) (setq arg -1)) ; translate neg arg to -1
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1795 (if (numberp arg) (ediff-jump-to-difference arg))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1796
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1797 (let* ((key1 (aref keys 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1798 (key2 (aref keys 1))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1799 (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
1800 (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
1801 ediff-verbose-p)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1802 (ediff-copy-diff ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1803 (ediff-char-to-buftype char1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1804 (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
1805 ;; 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
1806 (ediff-recenter)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1807
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1808 (defun ediff-copy-A-to-B (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1809 "Copy ARGth difference region from buffer A to B.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1810 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
1811 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1812 (ediff-diff-to-diff arg "ab"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1813
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1814 (defun ediff-copy-B-to-A (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1815 "Copy ARGth difference region from buffer B to A.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1816 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
1817 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1818 (ediff-diff-to-diff arg "ba"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1819
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1820 (defun ediff-copy-A-to-C (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1821 "Copy ARGth difference region from buffer A to buffer C.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1822 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
1823 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1824 (ediff-diff-to-diff arg "ac"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1825
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1826 (defun ediff-copy-B-to-C (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1827 "Copy ARGth difference region from buffer B to buffer C.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1828 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
1829 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1830 (ediff-diff-to-diff arg "bc"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1831
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1832 (defun ediff-copy-C-to-B (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1833 "Copy ARGth difference region from buffer C to B.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1834 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
1835 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1836 (ediff-diff-to-diff arg "cb"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1837
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1838 (defun ediff-copy-C-to-A (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1839 "Copy ARGth difference region from buffer C to A.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1840 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
1841 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1842 (ediff-diff-to-diff arg "ca"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1843
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1844
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1845
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1846 ;; 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
1847 ;; 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
1848 ;; target diff. This is used in merging, when constructing the merged
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1849 ;; version.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1850 (defun ediff-copy-diff (n from-buf-type to-buf-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1851 &optional batch-invocation reg-to-copy)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1852 (let* ((to-buf (ediff-get-buffer to-buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1853 ;;(from-buf (if (not reg-to-copy) (ediff-get-buffer from-buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1854 (ctrl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1855 (saved-p t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1856 (three-way ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1857 messg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1858 ediff-verbose-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1859 reg-to-delete reg-to-delete-beg reg-to-delete-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1860
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1861 (setq reg-to-delete-beg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1862 (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1863 (setq reg-to-delete-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1864 (ediff-get-diff-posn to-buf-type 'end n ctrl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1865
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1866 (if reg-to-copy
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1867 (setq from-buf-type nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1868 (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
1869
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1870 (setq reg-to-delete (ediff-get-region-contents
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1871 n to-buf-type ctrl-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1872 reg-to-delete-beg reg-to-delete-end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1873
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1874 (if (string= reg-to-delete reg-to-copy)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1875 (setq saved-p nil) ; don't copy identical buffers
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1876 ;; seems ok to copy
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1877 (if (or batch-invocation (ediff-test-save-region n to-buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1878 (condition-case conds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1879 (progn
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1880 (ediff-with-current-buffer to-buf
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1881 ;; 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
1882 (let ((inhibit-read-only (null buffer-read-only)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1883
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1884 (goto-char reg-to-delete-end)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1885 (insert reg-to-copy)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1886
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1887 (if (> reg-to-delete-end reg-to-delete-beg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1888 (kill-region reg-to-delete-beg reg-to-delete-end))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1889 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1890 (or batch-invocation
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1891 (setq
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1892 messg
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1893 (ediff-save-diff-region n to-buf-type reg-to-delete))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1894 (error (message "ediff-copy-diff: %s %s"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1895 (car conds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1896 (mapconcat 'prin1-to-string (cdr conds) " "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1897 (beep 1)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
1898 (sit-for 2) ; let the user see the error msg
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1899 (setq saved-p nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1900 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1901 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1902
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1903 ;; adjust state of difference in case 3-way and diff was copied ok
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1904 (if (and saved-p three-way)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1905 (ediff-set-state-of-diff-in-all-buffers n ctrl-buf))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1906
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1907 (if batch-invocation
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1908 (ediff-clear-fine-differences n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1909 ;; If diff3 job, we should recompute fine diffs so we clear them
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1910 ;; before reinserting flags (and thus before ediff-recenter).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1911 (if (and saved-p three-way)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1912 (ediff-clear-fine-differences n))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1913
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1914 (ediff-refresh-mode-lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1915
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1916 ;; For diff2 jobs, don't recompute fine diffs, since we know there
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1917 ;; aren't any. So we clear diffs after ediff-recenter.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1918 (if (and saved-p (not three-way))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1919 (ediff-clear-fine-differences n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1920 ;; Make sure that the message about saving and how to restore is seen
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1921 ;; by the user
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1922 (message messg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1923 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1924
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1925 ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1926 ;; 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
1927 ;; 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
1928 ;; convenience.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1929 (defun ediff-save-diff-region (n buf-type reg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1930 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1931 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1932 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1933
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1934 (if this-buf-n-th-diff-saved
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1935 ;; either nothing saved for n-th diff and buffer or we OK'ed
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1936 ;; overriding
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1937 (setcdr this-buf-n-th-diff-saved reg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1938 (if n-th-diff-saved ;; n-th diff saved, but for another buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1939 (nconc n-th-diff-saved (list (cons buf reg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1940 (setq ediff-killed-diffs-alist ;; create record for n-th diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1941 (cons (list n (cons buf reg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1942 ediff-killed-diffs-alist))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1943 (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
1944 (1+ n) buf-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1945 (if ediff-merge-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1946 "" (downcase (symbol-name buf-type))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1947 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1948
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1949 ;; Test if saving Nth difference region of buffer BUF-TYPE is possible.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1950 (defun ediff-test-save-region (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1951 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1952 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1953 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1954
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1955 (if this-buf-n-th-diff-saved
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1956 (if (yes-or-no-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1957 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1958 "You've previously copied diff region %d to buffer %S. Confirm "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1959 (1+ n) buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1960 t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1961 (error "Quit"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1962 t)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1963
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1964 (defun ediff-pop-diff (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1965 "Pop last killed Nth diff region from buffer BUF-TYPE."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1966 (let* ((n-th-record (assoc n ediff-killed-diffs-alist))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1967 (buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1968 (saved-rec (assoc buf (cdr n-th-record)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1969 (three-way ediff-3way-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1970 (ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1971 ediff-verbose-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1972 saved-diff reg-beg reg-end recovered)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1973
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1974 (if (cdr saved-rec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1975 (setq saved-diff (cdr saved-rec))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1976 (if (> ediff-number-of-differences 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1977 (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
1978 (error ediff-NO-DIFFERENCES)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1979
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1980 (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
1981 (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
1982
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1983 (condition-case conds
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
1984 (ediff-with-current-buffer buf
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
1985 (let ((inhibit-read-only (null buffer-read-only)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1986
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1987 (goto-char reg-end)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1988 (insert saved-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1989
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1990 (if (> reg-end reg-beg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1991 (kill-region reg-beg reg-end))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1992
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1993 (setq recovered t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1994 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1995 (error (message "ediff-pop-diff: %s %s"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1996 (car conds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1997 (mapconcat 'prin1-to-string (cdr conds) " "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1998 (beep 1)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1999
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2000 ;; Clearing fine diffs is necessary for
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2001 ;; 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
2002 ;; 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
2003 ;; 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
2004 ;; fine diffs.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2005 (if recovered
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2006 (ediff-clear-fine-differences n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2007
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2008 ;; adjust state of difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2009 (if (and three-way recovered)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2010 (ediff-set-state-of-diff-in-all-buffers n ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2011
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2012 (ediff-refresh-mode-lines)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2013
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2014 (if recovered
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2015 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2016 (setq n-th-record (delq saved-rec n-th-record))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2017 (message "Diff region %d in buffer %S restored" (1+ n) buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2018 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2019 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2020
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2021 (defun ediff-restore-diff (arg &optional key)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2022 "Restore ARGth diff from `ediff-killed-diffs-alist'.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2023 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
2024 If the second optional argument, a character, is given, use it to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2025 determine the target buffer instead of last-command-char"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2026 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2027 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2028 (if (numberp arg)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2029 (ediff-jump-to-difference arg))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2030 (ediff-pop-diff ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2031 (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
2032 ;; 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
2033 (let (ediff-verbose-p)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2034 (ediff-recenter)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2035
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2036 (defun ediff-restore-diff-in-merge-buffer (arg)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2037 "Restore ARGth diff in the merge buffer.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2038 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
2039 (interactive "P")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2040 (ediff-restore-diff arg ?c))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2041
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2043 (defun ediff-toggle-regexp-match ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2044 "Toggle between focusing and hiding of difference regions that match
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2045 a regular expression typed in by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2046 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2047 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2048 (let ((regexp-A "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2049 (regexp-B "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2050 (regexp-C "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2051 msg-connective alt-msg-connective alt-connective)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2052 (cond
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2053 ((or (and (eq ediff-skip-diff-region-function
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2054 ediff-focus-on-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2055 (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
2056 (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
2057 ediff-hide-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2058 (eq last-command-char ?h)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2059 (message "Selective browsing by regexp turned off")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2060 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2061 ((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
2062 (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2063 regexp-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2064 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2065 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2066 "Ignore A-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2067 ediff-regexp-hide-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2068 regexp-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2069 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2070 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2071 "Ignore B-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2072 ediff-regexp-hide-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2073 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2074 (setq regexp-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2075 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2076 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2077 "Ignore C-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2078 ediff-regexp-hide-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2079 (if (eq ediff-hide-regexp-connective 'and)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2080 (setq msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2081 alt-msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2082 alt-connective 'or)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2083 (setq msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2084 alt-msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2085 alt-connective 'and))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2086 (if (y-or-n-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2087 (format
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2088 "Ignore regions that match %s regexps, OK? "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2089 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
2090 (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
2091 (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
2092 (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
2093 alt-msg-connective))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2094
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2095 (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2096 (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2097 (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
2098
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2099 ((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
2100 (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
2101 ediff-focus-on-regexp-matches-function
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2102 regexp-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2103 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2104 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2105 "Focus on A-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2106 ediff-regexp-focus-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2107 regexp-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2108 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2109 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2110 "Focus on B-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2111 ediff-regexp-focus-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2112 (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2113 (setq regexp-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2114 (read-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2115 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2116 "Focus on C-regions matching this regexp (default \"%s\"): "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2117 ediff-regexp-focus-C))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2118 (if (eq ediff-focus-regexp-connective 'and)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2119 (setq msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2120 alt-msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2121 alt-connective 'or)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2122 (setq msg-connective "ONE OF"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2123 alt-msg-connective "BOTH"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2124 alt-connective 'and))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2125 (if (y-or-n-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2126 (format
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2127 "Focus on regions that match %s regexps, OK? "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2128 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
2129 (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
2130 msg-connective)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2131 (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
2132 (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
2133 alt-msg-connective))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2134
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2135 (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2136 (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2137 (or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2138
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2139 (defun ediff-toggle-skip-similar ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2140 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2141 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2142 (if (not (eq ediff-auto-refine 'on))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2143 (error
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2144 "Can't skip over whitespace regions: first turn auto-refining on"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2145 (setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2146 (if ediff-ignore-similar-regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2147 (message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2148 "Skipping regions that differ only in white space & line breaks")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2149 (message "Skipping over white-space differences turned off")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2150
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2151 (defun ediff-focus-on-regexp-matches (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2152 "Focus on diffs that match regexp `ediff-regexp-focus-A/B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2153 Regions to be ignored according to this function are those where
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2154 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
2155 doesn't match `ediff-regexp-focus-B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2156 This function returns nil if the region number N (specified as
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2157 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
2158
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2159 N is a region number used by Ediff internally. It is 1 less
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2160 the number seen by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2161 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2162 (let* ((ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2163 (regex-A ediff-regexp-focus-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2164 (regex-B ediff-regexp-focus-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2165 (regex-C ediff-regexp-focus-C)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2166 (reg-A-match (ediff-with-current-buffer ediff-buffer-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2167 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2168 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2169 (ediff-get-diff-posn 'A 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2170 (ediff-get-diff-posn 'A 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2171 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2172 (re-search-forward regex-A nil t))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2173 (reg-B-match (ediff-with-current-buffer ediff-buffer-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2174 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2175 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2176 (ediff-get-diff-posn 'B 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2177 (ediff-get-diff-posn 'B 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2178 (re-search-forward regex-B nil t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2179 (reg-C-match (if ediff-3way-comparison-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2180 (ediff-with-current-buffer ediff-buffer-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2181 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2182 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2183 (ediff-get-diff-posn 'C 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2184 (ediff-get-diff-posn 'C 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2185 (re-search-forward regex-C nil t))))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2186 (not (eval (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2187 (list ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2188 reg-A-match reg-B-match reg-C-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2189 (list ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2190 reg-A-match reg-B-match))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2191 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2192
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2193 (defun ediff-hide-regexp-matches (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2194 "Hide diffs that match regexp `ediff-regexp-hide-A/B/C'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2195 Regions to be ignored are those where buf A region matches
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2196 `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2197 This function returns nil if the region number N (specified as
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2198 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
2199
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2200 N is a region number used by Ediff internally. It is 1 less
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2201 the number seen by the user."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2202 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2203 (let* ((ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2204 (regex-A ediff-regexp-hide-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2205 (regex-B ediff-regexp-hide-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2206 (regex-C ediff-regexp-hide-C)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2207 (reg-A-match (ediff-with-current-buffer ediff-buffer-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2208 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2209 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2210 (ediff-get-diff-posn 'A 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2211 (ediff-get-diff-posn 'A 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2212 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2213 (re-search-forward regex-A nil t))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2214 (reg-B-match (ediff-with-current-buffer ediff-buffer-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2215 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2216 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2217 (ediff-get-diff-posn 'B 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2218 (ediff-get-diff-posn 'B 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2219 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2220 (re-search-forward regex-B nil t))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2221 (reg-C-match (if ediff-3way-comparison-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2222 (ediff-with-current-buffer ediff-buffer-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2223 (save-restriction
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2224 (narrow-to-region
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2225 (ediff-get-diff-posn 'C 'beg n ctl-buf)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2226 (ediff-get-diff-posn 'C 'end n ctl-buf))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2227 (goto-char (point-min))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2228 (re-search-forward regex-C nil t))))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2229 (eval (if ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2230 (list ediff-hide-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2231 reg-A-match reg-B-match reg-C-match)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2232 (list ediff-hide-regexp-connective reg-A-match reg-B-match)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2233 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2234
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2235
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2236
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2237 ;;; Quitting, suspending, etc.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2238
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2239 (defun ediff-quit (reverse-default-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2240 "Finish an Ediff session and exit Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2241 Unselects the selected difference, if any, restores the read-only and modified
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2242 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
2243 \(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
2244
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2245 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
2246 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
2247 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
2248 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
2249 (interactive "P")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2250 (ediff-barf-if-not-control-buffer)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2251 (let ((ctl-buf (current-buffer)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2252 (if (y-or-n-p (format "Quit this Ediff session%s? "
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2253 (if (ediff-buffer-live-p ediff-meta-buffer)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2254 " & show containing session group" "")))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2255 (progn
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2256 (message "")
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2257 (set-buffer ctl-buf)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2258 (ediff-really-quit reverse-default-keep-variants))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2259 (message ""))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2260
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2261
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2262 ;; Perform the quit operations.
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2263 (defun ediff-really-quit (reverse-default-keep-variants)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2264 (ediff-unhighlight-diffs-totally)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2265 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2266 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2267 (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
2268 (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
2269
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2270 (ediff-delete-temp-files)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2271
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2272 ;; Restore visibility range. This affects only ediff-*-regions/windows.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2273 ;; Since for other job names ediff-visible-region sets
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2274 ;; ediff-visible-bounds to ediff-wide-bounds, the settings below are
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2275 ;; ignored for such jobs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2276 (if ediff-quit-widened
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2277 (setq ediff-visible-bounds ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2278 (setq ediff-visible-bounds ediff-narrow-bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2279
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2280 ;; Apply selective display to narrow or widen
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2281 (ediff-visible-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2282 (mapcar (function (lambda (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2283 (if (ediff-overlayp overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2284 (ediff-delete-overlay overl))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2285 ediff-wide-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2286 (mapcar (function (lambda (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2287 (if (ediff-overlayp overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2288 (ediff-delete-overlay overl))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2289 ediff-narrow-bounds)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2290
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2291 ;; 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
2292 (let ((control-buffer ediff-control-buffer)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2293 (meta-buffer ediff-meta-buffer)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2294 ;; suitable working frame
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2295 (warp-frame (if (and (ediff-window-display-p) (eq ediff-grab-mouse t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2296 (cond ((window-live-p ediff-window-A)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2297 (window-frame ediff-window-A))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2298 ((window-live-p ediff-window-B)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2299 (window-frame ediff-window-B))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2300 (t (next-frame))))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2301 (condition-case nil
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2302 (ediff-with-current-buffer ediff-buffer-A
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2303 (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
2304 (delq control-buffer ediff-this-buffer-ediff-sessions))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2305 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2306 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2307 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2308 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2309
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2310 (condition-case nil
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2311 (ediff-with-current-buffer ediff-buffer-B
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2312 (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
2313 (delq control-buffer ediff-this-buffer-ediff-sessions))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2314 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2315 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2316 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2317 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2318
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2319 (condition-case nil
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2320 (ediff-with-current-buffer ediff-buffer-C
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2321 (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
2322 (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
2323 (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
2324 (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
2325 )
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2326 (error))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2327
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2328 (condition-case nil
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2329 (ediff-with-current-buffer ediff-ancestor-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2330 (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
2331 (delq control-buffer ediff-this-buffer-ediff-sessions))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2332 (kill-local-variable 'mode-line-buffer-identification)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2333 (kill-local-variable 'mode-line-format)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2334 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2335 (error))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2336
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2337 (setq ediff-session-registry
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2338 (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
2339 (ediff-update-registry)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2340 ;; restore state of buffers to what it was before ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2341 (ediff-restore-protected-variables)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2342
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2343 ;; If the user interrupts (canceling saving the merge buffer), continue
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2344 ;; normally.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2345 (condition-case nil
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2346 (if (ediff-merge-job)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2347 (run-hooks 'ediff-quit-merge-hook))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2348 (quit))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2349
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2350 ;; 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
2351 (run-hooks 'ediff-cleanup-hook)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2352 (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
2353 (if reverse-default-keep-variants
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2354 (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
2355 (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
2356
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2357 (run-hooks 'ediff-quit-hook)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2358 (ediff-cleanup-meta-buffer meta-buffer)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2359
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2360 ;; warp mouse into a working window
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2361 (setq warp-frame ; if mouse is over a reasonable frame, use it
19870
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2362 (cond ((ediff-good-frame-under-mouse))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2363 (t warp-frame)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2364 (if (frame-live-p warp-frame)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2365 (set-mouse-position (if ediff-emacs-p
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2366 warp-frame
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2367 (frame-selected-window warp-frame))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2368 2 1))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2369
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2370 (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
2371 (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
2372 ))
19870
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2373
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2374 ;; Returns frame under mouse, if this frame is not a minibuffer
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2375 ;; frame. Otherwise: nil
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2376 (defun ediff-good-frame-under-mouse ()
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2377 (let ((frame-or-win (car (mouse-position)))
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2378 (buf-name "")
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2379 frame obj-ok)
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2380 (setq obj-ok
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2381 (if ediff-emacs-p
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2382 (frame-live-p frame-or-win)
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2383 (window-live-p frame-or-win)))
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2384 (if obj-ok
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2385 (setq frame (if ediff-emacs-p frame-or-win (window-frame frame-or-win))
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2386 buf-name
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2387 (buffer-name (window-buffer (frame-selected-window frame)))))
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2388 (if (string-match "Minibuf" buf-name)
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2389 nil
a016beb4f4cf new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
2390 frame)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2391
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2392
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2393 (defun ediff-delete-temp-files ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2394 (if (stringp ediff-temp-file-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2395 (delete-file ediff-temp-file-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2396 (if (stringp ediff-temp-file-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2397 (delete-file ediff-temp-file-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2398 (if (stringp ediff-temp-file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2399 (delete-file ediff-temp-file-C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2400
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2401
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2402 ;; Kill control buffer, other auxiliary Ediff buffers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2403 ;; Leave one of the frames split between buffers A/B/C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2404 (defun ediff-cleanup-mess ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2405 (let ((buff-A ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2406 (buff-B ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2407 (buff-C ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2408 (ctl-buf ediff-control-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2409 (ctl-frame ediff-control-frame)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2410 (three-way-job ediff-3way-job))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2411
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2412 (ediff-kill-buffer-carefully ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2413 (ediff-kill-buffer-carefully ediff-custom-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2414 (ediff-kill-buffer-carefully ediff-fine-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2415 (ediff-kill-buffer-carefully ediff-tmp-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2416 (ediff-kill-buffer-carefully ediff-error-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2417 (ediff-kill-buffer-carefully ediff-msg-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2418 (ediff-kill-buffer-carefully ediff-debug-buffer)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2419 (if (boundp 'ediff-patch-diagnostics)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2420 (ediff-kill-buffer-carefully ediff-patch-diagnostics))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2421
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2422 (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
2423 (delete-frame ctl-frame))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2424 ;; Hide bottom toolbar. --marcpa
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2425 (if (not (ediff-multiframe-setup-p))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2426 (ediff-kill-bottom-toolbar))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2427
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2428 (ediff-kill-buffer-carefully ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2429
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2430 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2431
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2432 ;; display only if not visible
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2433 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2434 (or (ediff-get-visible-buffer-window buff-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2435 (switch-to-buffer buff-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2436 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2437 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2438 (or (ediff-get-visible-buffer-window buff-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2439 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2440 (if (ediff-get-visible-buffer-window buff-B)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2441 (funcall ediff-split-window-function))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2442 (switch-to-buffer buff-A)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2443 (error))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2444 (if three-way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2445 (condition-case nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2446 (or (ediff-get-visible-buffer-window buff-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2447 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2448 (if (or (ediff-get-visible-buffer-window buff-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2449 (ediff-get-visible-buffer-window buff-B))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2450 (funcall ediff-split-window-function))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2451 (switch-to-buffer buff-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2452 (balance-windows)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2453 (error)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2454 (message "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2455 ))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2456
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2457 (defun ediff-janitor (&optional ask)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2458 "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
2459 In merge jobs, buffer C is never deleted.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2460 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
2461 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
2462 buffer in another session as well."
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2463 (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
2464 (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
2465 (and ask
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2466 (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
2467 (buffer-name ediff-buffer-A)))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2468 (ediff-kill-buffer-carefully ediff-buffer-A))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2469 (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
2470 (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
2471 (and ask
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2472 (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
2473 (buffer-name ediff-buffer-B)))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2474 (ediff-kill-buffer-carefully ediff-buffer-B))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2475 (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
2476 (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
2477 (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
2478 (and ask
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2479 (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
2480 (buffer-name ediff-ancestor-buffer)))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2481 (ediff-kill-buffer-carefully ediff-ancestor-buffer))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2482 (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
2483 (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
2484 (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
2485 (buffer-name ediff-buffer-C)))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2486 (ediff-kill-buffer-carefully ediff-buffer-C))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2487
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2488 (defun ediff-maybe-save-and-delete-merge (&optional save-and-continue)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2489 "Default hook to run on quitting a merge job.
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2490 This can also be used to save merge buffer in the middle of an Ediff session.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2491
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2492 If the optional SAVE-AND-CONTINUE argument is non-nil, save merge buffer and
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2493 continue. Otherwise:
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2494 If `ediff-autostore-merges' is nil, this does nothing.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2495 If it is t, it saves the merge buffer in the file `ediff-merge-store-file'
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2496 or asks the user, if the latter is nil. It then asks the user whether to
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2497 delete the merge buffer.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2498 If `ediff-autostore-merges' is neither nil nor t, the merge buffer is saved
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2499 only if this merge job is part of a group, i.e., was invoked from within
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2500 `ediff-merge-directories', `ediff-merge-directory-revisions', and such."
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2501 (let ((merge-store-file ediff-merge-store-file)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2502 (ediff-autostore-merges ; fake ediff-autostore-merges, if necessary
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2503 (if save-and-continue t ediff-autostore-merges)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2504 (if ediff-autostore-merges
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2505 (cond ((stringp ediff-merge-store-file)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2506 ;; store, ask to delete
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2507 (ediff-write-merge-buffer-and-maybe-kill
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2508 ediff-buffer-C merge-store-file 'show-file save-and-continue))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2509 ((eq ediff-autostore-merges t)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2510 ;; ask for file name
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2511 (setq merge-store-file
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2512 (read-file-name "Save the merge buffer in file: "))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2513 (ediff-write-merge-buffer-and-maybe-kill
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2514 ediff-buffer-C merge-store-file nil save-and-continue))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2515 ((and (ediff-buffer-live-p ediff-meta-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2516 (ediff-with-current-buffer ediff-meta-buffer
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
2517 (ediff-merge-metajob)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2518 ;; This case shouldn't occur, as the parent metajob must pass on
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2519 ;; a file name, ediff-merge-store-file, where to save the result
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2520 ;; of the merge.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2521 ;; Ask where to save anyway--will decide what to do here later.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2522 (setq merge-store-file
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2523 (read-file-name "Save the merge buffer in file: "))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2524 (ediff-write-merge-buffer-and-maybe-kill
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2525 ediff-buffer-C merge-store-file nil save-and-continue))))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2526 ))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2527
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2528 ;; write merge buffer. If the optional argument save-and-continue is non-nil,
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2529 ;; then don't kill the merge buffer
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2530 (defun ediff-write-merge-buffer-and-maybe-kill (buf file
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2531 &optional
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2532 show-file save-and-continue)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2533 (ediff-with-current-buffer buf
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2534 (if (or (not (file-exists-p file))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2535 (y-or-n-p (format "File %s exists, overwrite? " file)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2536 (progn
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2537 (write-region (point-min) (point-max) file)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2538 (if show-file
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2539 (progn
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2540 (message "Merge buffer saved in: %s" file)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2541 (sit-for 2)))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2542 (if (and
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2543 (not save-and-continue)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2544 (y-or-n-p "Merge buffer saved in file. Now kill the buffer? "))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2545 (ediff-kill-buffer-carefully buf))))))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2546
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2547 ;; The default way of suspending Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2548 ;; 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
2549 (defun ediff-default-suspend-function ()
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2550 (let* ((buf-A ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2551 (buf-B ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2552 (buf-C ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2553 (buf-A-wind (ediff-get-visible-buffer-window buf-A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2554 (buf-B-wind (ediff-get-visible-buffer-window buf-B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2555 (buf-C-wind (ediff-get-visible-buffer-window buf-C))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2556 (buf-patch (if (boundp 'ediff-patchbufer) ediff-patchbufer nil))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2557 (buf-patch-diag (if (boundp 'ediff-patch-diagnostics)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2558 ediff-patch-diagnostics nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2559 (buf-err ediff-error-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2560 (buf-diff ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2561 (buf-custom-diff ediff-custom-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2562 (buf-fine-diff ediff-fine-diff-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2563
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2564 ;; hide the control panel
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2565 (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
2566 (iconify-frame ediff-control-frame)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2567 (bury-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2568 (if buf-err (bury-buffer buf-err))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2569 (if buf-diff (bury-buffer buf-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2570 (if buf-custom-diff (bury-buffer buf-custom-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2571 (if buf-fine-diff (bury-buffer buf-fine-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2572 (if buf-patch (bury-buffer buf-patch))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2573 (if buf-patch-diag (bury-buffer buf-patch-diag))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2574 (if (window-live-p buf-A-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2575 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2576 (select-window buf-A-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2577 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2578 (bury-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2579 (if (ediff-buffer-live-p buf-A)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2580 (progn
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2581 (set-buffer buf-A)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2582 (bury-buffer))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2583 (if (window-live-p buf-B-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2584 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2585 (select-window buf-B-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2586 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2587 (bury-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2588 (if (ediff-buffer-live-p buf-B)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2589 (progn
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2590 (set-buffer buf-B)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2591 (bury-buffer))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2592 (if (window-live-p buf-C-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2593 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2594 (select-window buf-C-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2595 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2596 (bury-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2597 (if (ediff-buffer-live-p buf-C)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2598 (progn
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2599 (set-buffer buf-C)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2600 (bury-buffer))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2601 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2602
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2603
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2604 (defun ediff-suspend ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2605 "Suspend Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2606 To resume, switch to the appropriate `Ediff Control Panel'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2607 buffer and then type \\[ediff-recenter]. Ediff will automatically set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2608 up an appropriate window config."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2609 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2610 (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
2611 (run-hooks 'ediff-suspend-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2612 (message
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2613 "To resume, type M-x eregistry and select the desired Ediff session"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2614
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2615
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2616 (defun ediff-status-info ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2617 "Show the names of the buffers or files being operated on by Ediff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2618 Hit \\[ediff-recenter] to reset the windows afterward."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2619 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2620 (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
2621 (save-excursion
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2622 (ediff-skip-unsuitable-frames))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2623 (with-output-to-temp-buffer ediff-msg-buffer
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2624 (raise-frame (selected-frame))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2625 (princ (ediff-version))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2626 (princ "\n\n")
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2627 (ediff-with-current-buffer ediff-buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2628 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2629 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2630 (format "File A = %S\n" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2631 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2632 (format "Buffer A = %S\n" (buffer-name)))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2633 (ediff-with-current-buffer ediff-buffer-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2634 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2635 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2636 (format "File B = %S\n" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2637 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2638 (format "Buffer B = %S\n" (buffer-name)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2639 (if ediff-3way-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2640 (ediff-with-current-buffer ediff-buffer-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2641 (if buffer-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2642 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2643 (format "File C = %S\n" buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2644 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2645 (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
2646 (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
2647 (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
2648 (concat "\tin buffer "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2649 (buffer-name ediff-custom-diff-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2650 " is not available")))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2651 (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
2652 (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
2653 (concat "\tin buffer "
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2654 (buffer-name ediff-diff-buffer))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2655 " is not available")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2656
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2657 (let* ((A-line (ediff-with-current-buffer ediff-buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2658 (1+ (count-lines (point-min) (point)))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2659 (B-line (ediff-with-current-buffer ediff-buffer-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2660 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2661 C-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2662 (princ (format "\Buffer A's point is on line %d\n" A-line))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2663 (princ (format "Buffer B's point is on line %d\n" B-line))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2664 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2665 (progn
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2666 (setq C-line (ediff-with-current-buffer ediff-buffer-C
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2667 (1+ (count-lines (point-min) (point)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2668 (princ (format "Buffer C's point is on line %d\n" C-line)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2669
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2670 (princ (format "\nCurrent difference number = %S\n"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2671 (cond ((< ediff-current-difference 0) 'start)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2672 ((>= ediff-current-difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2673 ediff-number-of-differences) 'end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2674 (t (1+ ediff-current-difference)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2675
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2676 (princ
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2677 (format "\n%s regions that differ in white space & line breaks only"
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2678 (if ediff-ignore-similar-regions
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
2679 "Ignoring" "Showing")))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2680 (if (and ediff-merge-job ediff-show-clashes-only)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2681 (princ
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2682 "\nFocusing on regions where both buffers differ from the ancestor"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2683
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2684 (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
2685 (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
2686 ((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
2687 ediff-hide-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2688 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2689 "\nIgnoring regions that match")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2690 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2691 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2692 "\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
2693 ediff-regexp-hide-A ediff-hide-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2694 ediff-regexp-hide-B)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2695 ((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
2696 ediff-focus-on-regexp-matches-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2697 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2698 "\nFocusing on regions that match")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2699 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2700 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2701 "\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
2702 ediff-regexp-focus-A ediff-focus-regexp-connective
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2703 ediff-regexp-focus-B)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2704 (t (princ "\nSelective browsing via a user-defined method.\n")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2705
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2706 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2707 (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2708 (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
2709 ) ; with output
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2710 (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
2711 (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
2712 (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
2713 (select-window ediff-control-window)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2714
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2715
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2716
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2717
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2718 ;;; Support routines
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2719
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2720 ;; Select a difference by placing the ASCII flags around the appropriate
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2721 ;; group of lines in the A, B buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2722 ;; 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
2723 (defun ediff-select-difference (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2724 (if (and (ediff-buffer-live-p ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2725 (ediff-buffer-live-p ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2726 (ediff-valid-difference-p n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2727 (progn
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2728 (if (and (ediff-has-face-support-p) ediff-use-faces)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2729 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2730 (ediff-highlight-diff n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2731 (setq ediff-highlighting-style 'face))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2732 (setq ediff-highlighting-style 'ascii)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2733 (ediff-place-flags-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2734 'A ediff-buffer-A ediff-control-buffer n)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2735 (ediff-place-flags-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2736 'B ediff-buffer-B ediff-control-buffer n)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2737 (if ediff-3way-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2738 (ediff-place-flags-in-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2739 '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
2740 (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
2741 (ediff-place-flags-in-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2742 'Ancestor ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2743 ediff-control-buffer n))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2744 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2745
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2746 (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
2747 (run-hooks 'ediff-select-hook))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2748
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2749
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2750 ;; Unselect a difference by removing the ASCII flags in the buffers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2751 ;; 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
2752 (defun ediff-unselect-difference (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2753 (if (ediff-valid-difference-p n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2754 (progn
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2755 (cond ((and (ediff-has-face-support-p) ediff-use-faces)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2756 (ediff-unhighlight-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2757 ((eq ediff-highlighting-style 'ascii)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2758 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2759 ediff-buffer-A
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2760 (ediff-get-diff-overlay n 'A))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2761 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2762 ediff-buffer-B
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2763 (ediff-get-diff-overlay n 'B))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2764 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2765 (ediff-remove-flags-from-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2766 ediff-buffer-C
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2767 (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
2768 (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
2769 (ediff-remove-flags-from-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2770 ediff-ancestor-buffer
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2771 (ediff-get-diff-overlay n 'Ancestor)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2772 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2773 (setq ediff-highlighting-style nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2774
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2775 ;; unhighlight fine diffs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2776 (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
2777 (run-hooks 'ediff-unselect-hook))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2778
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2779
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2780 ;; 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
2781 ;; 'select-only or 'unselect-only. If FLAG is 'select-only, the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2782 ;; next difference is selected, but the current selection is not
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2783 ;; unselected. If FLAG is 'unselect-only then the current selection is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2784 ;; 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
2785 ;; don't recenter buffers after selecting/unselecting.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2786 (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
2787 (let ((ediff-current-difference n))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2788 (or no-recenter
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2789 (ediff-recenter 'no-rehighlight)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2790
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2791 (let ((control-buf ediff-control-buffer))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2792 (unwind-protect
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2793 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2794 (or (eq flag 'select-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2795 (ediff-unselect-difference ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2796
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2797 (or (eq flag 'unselect-only)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2798 (ediff-select-difference n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2799 (setq ediff-current-difference n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2800 ) ; end protected section
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2801
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2802 (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2803 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2804
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2805
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2806 (defun ediff-read-file-name (prompt default-dir default-file)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2807 ; This is a modified version of a similar function in `emerge.el'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2808 ; PROMPT should not have trailing ': ', so that it can be modified
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2809 ; according to context.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2810 ; If default-file is set, it should be used as the default value.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2811 ; If default-dir is non-nil, use it as the default directory.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2812 ; Otherwise, use the value of Emacs' variable `default-directory.'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2813
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2814 ;; hack default-dir if it is not set
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2815 (setq default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2816 (file-name-as-directory
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2817 (ediff-abbreviate-file-name
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2818 (expand-file-name (or default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2819 (and default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2820 (file-name-directory default-file))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2821 default-directory)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2822
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2823 ;; strip the directory from default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2824 (if default-file
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2825 (setq default-file (file-name-nondirectory default-file)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2826 (if (string= default-file "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2827 (setq default-file nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2828
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2829 (let (f)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2830 (setq f (expand-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2831 (read-file-name
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2832 (format "%s%s "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2833 prompt
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2834 (cond (default-file
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2835 (concat " (default " default-file "):"))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2836 (t (concat " (default " default-dir "):"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2837 default-dir
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2838 (or default-file default-dir)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2839 t ; must match, no-confirm
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2840 (if default-file (file-name-directory default-file))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2841 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2842 default-dir
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2843 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2844 ;; If user enters a directory name, expand the default file in that
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2845 ;; directory. This allows the user to enter a directory name for the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2846 ;; B-file and diff against the default-file in that directory instead
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2847 ;; of a DIRED listing!
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2848 (if (and (file-directory-p f) default-file)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2849 (setq f (expand-file-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2850 (file-name-nondirectory default-file) f)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2851 f))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2852
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2853 ;; 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
2854 ;; name. Otherwise, `ediff_' is used. If FILE is given, use this
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2855 ;; file and don't create a new one.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2856 ;; 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
2857 ;; 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
2858 ;; 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
2859 ;; 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
2860 (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
2861 (let ((p (or prefix "ediff"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2862 f)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2863 (if (and (eq system-type 'ms-dos) (> (length p) 7))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2864 (setq p (substring p 0 7)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2865
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2866 (setq f (concat ediff-temp-file-prefix p)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2867 f (cond (given-file)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2868 ((find-file-name-handler f 'find-file-noselect)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2869 ;; 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
2870 ;; name ends with .Z or .gz
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2871 ;; This is needed so that patches produced by ediff will
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2872 ;; have more meaningful names
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2873 (make-temp-name f))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2874 ;; 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
2875 ;; 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
2876 ;; but in the temp directory.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2877 ((and prefix (not (file-exists-p f))) f)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2878 ;; 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
2879 ;; to it.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2880 (t (make-temp-name f))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2881
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2882 ;; create the file
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2883 (ediff-with-current-buffer buff
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2884 (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
2885 (if end end (point-max))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2886 f
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2887 nil ; don't append---erase
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2888 'no-message)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2889 (set-file-modes f ediff-temp-file-mode)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
2890 (ediff-convert-standard-filename (expand-file-name f)))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2891
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2892 ;; Quote metacharacters (using \) when executing diff in Unix, but not in
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2893 ;; EMX OS/2
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2894 ;;(defun ediff-protect-metachars (str)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2895 ;; (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
2896 ;; (let ((limit 0))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2897 ;; (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
2898 ;; (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
2899 ;; "\\"
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2900 ;; (substring str (match-beginning 0))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2901 ;; (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
2902 ;; str)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2903
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2904 ;; 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
2905 ;; file on disk, and attempt to remedy the situation if not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2906 ;; 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
2907 ;; to do what is necessary to make them the same.
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2908 ;; Also, Ediff always offers to revert obsolete buffers, whether they
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2909 ;; are modified or not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2910 (defun ediff-verify-file-buffer (&optional file-magic)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2911 ;; First check if the file has been modified since the buffer visited it.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2912 (if (verify-visited-file-modtime (current-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2913 (if (buffer-modified-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2914 ;; If buffer is not obsolete and is modified, offer to save
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2915 (if (yes-or-no-p
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2916 (format "Buffer out of sync with visited file. Save file %s? "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2917 buffer-file-name))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2918 (condition-case nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2919 (save-buffer)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2920 (error
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2921 (beep)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2922 (message "Couldn't save %s" buffer-file-name)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2923 (error "Buffer is out of sync for file %s" buffer-file-name))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2924 ;; If buffer is not obsolete and is not modified, do nothing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2925 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2926 ;; If buffer is obsolete, offer to revert
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2927 (if (yes-or-no-p
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
2928 (format "Buffer is out of sync with visited file. REVERT file %s? "
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2929 buffer-file-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2930 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2931 (if file-magic
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2932 (erase-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2933 (revert-buffer t t))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2934 (error "Buffer out of sync for file %s" buffer-file-name))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2935
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2936
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
2937 (defun ediff-file-compressed-p (file)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
2938 (require 'jka-compr)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
2939 (string-match (jka-compr-build-file-regexp) file))
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
2940
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
2941 (defun ediff-filename-magic-p (file)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
2942 (or (ediff-file-compressed-p file)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
2943 (ediff-file-remote-p file)))
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
2944
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
2945
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2946 (defun ediff-save-buffer (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2947 "Safe way of saving buffers A, B, C, and the diff output.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2948 `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
2949 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
2950
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2951 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
2952 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
2953 \(and plain output, if customized output was not generated\)."
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2954 (interactive "P")
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2955 (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
2956 (ediff-compute-custom-diffs-maybe)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
2957 (ediff-with-current-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2958 (cond ((memq last-command-char '(?a ?b ?c))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2959 (ediff-get-buffer
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2960 (ediff-char-to-buftype last-command-char)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2961 ((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
2962 (message "Saving diff output ...")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2963 (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
2964 (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
2965 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2966 ((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
2967 ediff-custom-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2968 ((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
2969 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2970 (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
2971 )
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
2972 (save-buffer)))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2973
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2974 (defun ediff-compute-custom-diffs-maybe ()
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2975 (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
2976 (buf-B-file-name (buffer-file-name ediff-buffer-B))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2977 file-A file-B)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2978 (if (stringp buf-A-file-name)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2979 (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
2980 (if (stringp buf-B-file-name)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2981 (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
2982 (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
2983 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
2984
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2985 (or (ediff-buffer-live-p ediff-custom-diff-buffer)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2986 (setq ediff-custom-diff-buffer
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2987 (get-buffer-create
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2988 (ediff-unique-buffer-name "*ediff-custom-diff" "*"))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2989 (ediff-exec-process
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2990 ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2991 ediff-custom-diff-options file-A file-B)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2992 (delete-file file-A)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2993 (delete-file file-B)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
2994 ))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2995
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2996 (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
2997 (interactive "P")
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
2998 (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
2999 (ediff-compute-custom-diffs-maybe)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3000 (save-excursion
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3001 (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
3002 (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
3003 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3004 ((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
3005 ediff-custom-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3006 ((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
3007 ediff-diff-buffer)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3008 (t
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3009 (beep)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3010 (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
3011 nil))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3012 (if buf
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3013 (progn
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3014 (ediff-with-current-buffer buf
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3015 (goto-char (point-min)))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3016 (switch-to-buffer buf)
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3017 (raise-frame (selected-frame)))))
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3018 (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
3019 (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
3020 (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
3021 (select-window ediff-control-window)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3022
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3023
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3024 (defun ediff-inferior-compare-regions ()
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3025 "Compare regions in an active Ediff session.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3026 Like ediff-regions-linewise but is called from under an active Ediff session on
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3027 the files that belong to that session.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3028
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3029 After quitting the session invoked via this function, type C-l to the parent
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3030 Ediff Control Panel to restore highlighting."
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3031 (interactive)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3032 (let ((answer "")
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3033 (possibilities (list ?A ?B ?C))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3034 (zmacs-regions t)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3035 (ctl-buf (current-buffer))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3036 quit-now
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3037 begA begB endA endB bufA bufB)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3038
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3039 (cond ((ediff-merge-job)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3040 (setq bufB ediff-buffer-C)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3041 (while (cond ((eq answer ?A)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3042 (setq bufA ediff-buffer-A
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3043 possibilities '(?B))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3044 nil)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3045 ((eq answer ?B)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3046 (setq bufA ediff-buffer-B
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3047 possibilities '(?A))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3048 nil)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3049 ((equal answer ""))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3050 (t (beep 1)
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3051 (message "Valid values are A or B")
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3052 (sit-for 2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3053 t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3054 (let ((cursor-in-echo-area t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3055 (message "Which buffer to compare to the merge buffer (A/B)? ")
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3056 (setq answer (capitalize (read-char-exclusive))))))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3057
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3058 ((ediff-3way-comparison-job)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3059 (while (cond ((memq answer possibilities)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3060 (setq possibilities (delq answer possibilities))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3061 (setq bufA
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3062 (eval
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3063 (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3064 answer ediff-buffer-alist)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3065 nil)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3066 ((equal answer ""))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3067 (t (beep 1)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3068 (message
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3069 "Valid values are %s"
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3070 (mapconcat 'char-to-string possibilities " or "))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3071 (sit-for 2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3072 t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3073 (let ((cursor-in-echo-area t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3074 (message "Enter the 1st buffer you want to compare (%s): "
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3075 (mapconcat 'char-to-string possibilities "/"))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3076 (setq answer (capitalize (read-char-exclusive)))))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3077 (setq answer "") ; silence error msg
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3078 (while (cond ((memq answer possibilities)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3079 (setq possibilities (delq answer possibilities))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3080 (setq bufB
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3081 (eval
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3082 (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3083 answer ediff-buffer-alist)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3084 nil)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3085 ((equal answer ""))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3086 (t (beep 1)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3087 (message
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3088 "Valid values are %s"
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3089 (mapconcat 'char-to-string possibilities " or "))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3090 (sit-for 2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3091 t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3092 (let ((cursor-in-echo-area t))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3093 (message "Enter the 2nd buffer you want to compare (%s): "
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3094 (mapconcat 'char-to-string possibilities "/"))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3095 (setq answer (capitalize (read-char-exclusive))))))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3096 (t ; 2way comparison
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3097 (setq bufA ediff-buffer-A
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3098 bufB ediff-buffer-B
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3099 possibilities nil)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3100
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3101 (ediff-with-current-buffer bufA
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3102 (or (mark t)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3103 (error "You forgot to specify a region in buffer %s" (buffer-name)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3104 (setq begA (region-beginning)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3105 endA (region-end))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3106 (goto-char begA)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3107 (beginning-of-line)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3108 (setq begA (point))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3109 (goto-char endA)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3110 (end-of-line)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3111 (or (eobp) (forward-char)) ; include the newline char
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3112 (setq endA (point)))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3113 (ediff-with-current-buffer bufB
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3114 (or (mark t)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3115 (error "You forgot to specify a region in buffer %s" (buffer-name)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3116 (setq begB (region-beginning)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3117 endB (region-end))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3118 (goto-char begB)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3119 (beginning-of-line)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3120 (setq begB (point))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3121 (goto-char endB)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3122 (end-of-line)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3123 (or (eobp) (forward-char)) ; include the newline char
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3124 (setq endB (point)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3125
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3126 (ediff-unselect-and-select-difference
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3127 ediff-current-difference 'unselect-only)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3128 (ediff-paint-background-regions 'unhighlight)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3129
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3130 (ediff-with-current-buffer bufA
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3131 (goto-char begA)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3132 (set-mark endA)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3133 (narrow-to-region begA endA)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3134 ;; (ediff-activate-mark)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3135 )
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3136 ;; (sit-for 0)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3137 (ediff-with-current-buffer bufB
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3138 (goto-char begB)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3139 (set-mark endB)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3140 (narrow-to-region begB endB)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3141 ;; (ediff-activate-mark)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3142 )
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3143 ;; (sit-for 0)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3144
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3145 ;; At this point, possibilities contains either the window char A/B/C
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3146 ;; that was not selected, or it is nil. We delete the window that is not
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3147 ;; selected.
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3148 (if possibilities
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3149 (ediff-with-current-buffer ctl-buf
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3150 (let* ((wind-to-delete (eval
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3151 (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3152 (car possibilities)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3153 ediff-window-alist)))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3154 (frame (window-frame wind-to-delete)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3155 (delete-window wind-to-delete)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3156 (select-frame frame)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3157 (balance-windows))))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3158 (or (y-or-n-p
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3159 "Please check regions selected for comparison. Continue? ")
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3160 (setq quit-now t))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3161
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3162 (ediff-with-current-buffer bufA
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3163 (widen))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3164 (ediff-with-current-buffer bufB
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3165 (widen))
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3166 (if quit-now
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3167 (ediff-with-current-buffer ctl-buf
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3168 (ediff-recenter)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3169 (sit-for 0)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3170 (error "All right. Make up your mind and come back...")))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3171
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3172 (ediff-regions-internal
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3173 bufA begA endA bufB begB endB
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3174 nil ; setup-hook
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3175 'ediff-regions-linewise ; job name
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3176 nil ; no word mode
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3177 ;; setup param to pass to ediff-setup
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
3178 (list (cons 'ediff-split-window-function ediff-split-window-function)))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3179 ))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3180
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3181
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3182
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3183 (defun ediff-remove-flags-from-buffer (buffer overlay)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3184 (ediff-with-current-buffer buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3185 (let ((inhibit-read-only t))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3186 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3187 (ediff-overlay-put overlay 'begin-glyph nil)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3188 (ediff-overlay-put overlay 'before-string nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3189
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3190 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3191 (ediff-overlay-put overlay 'end-glyph nil)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3192 (ediff-overlay-put overlay 'after-string nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3193 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3194
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3195
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3196
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3197 (defun ediff-place-flags-in-buffer (buf-type buffer ctl-buffer diff)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3198 (ediff-with-current-buffer buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3199 (ediff-place-flags-in-buffer1 buf-type ctl-buffer diff)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3200
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3201
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3202 (defun ediff-place-flags-in-buffer1 (buf-type ctl-buffer diff-no)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3203 (let* ((curr-overl (ediff-with-current-buffer ctl-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3204 (ediff-get-diff-overlay diff-no buf-type)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3205 (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
3206 after beg-of-line flag)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3207
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3208 ;; insert flag before the difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3209 (goto-char before)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3210 (setq beg-of-line (bolp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3211
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3212 (setq flag (ediff-with-current-buffer ctl-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3213 (if (eq ediff-highlighting-style 'ascii)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3214 (if beg-of-line
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3215 ediff-before-flag-bol ediff-before-flag-mol))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3216
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3217 ;; insert the flag itself
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3218 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3219 (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
3220 (ediff-overlay-put curr-overl 'before-string flag))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3221
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3222 ;; insert the flag after the difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3223 ;; `after' must be set here, after the before-flag was inserted
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3224 (setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3225 (goto-char after)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3226 (setq beg-of-line (bolp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3227
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3228 (setq flag (ediff-with-current-buffer ctl-buffer
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3229 (if (eq ediff-highlighting-style 'ascii)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3230 (if beg-of-line
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3231 ediff-after-flag-eol ediff-after-flag-mol))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3232
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3233 ;; insert the flag itself
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3234 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3235 (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
3236 (ediff-overlay-put curr-overl 'after-string flag))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3237 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3238
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3239
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3240 ;; Returns positions of difference sectors in the BUF-TYPE buffer.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3241 ;; BUF-TYPE should be a symbol -- `A', `B', or `C'.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3242 ;; POS is either `beg' or `end'--it specifies whether you want the position at
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3243 ;; the beginning of a difference or at the end.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3244 ;;
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3245 ;; The optional argument N says which difference (default:
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3246 ;; `ediff-current-difference'). N is the internal difference number (1- what
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3247 ;; the user sees). The optional argument CONTROL-BUF says
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3248 ;; which control buffer is in effect in case it is not the current
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3249 ;; buffer.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3250 (defun ediff-get-diff-posn (buf-type pos &optional n control-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3251 (let (diff-overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3252 (or control-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3253 (setq control-buf (current-buffer)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3254
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3255 (ediff-with-current-buffer control-buf
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3256 (or n (setq n ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3257 (if (or (< n 0) (>= n ediff-number-of-differences))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3258 (if (> ediff-number-of-differences 0)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3259 (error ediff-BAD-DIFF-NUMBER
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3260 this-command (1+ n) ediff-number-of-differences)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3261 (error ediff-NO-DIFFERENCES)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3262 (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
3263 (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
3264 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3265 (if (eq pos 'beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3266 (ediff-overlay-start diff-overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3267 (ediff-overlay-end diff-overlay))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3268 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3269
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3270
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3271 ;; Restore highlighting to what it should be according to ediff-use-faces,
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3272 ;; ediff-highlighting-style, and ediff-highlight-all-diffs variables.
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3273 (defun ediff-restore-highlighting (&optional ctl-buf)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3274 (ediff-with-current-buffer (or ctl-buf (current-buffer))
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3275 (if (and (ediff-has-face-support-p)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3276 ediff-use-faces
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3277 ediff-highlight-all-diffs)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3278 (ediff-paint-background-regions))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
3279 (ediff-select-difference ediff-current-difference)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3280
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3281
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3282
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3283 ;; null out difference overlays so they won't slow down future
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3284 ;; editing operations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3285 ;; VEC is either a difference vector or a fine-diff vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3286 (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3287 (if (vectorp (symbol-value vec-var))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3288 (mapcar (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3289 (lambda (elt)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3290 (ediff-delete-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3291 (ediff-get-diff-overlay-from-diff-record elt))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3292 (if fine-diffs-also
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3293 (ediff-clear-fine-diff-vector elt))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3294 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3295 (symbol-value vec-var)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3296 ;; allow them to be garbage collected
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3297 (set vec-var nil))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3298
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3299
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3300
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3301 ;;; Misc
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3302
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3303 ;; In Emacs, this just makes overlay. In the future, when Emacs will start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3304 ;; supporting sticky overlays, this function will make a sticky overlay.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3305 ;; BEG and END are expressions telling where overlay starts.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3306 ;; If they are numbers or buffers, then all is well. Otherwise, they must
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3307 ;; 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
3308 ;; bounds.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3309 ;; If BUFF is not a live buffer, then return nil; otherwise, return the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3310 ;; newly created overlay.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3311 (defun ediff-make-bullet-proof-overlay (beg end buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3312 (if (ediff-buffer-live-p buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3313 (let (overl)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3314 (ediff-with-current-buffer buff
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3315 (or (number-or-marker-p beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3316 (setq beg (eval beg)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3317 (or (number-or-marker-p end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3318 (setq end (eval end)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3319 (setq overl
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3320 (if ediff-xemacs-p
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3321 (make-extent beg end buff)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3322 ;; advance front and rear of the overlay
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3323 (make-overlay beg end buff nil 'rear-advance)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3324
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3325 ;; never detach
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3326 (ediff-overlay-put
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3327 overl (if ediff-emacs-p 'evaporate 'detachable) nil)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3328 ;; make vip-minibuffer-overlay open-ended
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3329 ;; In emacs, it is made open ended at creation time
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3330 (if ediff-xemacs-p
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3331 (progn
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3332 (ediff-overlay-put overl 'start-open nil)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3333 (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
3334 (ediff-overlay-put overl 'ediff-diff-num 0)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3335 overl))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3336
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3337
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3338 ;; Like other-buffer, but prefers visible buffers and ignores temporary or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3339 ;; other insignificant buffers (those beginning with "^[ *]").
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3340 ;; 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
3341 ;; these buffers).
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3342 (defun ediff-other-buffer (buff-lst)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3343 (or (listp buff-lst) (setq buff-lst (list buff-lst)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3344 (let* ((frame-buffers (buffer-list))
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3345 (buff-name-list
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3346 (mapcar
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3347 (function (lambda (b)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3348 (cond ((stringp b) b)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3349 ((bufferp b) (buffer-name b)))))
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3350 buff-lst))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3351 (significant-buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3352 (mapcar
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3353 (function (lambda (x)
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3354 (cond ((member (buffer-name x) buff-name-list) nil)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3355 ((not (ediff-get-visible-buffer-window x)) nil)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3356 ((string-match "^[ *]" (buffer-name x)) nil)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3357 ((memq (ediff-with-current-buffer x major-mode)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3358 '(dired-mode))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3359 nil)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3360 (t x))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3361 frame-buffers))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3362 (buffers (delq nil significant-buffers))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3363 less-significant-buffers)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3364
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3365 (cond (buffers (car buffers))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3366 ;; try also buffers that are not displayed in windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3367 ((setq less-significant-buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3368 (delq nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3369 (mapcar
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3370 (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3371 (lambda (x)
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3372 (cond ((member (buffer-name x) buff-name-list) nil)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3373 ((string-match "^[ *]" (buffer-name x)) nil)
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3374 ((memq
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3375 (ediff-with-current-buffer x major-mode)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3376 '(dired-mode))
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
3377 nil)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3378 (t x))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3379 frame-buffers)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3380 (car less-significant-buffers))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3381 (t (other-buffer (current-buffer))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3382 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3383
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3384
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3385 ;; Construct a unique buffer name.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3386 ;; The first one tried is prefixsuffix, then prefix<2>suffix,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3387 ;; prefix<3>suffix, etc.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3388 (defun ediff-unique-buffer-name (prefix suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3389 (if (null (get-buffer (concat prefix suffix)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3390 (concat prefix suffix)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3391 (let ((n 2))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3392 (while (get-buffer (format "%s<%d>%s" prefix n suffix))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3393 (setq n (1+ n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3394 (format "%s<%d>%s" prefix n suffix))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3395
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3396
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3397 (defun ediff-submit-report ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3398 "Submit bug report on Ediff."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3399 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3400 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3401 (let ((reporter-prompt-for-summary-p t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3402 (ctl-buf ediff-control-buffer)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3403 (ediff-device-type (ediff-device-type))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3404 varlist salutation buffer-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3405 (setq varlist '(ediff-diff-program ediff-diff-options
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3406 ediff-patch-program ediff-patch-options
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3407 ediff-shell
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3408 ediff-use-faces
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3409 ediff-auto-refine ediff-highlighting-style
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3410 ediff-buffer-A ediff-buffer-B ediff-control-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3411 ediff-forward-word-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3412 ediff-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3413 ediff-control-frame-parameters
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3414 ediff-control-frame-position-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3415 ediff-prefer-iconified-control-frame
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3416 ediff-window-setup-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3417 ediff-split-window-function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3418 ediff-job-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3419 ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3420 buffer-name
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3421 ediff-device-type
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3422 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3423 (setq salutation "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3424 Congratulations! You may have unearthed a bug in Ediff!
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3425
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3426 Please make a concise and accurate summary of what happened
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3427 and mail it to the address above.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3428 -----------------------------------------------------------
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3429 ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3430
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3431 (ediff-skip-unsuitable-frames)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3432 (ediff-reset-mouse)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3433
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3434 (switch-to-buffer ediff-msg-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3435 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3436 (delete-other-windows)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3437 (insert "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3438 Please read this first:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3439 ----------------------
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3440
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3441 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
3442 reporting that certain difference regions are not matched as you think they
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3443 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
3444 constitutes a difference region. Ediff is an Emacs interface to diff, and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3445 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
3446 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
3447 manipulation.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3448
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3449 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
3450 an Emacs bug. Report this to Emacs maintainers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3451
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3452 Another popular topic for reports is compilation messages. Because Ediff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3453 interfaces to several other packages and runs under Emacs and XEmacs,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3454 byte-compilation may produce output like this:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3455
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3456 While compiling toplevel forms in file ediff.el:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3457 ** reference to free variable pm-color-alist
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3458 ........................
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3459 While compiling the end of the data:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3460 ** 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
3461 ediff-valid-color-p, ediff-set-face,
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3462 ........................
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3463
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3464 These are NOT errors, but inevitable warnings, which ought to be ignored.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3465
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3466 Please do not report those and similar things. However, comments and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3467 suggestions are always welcome.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3468
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3469 Mail anyway? (y or n) ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3470
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3471 (if (y-or-n-p "Mail anyway? ")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3472 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3473 (if (ediff-buffer-live-p ctl-buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3474 (set-buffer ctl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3475 (setq buffer-name (buffer-name))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3476 (require 'reporter)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3477 (reporter-submit-bug-report "kifer@cs.sunysb.edu"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3478 (ediff-version)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3479 varlist
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3480 nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3481 'delete-other-windows
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3482 salutation))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3483 (bury-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3484 (beep 1)(message "Bug report aborted")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3485 (if (ediff-buffer-live-p ctl-buf)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3486 (ediff-with-current-buffer ctl-buf
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3487 (ediff-recenter 'no-rehighlight))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3488 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3489
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3490
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3491 (defun ediff-deactivate-mark ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3492 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3493 (zmacs-deactivate-region)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3494 (deactivate-mark)))
16766
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3495 (defun ediff-activate-mark ()
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3496 (if ediff-emacs-p
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3497 (setq mark-active t)
beb94a5271e2 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3498 (zmacs-activate-region)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3499
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3500 (cond ((fboundp 'nuke-selective-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3501 ;; XEmacs 19.12 has nuke-selective-display
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3502 (fset 'ediff-nuke-selective-display 'nuke-selective-display))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3503 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3504 (defun ediff-nuke-selective-display ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3505 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3506 (save-restriction
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3507 (widen)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3508 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3509 (let ((mod-p (buffer-modified-p))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3510 buffer-read-only end)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3511 (and (eq t selective-display)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3512 (while (search-forward "\^M" nil t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3513 (end-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3514 (setq end (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3515 (beginning-of-line)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3516 (while (search-forward "\^M" end t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3517 (delete-char -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3518 (insert "\^J"))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3519 (set-buffer-modified-p mod-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3520 (setq selective-display nil)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3521 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3522
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3523
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3524 ;; The next two are modified versions from emerge.el.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3525 ;; VARS must be a list of symbols
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3526 ;; 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
3527 (defsubst ediff-save-variables (vars)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3528 (mapcar (function (lambda (v) (cons v (symbol-value v))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3529 vars))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3530 ;; VARS is a list of variable symbols.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3531 (defun ediff-restore-variables (vars assoc-list)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3532 (while vars
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3533 (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
3534 (setq vars (cdr vars))))
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3535
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3536 (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
3537 (let* ((assoc-list
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3538 (symbol-value (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3539 buf-type
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3540 ediff-buffer-values-orig-alist)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3541 (assoc-elt (assoc var assoc-list)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3542 (if assoc-elt
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3543 (setcdr assoc-elt value))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3544
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3545
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3546 ;; must execute in control buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3547 (defun ediff-save-protected-variables ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3548 (setq ediff-buffer-values-orig-A
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3549 (ediff-with-current-buffer ediff-buffer-A
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3550 (ediff-save-variables ediff-protected-variables)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3551 (setq ediff-buffer-values-orig-B
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3552 (ediff-with-current-buffer ediff-buffer-B
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3553 (ediff-save-variables ediff-protected-variables)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3554 (if ediff-3way-comparison-job
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3555 (setq ediff-buffer-values-orig-C
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3556 (ediff-with-current-buffer ediff-buffer-C
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3557 (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
3558 (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
3559 (setq ediff-buffer-values-orig-Ancestor
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3560 (ediff-with-current-buffer ediff-ancestor-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3561 (ediff-save-variables ediff-protected-variables)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3562
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3563 ;; must execute in control buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3564 (defun ediff-restore-protected-variables ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3565 (let ((values-A ediff-buffer-values-orig-A)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3566 (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
3567 (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
3568 (values-Ancestor ediff-buffer-values-orig-Ancestor))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3569 (ediff-with-current-buffer ediff-buffer-A
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3570 (ediff-restore-variables ediff-protected-variables values-A))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3571 (ediff-with-current-buffer ediff-buffer-B
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3572 (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
3573 (if ediff-3way-comparison-job
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3574 (ediff-with-current-buffer ediff-buffer-C
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3575 (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
3576 (if (ediff-buffer-live-p ediff-ancestor-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3577 (ediff-with-current-buffer ediff-ancestor-buffer
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3578 (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
3579 ))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3580
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3581 ;; save BUFFER in FILE. used in hooks.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3582 (defun ediff-save-buffer-in-file (buffer file)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3583 (ediff-with-current-buffer buffer
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3584 (write-file file)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3585
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3586
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3587 ;;; Debug
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3588
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3589 (ediff-defvar-local ediff-command-begin-time '(0 0 0) "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3590
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3591 ;; calculate time used by command
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3592 (defun ediff-calc-command-time ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3593 (let ((end (current-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3594 micro sec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3595 (setq micro
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3596 (if (>= (nth 2 end) (nth 2 ediff-command-begin-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3597 (- (nth 2 end) (nth 2 ediff-command-begin-time))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3598 (+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3599 (setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3600 (or (equal ediff-command-begin-time '(0 0 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3601 (message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3602
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3603 (defsubst ediff-save-time ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3604 (setq ediff-command-begin-time (current-time)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3605
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3606 (defun ediff-profile ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3607 "Toggle profiling Ediff commands."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3608 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3609 (ediff-barf-if-not-control-buffer)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3610 (make-local-hook 'post-command-hook)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3611 (let ((pre-hook 'pre-command-hook)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3612 (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
3613 (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
3614 (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
3615 (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
3616 (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
3617 (message "Ediff profiling disabled"))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3618 (add-hook pre-hook 'ediff-save-time t t)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3619 (add-hook post-hook 'ediff-calc-command-time nil t)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3620 (message "Ediff profiling enabled"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3621
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3622 (defun ediff-print-diff-vector (diff-vector-var)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3623 (princ (format "\n*** %S ***\n" diff-vector-var))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3624 (mapcar (function
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3625 (lambda (overl-vec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3626 (princ
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3627 (format
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3628 "Diff %d: \tOverlay: %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3629 \t\tFine diffs: %s
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3630 \t\tNo-fine-diff-flag: %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3631 \t\tState-of-diff:\t %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3632 \t\tState-of-merge:\t %S
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3633 "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3634 (1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3635 (aref overl-vec 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3636 ;; fine-diff-vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3637 (if (= (length (aref overl-vec 1)) 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3638 "none\n"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3639 (mapconcat 'prin1-to-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3640 (aref overl-vec 1) "\n\t\t\t "))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3641 (aref overl-vec 2) ; no fine diff flag
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3642 (aref overl-vec 3) ; state-of-diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3643 (aref overl-vec 4) ; state-of-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3644 ))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3645 (eval diff-vector-var)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3646
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3647
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3648
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3649 (defun ediff-debug-info ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3650 (interactive)
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3651 (ediff-barf-if-not-control-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3652 (with-output-to-temp-buffer ediff-debug-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3653 (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
3654 (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
3655 (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
3656 (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
3657 (ediff-print-diff-vector (intern "ediff-difference-vector-Ancestor"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3658 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3659
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3660
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3661 ;;; General utilities
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3662
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3663 ;; this uses comparison-func to decide who is a member
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3664 (defun ediff-member (elt lis comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3665 (while (and lis (not (funcall comparison-func (car lis) elt)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3666 (setq lis (cdr lis)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3667 lis)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3668
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3669 ;; 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
3670 ;; intersection looks like
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3671 (defun ediff-intersection (lis1 lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3672 (let ((result (list 'a)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3673 (while lis1
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3674 (if (ediff-member (car lis1) lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3675 (nconc result (list (car lis1))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3676 (setq lis1 (cdr lis1)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3677 (cdr result)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3678
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3679
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3680 ;; eliminates duplicates using comparison-func
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3681 (defun ediff-union (lis1 lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3682 (let ((result (list 'a)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3683 (while lis1
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3684 (or (ediff-member (car lis1) (cdr result) comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3685 (nconc result (list (car lis1))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3686 (setq lis1 (cdr lis1)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3687 (while lis2
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3688 (or (ediff-member (car lis2) (cdr result) comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3689 (nconc result (list (car lis2))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3690 (setq lis2 (cdr lis2)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3691 (cdr result)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3692
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3693 ;; eliminates duplicates using comparison-func
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3694 (defun ediff-set-difference (lis1 lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3695 (let ((result (list 'a)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3696 (while lis1
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3697 (or (ediff-member (car lis1) (cdr result) comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3698 (ediff-member (car lis1) lis2 comparison-func)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3699 (nconc result (list (car lis1))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3700 (setq lis1 (cdr lis1)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3701 (cdr result)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3702
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3703 (defun ediff-copy-list (list)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3704 (if (consp list)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3705 ;;;(let ((res nil))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3706 ;;; (while (consp list) (push (pop list) res))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3707 ;;; (prog1 (nreverse res) (setcdr res list)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3708 (let (res elt)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3709 (while (consp list)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3710 (setq elt (car list)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3711 res (cons elt res)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3712 list (cdr list)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3713 (nreverse res))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3714 (car list)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3715
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
3716
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3717 ;; don't report error if version control package wasn't found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3718 ;;(ediff-load-version-control 'silent)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3719
13131
b0cb28b64a3c (ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12932
diff changeset
3720 (run-hooks 'ediff-load-hook)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3721
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11977
diff changeset
3722
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3723 ;;; Local Variables:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3724 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3725 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18953
diff changeset
3726 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3727 ;;; End:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3728
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
3729 ;;; ediff-util.el ends here