annotate lisp/ediff-help.el @ 99524:b8e68a14e5c2

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