1996-01-20 03:19:26 +00:00
|
|
|
|
;;; viper-keym.el --- Viper keymaps
|
1995-10-30 17:35:01 +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
|
|
|
|
;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02 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
|
|
|
|
|
|
;; 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
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; 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.
|
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-keym)
|
|
|
|
|
|
|
|
|
|
|
|
;; compiler pacifier
|
1997-06-18 01:26:55 +00:00
|
|
|
|
(defvar viper-always)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-current-state)
|
|
|
|
|
|
(defvar viper-mode-string)
|
1997-07-17 19:37:07 +00:00
|
|
|
|
(defvar viper-expert-level)
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(defvar viper-ex-style-editing)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-ex-style-motion)
|
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))
|
|
|
|
|
|
)))
|
1997-05-31 00:02:53 +00:00
|
|
|
|
;; end pacifier
|
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(require 'viper-util)
|
|
|
|
|
|
|
1997-05-31 00:02:53 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;;; Variables
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-toggle-key "\C-z"
|
1996-09-06 02:13:39 +00:00
|
|
|
|
"The key used to change states from emacs to Vi and back.
|
2003-02-04 13:24:35 +00:00
|
|
|
|
In insert mode, this key also functions as Meta.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
Must be set in .viper file or prior to loading Viper.
|
1996-09-06 02:13:39 +00:00
|
|
|
|
This setting cannot be changed interactively.")
|
|
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(defvar viper-ESC-key "\e"
|
|
|
|
|
|
"Key used to ESC.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
Must be set in .viper file or prior to loading Viper.
|
1996-09-06 02:13:39 +00:00
|
|
|
|
This setting cannot be changed interactively.")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Emacs keys in other states.
|
1997-05-31 00:02:53 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defcustom viper-want-emacs-keys-in-insert t
|
1997-05-31 00:02:53 +00:00
|
|
|
|
"*Set to nil if you want complete Vi compatibility in insert mode.
|
1997-07-17 19:37:07 +00:00
|
|
|
|
Complete compatibility with Vi is not recommended for power use of Viper."
|
|
|
|
|
|
:type 'boolean
|
|
|
|
|
|
:group 'viper)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defcustom viper-want-emacs-keys-in-vi t
|
1997-05-31 00:02:53 +00:00
|
|
|
|
"*Set to nil if you want complete Vi compatibility in Vi mode.
|
1997-07-17 19:37:07 +00:00
|
|
|
|
Full Vi compatibility is not recommended for power use of Viper."
|
|
|
|
|
|
:type 'boolean
|
|
|
|
|
|
:group 'viper)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defcustom viper-no-multiple-ESC t
|
1997-05-31 00:02:53 +00:00
|
|
|
|
"*If true, multiple ESC in Vi mode will cause bell to ring.
|
|
|
|
|
|
This is set to t on a windowing terminal and to 'twice on a dumb
|
1999-11-01 07:16:15 +00:00
|
|
|
|
terminal (unless the user level is 1, 2, or 5). On a dumb terminal, this
|
1997-05-31 00:02:53 +00:00
|
|
|
|
enables cursor keys and is generally more convenient, as terminals usually
|
|
|
|
|
|
don't have a convenient Meta key.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
Setting viper-no-multiple-ESC to nil will allow as many multiple ESC,
|
1997-07-17 19:37:07 +00:00
|
|
|
|
as is allowed by the major mode in effect."
|
|
|
|
|
|
:type 'boolean
|
2003-02-04 13:24:35 +00:00
|
|
|
|
:group 'viper)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defcustom viper-want-ctl-h-help nil
|
1997-09-12 21:09:03 +00:00
|
|
|
|
"*If non-nil, C-h gets bound to help-command; otherwise, C-h gets the usual Vi bindings."
|
1997-07-17 19:37:07 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
|
:group 'viper)
|
1996-09-06 02:13:39 +00:00
|
|
|
|
|
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;;; Keymaps
|
|
|
|
|
|
|
|
|
|
|
|
;; Keymaps for vital things like \e and C-z.
|
|
|
|
|
|
;; Not for users
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-vi-intercept-map (make-sparse-keymap))
|
|
|
|
|
|
(defvar viper-insert-intercept-map (make-sparse-keymap))
|
|
|
|
|
|
(defvar viper-emacs-intercept-map (make-sparse-keymap))
|
1995-07-27 19:42:29 +00:00
|
|
|
|
|
1996-01-20 03:19:26 +00:00
|
|
|
|
;; keymap used to zap all keymaps other than function-key-map,
|
|
|
|
|
|
;; device-function-key-map, etc.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-overriding-map (make-sparse-keymap))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deflocalvar viper-vi-local-user-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Keymap for user-defined local bindings.
|
|
|
|
|
|
Useful for changing bindings such as ZZ in certain major modes.
|
|
|
|
|
|
For instance, in letter-mode, one may want to bind ZZ to
|
1999-11-01 07:16:15 +00:00
|
|
|
|
mh-send-letter. In a newsreader such as gnus, tin, or rn, ZZ could be bound
|
1995-02-20 23:15:10 +00:00
|
|
|
|
to save-buffers-kill-emacs then post article, etc.")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(put 'viper-vi-local-user-map 'permanent-local t)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-vi-global-user-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Keymap for user-defined global bindings.
|
|
|
|
|
|
These bindings are seen in all Viper buffers.")
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-vi-basic-map (make-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"This is the main keymap in effect in Viper's Vi state.
|
|
|
|
|
|
This map is global, shared by all buffers.")
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-vi-kbd-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"This keymap keeps keyboard macros defined via the :map command.")
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-vi-diehard-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"This keymap is in use when the user asks Viper to simulate Vi very closely.
|
1999-11-01 07:16:15 +00:00
|
|
|
|
This happens when viper-expert-level is 1 or 2. See viper-set-expert-level.")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deflocalvar viper-insert-local-user-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Auxiliary map for per-buffer user-defined keybindings in Insert state.")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(put 'viper-insert-local-user-map 'permanent-local t)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-insert-global-user-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Auxiliary map for global user-defined bindings in Insert state.")
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-insert-basic-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"The basic insert-mode keymap.")
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-insert-diehard-map (make-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Map used when user wants vi-style keys in insert mode.
|
1999-11-01 07:16:15 +00:00
|
|
|
|
Most of the Emacs keys are suppressed. This map overshadows
|
|
|
|
|
|
viper-insert-basic-map. Not recommended, except for novice users.")
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-insert-kbd-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"This keymap keeps VI-style kbd macros for insert mode.")
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-replace-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Map used in Viper's replace state.")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-emacs-global-user-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Auxiliary map for global user-defined bindings in Emacs state.")
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-emacs-kbd-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"This keymap keeps Vi-style kbd macros for emacs mode.")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deflocalvar viper-emacs-local-user-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Auxiliary map for local user-defined bindings in Emacs state.")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(put 'viper-emacs-local-user-map 'permanent-local t)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
;; This keymap should stay empty
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-empty-keymap (make-sparse-keymap))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1995-06-09 00:12:29 +00:00
|
|
|
|
;; This was the main Vi mode in old versions of VIP which may have been
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; extensively used by VIP users. We declare it as a global var
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; and, after .viper is loaded, we add this keymap to viper-vi-basic-map.
|
|
|
|
|
|
(defvar viper-mode-map (make-sparse-keymap))
|
1995-06-09 00:12:29 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Variables used by minor modes
|
|
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
;; Association list of the form
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; ((major-mode . keymap) (major-mode . keymap) ...)
|
|
|
|
|
|
;; Viper uses these keymaps to make user-requested adjustments
|
|
|
|
|
|
;; to its Vi state in various major modes.")
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-vi-state-modifier-alist nil)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
;; Association list of the form
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; ((major-mode . keymap) (major-mode . keymap) ...)
|
|
|
|
|
|
;; Viper uses these keymaps to make user-requested adjustments
|
|
|
|
|
|
;; to its Insert state in various major modes.")
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-insert-state-modifier-alist nil)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
;; Association list of the form
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; ((major-mode . keymap) (major-mode . keymap) ...)
|
|
|
|
|
|
;; Viper uses these keymaps to make user-requested adjustments
|
|
|
|
|
|
;; to its Emacs state in various major modes.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-emacs-state-modifier-alist nil)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; Tells viper-add-local-keys to create a new viper-vi-local-user-map for new
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; buffers. Not a user option.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deflocalvar viper-need-new-vi-local-map t "")
|
|
|
|
|
|
(put 'viper-need-new-vi-local-map 'permanent-local t)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; Tells viper-add-local-keys to create a new viper-insert-local-user-map for
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; new buffers. Not a user option.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deflocalvar viper-need-new-insert-local-map t "")
|
|
|
|
|
|
(put 'viper-need-new-insert-local-map 'permanent-local t)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; Tells viper-add-local-keys to create a new viper-emacs-local-user-map for
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; new buffers. Not a user option.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deflocalvar viper-need-new-emacs-local-map t "")
|
|
|
|
|
|
(put 'viper-need-new-emacs-local-map 'permanent-local t)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Insert mode keymap
|
|
|
|
|
|
|
|
|
|
|
|
;; for novice users, pretend you are the real vi.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-insert-diehard-map "\t" 'viper-insert-tab)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-a" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-b" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-c" 'viper-change-state-to-vi)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-e" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-f" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-g" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-i" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-k" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-l" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-n" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-o" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-p" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-q" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-r" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-s" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-u" 'viper-erase-line)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-x" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-y" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-z" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-]" 'self-insert-command)
|
|
|
|
|
|
(define-key viper-insert-diehard-map "\C-_" 'self-insert-command)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
(let ((i ?\ ))
|
|
|
|
|
|
(while (<= i ?~)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-insert-diehard-map (make-string 1 i) 'self-insert-command)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(setq i (1+ i))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Insert mode map when user wants emacs style
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-insert-basic-map "\C-d" 'viper-backward-indent)
|
|
|
|
|
|
(define-key viper-insert-basic-map "\C-w" 'viper-delete-backward-word)
|
|
|
|
|
|
(define-key viper-insert-basic-map "\C-t" 'viper-forward-indent)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(define-key viper-insert-basic-map
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if viper-xemacs-p [(shift tab)] [S-tab]) 'viper-insert-tab)
|
|
|
|
|
|
(define-key viper-insert-basic-map "\C-v" 'quoted-insert)
|
|
|
|
|
|
(define-key viper-insert-basic-map "\C-?" 'viper-del-backward-char-in-insert)
|
1997-09-12 21:09:03 +00:00
|
|
|
|
(define-key viper-insert-basic-map [backspace] 'viper-del-backward-char-in-insert)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-insert-basic-map "\C-\\" 'viper-alternate-Meta-key)
|
|
|
|
|
|
(define-key viper-insert-basic-map viper-toggle-key 'viper-escape-to-vi)
|
|
|
|
|
|
(define-key viper-insert-basic-map "\C-c\M-p"
|
|
|
|
|
|
'viper-insert-prev-from-insertion-ring)
|
|
|
|
|
|
(define-key viper-insert-basic-map "\C-c\M-n"
|
|
|
|
|
|
'viper-insert-next-from-insertion-ring)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Replace keymap
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-replace-map "\C-t" 'viper-forward-indent)
|
|
|
|
|
|
(define-key viper-replace-map "\C-j" 'viper-replace-state-carriage-return)
|
|
|
|
|
|
(define-key viper-replace-map "\C-m" 'viper-replace-state-carriage-return)
|
|
|
|
|
|
(define-key viper-replace-map "\C-?" 'viper-del-backward-char-in-replace)
|
1997-09-12 21:09:03 +00:00
|
|
|
|
(define-key viper-replace-map [backspace] 'viper-del-backward-char-in-replace)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Vi keymaps
|
|
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(define-key viper-vi-basic-map "\C-^" (lambda ()
|
|
|
|
|
|
(interactive) (viper-ex nil "e#")))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-vi-basic-map "\C-b" 'viper-scroll-screen-back)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-d" 'viper-scroll-up)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-e" 'viper-scroll-up-one)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-f" 'viper-scroll-screen)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-m" 'viper-next-line-at-bol)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-u" 'viper-scroll-down)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-y" 'viper-scroll-down-one)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-s" 'viper-isearch-forward)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-r" 'viper-isearch-backward)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-c/" 'viper-toggle-search-style)
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(define-key viper-vi-basic-map "\C-c\C-g" 'viper-info-on-file)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-c\M-p" 'viper-prev-destructive-command)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-c\M-n" 'viper-next-destructive-command)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(define-key viper-vi-basic-map " " 'viper-forward-char)
|
|
|
|
|
|
(define-key viper-vi-basic-map "!" 'viper-command-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\"" 'viper-command-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "#" 'viper-command-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "$" 'viper-goto-eol)
|
|
|
|
|
|
(define-key viper-vi-basic-map "%" 'viper-paren-match)
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(define-key viper-vi-basic-map "&" (lambda ()
|
|
|
|
|
|
(interactive) (viper-ex nil "&")))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-vi-basic-map "'" 'viper-goto-mark-and-skip-white)
|
|
|
|
|
|
(define-key viper-vi-basic-map "(" 'viper-backward-sentence)
|
|
|
|
|
|
(define-key viper-vi-basic-map ")" 'viper-forward-sentence)
|
|
|
|
|
|
(define-key viper-vi-basic-map "*" 'call-last-kbd-macro)
|
|
|
|
|
|
(define-key viper-vi-basic-map "+" 'viper-next-line-at-bol)
|
|
|
|
|
|
(define-key viper-vi-basic-map "," 'viper-repeat-find-opposite)
|
|
|
|
|
|
(define-key viper-vi-basic-map "-" 'viper-previous-line-at-bol)
|
|
|
|
|
|
(define-key viper-vi-basic-map "." 'viper-repeat)
|
|
|
|
|
|
(define-key viper-vi-basic-map "/" 'viper-search-forward)
|
|
|
|
|
|
|
|
|
|
|
|
(define-key viper-vi-basic-map "0" 'viper-beginning-of-line)
|
|
|
|
|
|
(define-key viper-vi-basic-map "1" 'viper-digit-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "2" 'viper-digit-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "3" 'viper-digit-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "4" 'viper-digit-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "5" 'viper-digit-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "6" 'viper-digit-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "7" 'viper-digit-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "8" 'viper-digit-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "9" 'viper-digit-argument)
|
|
|
|
|
|
|
|
|
|
|
|
(define-key viper-vi-basic-map ":" 'viper-ex)
|
|
|
|
|
|
(define-key viper-vi-basic-map ";" 'viper-repeat-find)
|
|
|
|
|
|
(define-key viper-vi-basic-map "<" 'viper-command-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "=" 'viper-command-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map ">" 'viper-command-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "?" 'viper-search-backward)
|
|
|
|
|
|
(define-key viper-vi-basic-map "@" 'viper-register-macro)
|
|
|
|
|
|
|
|
|
|
|
|
(define-key viper-vi-basic-map "A" 'viper-Append)
|
|
|
|
|
|
(define-key viper-vi-basic-map "B" 'viper-backward-Word)
|
|
|
|
|
|
(define-key viper-vi-basic-map "C" 'viper-change-to-eol)
|
|
|
|
|
|
(define-key viper-vi-basic-map "D" 'viper-kill-line)
|
|
|
|
|
|
(define-key viper-vi-basic-map "E" 'viper-end-of-Word)
|
|
|
|
|
|
(define-key viper-vi-basic-map "F" 'viper-find-char-backward)
|
|
|
|
|
|
(define-key viper-vi-basic-map "G" 'viper-goto-line)
|
|
|
|
|
|
(define-key viper-vi-basic-map "H" 'viper-window-top)
|
|
|
|
|
|
(define-key viper-vi-basic-map "I" 'viper-Insert)
|
|
|
|
|
|
(define-key viper-vi-basic-map "J" 'viper-join-lines)
|
|
|
|
|
|
(define-key viper-vi-basic-map "K" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-basic-map "L" 'viper-window-bottom)
|
|
|
|
|
|
(define-key viper-vi-basic-map "M" 'viper-window-middle)
|
|
|
|
|
|
(define-key viper-vi-basic-map "N" 'viper-search-Next)
|
|
|
|
|
|
(define-key viper-vi-basic-map "O" 'viper-Open-line)
|
|
|
|
|
|
(define-key viper-vi-basic-map "P" 'viper-Put-back)
|
|
|
|
|
|
(define-key viper-vi-basic-map "Q" 'viper-query-replace)
|
|
|
|
|
|
(define-key viper-vi-basic-map "R" 'viper-overwrite)
|
|
|
|
|
|
(define-key viper-vi-basic-map "S" 'viper-substitute-line)
|
|
|
|
|
|
(define-key viper-vi-basic-map "T" 'viper-goto-char-backward)
|
|
|
|
|
|
(define-key viper-vi-basic-map "U" 'viper-undo)
|
|
|
|
|
|
(define-key viper-vi-basic-map "V" 'find-file-other-window)
|
|
|
|
|
|
(define-key viper-vi-basic-map "W" 'viper-forward-Word)
|
|
|
|
|
|
(define-key viper-vi-basic-map "X" 'viper-delete-backward-char)
|
|
|
|
|
|
(define-key viper-vi-basic-map "Y" 'viper-yank-line)
|
|
|
|
|
|
(define-key viper-vi-basic-map "ZZ" 'viper-save-kill-buffer)
|
|
|
|
|
|
|
|
|
|
|
|
(define-key viper-vi-basic-map "\\" 'viper-escape-to-emacs)
|
|
|
|
|
|
(define-key viper-vi-basic-map "[" 'viper-brac-function)
|
|
|
|
|
|
(define-key viper-vi-basic-map "]" 'viper-ket-function)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-\\" 'viper-alternate-Meta-key)
|
|
|
|
|
|
(define-key viper-vi-basic-map "^" 'viper-bol-and-skip-white)
|
|
|
|
|
|
(define-key viper-vi-basic-map "`" 'viper-goto-mark)
|
|
|
|
|
|
|
|
|
|
|
|
(define-key viper-vi-basic-map "a" 'viper-append)
|
|
|
|
|
|
(define-key viper-vi-basic-map "b" 'viper-backward-word)
|
|
|
|
|
|
(define-key viper-vi-basic-map "c" 'viper-command-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "d" 'viper-command-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "e" 'viper-end-of-word)
|
|
|
|
|
|
(define-key viper-vi-basic-map "f" 'viper-find-char-forward)
|
|
|
|
|
|
(define-key viper-vi-basic-map "g" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-basic-map "h" 'viper-backward-char)
|
1997-09-12 21:09:03 +00:00
|
|
|
|
(define-key viper-vi-basic-map [backspace] 'viper-backward-char)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-vi-basic-map "i" 'viper-insert)
|
|
|
|
|
|
(define-key viper-vi-basic-map "j" 'viper-next-line)
|
|
|
|
|
|
(define-key viper-vi-basic-map "k" 'viper-previous-line)
|
|
|
|
|
|
(define-key viper-vi-basic-map "l" 'viper-forward-char)
|
|
|
|
|
|
(define-key viper-vi-basic-map "m" 'viper-mark-point)
|
|
|
|
|
|
(define-key viper-vi-basic-map "n" 'viper-search-next)
|
|
|
|
|
|
(define-key viper-vi-basic-map "o" 'viper-open-line)
|
|
|
|
|
|
(define-key viper-vi-basic-map "p" 'viper-put-back)
|
|
|
|
|
|
(define-key viper-vi-basic-map "q" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-basic-map "r" 'viper-replace-char)
|
|
|
|
|
|
(define-key viper-vi-basic-map "s" 'viper-substitute)
|
|
|
|
|
|
(define-key viper-vi-basic-map "t" 'viper-goto-char-forward)
|
|
|
|
|
|
(define-key viper-vi-basic-map "u" 'viper-undo)
|
|
|
|
|
|
(define-key viper-vi-basic-map "v" 'find-file)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-v" 'find-file-other-frame)
|
|
|
|
|
|
(define-key viper-vi-basic-map "w" 'viper-forward-word)
|
|
|
|
|
|
(define-key viper-vi-basic-map "x" 'viper-delete-char)
|
|
|
|
|
|
(define-key viper-vi-basic-map "y" 'viper-command-argument)
|
|
|
|
|
|
(define-key viper-vi-basic-map "zH" 'viper-line-to-top)
|
|
|
|
|
|
(define-key viper-vi-basic-map "zM" 'viper-line-to-middle)
|
|
|
|
|
|
(define-key viper-vi-basic-map "zL" 'viper-line-to-bottom)
|
|
|
|
|
|
(define-key viper-vi-basic-map "z\C-m" 'viper-line-to-top)
|
|
|
|
|
|
(define-key viper-vi-basic-map "z." 'viper-line-to-middle)
|
|
|
|
|
|
(define-key viper-vi-basic-map "z-" 'viper-line-to-bottom)
|
|
|
|
|
|
|
|
|
|
|
|
(define-key viper-vi-basic-map "{" 'viper-backward-paragraph)
|
|
|
|
|
|
(define-key viper-vi-basic-map "|" 'viper-goto-col)
|
|
|
|
|
|
(define-key viper-vi-basic-map "}" 'viper-forward-paragraph)
|
|
|
|
|
|
(define-key viper-vi-basic-map "~" 'viper-toggle-case)
|
|
|
|
|
|
(define-key viper-vi-basic-map "\C-?" 'viper-backward-char)
|
|
|
|
|
|
(define-key viper-vi-basic-map "_" 'viper-nil)
|
|
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;;; This is viper-vi-diehard-map. Used when viper-vi-diehard-minor-mode is on.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-a" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-c" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-g" 'viper-info-on-file)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-i" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-k" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-l" 'redraw-display)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-n" 'viper-next-line)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-o" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-p" 'viper-previous-line)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-q" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-r" 'redraw-display)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-s" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-t" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-v" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-w" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "@" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "_" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "*" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "#" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-_" 'viper-nil)
|
|
|
|
|
|
(define-key viper-vi-diehard-map "\C-]" 'viper-nil) ; This is actually tags.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Minibuffer keymap
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-minibuffer-map (make-sparse-keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Keymap used to modify keys when Minibuffer is in Insert state.")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-minibuffer-map "\C-m" 'viper-exit-minibuffer)
|
|
|
|
|
|
(define-key viper-minibuffer-map "\C-j" 'viper-exit-minibuffer)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
;; Map used to read Ex-style commands.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-ex-cmd-map (make-sparse-keymap))
|
|
|
|
|
|
(define-key viper-ex-cmd-map " " 'ex-cmd-read-exit)
|
|
|
|
|
|
(define-key viper-ex-cmd-map "\t" 'ex-cmd-complete)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
;; Keymap for reading file names in Ex-style commands.
|
|
|
|
|
|
(defvar ex-read-filename-map (make-sparse-keymap))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key ex-read-filename-map " " 'viper-complete-filename-or-exit)
|
|
|
|
|
|
(define-key ex-read-filename-map "!" 'viper-handle-!)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1996-09-06 02:13:39 +00:00
|
|
|
|
;; Some other maps
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-slash-and-colon-map (make-sparse-keymap)
|
1996-09-06 02:13:39 +00:00
|
|
|
|
"This map redefines `/' and `:' to behave as in Vi.
|
|
|
|
|
|
Useful in some modes, such as Gnus, MH, etc.")
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-slash-and-colon-map ":" 'viper-ex)
|
|
|
|
|
|
(define-key viper-slash-and-colon-map "/" 'viper-search-forward)
|
1996-09-06 02:13:39 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-comint-mode-modifier-map (make-sparse-keymap)
|
1996-09-06 02:13:39 +00:00
|
|
|
|
"This map modifies comint mode.")
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
|
(define-key viper-comint-mode-modifier-map "\C-m" 'viper-exec-key-in-emacs)
|
|
|
|
|
|
(define-key viper-comint-mode-modifier-map "\C-d" 'viper-exec-key-in-emacs)
|
1996-09-06 02:13:39 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-dired-modifier-map (make-sparse-keymap)
|
1996-09-06 02:13:39 +00:00
|
|
|
|
"This map modifies Dired behavior.")
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(define-key viper-dired-modifier-map ":" 'viper-ex)
|
|
|
|
|
|
(define-key viper-dired-modifier-map "/" 'viper-search-forward)
|
1996-09-06 02:13:39 +00:00
|
|
|
|
|
2005-02-19 19:32:47 +00:00
|
|
|
|
(defvar viper-gnus-modifier-map (make-sparse-keymap)
|
|
|
|
|
|
"This map modifies Gnus behavior.")
|
|
|
|
|
|
(define-key viper-gnus-modifier-map ":" 'viper-ex)
|
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-add-local-keys (state alist)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Override some vi-state or insert-state bindings in the current buffer.
|
|
|
|
|
|
The effect is seen in the current buffer only.
|
|
|
|
|
|
Useful for customizing mailer buffers, gnus, etc.
|
|
|
|
|
|
STATE is 'vi-state, 'insert-state, or 'emacs-state
|
|
|
|
|
|
ALIST is of the form ((key . func) (key . func) ...)
|
|
|
|
|
|
Normally, this would be called from a hook to a major mode or
|
|
|
|
|
|
on a per buffer basis.
|
|
|
|
|
|
Usage:
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-add-local-keys state '((key-str . func) (key-str . func)...)) "
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let (map)
|
|
|
|
|
|
(cond ((eq state 'vi-state)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if viper-need-new-vi-local-map
|
|
|
|
|
|
(setq viper-vi-local-user-map (make-sparse-keymap)))
|
|
|
|
|
|
(setq viper-need-new-vi-local-map nil
|
|
|
|
|
|
map viper-vi-local-user-map))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
((eq state 'insert-state)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if viper-need-new-insert-local-map
|
|
|
|
|
|
(setq viper-insert-local-user-map (make-sparse-keymap)))
|
|
|
|
|
|
(setq viper-need-new-insert-local-map nil
|
|
|
|
|
|
map viper-insert-local-user-map))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
((eq state 'emacs-state)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if viper-need-new-emacs-local-map
|
|
|
|
|
|
(setq viper-emacs-local-user-map (make-sparse-keymap)))
|
|
|
|
|
|
(setq viper-need-new-emacs-local-map nil
|
|
|
|
|
|
map viper-emacs-local-user-map))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(t
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(error
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"Invalid state in viper-add-local-keys: %S. Valid states: vi-state, insert-state or emacs-state" state)))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-modify-keymap map alist)
|
|
|
|
|
|
(viper-normalize-minor-mode-map-alist)
|
|
|
|
|
|
(viper-set-mode-vars-for viper-current-state)))
|
1996-01-20 03:19:26 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-zap-local-keys ()
|
|
|
|
|
|
"Unconditionally reset Viper viper-*-local-user-map's.
|
1996-01-20 03:19:26 +00:00
|
|
|
|
Rarely useful, but if u made a mistake by switching to a mode that adds
|
1996-09-06 02:13:39 +00:00
|
|
|
|
undesirable local keys, e.g., comint-mode, then this function can restore
|
|
|
|
|
|
sanity."
|
1996-01-20 03:19:26 +00:00
|
|
|
|
(interactive)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(setq viper-vi-local-user-map (make-sparse-keymap)
|
|
|
|
|
|
viper-need-new-vi-local-map nil
|
|
|
|
|
|
viper-insert-local-user-map (make-sparse-keymap)
|
|
|
|
|
|
viper-need-new-insert-local-map nil
|
|
|
|
|
|
viper-emacs-local-user-map (make-sparse-keymap)
|
|
|
|
|
|
viper-need-new-emacs-local-map nil)
|
|
|
|
|
|
(viper-normalize-minor-mode-map-alist))
|
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-modify-major-mode (mode state keymap)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Modify key bindings in a major-mode in a Viper state using a keymap.
|
|
|
|
|
|
|
|
|
|
|
|
If the default for a major mode is emacs-state, then modifications to this
|
|
|
|
|
|
major mode may not take effect until the buffer switches state to Vi,
|
1999-11-01 07:16:15 +00:00
|
|
|
|
Insert or Emacs. If this happens, add viper-change-state-to-emacs to this
|
|
|
|
|
|
major mode's hook. If no such hook exists, you may have to put an advice on
|
|
|
|
|
|
the function that invokes the major mode. See viper-set-hooks for hints.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
The above needs not to be done for major modes that come up in Vi or Insert
|
|
|
|
|
|
state by default.
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
Arguments: (major-mode viper-state keymap)"
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let ((alist
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(cond ((eq state 'vi-state) 'viper-vi-state-modifier-alist)
|
|
|
|
|
|
((eq state 'insert-state) 'viper-insert-state-modifier-alist)
|
|
|
|
|
|
((eq state 'emacs-state) 'viper-emacs-state-modifier-alist)))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
elt)
|
|
|
|
|
|
(if (setq elt (assoc mode (eval alist)))
|
|
|
|
|
|
(set alist (delq elt (eval alist))))
|
|
|
|
|
|
(set alist (cons (cons mode keymap) (eval alist)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; Normalization usually doesn't help here, since one needs to
|
|
|
|
|
|
;; normalize in the actual buffer where changes to the keymap are
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; to take place. However, it doesn't hurt, and it helps whenever this
|
1998-05-04 22:42:59 +00:00
|
|
|
|
;; function is actually called from within the affected buffer.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-normalize-minor-mode-map-alist)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-set-mode-vars-for viper-current-state)))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-06-09 00:12:29 +00:00
|
|
|
|
;; Displays variables that control Viper's keymaps
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-debug-keymaps ()
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(interactive)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(with-output-to-temp-buffer " *viper-debug*"
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(princ (format "Buffer name: %s\n\n" (buffer-name)))
|
|
|
|
|
|
(princ "Variables: \n")
|
|
|
|
|
|
(princ (format "major-mode: %S\n" major-mode))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(princ (format "viper-current-state: %S\n" viper-current-state))
|
|
|
|
|
|
(princ (format "viper-mode-string: %S\n\n" viper-mode-string))
|
|
|
|
|
|
(princ (format "viper-vi-intercept-minor-mode: %S\n"
|
|
|
|
|
|
viper-vi-intercept-minor-mode))
|
|
|
|
|
|
(princ (format "viper-insert-intercept-minor-mode: %S\n"
|
|
|
|
|
|
viper-insert-intercept-minor-mode))
|
|
|
|
|
|
(princ (format "viper-emacs-intercept-minor-mode: %S\n"
|
|
|
|
|
|
viper-emacs-intercept-minor-mode))
|
|
|
|
|
|
(princ (format "viper-vi-minibuffer-minor-mode: %S\n"
|
|
|
|
|
|
viper-vi-minibuffer-minor-mode))
|
|
|
|
|
|
(princ (format "viper-insert-minibuffer-minor-mode: %S\n\n"
|
|
|
|
|
|
viper-insert-minibuffer-minor-mode))
|
|
|
|
|
|
(princ (format "viper-vi-local-user-minor-mode: %S\n"
|
|
|
|
|
|
viper-vi-local-user-minor-mode))
|
|
|
|
|
|
(princ (format "viper-vi-global-user-minor-mode: %S\n"
|
|
|
|
|
|
viper-vi-global-user-minor-mode))
|
|
|
|
|
|
(princ (format "viper-vi-kbd-minor-mode: %S\n" viper-vi-kbd-minor-mode))
|
|
|
|
|
|
(princ (format "viper-vi-state-modifier-minor-mode: %S\n"
|
|
|
|
|
|
viper-vi-state-modifier-minor-mode))
|
|
|
|
|
|
(princ (format "viper-vi-diehard-minor-mode: %S\n"
|
|
|
|
|
|
viper-vi-diehard-minor-mode))
|
|
|
|
|
|
(princ (format "viper-vi-basic-minor-mode: %S\n" viper-vi-basic-minor-mode))
|
|
|
|
|
|
(princ (format "viper-replace-minor-mode: %S\n" viper-replace-minor-mode))
|
|
|
|
|
|
(princ (format "viper-insert-local-user-minor-mode: %S\n"
|
|
|
|
|
|
viper-insert-local-user-minor-mode))
|
|
|
|
|
|
(princ (format "viper-insert-global-user-minor-mode: %S\n"
|
|
|
|
|
|
viper-insert-global-user-minor-mode))
|
|
|
|
|
|
(princ (format "viper-insert-kbd-minor-mode: %S\n"
|
2003-02-04 13:24:35 +00:00
|
|
|
|
viper-insert-kbd-minor-mode))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(princ (format "viper-insert-state-modifier-minor-mode: %S\n"
|
|
|
|
|
|
viper-insert-state-modifier-minor-mode))
|
|
|
|
|
|
(princ (format "viper-insert-diehard-minor-mode: %S\n"
|
|
|
|
|
|
viper-insert-diehard-minor-mode))
|
|
|
|
|
|
(princ (format "viper-insert-basic-minor-mode: %S\n"
|
|
|
|
|
|
viper-insert-basic-minor-mode))
|
|
|
|
|
|
(princ (format "viper-emacs-local-user-minor-mode: %S\n"
|
|
|
|
|
|
viper-emacs-local-user-minor-mode))
|
|
|
|
|
|
(princ (format "viper-emacs-kbd-minor-mode: %S\n"
|
|
|
|
|
|
viper-emacs-kbd-minor-mode))
|
|
|
|
|
|
(princ (format "viper-emacs-global-user-minor-mode: %S\n"
|
|
|
|
|
|
viper-emacs-global-user-minor-mode))
|
|
|
|
|
|
(princ (format "viper-emacs-state-modifier-minor-mode: %S\n"
|
|
|
|
|
|
viper-emacs-state-modifier-minor-mode))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
|
(princ (format "\nviper-expert-level %S\n" viper-expert-level))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(princ (format "viper-no-multiple-ESC %S\n" viper-no-multiple-ESC))
|
1997-06-18 01:26:55 +00:00
|
|
|
|
(princ (format "viper-always %S\n" viper-always))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(princ (format "viper-ex-style-motion %S\n"
|
|
|
|
|
|
viper-ex-style-motion))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(princ (format "viper-ex-style-editing %S\n"
|
|
|
|
|
|
viper-ex-style-editing))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(princ (format "viper-want-emacs-keys-in-vi %S\n"
|
2003-02-04 13:24:35 +00:00
|
|
|
|
viper-want-emacs-keys-in-vi))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(princ (format "viper-want-emacs-keys-in-insert %S\n"
|
2003-02-04 13:24:35 +00:00
|
|
|
|
viper-want-emacs-keys-in-insert))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(princ (format "viper-want-ctl-h-help %S\n" viper-want-ctl-h-help))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(princ "\n\n\n")
|
|
|
|
|
|
(princ (format "Default value for minor-mode-map-alist: \n%S\n\n"
|
|
|
|
|
|
(default-value 'minor-mode-map-alist)))
|
|
|
|
|
|
(princ (format "Actual value for minor-mode-map-alist: \n%S\n"
|
|
|
|
|
|
minor-mode-map-alist))
|
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Keymap utils
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
(defun viper-add-keymap (mapsrc mapdst)
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"Add contents of mapsrc to mapdst. It is assumed that mapsrc is sparse."
|
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
|
|
|
|
|
|
;; xemacs
|
|
|
|
|
|
(map-keymap (lambda (key binding) (define-key mapdst key binding))
|
|
|
|
|
|
mapsrc)
|
|
|
|
|
|
;; emacs
|
|
|
|
|
|
(mapcar (lambda (p) (define-key mapdst (vector (car p)) (cdr p)))
|
|
|
|
|
|
(cdr mapsrc))
|
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-modify-keymap (map alist)
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"Modifies MAP with bindings specified in the ALIST. The alist has the
|
1995-02-20 23:15:10 +00:00
|
|
|
|
form ((key . function) (key . function) ... )."
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(mapcar (lambda (p) (define-key map (eval (car p)) (cdr p)))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
alist))
|
|
|
|
|
|
|
|
|
|
|
|
|
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:
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
|
;;; arch-tag: 43af4b2f-0bea-400b-889e-221ebc00acb1
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;;; viper-keym.el ends here
|