1995-10-30 17:35:01 +00:00
|
|
|
|
;;; viper-mous.el --- mouse support for Viper
|
|
|
|
|
|
2005-08-01 15:47:19 +00:00
|
|
|
|
;; Copyright (C) 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004,
|
2007-01-21 02:48:43 +00:00
|
|
|
|
;; 2005, 2006, 2007 Free Software Foundation, Inc.
|
1995-04-08 02:20:38 +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>
|
2001-09-09 22:33:38 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +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
|
2007-07-25 04:14:29 +00:00
|
|
|
|
;; the Free Software Foundation; either version 3, or (at your option)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; 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
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
2005-07-04 17:55:18 +00:00
|
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
1996-03-29 01:02:28 +00:00
|
|
|
|
|
1997-05-31 00:02:53 +00:00
|
|
|
|
(provide 'viper-mous)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1996-03-29 01:02:28 +00:00
|
|
|
|
;; compiler pacifier
|
|
|
|
|
(defvar double-click-time)
|
|
|
|
|
(defvar mouse-track-multi-click-time)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-search-start-marker)
|
|
|
|
|
(defvar viper-local-search-start-marker)
|
|
|
|
|
(defvar viper-search-history)
|
|
|
|
|
(defvar viper-s-string)
|
|
|
|
|
(defvar viper-re-search)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
|
1997-06-09 04:00:50 +00:00
|
|
|
|
;; loading happens only in non-interactive compilation
|
|
|
|
|
;; in order to spare non-viperized emacs from being viperized
|
|
|
|
|
(if noninteractive
|
|
|
|
|
(eval-when-compile
|
|
|
|
|
(let ((load-path (cons (expand-file-name ".") load-path)))
|
|
|
|
|
(or (featurep 'viper-util)
|
|
|
|
|
(load "viper-util.el" nil nil 'nosuffix))
|
|
|
|
|
(or (featurep 'viper-cmd)
|
|
|
|
|
(load "viper-cmd.el" nil nil 'nosuffix))
|
|
|
|
|
)))
|
1997-05-31 00:02:53 +00:00
|
|
|
|
;; end pacifier
|
|
|
|
|
|
|
|
|
|
(require 'viper-util)
|
|
|
|
|
|
1996-03-29 01:02:28 +00:00
|
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
|
(defgroup viper-mouse nil
|
2005-07-04 02:49:51 +00:00
|
|
|
|
"Support for Viper special mouse-bound commands."
|
1997-08-02 07:40:22 +00:00
|
|
|
|
:prefix "viper-"
|
1997-07-17 19:37:07 +00:00
|
|
|
|
:group 'viper)
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;;; Variables
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; Variable used for catching the switch-frame event.
|
|
|
|
|
;; If non-nil, indicates that previous-frame should be the selected
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; one. Used by viper-mouse-click-get-word. Not a user option.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-frame-of-focus nil)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; Frame that was selected before the switch-frame event.
|
2005-07-10 18:46:24 +00:00
|
|
|
|
(defvar viper-current-frame-saved (selected-frame))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defcustom viper-surrounding-word-function 'viper-surrounding-word
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"*Function that determines what constitutes a word for clicking events.
|
2003-02-04 13:24:35 +00:00
|
|
|
|
Takes two parameters: a COUNT, indicating how many words to return,
|
1995-02-20 23:15:10 +00:00
|
|
|
|
and CLICK-COUNT, telling whether this is the first click, a double-click,
|
1997-07-17 19:37:07 +00:00
|
|
|
|
or a tripple-click."
|
1999-11-01 07:16:15 +00:00
|
|
|
|
:type 'symbol
|
1997-07-17 19:37:07 +00:00
|
|
|
|
:group 'viper-mouse)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; time interval in millisecond within which successive clicks are
|
|
|
|
|
;; considered related
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defcustom viper-multiclick-timeout (if (viper-window-display-p)
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(if (featurep 'xemacs)
|
1997-07-17 19:37:07 +00:00
|
|
|
|
mouse-track-multi-click-time
|
|
|
|
|
double-click-time)
|
|
|
|
|
500)
|
|
|
|
|
"*Time interval in millisecond within which successive mouse clicks are
|
|
|
|
|
considered related."
|
|
|
|
|
:type 'integer
|
|
|
|
|
:group 'viper-mouse)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;; current event click count; XEmacs only
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-current-click-count 0)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; time stamp of the last click event; XEmacs only
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-last-click-event-timestamp 0)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;; Local variable used to toggle wraparound search on click.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deflocalvar viper-mouse-click-search-noerror t)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; Local variable used to delimit search after wraparound.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deflocalvar viper-mouse-click-search-limit nil)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; remembers prefix argument to pass along to commands invoked by second
|
|
|
|
|
;; click.
|
|
|
|
|
;; This is needed because in Emacs (not XEmacs), assigning to preix-arg
|
|
|
|
|
;; causes Emacs to count the second click as if it was a single click
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-global-prefix-argument nil)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; same keys, but parsed
|
|
|
|
|
(defvar viper-mouse-up-search-key-parsed nil)
|
|
|
|
|
(defvar viper-mouse-down-search-key-parsed nil)
|
|
|
|
|
(defvar viper-mouse-up-insert-key-parsed nil)
|
|
|
|
|
(defvar viper-mouse-down-insert-key-parsed nil)
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-multiclick-p ()
|
|
|
|
|
(not (viper-sit-for-short viper-multiclick-timeout t)))
|
1996-01-26 23:34:09 +00:00
|
|
|
|
|
|
|
|
|
;; Returns window where click occurs
|
1997-11-01 01:46:51 +00:00
|
|
|
|
(defun viper-mouse-click-window (click)
|
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
|
|
|
|
(let ((win (viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(event-window click) ; xemacs
|
|
|
|
|
(posn-window (event-start click)) ; emacs
|
|
|
|
|
)))
|
1997-11-01 01:46:51 +00:00
|
|
|
|
(if (window-live-p win)
|
|
|
|
|
win
|
|
|
|
|
(error "Click was not over a live window"))))
|
1996-01-26 23:34:09 +00:00
|
|
|
|
|
|
|
|
|
;; Returns window where click occurs
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-mouse-click-frame (click)
|
|
|
|
|
(window-frame (viper-mouse-click-window click)))
|
1996-01-26 23:34:09 +00:00
|
|
|
|
|
|
|
|
|
;; Returns the buffer of the window where click occurs
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-mouse-click-window-buffer (click)
|
|
|
|
|
(window-buffer (viper-mouse-click-window click)))
|
1996-01-26 23:34:09 +00:00
|
|
|
|
|
|
|
|
|
;; Returns the name of the buffer in the window where click occurs
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-mouse-click-window-buffer-name (click)
|
|
|
|
|
(buffer-name (viper-mouse-click-window-buffer click)))
|
1996-01-26 23:34:09 +00:00
|
|
|
|
|
|
|
|
|
;; Returns position of a click
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-mouse-click-posn (click)
|
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
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(event-point click) ; xemacs
|
|
|
|
|
(posn-point (event-start click)) ; emacs
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1996-01-26 23:34:09 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-surrounding-word (count click-count)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Returns word surrounding point according to a heuristic.
|
|
|
|
|
COUNT indicates how many regions to return.
|
1995-07-27 19:41:08 +00:00
|
|
|
|
If CLICK-COUNT is 1, `word' is a word in Vi sense.
|
|
|
|
|
If CLICK-COUNT is 2,then `word' is a Word in Vi sense.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
If the character clicked on is a non-separator and is non-alphanumeric but
|
|
|
|
|
is adjacent to an alphanumeric symbol, then it is considered alphanumeric
|
1999-11-01 07:16:15 +00:00
|
|
|
|
for the purpose of this command. If this character has a matching
|
1995-02-20 23:15:10 +00:00
|
|
|
|
character, such as `\(' is a match for `\)', then the matching character is
|
|
|
|
|
also considered alphanumeric.
|
1995-07-27 19:41:08 +00:00
|
|
|
|
For convenience, in Lisp modes, `-' is considered alphanumeric.
|
|
|
|
|
|
|
|
|
|
If CLICK-COUNT is 3 or more, returns the line clicked on with leading and
|
1999-11-01 07:16:15 +00:00
|
|
|
|
trailing space and tabs removed. In that case, the first argument, COUNT,
|
1995-07-27 19:41:08 +00:00
|
|
|
|
is ignored."
|
1998-05-30 14:29:44 +00:00
|
|
|
|
(let ((modifiers "_")
|
1995-08-20 04:30:48 +00:00
|
|
|
|
beg skip-flag result
|
1995-10-14 02:26:46 +00:00
|
|
|
|
word-beg)
|
1995-08-20 04:30:48 +00:00
|
|
|
|
(if (> click-count 2)
|
1995-07-27 19:41:08 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-skip-all-separators-forward 'within-line)
|
1995-07-27 19:41:08 +00:00
|
|
|
|
(setq beg (point))
|
|
|
|
|
(end-of-line)
|
1995-08-20 04:30:48 +00:00
|
|
|
|
(setq result (buffer-substring beg (point))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (and (not (viper-looking-at-alphasep))
|
|
|
|
|
(or (save-excursion (viper-backward-char-carefully)
|
|
|
|
|
(viper-looking-at-alpha))
|
|
|
|
|
(save-excursion (viper-forward-char-carefully)
|
|
|
|
|
(viper-looking-at-alpha))))
|
1995-10-14 02:26:46 +00:00
|
|
|
|
(setq modifiers
|
1998-05-30 14:29:44 +00:00
|
|
|
|
(concat modifiers
|
|
|
|
|
(cond ((looking-at "\\\\") "\\\\")
|
|
|
|
|
((looking-at "-") "C-C-")
|
|
|
|
|
((looking-at "[][]") "][")
|
|
|
|
|
((looking-at "[()]") ")(")
|
|
|
|
|
((looking-at "[{}]") "{}")
|
|
|
|
|
((looking-at "[<>]") "<>")
|
|
|
|
|
((looking-at "[`']") "`'")
|
|
|
|
|
((looking-at "\\^") "\\^")
|
|
|
|
|
((viper-looking-at-separator) "")
|
|
|
|
|
(t (char-to-string (following-char))))
|
|
|
|
|
)
|
1995-10-14 02:26:46 +00:00
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-10-14 02:26:46 +00:00
|
|
|
|
;; Add `-' to alphanum, if it wasn't added and if we are in Lisp
|
1995-07-27 19:41:08 +00:00
|
|
|
|
(or (looking-at "-")
|
|
|
|
|
(not (string-match "lisp" (symbol-name major-mode)))
|
1995-10-14 02:26:46 +00:00
|
|
|
|
(setq modifiers (concat modifiers "C-C-")))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
1995-07-27 19:41:08 +00:00
|
|
|
|
(save-excursion
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(cond ((> click-count 1) (viper-skip-nonseparators 'backward))
|
|
|
|
|
((viper-looking-at-alpha modifiers)
|
|
|
|
|
(viper-skip-alpha-backward modifiers))
|
|
|
|
|
((not (viper-looking-at-alphasep modifiers))
|
|
|
|
|
(viper-skip-nonalphasep-backward))
|
1995-10-14 02:26:46 +00:00
|
|
|
|
(t (if (> click-count 1)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-skip-nonseparators 'backward)
|
|
|
|
|
(viper-skip-alpha-backward modifiers))))
|
1995-10-14 02:26:46 +00:00
|
|
|
|
|
1995-07-27 19:41:08 +00:00
|
|
|
|
(setq word-beg (point))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-10-14 02:26:46 +00:00
|
|
|
|
(setq skip-flag nil) ; don't move 1 char forw the first time
|
1995-07-27 19:41:08 +00:00
|
|
|
|
(while (> count 0)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if skip-flag (viper-forward-char-carefully 1))
|
1995-10-14 02:26:46 +00:00
|
|
|
|
(setq skip-flag t) ; now always move 1 char forward
|
|
|
|
|
(if (> click-count 1)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-skip-nonseparators 'forward)
|
|
|
|
|
(viper-skip-alpha-forward modifiers))
|
1995-07-27 19:41:08 +00:00
|
|
|
|
(setq count (1- count)))
|
1995-10-14 02:26:46 +00:00
|
|
|
|
|
1995-08-20 04:30:48 +00:00
|
|
|
|
(setq result (buffer-substring word-beg (point))))
|
|
|
|
|
) ; if
|
1995-10-14 02:26:46 +00:00
|
|
|
|
;; XEmacs doesn't have set-text-properties, but there buffer-substring
|
1995-08-20 04:30:48 +00:00
|
|
|
|
;; doesn't return properties together with the string, so it's not needed.
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(if (featurep 'emacs)
|
1995-08-20 04:30:48 +00:00
|
|
|
|
(set-text-properties 0 (length result) nil result))
|
|
|
|
|
result
|
|
|
|
|
))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-mouse-click-get-word (click count click-count)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Returns word surrounding the position of a mouse click.
|
1999-11-01 07:16:15 +00:00
|
|
|
|
Click may be in another window. Current window and buffer isn't changed.
|
1995-07-27 19:41:08 +00:00
|
|
|
|
On single or double click, returns the word as determined by
|
1997-08-02 07:40:22 +00:00
|
|
|
|
`viper-surrounding-word-function'."
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let ((click-word "")
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(click-pos (viper-mouse-click-posn click))
|
|
|
|
|
(click-buf (viper-mouse-click-window-buffer click)))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(or (natnump count) (setq count 1))
|
|
|
|
|
(or (natnump click-count) (setq click-count 1))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
(if click-pos
|
|
|
|
|
(progn
|
|
|
|
|
(set-buffer click-buf)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(goto-char click-pos)
|
|
|
|
|
(setq click-word
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(funcall viper-surrounding-word-function count click-count)))
|
2001-07-15 19:53:53 +00:00
|
|
|
|
(error "Click must be over a window"))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
click-word))))
|
|
|
|
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-mouse-click-insert-word (click arg)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Insert word clicked or double-clicked on.
|
|
|
|
|
With prefix argument, N, insert that many words.
|
|
|
|
|
This command must be bound to a mouse click.
|
|
|
|
|
The double-click action of the same mouse button must not be bound
|
|
|
|
|
\(or it must be bound to the same function\).
|
1997-08-02 07:40:22 +00:00
|
|
|
|
See `viper-surrounding-word' for the definition of a word in this case."
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(interactive "e\nP")
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if viper-frame-of-focus ;; to handle clicks in another frame
|
|
|
|
|
(select-frame viper-frame-of-focus))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(if (save-excursion
|
|
|
|
|
(or (not (eq (key-binding viper-mouse-down-insert-key-parsed)
|
|
|
|
|
'viper-mouse-catch-frame-switch))
|
|
|
|
|
(not (eq (key-binding viper-mouse-up-insert-key-parsed)
|
|
|
|
|
'viper-mouse-click-insert-word))
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(and (featurep 'xemacs) (not (event-over-text-area-p click)))))
|
1997-09-05 04:48:58 +00:00
|
|
|
|
() ; do nothing, if binding isn't right or not over text
|
|
|
|
|
;; turn arg into a number
|
|
|
|
|
(cond ((integerp arg) nil)
|
|
|
|
|
;; prefix arg is a list when one hits C-u then command
|
|
|
|
|
((and (listp arg) (integerp (car arg)))
|
|
|
|
|
(setq arg (car arg)))
|
|
|
|
|
(t (setq arg 1)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-09-05 04:48:58 +00:00
|
|
|
|
(if (not (eq (key-binding viper-mouse-down-insert-key-parsed)
|
|
|
|
|
'viper-mouse-catch-frame-switch))
|
|
|
|
|
() ; do nothing
|
|
|
|
|
(let (click-count interrupting-event)
|
|
|
|
|
(if (and
|
|
|
|
|
(viper-multiclick-p)
|
|
|
|
|
;; This trick checks if there is a pending mouse event if so, we
|
|
|
|
|
;; use this latter event and discard the current mouse click If
|
|
|
|
|
;; the next pending event is not a mouse event, we execute the
|
|
|
|
|
;; current mouse event
|
|
|
|
|
(progn
|
|
|
|
|
(setq interrupting-event (viper-read-event))
|
|
|
|
|
(viper-mouse-event-p last-input-event)))
|
|
|
|
|
(progn ; interrupted wait
|
|
|
|
|
(setq viper-global-prefix-argument arg)
|
|
|
|
|
;; count this click for XEmacs
|
|
|
|
|
(viper-event-click-count click))
|
|
|
|
|
;; uninterrupted wait or the interrupting event wasn't a mouse event
|
|
|
|
|
(setq click-count (viper-event-click-count click))
|
|
|
|
|
(if (> click-count 1)
|
|
|
|
|
(setq arg viper-global-prefix-argument
|
|
|
|
|
viper-global-prefix-argument nil))
|
|
|
|
|
(insert (viper-mouse-click-get-word click arg click-count))
|
|
|
|
|
(if (and interrupting-event
|
|
|
|
|
(eventp interrupting-event)
|
|
|
|
|
(not (viper-mouse-event-p interrupting-event)))
|
|
|
|
|
(viper-set-unread-command-events interrupting-event))
|
|
|
|
|
)))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Arg is an event. Accepts symbols and numbers, too
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-mouse-event-p (event)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(if (eventp event)
|
|
|
|
|
(string-match "\\(mouse-\\|frame\\|screen\\|track\\)"
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(prin1-to-string (viper-event-key event)))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; XEmacs has no double-click events. So, we must simulate.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; So, we have to simulate event-click-count.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-event-click-count (click)
|
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
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(viper-event-click-count-xemacs click) ; xemacs
|
|
|
|
|
(event-click-count click) ; emacs
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; kind of semaphore for updating viper-current-click-count
|
|
|
|
|
(defvar viper-counting-clicks-p nil)
|
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
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(defun viper-event-click-count-xemacs (click)
|
|
|
|
|
(let ((time-delta (- (event-timestamp click)
|
|
|
|
|
viper-last-click-event-timestamp))
|
|
|
|
|
inhibit-quit)
|
|
|
|
|
(while viper-counting-clicks-p
|
|
|
|
|
(ignore))
|
|
|
|
|
(setq viper-counting-clicks-p t)
|
|
|
|
|
(if (> time-delta viper-multiclick-timeout)
|
|
|
|
|
(setq viper-current-click-count 0))
|
|
|
|
|
(discard-input)
|
|
|
|
|
(setq viper-current-click-count (1+ viper-current-click-count)
|
|
|
|
|
viper-last-click-event-timestamp (event-timestamp click))
|
|
|
|
|
(setq viper-counting-clicks-p nil)
|
|
|
|
|
(if (viper-sit-for-short viper-multiclick-timeout t)
|
|
|
|
|
viper-current-click-count
|
|
|
|
|
0)
|
|
|
|
|
))
|
|
|
|
|
nil ; emacs
|
|
|
|
|
)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-mouse-click-search-word (click arg)
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"Find the word clicked or double-clicked on. Word may be in another window.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
With prefix argument, N, search for N-th occurrence.
|
1999-11-01 07:16:15 +00:00
|
|
|
|
This command must be bound to a mouse click. The double-click action of the
|
1995-02-20 23:15:10 +00:00
|
|
|
|
same button must not be bound \(or it must be bound to the same function\).
|
1997-08-02 07:40:22 +00:00
|
|
|
|
See `viper-surrounding-word' for the details on what constitutes a word for
|
1995-02-20 23:15:10 +00:00
|
|
|
|
this command."
|
|
|
|
|
(interactive "e\nP")
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if viper-frame-of-focus ;; to handle clicks in another frame
|
|
|
|
|
(select-frame viper-frame-of-focus))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(if (save-excursion
|
|
|
|
|
(or (not (eq (key-binding viper-mouse-down-search-key-parsed)
|
|
|
|
|
'viper-mouse-catch-frame-switch))
|
|
|
|
|
(not (eq (key-binding viper-mouse-up-search-key-parsed)
|
|
|
|
|
'viper-mouse-click-search-word))
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(and (featurep 'xemacs) (not (event-over-text-area-p click)))))
|
1997-09-05 04:48:58 +00:00
|
|
|
|
() ; do nothing, if binding isn't right or not over text
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(let ((previous-search-string viper-s-string)
|
|
|
|
|
click-word click-count)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (and
|
|
|
|
|
(viper-multiclick-p)
|
|
|
|
|
;; This trick checks if there is a pending mouse event if so, we use
|
|
|
|
|
;; this latter event and discard the current mouse click If the next
|
|
|
|
|
;; pending event is not a mouse event, we execute the current mouse
|
|
|
|
|
;; event
|
|
|
|
|
(progn
|
|
|
|
|
(viper-read-event)
|
|
|
|
|
(viper-mouse-event-p last-input-event)))
|
|
|
|
|
(progn ; interrupted wait
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(setq viper-global-prefix-argument (or viper-global-prefix-argument
|
|
|
|
|
arg)
|
|
|
|
|
;; remember command that was before the multiclick
|
|
|
|
|
this-command last-command)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; make sure we counted this event---needed for XEmacs only
|
|
|
|
|
(viper-event-click-count click))
|
|
|
|
|
;; uninterrupted wait
|
|
|
|
|
(setq click-count (viper-event-click-count click))
|
|
|
|
|
(setq click-word (viper-mouse-click-get-word click nil click-count))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (> click-count 1)
|
|
|
|
|
(setq arg viper-global-prefix-argument
|
|
|
|
|
viper-global-prefix-argument nil))
|
|
|
|
|
(setq arg (or arg 1))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deactivate-mark)
|
|
|
|
|
(if (or (not (string= click-word viper-s-string))
|
|
|
|
|
(not (markerp viper-search-start-marker))
|
|
|
|
|
(not (equal (marker-buffer viper-search-start-marker)
|
|
|
|
|
(current-buffer)))
|
|
|
|
|
(not (eq last-command 'viper-mouse-click-search-word)))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(progn
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(setq viper-search-start-marker (point-marker)
|
|
|
|
|
viper-local-search-start-marker viper-search-start-marker
|
|
|
|
|
viper-mouse-click-search-noerror t
|
|
|
|
|
viper-mouse-click-search-limit nil)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; make search string known to Viper
|
|
|
|
|
(setq viper-s-string (if viper-re-search
|
|
|
|
|
(regexp-quote click-word)
|
|
|
|
|
click-word))
|
|
|
|
|
(if (not (string= viper-s-string (car viper-search-history)))
|
|
|
|
|
(setq viper-search-history
|
|
|
|
|
(cons viper-s-string viper-search-history)))
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(push-mark nil t)
|
|
|
|
|
(while (> arg 0)
|
|
|
|
|
(viper-forward-word 1)
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(progn
|
|
|
|
|
(if (not (search-forward
|
|
|
|
|
click-word viper-mouse-click-search-limit
|
|
|
|
|
viper-mouse-click-search-noerror))
|
|
|
|
|
(progn
|
|
|
|
|
(setq viper-mouse-click-search-noerror nil)
|
|
|
|
|
(setq viper-mouse-click-search-limit
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (and
|
|
|
|
|
(markerp viper-local-search-start-marker)
|
|
|
|
|
(marker-buffer viper-local-search-start-marker))
|
|
|
|
|
(goto-char viper-local-search-start-marker))
|
|
|
|
|
(viper-line-pos 'end)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(search-forward click-word
|
|
|
|
|
viper-mouse-click-search-limit nil)))
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
(message "Searching for: %s" viper-s-string)
|
|
|
|
|
(if (<= arg 1) ; found the right occurrence of the pattern
|
|
|
|
|
(progn
|
|
|
|
|
(viper-adjust-window)
|
|
|
|
|
(viper-flash-search-pattern)))
|
|
|
|
|
)
|
|
|
|
|
(error (beep 1)
|
|
|
|
|
(if (or (not (string= click-word previous-search-string))
|
|
|
|
|
(not (eq last-command 'viper-mouse-click-search-word)))
|
|
|
|
|
(message "`%s': String not found in %s"
|
|
|
|
|
viper-s-string (buffer-name (current-buffer)))
|
|
|
|
|
(message
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"`%s': Last occurrence in %s. Back to beginning of search"
|
1997-08-02 07:40:22 +00:00
|
|
|
|
click-word (buffer-name (current-buffer)))
|
|
|
|
|
(setq arg 1) ;; to terminate the loop
|
|
|
|
|
(sit-for 2))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(setq viper-mouse-click-search-noerror t)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(setq viper-mouse-click-search-limit nil)
|
|
|
|
|
(if (and (markerp viper-local-search-start-marker)
|
|
|
|
|
(marker-buffer viper-local-search-start-marker))
|
|
|
|
|
(goto-char viper-local-search-start-marker))))
|
|
|
|
|
(setq arg (1- arg)))
|
|
|
|
|
))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-mouse-catch-frame-switch (event arg)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Catch the event of switching frame.
|
1999-11-01 07:16:15 +00:00
|
|
|
|
Usually is bound to a `down-mouse' event to work properly. See sample
|
1997-06-02 22:50:31 +00:00
|
|
|
|
bindings in the Viper manual."
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(interactive "e\nP")
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(setq viper-frame-of-focus nil)
|
|
|
|
|
;; pass prefix arg along to viper-mouse-click-search/insert-word
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(setq prefix-arg arg)
|
|
|
|
|
(if (eq last-command 'handle-switch-frame)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(setq viper-frame-of-focus viper-current-frame-saved))
|
|
|
|
|
;; make Emacs forget that it executed viper-mouse-catch-frame-switch
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(setq this-command last-command))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Called just before switching frames. Saves the old selected frame.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; Sets last-command to handle-switch-frame (this is done automatically in
|
2003-02-04 13:24:35 +00:00
|
|
|
|
;; Emacs.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; The semantics of switching frames is different in Emacs and XEmacs.
|
|
|
|
|
;; In Emacs, if you select-frame A while mouse is over frame B and then
|
|
|
|
|
;; start typing, input goes to frame B, which becomes selected.
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; In XEmacs, input will go to frame A. This may be a bug in one of the
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; Emacsen, but also may be a design decision.
|
|
|
|
|
;; Also, in Emacs sending input to frame B generates handle-switch-frame
|
|
|
|
|
;; event, while in XEmacs it doesn't.
|
|
|
|
|
;; All this accounts for the difference in the behavior of
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; viper-mouse-click-* commands when you click in a frame other than the one
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; that was the last to receive input. In Emacs, focus will be in frame A
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; until you do something other than viper-mouse-click-* command.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; In XEmacs, you have to manually select frame B (with the mouse click) in
|
|
|
|
|
;; order to shift focus to frame B.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-remember-current-frame (frame)
|
1995-06-09 00:12:29 +00:00
|
|
|
|
(setq last-command 'handle-switch-frame
|
1997-08-02 07:40:22 +00:00
|
|
|
|
viper-current-frame-saved (selected-frame)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; The key is of the form (MODIFIER ... BUTTON-NUMBER)
|
|
|
|
|
;; Converts into a valid mouse button spec for the appropriate version of
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Emacs. EVENT-TYPE is either `up' or `down'. Up returns button-up key; down
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; returns button-down key.
|
|
|
|
|
(defun viper-parse-mouse-key (key-var event-type)
|
|
|
|
|
(let ((key (eval key-var))
|
|
|
|
|
button-spec meta-spec shift-spec control-spec key-spec)
|
|
|
|
|
(if (null key)
|
|
|
|
|
;; just return nil
|
|
|
|
|
()
|
|
|
|
|
(setq button-spec
|
|
|
|
|
(cond ((memq 1 key)
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(if (featurep 'emacs)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (eq 'up event-type)
|
|
|
|
|
"mouse-1" "down-mouse-1")
|
|
|
|
|
(if (eq 'up event-type)
|
|
|
|
|
'button1up 'button1)))
|
|
|
|
|
((memq 2 key)
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(if (featurep 'emacs)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (eq 'up event-type)
|
|
|
|
|
"mouse-2" "down-mouse-2")
|
|
|
|
|
(if (eq 'up event-type)
|
|
|
|
|
'button2up 'button2)))
|
|
|
|
|
((memq 3 key)
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(if (featurep 'emacs)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (eq 'up event-type)
|
|
|
|
|
"mouse-3" "down-mouse-3")
|
|
|
|
|
(if (eq 'up event-type)
|
|
|
|
|
'button3up 'button3)))
|
|
|
|
|
(t (error
|
|
|
|
|
"%S: invalid button number, %S" key-var key)))
|
|
|
|
|
meta-spec
|
|
|
|
|
(if (memq 'meta key)
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(if (featurep 'emacs) "M-" 'meta)
|
|
|
|
|
(if (featurep 'emacs) "" nil))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
shift-spec
|
|
|
|
|
(if (memq 'shift key)
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(if (featurep 'emacs) "S-" 'shift)
|
|
|
|
|
(if (featurep 'emacs) "" nil))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
control-spec
|
|
|
|
|
(if (memq 'control key)
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(if (featurep 'emacs) "C-" 'control)
|
|
|
|
|
(if (featurep 'emacs) "" nil)))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
|
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
|
|
|
|
(setq key-spec (if (featurep 'emacs)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(vector
|
|
|
|
|
(intern
|
|
|
|
|
(concat
|
|
|
|
|
control-spec meta-spec shift-spec button-spec)))
|
|
|
|
|
(vector
|
|
|
|
|
(delq
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
control-spec meta-spec shift-spec button-spec)))))
|
|
|
|
|
)))
|
|
|
|
|
|
|
|
|
|
(defun viper-unbind-mouse-search-key ()
|
|
|
|
|
(if viper-mouse-up-search-key-parsed
|
|
|
|
|
(global-unset-key viper-mouse-up-search-key-parsed))
|
|
|
|
|
(if viper-mouse-down-search-key-parsed
|
|
|
|
|
(global-unset-key viper-mouse-down-search-key-parsed))
|
|
|
|
|
(setq viper-mouse-up-search-key-parsed nil
|
|
|
|
|
viper-mouse-down-search-key-parsed nil))
|
|
|
|
|
|
|
|
|
|
(defun viper-unbind-mouse-insert-key ()
|
|
|
|
|
(if viper-mouse-up-insert-key-parsed
|
|
|
|
|
(global-unset-key viper-mouse-up-insert-key-parsed))
|
|
|
|
|
(if viper-mouse-down-insert-key-parsed
|
|
|
|
|
(global-unset-key viper-mouse-down-insert-key-parsed))
|
|
|
|
|
(setq viper-mouse-up-insert-key-parsed nil
|
|
|
|
|
viper-mouse-down-insert-key-parsed nil))
|
|
|
|
|
|
|
|
|
|
;; If FORCE, bind even if this mouse action is already bound to something else
|
|
|
|
|
(defun viper-bind-mouse-search-key (&optional force)
|
|
|
|
|
(setq viper-mouse-up-search-key-parsed
|
|
|
|
|
(viper-parse-mouse-key 'viper-mouse-search-key 'up)
|
|
|
|
|
viper-mouse-down-search-key-parsed
|
|
|
|
|
(viper-parse-mouse-key 'viper-mouse-search-key 'down))
|
|
|
|
|
(cond ((or (null viper-mouse-up-search-key-parsed)
|
|
|
|
|
(null viper-mouse-down-search-key-parsed))
|
|
|
|
|
nil) ; just quit
|
2003-02-04 13:24:35 +00:00
|
|
|
|
((and (null force)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(key-binding viper-mouse-up-search-key-parsed)
|
|
|
|
|
(not (eq (key-binding viper-mouse-up-search-key-parsed)
|
|
|
|
|
'viper-mouse-click-search-word)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(message
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"%S already bound to a mouse event. Viper mouse-search feature disabled"
|
1997-08-02 07:40:22 +00:00
|
|
|
|
viper-mouse-up-search-key-parsed))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
((and (null force)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(key-binding viper-mouse-down-search-key-parsed)
|
|
|
|
|
(not (eq (key-binding viper-mouse-down-search-key-parsed)
|
|
|
|
|
'viper-mouse-catch-frame-switch)))
|
|
|
|
|
(message
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"%S already bound to a mouse event. Viper mouse-search feature disabled"
|
1997-08-02 07:40:22 +00:00
|
|
|
|
viper-mouse-down-search-key-parsed))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(t
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(global-set-key viper-mouse-up-search-key-parsed
|
|
|
|
|
'viper-mouse-click-search-word)
|
|
|
|
|
(global-set-key viper-mouse-down-search-key-parsed
|
|
|
|
|
'viper-mouse-catch-frame-switch))))
|
|
|
|
|
|
|
|
|
|
;; If FORCE, bind even if this mouse action is already bound to something else
|
|
|
|
|
(defun viper-bind-mouse-insert-key (&optional force)
|
|
|
|
|
(setq viper-mouse-up-insert-key-parsed
|
|
|
|
|
(viper-parse-mouse-key 'viper-mouse-insert-key 'up)
|
|
|
|
|
viper-mouse-down-insert-key-parsed
|
|
|
|
|
(viper-parse-mouse-key 'viper-mouse-insert-key 'down))
|
|
|
|
|
(cond ((or (null viper-mouse-up-insert-key-parsed)
|
|
|
|
|
(null viper-mouse-down-insert-key-parsed))
|
|
|
|
|
nil) ; just quit
|
|
|
|
|
((and (null force)
|
|
|
|
|
(key-binding viper-mouse-up-insert-key-parsed)
|
|
|
|
|
(not (eq (key-binding viper-mouse-up-insert-key-parsed)
|
|
|
|
|
'viper-mouse-click-insert-word)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(message
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"%S already bound to a mouse event. Viper mouse-insert feature disabled"
|
1997-08-02 07:40:22 +00:00
|
|
|
|
viper-mouse-up-insert-key-parsed))
|
|
|
|
|
((and (null force)
|
|
|
|
|
(key-binding viper-mouse-down-insert-key-parsed)
|
|
|
|
|
(not (eq (key-binding viper-mouse-down-insert-key-parsed)
|
|
|
|
|
'viper-mouse-catch-frame-switch)))
|
|
|
|
|
(message
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"%S already bound to a mouse event. Viper mouse-insert feature disabled"
|
1997-08-02 07:40:22 +00:00
|
|
|
|
viper-mouse-down-insert-key-parsed))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(t
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(global-set-key viper-mouse-up-insert-key-parsed
|
|
|
|
|
'viper-mouse-click-insert-word)
|
|
|
|
|
(global-set-key viper-mouse-down-insert-key-parsed
|
|
|
|
|
'viper-mouse-catch-frame-switch))))
|
|
|
|
|
|
|
|
|
|
(defun viper-reset-mouse-search-key (symb val)
|
|
|
|
|
(viper-unbind-mouse-search-key)
|
|
|
|
|
(set symb val)
|
|
|
|
|
(viper-bind-mouse-search-key 'force))
|
|
|
|
|
|
|
|
|
|
(defun viper-reset-mouse-insert-key (symb val)
|
|
|
|
|
(viper-unbind-mouse-insert-key)
|
|
|
|
|
(set symb val)
|
|
|
|
|
(viper-bind-mouse-insert-key 'force))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom viper-mouse-search-key '(meta shift 1)
|
|
|
|
|
"*Key used to click-search in Viper.
|
1997-09-13 06:16:07 +00:00
|
|
|
|
This must be a list that specifies the mouse button and modifiers.
|
|
|
|
|
The supported modifiers are `meta', `shift', and `control'.
|
|
|
|
|
For instance, `(meta shift 1)' means that holding the meta and shift
|
|
|
|
|
keys down and clicking on a word with mouse button 1
|
|
|
|
|
will search for that word in the buffer that was current before the click.
|
|
|
|
|
This buffer may be different from the one where the click occurred."
|
1997-09-15 23:21:03 +00:00
|
|
|
|
:type '(list (set :inline t :tag "Modifiers" :format "%t: %v"
|
|
|
|
|
(const :format "%v " meta)
|
|
|
|
|
(const :format "%v " shift)
|
|
|
|
|
(const control))
|
|
|
|
|
(integer :tag "Button"))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
:set 'viper-reset-mouse-search-key
|
|
|
|
|
:group 'viper-mouse)
|
|
|
|
|
|
|
|
|
|
(defcustom viper-mouse-insert-key '(meta shift 2)
|
|
|
|
|
"*Key used to click-insert in Viper.
|
1997-09-13 06:16:07 +00:00
|
|
|
|
Must be a list that specifies the mouse button and modifiers.
|
|
|
|
|
The supported modifiers are `meta', `shift', and `control'.
|
|
|
|
|
For instance, `(meta shift 2)' means that holding the meta and shift keys
|
|
|
|
|
down, and clicking on a word with mouse button 2, will insert that word
|
|
|
|
|
at the cursor in the buffer that was current just before the click.
|
|
|
|
|
This buffer may be different from the one where the click occurred."
|
1997-09-15 23:21:03 +00:00
|
|
|
|
:type '(list (set :inline t :tag "Modifiers" :format "%t: %v"
|
|
|
|
|
(const :format "%v " meta)
|
|
|
|
|
(const :format "%v " shift)
|
|
|
|
|
(const control))
|
|
|
|
|
(integer :tag "Button"))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
:set 'viper-reset-mouse-insert-key
|
|
|
|
|
:group 'viper-mouse)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
|
;;; Local Variables:
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
|
1997-07-17 19:37:07 +00:00
|
|
|
|
;;; End:
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
|
;;; arch-tag: e56b2390-06c4-4dd1-96f5-c7876e2d8c2f
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;;; viper-mous.el ends here
|