annotate lisp/ediff-help.el @ 33488:352cb95d9f27

(diff-imenu-generic-expression): Modify unidiff pattern.
author Dave Love <fx@gnu.org>
date Tue, 14 Nov 2000 18:09:21 +0000
parents 42f9a58e0fc4
children f6a67d77484a
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
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
3 ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
6
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
8
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
12 ;; any later version.
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
13
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
17 ;; GNU General Public License for more details.
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
18
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
22 ;; Boston, MA 02111-1307, USA.
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
23
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
24 ;;; Code:
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
25
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
26 (provide 'ediff-help)
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)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
30
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
31 (eval-when-compile
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
32 (let ((load-path (cons (expand-file-name ".") load-path)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
33 (or (featurep 'ediff-init)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
34 (load "ediff-init.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
35 ))
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
36 ;; end pacifier
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
37
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
38 (require 'ediff-init)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
39
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
40 ;; Help messages
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
41
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
42 (defconst ediff-long-help-message-head
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
43 " Move around | Toggle features | Manipulate
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
44 =====================|===========================|============================="
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
45 "The head of the full help message.")
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
46 (defconst ediff-long-help-message-tail
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
47 "=====================|===========================|=============================
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
48 R -show registry | = -compare regions | M -show session group
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
49 D -diff output | E -browse Ediff manual| G -send bug report
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
50 i -status info | ? -help off | z/q -suspend/quit
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 For help on a specific command: Click Button 2 over it; or
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
53 Put the cursor over it and type RET."
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
54 "The tail of the full-help message.")
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
55
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
56 (defconst ediff-long-help-message-compare3
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
57 "
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
58 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
59 n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
60 j -jump to diff | @ -auto-refinement | * -refine current region
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
61 gx -goto X's point| | ! -update diff regions
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
62 C-l -recenter | ## -ignore whitespace |
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
63 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
64 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
65 ~ -rotate buffers| m -wide display |
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
66 "
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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.")
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
69
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
70 (defconst ediff-long-help-message-compare2
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
71 "
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
72 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
73 n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
74 j -jump to diff | @ -auto-refinement | * -refine current region
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
75 gx -goto X's point| | ! -update diff regions
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
76 C-l -recenter | ## -ignore whitespace |
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
77 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
78 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
79 ~ -swap variants | m -wide display |
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
80 "
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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.")
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
83
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
84 (defconst ediff-long-help-message-narrow2
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
85 "
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
86 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
87 n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
88 j -jump to diff | @ -auto-refinement | * -refine current region
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
89 gx -goto X's point| % -narrow/widen buffs | ! -update diff regions
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
90 C-l -recenter | ## -ignore whitespace |
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
91 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
92 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
93 ~ -swap variants | m -wide display |
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
94 "
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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.")
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
97
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
98 (defconst ediff-long-help-message-word-mode
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
99 "
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
100 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
101 n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
102 j -jump to diff | |
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
103 gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
104 C-l -recenter | |
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
105 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
106 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
107 ~ -swap variants | m -wide display |
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
108 "
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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.")
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
111
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
112 (defconst ediff-long-help-message-merge
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
113 "
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
114 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
115 n,SPC -next diff | h -hilighting | r -restore buf C's old diff
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
116 j -jump to diff | @ -auto-refinement | * -refine current region
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
117 gx -goto X's point| ## -ignore whitespace | ! -update diff regions
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
118 C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
119 v/V -scroll up/dn | X -read-only in buf X | wx -save buf X
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
120 </> -scroll lt/rt | m -wide display | wd -save diff output
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
121 ~ -swap variants | s -shrink window C | / -show ancestor buff
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
122 | $$ -show clashes only | & -merge w/new default
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
123 | $* -skip changed regions |
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
127
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
128 ;; The actual long help message.
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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.")
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
131
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
132 (defconst ediff-brief-message-string
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
133 " ? -quick help "
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
134 "Contents of the brief help message.")
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
135 ;; The actual brief help message
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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.")
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
138
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
139 (ediff-defvar-local ediff-brief-help-message-function nil
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
140 "The brief help message that the user can customize.
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
143 (ediff-defvar-local ediff-long-help-message-function nil
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
144 "The long help message that the user can customize.
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
145 See `ediff-brief-help-message-function' for more.")
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
146
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
147 (defvar ediff-use-long-help-message nil
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
148 "*If t, Ediff displays a long help message. Short help message otherwise.")
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
149
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
150 ;; The actual help message.
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
151 (ediff-defvar-local ediff-help-message ""
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
152 "The actual help message.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
153 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
154 start up with different help messages for different jobs, you can change
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
155 the value of this variable and the variables `ediff-help-message-*' in
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
156 `ediff-startup-hook'.")
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
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
159 ;; the keymap that defines clicks over the quick help regions
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
160 (defvar ediff-help-region-map (make-sparse-keymap))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
161
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
162 (define-key
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
163 ediff-help-region-map
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
164 (if ediff-emacs-p [mouse-2] [button2])
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
165 'ediff-help-for-quick-help)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
166
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
167 ;; runs in the control buffer
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
168 (defun ediff-set-help-overlays ()
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
169 (goto-char (point-min))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
170 (let (overl beg end cmd)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
171 (while (re-search-forward " *\\([^ \t\n|]+\\||\\) +-[^|\n]+" nil 'noerror)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
172 (setq beg (match-beginning 0)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
173 end (match-end 0)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
174 cmd (buffer-substring (match-beginning 1) (match-end 1)))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
175 (setq overl (ediff-make-overlay beg end))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
176 (if ediff-emacs-p
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
177 (ediff-overlay-put overl 'mouse-face 'highlight)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
178 (ediff-overlay-put overl 'highlight t))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
179 (ediff-overlay-put overl 'ediff-help-info cmd))))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
180
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
181
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
182 (defun ediff-help-for-quick-help ()
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
183 "Explain Ediff commands in more detail."
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
184 (interactive)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
185 (ediff-barf-if-not-control-buffer)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16247
diff changeset
186 (let ((pos (ediff-event-point last-command-event))
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
187 overl cmd)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
188
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
189 (if ediff-xemacs-p
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
190 (setq overl (extent-at pos (current-buffer) 'ediff-help-info)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
191 cmd (ediff-overlay-get overl 'ediff-help-info))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
192 (setq cmd (car (mapcar (lambda (elt)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
193 (overlay-get elt 'ediff-help-info))
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
194 (overlays-at pos)))))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
195
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
196 (if (not (stringp cmd))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
197 (error "Hmm... I don't see an Ediff command around here..."))
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
198
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
199 (ediff-documentation "Quick Help Commands")
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
200
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
201 (let (case-fold-search)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
202 (cond ((string= cmd "?") (re-search-forward "^`\\?'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
203 ((string= cmd "G") (re-search-forward "^`G'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
204 ((string= cmd "E") (re-search-forward "^`E'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
205 ((string= cmd "wd") (re-search-forward "^`wd'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
206 ((string= cmd "wx") (re-search-forward "^`wa'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
207 ((string= cmd "a/b") (re-search-forward "^`a'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
208 ((string= cmd "x") (re-search-forward "^`a'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
209 ((string= cmd "xy") (re-search-forward "^`ab'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
210 ((string= cmd "p,DEL") (re-search-forward "^`p'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
211 ((string= cmd "n,SPC") (re-search-forward "^`n'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
212 ((string= cmd "j") (re-search-forward "^`j'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
213 ((string= cmd "gx") (re-search-forward "^`ga'"))
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 "*") (re-search-forward "^`\\*'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
216 ((string= cmd "m") (re-search-forward "^`m'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
217 ((string= cmd "|") (re-search-forward "^`|'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
218 ((string= cmd "@") (re-search-forward "^`@'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
219 ((string= cmd "h") (re-search-forward "^`h'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
220 ((string= cmd "r") (re-search-forward "^`r'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
221 ((string= cmd "rx") (re-search-forward "^`ra'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
222 ((string= cmd "##") (re-search-forward "^`##'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
223 ((string= cmd "#f/#h") (re-search-forward "^`#f'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
224 ((string= cmd "X") (re-search-forward "^`A'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
225 ((string= cmd "v/V") (re-search-forward "^`v'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
226 ((string= cmd "</>") (re-search-forward "^`<'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
227 ((string= cmd "~") (re-search-forward "^`~'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
228 ((string= cmd "i") (re-search-forward "^`i'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
229 ((string= cmd "D") (re-search-forward "^`D'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
230 ((string= cmd "R") (re-search-forward "^`R'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
231 ((string= cmd "M") (re-search-forward "^`M'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
232 ((string= cmd "z/q") (re-search-forward "^`z'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
233 ((string= cmd "%") (re-search-forward "^`%'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
234 ((string= cmd "C-l") (re-search-forward "^`C-l'"))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
235 ((string= cmd "$$") (re-search-forward "^`\\$\\$'"))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
236 ((string= cmd "$*") (re-search-forward "^`\\$\\*'"))
16247
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 ((string= cmd "s") (re-search-forward "^`s'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
240 ((string= cmd "+") (re-search-forward "^`\\+'"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
241 ((string= cmd "=") (re-search-forward "^`='"))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
242 (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
243 ) ; let case-fold-search
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
244 ))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
245
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
246
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
247 ;; 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
248 ;; help message
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
249 (defun ediff-help-message-line-length ()
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
250 (save-excursion
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
251 (goto-char (point-min))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
252 (if ediff-use-long-help-message
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
253 (next-line 1))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
254 (end-of-line)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
255 (current-column)))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
256
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
257
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
258 (defun ediff-indent-help-message ()
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
259 (let* ((shift (/ (max 0 (- (window-width (selected-window))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
260 (ediff-help-message-line-length)))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
261 2))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
262 (str (make-string shift ?\ )))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
263 (save-excursion
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
264 (goto-char (point-min))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
265 (while (< (point) (point-max))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
266 (insert str)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
267 (beginning-of-line)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
268 (forward-line 1)))))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
269
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
270
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
271 ;; compose the help message as a string
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
272 (defun ediff-set-help-message ()
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
273 (setq ediff-long-help-message
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
274 (cond ((and ediff-long-help-message-function
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
275 (or (symbolp ediff-long-help-message-function)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
276 (consp ediff-long-help-message-function)))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
277 (funcall ediff-long-help-message-function))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
278 (ediff-word-mode
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
279 (concat ediff-long-help-message-head
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
280 ediff-long-help-message-word-mode
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
281 ediff-long-help-message-tail))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
282 (ediff-narrow-job
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
283 (concat ediff-long-help-message-head
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
284 ediff-long-help-message-narrow2
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
285 ediff-long-help-message-tail))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
286 (ediff-merge-job
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
287 (concat ediff-long-help-message-head
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
288 ediff-long-help-message-merge
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
289 ediff-long-help-message-tail))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
290 (ediff-diff3-job
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
291 (concat ediff-long-help-message-head
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
292 ediff-long-help-message-compare3
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
293 ediff-long-help-message-tail))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
294 (t
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
295 (concat ediff-long-help-message-head
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
296 ediff-long-help-message-compare2
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
297 ediff-long-help-message-tail))))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
298 (setq ediff-brief-help-message
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
299 (cond ((and ediff-brief-help-message-function
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
300 (or (symbolp ediff-brief-help-message-function)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
301 (consp ediff-brief-help-message-function)))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
302 (funcall ediff-brief-help-message-function))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
303 ((stringp ediff-brief-help-message-function)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
304 ediff-brief-help-message-function)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
305 ((ediff-multiframe-setup-p) ediff-brief-message-string)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
306 (t ; long brief msg, not multiframe --- put in the middle
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
307 ediff-brief-message-string)
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
308 ))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
309 (setq ediff-help-message (if ediff-use-long-help-message
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
310 ediff-long-help-message
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
311 ediff-brief-help-message))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
312 (run-hooks 'ediff-display-help-hook))
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
313
27899
42f9a58e0fc4 * viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
314 ;;;###autoload
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
315 (defun ediff-customize ()
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
316 (interactive)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
317 (customize-group "ediff"))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
318
16247
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
319
a0940ace16a3 Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
320 ;;; ediff-help.el ends here