1996-09-20 01:08:36 +00:00
|
|
|
;;; ediff-help.el --- Code related to the contents of Ediff help buffers
|
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
;; Copyright (C) 1996, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
|
1996-09-20 01:08:36 +00:00
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
|
1996-09-20 01:08:36 +00:00
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
;; any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
|
|
|
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
;; Boston, MA 02111-1307, USA.
|
|
|
|
|
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
;;; Code:
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(provide 'ediff-help)
|
1996-09-20 01:08:36 +00:00
|
|
|
|
|
|
|
|
;; Compiler pacifier start
|
|
|
|
|
(defvar ediff-multiframe)
|
1997-05-31 01:10:39 +00:00
|
|
|
|
|
|
|
|
(eval-when-compile
|
|
|
|
|
(let ((load-path (cons (expand-file-name ".") load-path)))
|
|
|
|
|
(or (featurep 'ediff-init)
|
|
|
|
|
(load "ediff-init.el" nil nil 'nosuffix))
|
|
|
|
|
))
|
1996-09-20 01:08:36 +00:00
|
|
|
;; end pacifier
|
|
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(require 'ediff-init)
|
|
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
;; Help messages
|
|
|
|
|
|
|
|
|
|
(defconst ediff-long-help-message-head
|
|
|
|
|
" Move around | Toggle features | Manipulate
|
|
|
|
|
=====================|===========================|============================="
|
|
|
|
|
"The head of the full help message.")
|
|
|
|
|
(defconst ediff-long-help-message-tail
|
|
|
|
|
"=====================|===========================|=============================
|
2003-02-04 11:26:42 +00:00
|
|
|
R -show registry | = -compare regions | M -show session group
|
|
|
|
|
D -diff output | E -browse Ediff manual| G -send bug report
|
|
|
|
|
i -status info | ? -help off | z/q -suspend/quit
|
1996-09-20 01:08:36 +00:00
|
|
|
-------------------------------------------------------------------------------
|
|
|
|
|
For help on a specific command: Click Button 2 over it; or
|
|
|
|
|
Put the cursor over it and type RET."
|
|
|
|
|
"The tail of the full-help message.")
|
|
|
|
|
|
|
|
|
|
(defconst ediff-long-help-message-compare3
|
|
|
|
|
"
|
|
|
|
|
p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
|
|
|
|
|
n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
|
2003-02-04 11:26:42 +00:00
|
|
|
j -jump to diff | @ -auto-refinement | * -refine current region
|
|
|
|
|
gx -goto X's point| | ! -update diff regions
|
1996-09-20 01:08:36 +00:00
|
|
|
C-l -recenter | ## -ignore whitespace |
|
2003-02-04 11:26:42 +00:00
|
|
|
v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
|
|
|
|
|
</> -scroll lt/rt | X -read-only in buf X | wd -save diff output
|
1996-09-20 01:08:36 +00:00
|
|
|
~ -rotate buffers| m -wide display |
|
|
|
|
|
"
|
|
|
|
|
"Help message usually used for 3-way comparison.
|
1999-11-01 07:16:15 +00:00
|
|
|
Normally, not a user option. See `ediff-help-message' for details.")
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
(defconst ediff-long-help-message-compare2
|
|
|
|
|
"
|
|
|
|
|
p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
|
|
|
|
|
n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
|
2003-02-04 11:26:42 +00:00
|
|
|
j -jump to diff | @ -auto-refinement | * -refine current region
|
|
|
|
|
gx -goto X's point| | ! -update diff regions
|
1996-09-20 01:08:36 +00:00
|
|
|
C-l -recenter | ## -ignore whitespace |
|
2003-02-04 11:26:42 +00:00
|
|
|
v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
|
|
|
|
|
</> -scroll lt/rt | X -read-only in buf X | wd -save diff output
|
|
|
|
|
~ -swap variants | m -wide display |
|
1996-09-20 01:08:36 +00:00
|
|
|
"
|
|
|
|
|
"Help message usually used for 2-way comparison.
|
1999-11-01 07:16:15 +00:00
|
|
|
Normally, not a user option. See `ediff-help-message' for details.")
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
(defconst ediff-long-help-message-narrow2
|
|
|
|
|
"
|
|
|
|
|
p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
|
|
|
|
|
n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
|
2003-02-04 11:26:42 +00:00
|
|
|
j -jump to diff | @ -auto-refinement | * -refine current region
|
|
|
|
|
gx -goto X's point| % -narrow/widen buffs | ! -update diff regions
|
1996-09-20 01:08:36 +00:00
|
|
|
C-l -recenter | ## -ignore whitespace |
|
2003-02-04 11:26:42 +00:00
|
|
|
v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
|
|
|
|
|
</> -scroll lt/rt | X -read-only in buf X | wd -save diff output
|
|
|
|
|
~ -swap variants | m -wide display |
|
1996-09-20 01:08:36 +00:00
|
|
|
"
|
|
|
|
|
"Help message when comparing windows or regions line-by-line.
|
1999-11-01 07:16:15 +00:00
|
|
|
Normally, not a user option. See `ediff-help-message' for details.")
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
(defconst ediff-long-help-message-word-mode
|
|
|
|
|
"
|
|
|
|
|
p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
|
|
|
|
|
n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
|
2003-02-04 11:26:42 +00:00
|
|
|
j -jump to diff | |
|
|
|
|
|
gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs
|
1996-09-20 01:08:36 +00:00
|
|
|
C-l -recenter | |
|
2003-02-04 11:26:42 +00:00
|
|
|
v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
|
|
|
|
|
</> -scroll lt/rt | X -read-only in buf X | wd -save diff output
|
|
|
|
|
~ -swap variants | m -wide display |
|
1996-09-20 01:08:36 +00:00
|
|
|
"
|
|
|
|
|
"Help message when comparing windows or regions word-by-word.
|
1999-11-01 07:16:15 +00:00
|
|
|
Normally, not a user option. See `ediff-help-message' for details.")
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
(defconst ediff-long-help-message-merge
|
|
|
|
|
"
|
|
|
|
|
p,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C
|
|
|
|
|
n,SPC -next diff | h -hilighting | r -restore buf C's old diff
|
2003-02-04 11:26:42 +00:00
|
|
|
j -jump to diff | @ -auto-refinement | * -refine current region
|
|
|
|
|
gx -goto X's point| ## -ignore whitespace | ! -update diff regions
|
|
|
|
|
C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions
|
|
|
|
|
v/V -scroll up/dn | X -read-only in buf X | wx -save buf X
|
|
|
|
|
</> -scroll lt/rt | m -wide display | wd -save diff output
|
|
|
|
|
~ -swap variants | s -shrink window C | / -show ancestor buff
|
|
|
|
|
| $$ -show clashes only | & -merge w/new default
|
1999-11-01 07:16:15 +00:00
|
|
|
| $* -skip changed regions |
|
1996-09-20 01:08:36 +00:00
|
|
|
"
|
1999-11-01 07:16:15 +00:00
|
|
|
"Help message for merge sessions.
|
|
|
|
|
Normally, not a user option. See `ediff-help-message' for details.")
|
1996-09-20 01:08:36 +00:00
|
|
|
|
|
|
|
|
;; The actual long help message.
|
|
|
|
|
(ediff-defvar-local ediff-long-help-message ""
|
1999-11-01 07:16:15 +00:00
|
|
|
"Normally, not a user option. See `ediff-help-message' for details.")
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
(defconst ediff-brief-message-string
|
2005-06-03 08:04:04 +00:00
|
|
|
" Type ? for help"
|
1996-09-20 01:08:36 +00:00
|
|
|
"Contents of the brief help message.")
|
|
|
|
|
;; The actual brief help message
|
|
|
|
|
(ediff-defvar-local ediff-brief-help-message ""
|
1999-11-01 07:16:15 +00:00
|
|
|
"Normally, not a user option. See `ediff-help-message' for details.")
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
(ediff-defvar-local ediff-brief-help-message-function nil
|
|
|
|
|
"The brief help message that the user can customize.
|
|
|
|
|
If the user sets this to a parameter-less function, Ediff will use it to
|
1999-11-01 07:16:15 +00:00
|
|
|
produce the brief help message. This function must return a string.")
|
1996-09-20 01:08:36 +00:00
|
|
|
(ediff-defvar-local ediff-long-help-message-function nil
|
|
|
|
|
"The long help message that the user can customize.
|
|
|
|
|
See `ediff-brief-help-message-function' for more.")
|
|
|
|
|
|
2000-11-24 08:15:11 +00:00
|
|
|
(defcustom ediff-use-long-help-message nil
|
|
|
|
|
"*If t, Ediff displays a long help message. Short help message otherwise."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'ediff-window)
|
1996-09-20 01:08:36 +00:00
|
|
|
|
|
|
|
|
;; The actual help message.
|
|
|
|
|
(ediff-defvar-local ediff-help-message ""
|
|
|
|
|
"The actual help message.
|
1999-11-01 07:16:15 +00:00
|
|
|
Normally, the user shouldn't touch this. However, if you want Ediff to
|
1996-09-20 01:08:36 +00:00
|
|
|
start up with different help messages for different jobs, you can change
|
|
|
|
|
the value of this variable and the variables `ediff-help-message-*' in
|
2003-02-04 11:26:42 +00:00
|
|
|
`ediff-startup-hook'.")
|
1996-09-20 01:08:36 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
;; the keymap that defines clicks over the quick help regions
|
|
|
|
|
(defvar ediff-help-region-map (make-sparse-keymap))
|
|
|
|
|
|
|
|
|
|
(define-key
|
|
|
|
|
ediff-help-region-map
|
|
|
|
|
(if ediff-emacs-p [mouse-2] [button2])
|
|
|
|
|
'ediff-help-for-quick-help)
|
|
|
|
|
|
|
|
|
|
;; runs in the control buffer
|
|
|
|
|
(defun ediff-set-help-overlays ()
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(let (overl beg end cmd)
|
|
|
|
|
(while (re-search-forward " *\\([^ \t\n|]+\\||\\) +-[^|\n]+" nil 'noerror)
|
|
|
|
|
(setq beg (match-beginning 0)
|
|
|
|
|
end (match-end 0)
|
|
|
|
|
cmd (buffer-substring (match-beginning 1) (match-end 1)))
|
|
|
|
|
(setq overl (ediff-make-overlay beg end))
|
|
|
|
|
(if ediff-emacs-p
|
|
|
|
|
(ediff-overlay-put overl 'mouse-face 'highlight)
|
|
|
|
|
(ediff-overlay-put overl 'highlight t))
|
|
|
|
|
(ediff-overlay-put overl 'ediff-help-info cmd))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun ediff-help-for-quick-help ()
|
|
|
|
|
"Explain Ediff commands in more detail."
|
|
|
|
|
(interactive)
|
|
|
|
|
(ediff-barf-if-not-control-buffer)
|
1997-05-31 01:10:39 +00:00
|
|
|
(let ((pos (ediff-event-point last-command-event))
|
1996-09-20 01:08:36 +00:00
|
|
|
overl cmd)
|
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
(ediff-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
;; xemacs
|
|
|
|
|
(setq overl (extent-at pos (current-buffer) 'ediff-help-info)
|
|
|
|
|
cmd (ediff-overlay-get overl 'ediff-help-info))
|
|
|
|
|
;; emacs
|
|
|
|
|
(setq cmd (car (mapcar (lambda (elt)
|
|
|
|
|
(overlay-get elt 'ediff-help-info))
|
|
|
|
|
(overlays-at pos))))
|
|
|
|
|
)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
(if (not (stringp cmd))
|
1999-11-01 07:16:15 +00:00
|
|
|
(error "Hmm... I don't see an Ediff command around here..."))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
(ediff-documentation "Quick Help Commands")
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
(let (case-fold-search)
|
|
|
|
|
(cond ((string= cmd "?") (re-search-forward "^`\\?'"))
|
|
|
|
|
((string= cmd "G") (re-search-forward "^`G'"))
|
|
|
|
|
((string= cmd "E") (re-search-forward "^`E'"))
|
|
|
|
|
((string= cmd "wd") (re-search-forward "^`wd'"))
|
|
|
|
|
((string= cmd "wx") (re-search-forward "^`wa'"))
|
|
|
|
|
((string= cmd "a/b") (re-search-forward "^`a'"))
|
|
|
|
|
((string= cmd "x") (re-search-forward "^`a'"))
|
|
|
|
|
((string= cmd "xy") (re-search-forward "^`ab'"))
|
|
|
|
|
((string= cmd "p,DEL") (re-search-forward "^`p'"))
|
|
|
|
|
((string= cmd "n,SPC") (re-search-forward "^`n'"))
|
|
|
|
|
((string= cmd "j") (re-search-forward "^`j'"))
|
|
|
|
|
((string= cmd "gx") (re-search-forward "^`ga'"))
|
|
|
|
|
((string= cmd "!") (re-search-forward "^`!'"))
|
|
|
|
|
((string= cmd "*") (re-search-forward "^`\\*'"))
|
|
|
|
|
((string= cmd "m") (re-search-forward "^`m'"))
|
|
|
|
|
((string= cmd "|") (re-search-forward "^`|'"))
|
|
|
|
|
((string= cmd "@") (re-search-forward "^`@'"))
|
|
|
|
|
((string= cmd "h") (re-search-forward "^`h'"))
|
|
|
|
|
((string= cmd "r") (re-search-forward "^`r'"))
|
|
|
|
|
((string= cmd "rx") (re-search-forward "^`ra'"))
|
|
|
|
|
((string= cmd "##") (re-search-forward "^`##'"))
|
|
|
|
|
((string= cmd "#f/#h") (re-search-forward "^`#f'"))
|
|
|
|
|
((string= cmd "X") (re-search-forward "^`A'"))
|
|
|
|
|
((string= cmd "v/V") (re-search-forward "^`v'"))
|
|
|
|
|
((string= cmd "</>") (re-search-forward "^`<'"))
|
|
|
|
|
((string= cmd "~") (re-search-forward "^`~'"))
|
|
|
|
|
((string= cmd "i") (re-search-forward "^`i'"))
|
|
|
|
|
((string= cmd "D") (re-search-forward "^`D'"))
|
|
|
|
|
((string= cmd "R") (re-search-forward "^`R'"))
|
|
|
|
|
((string= cmd "M") (re-search-forward "^`M'"))
|
|
|
|
|
((string= cmd "z/q") (re-search-forward "^`z'"))
|
|
|
|
|
((string= cmd "%") (re-search-forward "^`%'"))
|
|
|
|
|
((string= cmd "C-l") (re-search-forward "^`C-l'"))
|
1999-11-01 07:16:15 +00:00
|
|
|
((string= cmd "$$") (re-search-forward "^`\\$\\$'"))
|
|
|
|
|
((string= cmd "$*") (re-search-forward "^`\\$\\*'"))
|
1996-09-20 01:08:36 +00:00
|
|
|
((string= cmd "/") (re-search-forward "^`/'"))
|
|
|
|
|
((string= cmd "&") (re-search-forward "^`&'"))
|
|
|
|
|
((string= cmd "s") (re-search-forward "^`s'"))
|
|
|
|
|
((string= cmd "+") (re-search-forward "^`\\+'"))
|
|
|
|
|
((string= cmd "=") (re-search-forward "^`='"))
|
|
|
|
|
(t (error "Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer")))
|
|
|
|
|
) ; let case-fold-search
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; assuming we are in control window, calculate length of the first line in
|
|
|
|
|
;; help message
|
|
|
|
|
(defun ediff-help-message-line-length ()
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if ediff-use-long-help-message
|
|
|
|
|
(next-line 1))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(current-column)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
|
|
|
|
|
(defun ediff-indent-help-message ()
|
|
|
|
|
(let* ((shift (/ (max 0 (- (window-width (selected-window))
|
|
|
|
|
(ediff-help-message-line-length)))
|
|
|
|
|
2))
|
|
|
|
|
(str (make-string shift ?\ )))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (< (point) (point-max))
|
|
|
|
|
(insert str)
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(forward-line 1)))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
|
|
|
|
|
;; compose the help message as a string
|
|
|
|
|
(defun ediff-set-help-message ()
|
|
|
|
|
(setq ediff-long-help-message
|
|
|
|
|
(cond ((and ediff-long-help-message-function
|
|
|
|
|
(or (symbolp ediff-long-help-message-function)
|
|
|
|
|
(consp ediff-long-help-message-function)))
|
|
|
|
|
(funcall ediff-long-help-message-function))
|
2003-02-04 11:26:42 +00:00
|
|
|
(ediff-word-mode
|
1996-09-20 01:08:36 +00:00
|
|
|
(concat ediff-long-help-message-head
|
|
|
|
|
ediff-long-help-message-word-mode
|
|
|
|
|
ediff-long-help-message-tail))
|
|
|
|
|
(ediff-narrow-job
|
|
|
|
|
(concat ediff-long-help-message-head
|
|
|
|
|
ediff-long-help-message-narrow2
|
|
|
|
|
ediff-long-help-message-tail))
|
2003-02-04 11:26:42 +00:00
|
|
|
(ediff-merge-job
|
1996-09-20 01:08:36 +00:00
|
|
|
(concat ediff-long-help-message-head
|
|
|
|
|
ediff-long-help-message-merge
|
|
|
|
|
ediff-long-help-message-tail))
|
|
|
|
|
(ediff-diff3-job
|
|
|
|
|
(concat ediff-long-help-message-head
|
|
|
|
|
ediff-long-help-message-compare3
|
|
|
|
|
ediff-long-help-message-tail))
|
2003-02-04 11:26:42 +00:00
|
|
|
(t
|
1996-09-20 01:08:36 +00:00
|
|
|
(concat ediff-long-help-message-head
|
|
|
|
|
ediff-long-help-message-compare2
|
|
|
|
|
ediff-long-help-message-tail))))
|
2003-02-04 11:26:42 +00:00
|
|
|
(setq ediff-brief-help-message
|
1996-09-20 01:08:36 +00:00
|
|
|
(cond ((and ediff-brief-help-message-function
|
|
|
|
|
(or (symbolp ediff-brief-help-message-function)
|
|
|
|
|
(consp ediff-brief-help-message-function)))
|
|
|
|
|
(funcall ediff-brief-help-message-function))
|
|
|
|
|
((stringp ediff-brief-help-message-function)
|
|
|
|
|
ediff-brief-help-message-function)
|
|
|
|
|
((ediff-multiframe-setup-p) ediff-brief-message-string)
|
|
|
|
|
(t ; long brief msg, not multiframe --- put in the middle
|
|
|
|
|
ediff-brief-message-string)
|
|
|
|
|
))
|
|
|
|
|
(setq ediff-help-message (if ediff-use-long-help-message
|
|
|
|
|
ediff-long-help-message
|
|
|
|
|
ediff-brief-help-message))
|
|
|
|
|
(run-hooks 'ediff-display-help-hook))
|
|
|
|
|
|
2000-02-28 06:16:44 +00:00
|
|
|
;;;###autoload
|
1999-11-01 07:16:15 +00:00
|
|
|
(defun ediff-customize ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(customize-group "ediff"))
|
|
|
|
|
|
1996-09-20 01:08:36 +00:00
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
;;; arch-tag: 05659813-7fcf-4274-964f-d2f577431a9d
|
1996-09-20 01:08:36 +00:00
|
|
|
;;; ediff-help.el ends here
|