Mercurial > emacs
annotate lisp/ediff-help.el @ 94310:bfca17635a9f
Fix dates of merge entries.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 24 Apr 2008 05:40:09 +0000 |
parents | 1e3a407766b9 |
children | c0dfa9027738 |
rev | line source |
---|---|
16247 | 1 ;;; ediff-help.el --- Code related to the contents of Ediff help buffers |
2 | |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, |
79721 | 4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
16247 | 5 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
16247 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75347
diff
changeset
|
12 ;; the Free Software Foundation; either version 3, or (at your option) |
16247 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64091 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
16247 | 24 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33842
diff
changeset
|
25 ;;; Commentary: |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33842
diff
changeset
|
26 |
16247 | 27 ;;; Code: |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
28 |
16247 | 29 |
30 ;; Compiler pacifier start | |
31 (defvar ediff-multiframe) | |
18054 | 32 |
33 (eval-when-compile | |
93652
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92501
diff
changeset
|
34 (require 'ediff-init) |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92501
diff
changeset
|
35 ) |
16247 | 36 ;; end pacifier |
37 | |
18054 | 38 (require 'ediff-init) |
39 | |
16247 | 40 ;; Help messages |
41 | |
42 (defconst ediff-long-help-message-head | |
43 " Move around | Toggle features | Manipulate | |
44 =====================|===========================|=============================" | |
45 "The head of the full help message.") | |
46 (defconst ediff-long-help-message-tail | |
47 "=====================|===========================|============================= | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
48 R -show registry | = -compare regions | M -show session group |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
49 D -diff output | E -browse Ediff manual| G -send bug report |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
50 i -status info | ? -help off | z/q -suspend/quit |
16247 | 51 ------------------------------------------------------------------------------- |
52 For help on a specific command: Click Button 2 over it; or | |
53 Put the cursor over it and type RET." | |
54 "The tail of the full-help message.") | |
55 | |
56 (defconst ediff-long-help-message-compare3 | |
57 " | |
58 p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y | |
59 n,SPC -next diff | h -hilighting | rx -restore buf X's old diff | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
60 j -jump to diff | @ -auto-refinement | * -refine current region |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
61 gx -goto X's point| ## -ignore whitespace | ! -update diff regions |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
62 C-l -recenter | #c -ignore case | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
63 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
64 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output |
16247 | 65 ~ -rotate buffers| m -wide display | |
66 " | |
67 "Help message usually used for 3-way comparison. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
68 Normally, not a user option. See `ediff-help-message' for details.") |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
69 |
16247 | 70 (defconst ediff-long-help-message-compare2 |
71 " | |
72 p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A | |
73 n,SPC -next diff | h -hilighting | rx -restore buf X's old diff | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
74 j -jump to diff | @ -auto-refinement | * -refine current region |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
75 gx -goto X's point| ## -ignore whitespace | ! -update diff regions |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
76 C-l -recenter | #c -ignore case | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
77 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
78 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
79 ~ -swap variants | m -wide display | |
16247 | 80 " |
81 "Help message usually used for 2-way comparison. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
82 Normally, not a user option. See `ediff-help-message' for details.") |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
83 |
16247 | 84 (defconst ediff-long-help-message-narrow2 |
85 " | |
86 p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A | |
87 n,SPC -next diff | h -hilighting | rx -restore buf X's old diff | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
88 j -jump to diff | @ -auto-refinement | * -refine current region |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
89 gx -goto X's point| ## -ignore whitespace | ! -update diff regions |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
90 C-l -recenter | #c -ignore case | % -narrow/widen buffs |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
91 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
92 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
93 ~ -swap variants | m -wide display | |
16247 | 94 " |
95 "Help message when comparing windows or regions line-by-line. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
96 Normally, not a user option. See `ediff-help-message' for details.") |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
97 |
16247 | 98 (defconst ediff-long-help-message-word-mode |
99 " | |
100 p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y | |
101 n,SPC -next diff | h -hilighting | rx -restore buf X's old diff | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
102 j -jump to diff | | |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
103 gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
104 C-l -recenter | #c -ignore case | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
105 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
106 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
107 ~ -swap variants | m -wide display | |
16247 | 108 " |
109 "Help message when comparing windows or regions word-by-word. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
110 Normally, not a user option. See `ediff-help-message' for details.") |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
111 |
16247 | 112 (defconst ediff-long-help-message-merge |
113 " | |
114 p,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C | |
115 n,SPC -next diff | h -hilighting | r -restore buf C's old diff | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
116 j -jump to diff | @ -auto-refinement | * -refine current region |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
117 gx -goto X's point| ## -ignore whitespace | ! -update diff regions |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
118 C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
119 v/V -scroll up/dn | X -read-only in buf X | wx -save buf X |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
120 </> -scroll lt/rt | m -wide display | wd -save diff output |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
121 ~ -swap variants | s -shrink window C | / -show ancestor buff |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
122 | $$ -show clashes only | & -merge w/new default |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
123 | $* -skip changed regions | |
16247 | 124 " |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
125 "Help message for merge sessions. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
126 Normally, not a user option. See `ediff-help-message' for details.") |
16247 | 127 |
128 ;; The actual long help message. | |
129 (ediff-defvar-local ediff-long-help-message "" | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
130 "Normally, not a user option. See `ediff-help-message' for details.") |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
131 |
16247 | 132 (defconst ediff-brief-message-string |
62963
fcacef2ed810
2005-06-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
133 " Type ? for help" |
16247 | 134 "Contents of the brief help message.") |
135 ;; The actual brief help message | |
136 (ediff-defvar-local ediff-brief-help-message "" | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
137 "Normally, not a user option. See `ediff-help-message' for details.") |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
138 |
16247 | 139 (ediff-defvar-local ediff-brief-help-message-function nil |
140 "The brief help message that the user can customize. | |
141 If the user sets this to a parameter-less function, Ediff will use it to | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
142 produce the brief help message. This function must return a string.") |
16247 | 143 (ediff-defvar-local ediff-long-help-message-function nil |
144 "The long help message that the user can customize. | |
145 See `ediff-brief-help-message-function' for more.") | |
146 | |
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
147 (defcustom ediff-use-long-help-message nil |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
148 "*If t, Ediff displays a long help message. Short help message otherwise." |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
149 :type 'boolean |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
150 :group 'ediff-window) |
16247 | 151 |
152 ;; The actual help message. | |
153 (ediff-defvar-local ediff-help-message "" | |
154 "The actual help message. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
155 Normally, the user shouldn't touch this. However, if you want Ediff to |
16247 | 156 start up with different help messages for different jobs, you can change |
157 the value of this variable and the variables `ediff-help-message-*' in | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
158 `ediff-startup-hook'.") |
16247 | 159 |
160 | |
161 ;; the keymap that defines clicks over the quick help regions | |
162 (defvar ediff-help-region-map (make-sparse-keymap)) | |
163 | |
164 (define-key | |
165 ediff-help-region-map | |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85478
diff
changeset
|
166 (if (featurep 'emacs) [mouse-2] [button2]) |
16247 | 167 'ediff-help-for-quick-help) |
168 | |
169 ;; runs in the control buffer | |
170 (defun ediff-set-help-overlays () | |
171 (goto-char (point-min)) | |
172 (let (overl beg end cmd) | |
173 (while (re-search-forward " *\\([^ \t\n|]+\\||\\) +-[^|\n]+" nil 'noerror) | |
174 (setq beg (match-beginning 0) | |
175 end (match-end 0) | |
176 cmd (buffer-substring (match-beginning 1) (match-end 1))) | |
177 (setq overl (ediff-make-overlay beg end)) | |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85478
diff
changeset
|
178 (if (featurep 'emacs) |
16247 | 179 (ediff-overlay-put overl 'mouse-face 'highlight) |
180 (ediff-overlay-put overl 'highlight t)) | |
181 (ediff-overlay-put overl 'ediff-help-info cmd)))) | |
182 | |
183 | |
184 (defun ediff-help-for-quick-help () | |
185 "Explain Ediff commands in more detail." | |
186 (interactive) | |
187 (ediff-barf-if-not-control-buffer) | |
18054 | 188 (let ((pos (ediff-event-point last-command-event)) |
16247 | 189 overl cmd) |
190 | |
92501
956adeeb0083
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
191 (if (featurep 'xemacs) |
956adeeb0083
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
192 (setq overl (extent-at pos (current-buffer) 'ediff-help-info) |
956adeeb0083
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
193 cmd (ediff-overlay-get overl 'ediff-help-info)) |
956adeeb0083
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
194 (setq cmd (car (mapcar (lambda (elt) |
956adeeb0083
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
195 (overlay-get elt 'ediff-help-info)) |
956adeeb0083
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
196 (overlays-at pos))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
197 |
16247 | 198 (if (not (stringp cmd)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
199 (error "Hmm... I don't see an Ediff command around here...")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
200 |
16247 | 201 (ediff-documentation "Quick Help Commands") |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
202 |
16247 | 203 (let (case-fold-search) |
204 (cond ((string= cmd "?") (re-search-forward "^`\\?'")) | |
205 ((string= cmd "G") (re-search-forward "^`G'")) | |
206 ((string= cmd "E") (re-search-forward "^`E'")) | |
207 ((string= cmd "wd") (re-search-forward "^`wd'")) | |
208 ((string= cmd "wx") (re-search-forward "^`wa'")) | |
209 ((string= cmd "a/b") (re-search-forward "^`a'")) | |
210 ((string= cmd "x") (re-search-forward "^`a'")) | |
211 ((string= cmd "xy") (re-search-forward "^`ab'")) | |
212 ((string= cmd "p,DEL") (re-search-forward "^`p'")) | |
213 ((string= cmd "n,SPC") (re-search-forward "^`n'")) | |
214 ((string= cmd "j") (re-search-forward "^`j'")) | |
215 ((string= cmd "gx") (re-search-forward "^`ga'")) | |
216 ((string= cmd "!") (re-search-forward "^`!'")) | |
217 ((string= cmd "*") (re-search-forward "^`\\*'")) | |
218 ((string= cmd "m") (re-search-forward "^`m'")) | |
219 ((string= cmd "|") (re-search-forward "^`|'")) | |
220 ((string= cmd "@") (re-search-forward "^`@'")) | |
221 ((string= cmd "h") (re-search-forward "^`h'")) | |
222 ((string= cmd "r") (re-search-forward "^`r'")) | |
223 ((string= cmd "rx") (re-search-forward "^`ra'")) | |
224 ((string= cmd "##") (re-search-forward "^`##'")) | |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
225 ((string= cmd "#c") (re-search-forward "^`#c'")) |
16247 | 226 ((string= cmd "#f/#h") (re-search-forward "^`#f'")) |
227 ((string= cmd "X") (re-search-forward "^`A'")) | |
228 ((string= cmd "v/V") (re-search-forward "^`v'")) | |
229 ((string= cmd "</>") (re-search-forward "^`<'")) | |
230 ((string= cmd "~") (re-search-forward "^`~'")) | |
231 ((string= cmd "i") (re-search-forward "^`i'")) | |
232 ((string= cmd "D") (re-search-forward "^`D'")) | |
233 ((string= cmd "R") (re-search-forward "^`R'")) | |
234 ((string= cmd "M") (re-search-forward "^`M'")) | |
235 ((string= cmd "z/q") (re-search-forward "^`z'")) | |
236 ((string= cmd "%") (re-search-forward "^`%'")) | |
237 ((string= cmd "C-l") (re-search-forward "^`C-l'")) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
238 ((string= cmd "$$") (re-search-forward "^`\\$\\$'")) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
239 ((string= cmd "$*") (re-search-forward "^`\\$\\*'")) |
16247 | 240 ((string= cmd "/") (re-search-forward "^`/'")) |
241 ((string= cmd "&") (re-search-forward "^`&'")) | |
242 ((string= cmd "s") (re-search-forward "^`s'")) | |
243 ((string= cmd "+") (re-search-forward "^`\\+'")) | |
244 ((string= cmd "=") (re-search-forward "^`='")) | |
245 (t (error "Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer"))) | |
246 ) ; let case-fold-search | |
247 )) | |
248 | |
249 | |
250 ;; assuming we are in control window, calculate length of the first line in | |
251 ;; help message | |
252 (defun ediff-help-message-line-length () | |
253 (save-excursion | |
254 (goto-char (point-min)) | |
255 (if ediff-use-long-help-message | |
85478
786d3a985758
* term/x-win.el (x-gtk-stock-map, icon-map-list)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
256 (forward-line 1)) |
16247 | 257 (end-of-line) |
258 (current-column))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
259 |
16247 | 260 |
261 (defun ediff-indent-help-message () | |
262 (let* ((shift (/ (max 0 (- (window-width (selected-window)) | |
263 (ediff-help-message-line-length))) | |
264 2)) | |
265 (str (make-string shift ?\ ))) | |
266 (save-excursion | |
267 (goto-char (point-min)) | |
268 (while (< (point) (point-max)) | |
269 (insert str) | |
270 (beginning-of-line) | |
271 (forward-line 1))))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
272 |
16247 | 273 |
274 ;; compose the help message as a string | |
275 (defun ediff-set-help-message () | |
276 (setq ediff-long-help-message | |
277 (cond ((and ediff-long-help-message-function | |
278 (or (symbolp ediff-long-help-message-function) | |
279 (consp ediff-long-help-message-function))) | |
280 (funcall ediff-long-help-message-function)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
281 (ediff-word-mode |
16247 | 282 (concat ediff-long-help-message-head |
283 ediff-long-help-message-word-mode | |
284 ediff-long-help-message-tail)) | |
285 (ediff-narrow-job | |
286 (concat ediff-long-help-message-head | |
287 ediff-long-help-message-narrow2 | |
288 ediff-long-help-message-tail)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
289 (ediff-merge-job |
16247 | 290 (concat ediff-long-help-message-head |
291 ediff-long-help-message-merge | |
292 ediff-long-help-message-tail)) | |
293 (ediff-diff3-job | |
294 (concat ediff-long-help-message-head | |
295 ediff-long-help-message-compare3 | |
296 ediff-long-help-message-tail)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
297 (t |
16247 | 298 (concat ediff-long-help-message-head |
299 ediff-long-help-message-compare2 | |
300 ediff-long-help-message-tail)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
301 (setq ediff-brief-help-message |
16247 | 302 (cond ((and ediff-brief-help-message-function |
303 (or (symbolp ediff-brief-help-message-function) | |
304 (consp ediff-brief-help-message-function))) | |
305 (funcall ediff-brief-help-message-function)) | |
306 ((stringp ediff-brief-help-message-function) | |
307 ediff-brief-help-message-function) | |
308 ((ediff-multiframe-setup-p) ediff-brief-message-string) | |
309 (t ; long brief msg, not multiframe --- put in the middle | |
310 ediff-brief-message-string) | |
311 )) | |
312 (setq ediff-help-message (if ediff-use-long-help-message | |
313 ediff-long-help-message | |
314 ediff-brief-help-message)) | |
315 (run-hooks 'ediff-display-help-hook)) | |
316 | |
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
317 ;;;###autoload |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
318 (defun ediff-customize () |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
319 (interactive) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
320 (customize-group "ediff")) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
18054
diff
changeset
|
321 |
16247 | 322 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
323 (provide 'ediff-help) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
324 |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
325 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93652
diff
changeset
|
326 ;; arch-tag: 05659813-7fcf-4274-964f-d2f577431a9d |
16247 | 327 ;;; ediff-help.el ends here |