annotate lisp/viper/viper.el @ 14:9ee227acff29 r19-15b90

Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents bcdc7deadc19
children 0293115a14e9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 ;;; viper.el --- A full-featured Vi emulator for GNU Emacs 19 and XEmacs 19,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 ;; a VI Plan for Emacs Rescue,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 ;; and a venomous VI PERil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 ;; Viper Is also a Package for Emacs Rebels.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 ;; Keywords: emulations
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 ;; Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
11 (defconst viper-version "2.92 of January 3, 1997"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 "The current version of Viper")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ;; This file is part of GNU Emacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ;; GNU Emacs is free software; you can redistribute it and/or modify
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 ;; it under the terms of the GNU General Public License as published by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 ;; the Free Software Foundation; either version 2, or (at your option)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 ;; any later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 ;; GNU Emacs is distributed in the hope that it will be useful,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 ;; GNU General Public License for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 ;; You should have received a copy of the GNU General Public License
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
27 ;; along with GNU Emacs; see the file COPYING. If not, write to the
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
28 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
29 ;; Boston, MA 02111-1307, USA.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 ;;; Commentary:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 ;; Viper is a full-featured Vi emulator for Emacs 19. It emulates and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 ;; improves upon the standard features of Vi and, at the same time, allows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 ;; full access to all Emacs facilities. Viper supports multiple undo,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 ;; file name completion, command, file, and search history and it extends
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 ;; Vi in many other ways. Viper is highly customizable through the various
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 ;; hooks, user variables, and keymaps. It is implemented as a collection
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 ;; of minor modes and it is designed to provide full access to all Emacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 ;; major and minor modes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 ;;; History
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 ;; Viper is a new name for a package formerly known as VIP-19,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 ;; which was a successor of VIP version 3.5 by Masahiko Sato
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 ;; <ms@sail.stanford.edu> and VIP version 4.2 by Aamod Sane
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 ;; <sane@cs.uiuc.edu>. Some ideas from vip 4.4.2 by Aamod Sane
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 ;; were also shamelessly plagiarized.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 ;; Viper maintains some degree of compatibility with these older
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 ;; packages. See the documentation for customization.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 ;; The main difference between Viper and these older packages are:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 ;; 1. Viper emulates Vi at several levels, from almost complete conformity
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 ;; to a rather loose Vi-compliance.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 ;; 2. Viper provides full access to all major and minor modes of Emacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 ;; without the need to type extra keys.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 ;; The older versions of VIP (and other Vi emulators) do not work with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 ;; some major and minor modes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 ;; 3. Viper supports vi-style undo.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 ;; 4. Viper fully emulates (and improves upon) vi's replacement mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 ;; 5. Viper has a better interface to ex, including command, variable, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 ;; file name completion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 ;; 6. Viper uses native Emacs history and completion features; it doesn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 ;; rely on other packages (such as gmhist.el and completer.el) to provide
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 ;; these features.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 ;; 7. Viper supports Vi-style editing in the minibuffer, by allowing the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 ;; user to switch from Insert state to Vi state to Replace state, etc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 ;; 8. Viper keeps history of recently inserted pieces of text and recently
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 ;; executed Vi-style destructive commands, such as `i', `d', etc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 ;; These pieces of text can be inserted in later insertion commands;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 ;; the previous destructive commands can be re-executed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 ;; 9. Viper has Vi-style keyboard macros, which enhances the similar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 ;; facility in the original Vi.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 ;; First, one can execute any Emacs command while defining a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 ;; macro, not just the Vi commands. Second, macros are defined in a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 ;; WYSYWYG mode, using an interface to Emacs' WYSIWYG style of defining
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 ;; macros. Third, in Viper, one can define macros that are specific to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 ;; a given buffer, a given major mode, or macros defined for all buffers.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 ;; The same macro name can have several different definitions:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 ;; one global, several definitions for various major modes, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 ;; definitions for specific buffers.
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
92 ;; Buffer-specific definitions override mode-specific
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 ;; definitions, which, in turn, override global definitions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 ;;; Installation:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 ;; -------------
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 ;; (require 'viper)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 ;;; Acknowledgements:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 ;; -----------------
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
104 ;; Bug reports and ideas contributed by many users have helped
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
105 ;; improve Viper and the various versions of VIP.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 ;; See the on-line manual for a complete list of contributors.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 ;;; Notes:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 ;; 1. Major modes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 ;; In most cases, Viper handles major modes correctly, i.e., they come up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 ;; in the right state (either vi-state or emacs-state). For instance, text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 ;; files come up in vi-state, while, say, Dired appears in emacs-state by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 ;; default.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 ;; However, some modes do not appear in the right mode in the beginning,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 ;; usually because they neglect to follow Emacs conventions (e.g., they don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 ;; use kill-all-local-variables when they start). Some major modes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 ;; may fail to come up in emacs-state if they call hooks, such as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 ;; text-hook, for no good reason.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 ;; As an immediate solution, you can hit C-z to bring about the right mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 ;; An interim solution is to add an appropriate hook to the mode like this:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 ;; (add-hook 'your-favorite-mode 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 ;; or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 ;; (add-hook 'your-favorite-mode 'vip-change-state-to-emacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 ;; whichever applies. The right thing to do, however, is to complain to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 ;; author of the respective package. (Sometimes they also neglect to equip
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 ;; their modes with hooks, which is one more reason for complaining.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 ;; 2. Keymap handling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 ;; Because Emacs 19 has an elegant mechanism for turning minor mode keymaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 ;; on and off, implementation of Viper has been greatly simplified. Viper
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 ;; has several minor modes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 ;; Viper's Vi state consists of seven minor modes:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 ;; vip-vi-intercept-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 ;; vip-vi-local-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 ;; vip-vi-global-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 ;; vip-vi-kbd-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 ;; vip-vi-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 ;; vip-vi-diehard-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 ;; vip-vi-basic-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 ;; Bindings done to the keymap of the first mode overshadow those done to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 ;; the second, which, in turn, overshadows those done to the third, etc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 ;; The last vip-vi-basic-minor-mode contains most of the usual Vi bindings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 ;; in its edit mode. This mode provides access to all Emacs facilities.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 ;; Novice users, however, may want to set their vip-expert-level to 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 ;; in their .vip file. This will enable vip-vi-diehard-minor-mode. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 ;; minor mode's bindings make Viper simulate the usual Vi very closely.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 ;; For instance, C-c will not have its standard Emacs binding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 ;; and so many of the goodies of Emacs are not available.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 ;;
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
159 ;; A skilled user should set vip-expert-level to at least 3. This will
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
160 ;; enable `C-c' and many Emacs facilities will become available.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 ;; In this case, vip-vi-diehard-minor-mode is inactive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 ;; Viper gurus should have at least
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 ;; (setq vip-expert-level 4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 ;; in their ~/.vip files. This will unsuppress all Emacs keys that are not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 ;; essential for VI-style editing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 ;; Pick-and-choose users may want to put
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 ;; (setq vip-expert-level 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 ;; in ~/.vip. Viper will then leave it up to the user to set the variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 ;; vip-want-* See vip-set-expert-level for details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 ;; The very first minor mode, vip-vi-intercept-minor-mode, is of no
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 ;; concern for the user. It is needed to bind Viper's vital keys, such as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 ;; ESC and C-z.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 ;; The second mode, vip-vi-local-user-minor-mode, usually has an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 ;; empty keymap. However, the user can set bindings in this keymap, which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 ;; will overshadow the corresponding bindings in the other two minor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 ;; modes. This is useful, for example, for setting up ZZ in gnus,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 ;; rmail, mh-e, etc., to send message instead of saving it in a file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 ;; Likewise, in Dired mode, you may want to bind ZN and ZP to commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 ;; that would visit the next or the previous file in the Dired buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 ;; Setting local keys is tricky, so don't do it directly. Instead, use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 ;; vip-add-local-keys function (see its doc).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 ;; The third minor mode, vip-vi-global-user-minor-mode, is also intended
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 ;; for the users but, unlike vip-vi-local-user-minor-mode, its key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 ;; bindings are seen in all Viper buffers. This mode keys can be done
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 ;; with define-key command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 ;; The fourth minor mode, vip-vi-kbd-minor-mode, is used by keyboard
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 ;; macros. Users are NOT supposed to modify this keymap directly.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 ;; The fifth mode, vip-vi-state-modifier-minor-mode, can be used to set
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 ;; key bindings that are visible in some major modes but not in others.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 ;; Users are allowed to modify keymaps that belong to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 ;; vip-vi-local-user-minor-mode, vip-vi-global-user-minor-mode,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 ;; and vip-vi-state-modifier-minor-mode only.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 ;; Viper's Insert state also has seven minor modes:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 ;; vip-insert-intercept-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 ;; vip-insert-local-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 ;; vip-insert-global-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 ;; vip-insert-kbd-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 ;; vip-insert-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 ;; vip-insert-diehard-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 ;; vip-insert-basic-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 ;; As with VI's editing modes, the first mode, vip-insert-intercept-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 ;; is used to bind vital keys that are not to be changed by the user.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 ;; The next mode, vip-insert-local-user-minor-mode, is used to customize
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 ;; bindings in the insert state of Viper. The third mode,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 ;; vip-insert-global-user-minor-mode is like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 ;; vip-insert-local-user-minor-mode, except that its bindings are seen in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 ;; all Viper buffers. As with vip-vi-local-user-minor-mode, its bindings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 ;; should be done via the function vip-add-local-keys. Bindings for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 ;; vip-insert-global-user-minor-mode can be set with the define-key command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 ;; The next minor mode, vip-insert-kbd-minor-mode,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 ;; is used for keyboard VI-style macros defined with :map!.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 ;; The fifth minor mode, vip-insert-state-modifier-minor-mode, is like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 ;; vip-vi-state-modifier-minor-mode, except that it is used in the Insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 ;; state; it can be used to modify keys in a mode-specific fashion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 ;; The minor mode vip-insert-diehard-minor-mode is in effect when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 ;; the user wants a high degree of Vi compatibility (a bad idea, really!).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 ;; The last minor mode, vip-insert-basic-minor-mode, is always in effect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 ;; when Viper is in insert state. It binds a small number of keys needed for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 ;; Viper's operation.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 ;; Finally, Viper provides minor modes for overriding bindings set by Emacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 ;; modes when Viper is in Emacs state:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 ;; vip-emacs-local-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 ;; vip-emacs-global-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 ;; vip-emacs-kbd-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 ;; vip-emacs-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 ;; These minor modes are in effect when Viper is in Emacs state. The keymap
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 ;; associated with vip-emacs-global-user-minor-mode,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 ;; vip-emacs-global-user-map, overrides the global and local keymaps as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 ;; well as the minor mode keymaps set by other modes. The keymap of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 ;; vip-emacs-local-user-minor-mode, vip-emacs-local-user-map, overrides
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 ;; everything, but it is used on a per buffer basis.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 ;; The keymap associated with vip-emacs-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 ;; overrides keys on a per-major-mode basis. The mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 ;; vip-emacs-kbd-minor-mode is used to define Vi-style macros in Emacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 ;; state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 ;; 3. There is also one minor mode that is used when Viper is in its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 ;; replace-state (used for commands like cw, C, etc.). This mode is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 ;; called
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 ;; vip-replace-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 ;; and its keymap is vip-replace-map. Replace minor mode is always
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 ;; used in conjunction with the minor modes for insert-state, and its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 ;; keymap overshadows the keymaps for insert minor modes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 ;; 4. Defining buffer-local bindings in Vi and Insert modes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 ;; As mentioned before, sometimes, it is convenient to have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 ;; buffer-specific of mode-specific key bindings in Vi and insert modes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 ;; Viper provides a special function, vip-add-local-keys, to do precisely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 ;; this. For instance, is you need to add couple of mode-specific bindings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 ;; to Insert mode, you can put
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 ;; (vip-add-local-keys 'insert-state '((key1 . func1) (key2 .func2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 ;; somewhere in a hook of this major mode. If you put something like this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 ;; in your own elisp function, this will define bindings specific to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 ;; buffer that was current at the time of the call to vip-add-local-keys.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 ;; The only thing to make sure here is that the major mode of this buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 ;; is written according to Emacs conventions, which includes a call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 ;; (kill-all-local-variables). See vip-add-local-keys for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 ;; TO DO (volunteers?):
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 ;; 1. Some of the code that is inherited from VIP-3.5 is rather
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 ;; convoluted. Instead of vip-command-argument, keymaps should bind the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 ;; actual commands. E.g., "dw" should be bound to a generic command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 ;; vip-delete that will delete things based on the value of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 ;; last-command-char. This would greatly simplify the logic and the code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 ;; 2. Somebody should venture to write a customization package a la
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 ;; options.el that would allow the user to change values of variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 ;; that meet certain specs (e.g., match a regexp) and whose doc string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 ;; starts with a '*'. Then, the user should be offered to save
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 ;; variables that were changed. This will make user's customization job
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 ;; much easier.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 ;; Code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 (require 'advice)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 (require 'cl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 (require 'ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
303 (provide 'viper)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 ;; Compiler pacifier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 (defvar vip-minibuffer-current-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 (defvar vip-minibuffer-insert-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 (defvar vip-minibuffer-vi-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 (defvar vip-minibuffer-emacs-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 (defvar iso-accents-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 (defvar zmacs-region-stays)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
312 (defvar mark-even-if-inactive)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
313
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
314 (eval-when-compile
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
315 (let ((load-path (cons "." load-path)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
316 (or (featurep 'viper-util)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
317 (load "viper-util.el" nil nil 'nosuffix))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
318 (or (featurep 'viper-keym)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
319 (load "viper-keym.el" nil nil 'nosuffix))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
320 (or (featurep 'viper-mous)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
321 (load "viper-mous.el" nil nil 'nosuffix))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
322 (or (featurep 'viper-macs)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
323 (load "viper-macs.el" nil nil 'nosuffix))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
324 (or (featurep 'viper-ex)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
325 (load "viper-ex.el" nil nil 'nosuffix))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
326 ))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 ;; end pacifier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
329 (require 'viper-util)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
330 (require 'viper-keym)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
331 (require 'viper-mous)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
332 (require 'viper-macs)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
333 (require 'viper-ex)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
334
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
335
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 ;;; Variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 ;; Is t until viper-mode executes for the very first time.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 ;; Prevents recursive descend into startup messages.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 (defvar vip-first-time t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 (defvar vip-expert-level 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 "User's expert level.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 The minor mode vip-vi-diehard-minor-mode is in effect when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 vip-expert-level is 1 or 2 or when vip-want-emacs-keys-in-vi is t.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 The minor mode vip-insert-diehard-minor-mode is in effect when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 vip-expert-level is 1 or 2 or if vip-want-emacs-keys-in-insert is t.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 Use `M-x vip-set-expert-level' to change this.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 ;; Max expert level supported by Viper. This is NOT a user option.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 ;; It is here to make it hard for the user from resetting it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 (defconst vip-max-expert-level 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 ;; Contains user settings for vars affected by vip-set-expert-level function.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 ;; Not a user option.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 (defvar vip-saved-user-settings nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 ;;; ISO characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 (vip-deflocalvar vip-automatic-iso-accents nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 "*If non-nil, ISO accents will be turned on in insert/replace emacs states and turned off in vi-state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 For some users, this behavior may be too primitive. In this case, use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 insert/emacs/vi state hooks.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 ;; VI-style Undo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 ;; Used to 'undo' complex commands, such as replace and insert commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 (vip-deflocalvar vip-undo-needs-adjustment nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 (put 'vip-undo-needs-adjustment 'permanent-local t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 ;; A mark that Viper puts on buffer-undo-list. Marks the beginning of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 ;; complex command that must be undone atomically. If inserted, it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 ;; erased by vip-change-state-to-vi and vip-repeat.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 (defconst vip-buffer-undo-list-mark 'viper)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 (defvar vip-keep-point-on-undo nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 "*Non-nil means not to move point while undoing commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 This style is different from Emacs and Vi. Try it to see if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 it better fits your working style.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 ;; Replace mode and changing text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 ;; Viper's own after/before change functions, which get vip-add-hook'ed to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 ;; Emacs's
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 (vip-deflocalvar vip-after-change-functions nil "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 (vip-deflocalvar vip-before-change-functions nil "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 (vip-deflocalvar vip-post-command-hooks nil "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 (vip-deflocalvar vip-pre-command-hooks nil "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 ;; Can be used to pass global states around for short period of time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 (vip-deflocalvar vip-intermediate-command nil "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 ;; Indicates that the current destructive command has started in replace mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 (vip-deflocalvar vip-began-as-replace nil "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 (defvar vip-replace-overlay-cursor-color "Red"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 "*Cursor color to use in Replace state")
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
401 (defvar vip-insert-state-cursor-color nil
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
402 "Cursor color for Viper insert state.")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
403 (put 'vip-insert-state-cursor-color 'permanent-local t)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
404 ;; place to save cursor colow when switching to insert mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
405 (vip-deflocalvar vip-saved-cursor-color nil "")
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
406
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 (vip-deflocalvar vip-replace-overlay nil "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 (put 'vip-replace-overlay 'permanent-local t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
410 (defvar vip-replace-overlay-pixmap "gray3"
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
411 "Pixmap to use for search face on non-color displays.")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
412 (defvar vip-search-face-pixmap "gray3"
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
413 "Pixmap to use for search face on non-color displays.")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
414
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
415
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
416 (defun vip-set-replace-overlay-face ()
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
417 (if (vip-has-face-support-p)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
418 (defvar vip-replace-overlay-face
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
419 (progn
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
420 (make-face 'vip-replace-overlay-face)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
421 (vip-hide-face 'vip-replace-overlay-face)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
422 (or (face-differs-from-default-p 'vip-replace-overlay-face)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
423 (progn
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
424 (if (vip-can-use-colors "darkseagreen2" "Black")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
425 (progn
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
426 (set-face-background
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
427 'vip-replace-overlay-face "darkseagreen2")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
428 (set-face-foreground 'vip-replace-overlay-face "Black")))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
429 (set-face-underline-p 'vip-replace-overlay-face t)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
430 (vip-set-face-pixmap
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
431 'vip-replace-overlay-face vip-replace-overlay-pixmap)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
432 'vip-replace-overlay-face)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
433 "*Face for highlighting replace regions on a window display.")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
434 ))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 (defvar vip-replace-region-end-delimiter "$"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 "A string marking the end of replacement regions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 It is used only with TTYs or if `vip-use-replace-region-delimiters'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 is non-nil.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 (defvar vip-replace-region-start-delimiter ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 "A string marking the beginning of replacement regions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 It is used only with TTYs or if `vip-use-replace-region-delimiters'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 is non-nil.")
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
444 (defvar vip-use-replace-region-delimiters (not (vip-has-face-support-p))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 "*If non-nil, Viper will always use `vip-replace-region-end-delimiter' and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 `vip-replace-region-start-delimiter' to delimit replacement regions, even on
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
447 color displays. By default, the delimiters are used only on TTYs.")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 ;; XEmacs requires glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 (if vip-xemacs-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 (or (glyphp vip-replace-region-end-delimiter)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 (setq vip-replace-region-end-delimiter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 (make-glyph vip-replace-region-end-delimiter)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 (or (glyphp vip-replace-region-start-delimiter)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 (setq vip-replace-region-start-delimiter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 (make-glyph vip-replace-region-start-delimiter)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 ;; These are local marker that must be initialized to nil and moved with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 ;; `vip-move-marker-locally'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 ;; Remember the last position inside the replace region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 (vip-deflocalvar vip-last-posn-in-replace-region nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 ;; Remember the last position while inserting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 (vip-deflocalvar vip-last-posn-while-in-insert-state nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 (put 'vip-last-posn-in-replace-region 'permanent-local t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 (put 'vip-last-posn-while-in-insert-state 'permanent-local t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 (vip-deflocalvar vip-sitting-in-replace nil "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 (put 'vip-sitting-in-replace 'permanent-local t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 ;; Remember the number of characters that have to be deleted in replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 ;; mode to compensate for the inserted characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 (vip-deflocalvar vip-replace-chars-to-delete 0 "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 (vip-deflocalvar vip-replace-chars-deleted 0 "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 ;; Insertion ring and command ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 (defvar vip-insertion-ring-size 14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 "The size of the insertion ring.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 ;; The insertion ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 (defvar vip-insertion-ring nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 ;; This is temp insertion ring. Used to do rotation for display purposes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 ;; When rotation just started, it is initialized to vip-insertion-ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 (defvar vip-temp-insertion-ring nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 (defvar vip-last-inserted-string-from-insertion-ring "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 (defvar vip-command-ring-size 14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 "The size of the command ring.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 ;; The command ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 (defvar vip-command-ring nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 ;; This is temp command ring. Used to do rotation for display purposes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 ;; When rotation just started, it is initialized to vip-command-ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 (defvar vip-temp-command-ring nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 ;; Modes and related variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 ;; Current mode. One of: `emacs-state', `vi-state', `insert-state'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 (vip-deflocalvar vip-current-state 'emacs-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 ;; Autoindent in insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 ;; Variable that keeps track of whether C-t has been pressed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 (vip-deflocalvar vip-cted nil "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 ;; Preserve the indent value, used by C-d in insert mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 (vip-deflocalvar vip-current-indent 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 ;; Whether to preserve the indent, used by C-d in insert mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 (vip-deflocalvar vip-preserve-indent nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 (vip-deflocalvar vip-auto-indent nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 "*Autoindent if t.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 (vip-deflocalvar vip-electric-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 "*If t, enable electric behavior.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 Currently only enables auto-indentation `according to mode'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 (defconst vip-shift-width 8
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 "*The shiftwidth variable.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 ;; Variables for repeating destructive commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 (defconst vip-keep-point-on-repeat t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 "*If t, don't move point when repeating previous command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 This is useful for doing repeated changes with the '.' key.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 The user can change this to nil, if she likes when the cursor moves
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 to a new place after repeating previous Vi command.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 ;; Remember insert point as a marker. This is a local marker that must be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 ;; initialized to nil and moved with `vip-move-marker-locally'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 (vip-deflocalvar vip-insert-point nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 (put 'vip-insert-point 'permanent-local t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 ;; This remembers the point before dabbrev-expand was called.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 ;; If vip-insert-point turns out to be bigger than that, it is reset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 ;; back to vip-pre-command-point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 ;; The reason this is needed is because dabbrev-expand (and possibly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 ;; others) may jump to before the insertion point, delete something and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 ;; then reinsert a bigger piece. For instance: bla^blo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 ;; If dabbrev-expand is called after `blo' and ^ undicates vip-insert-point,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 ;; then point jumps to the beginning of `blo'. If expansion is found, `blablo'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 ;; is deleted, and we have |^, where | denotes point. Next, dabbrev-expand
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 ;; will insert the expansion, and we get: blablo^
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 ;; Whatever we insert next goes before the ^, i.e., before the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 ;; vip-insert-point marker. So, Viper will think that nothing was
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 ;; inserted. Remembering the orig position of the marker circumvents the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 ;; problem.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 ;; We don't know of any command, except dabbrev-expand, that has the same
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 ;; problem. However, the same trick can be used if such a command is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 ;; discovered later.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 (vip-deflocalvar vip-pre-command-point nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 (put 'vip-pre-command-point 'permanent-local t) ; this is probably an overkill
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 ;; This is used for saving inserted text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 (defvar vip-last-insertion nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 ;; Remembers the last replaced region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 (defvar vip-last-replace-region "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 ;; Remember com point as a marker.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 ;; This is a local marker. Should be moved with `vip-move-marker-locally'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 (vip-deflocalvar vip-com-point nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 ;; If non-nil, the value is a list (M-COM VAL COM REG inserted-text cmd-keys)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 ;; It is used to re-execute last destructive command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 ;; M-COM is a Lisp symbol representing the function to be executed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 ;; VAL is the prefix argument that was used with that command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 ;; COM is an internal descriptor, such as ?r, ?c, ?C, which contains
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 ;; additional information on how the function in M-COM is to be handled.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 ;; REG is the register used by command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 ;; INSERTED-TEXT is text inserted by that command (in case of o, c, C, i, r
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 ;; commands).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 ;; COMMAND-KEYS are the keys that were typed to invoke the command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 (defvar vip-d-com nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 ;; The character remembered by the Vi `r' command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 (defvar vip-d-char nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 ;; Name of register to store deleted or yanked strings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 (defvar vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 ;; Variables for Moves and Searches
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 ;; For use by `;' command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 (defvar vip-f-char nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 ;; For use by `.' command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 (defvar vip-F-char nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 ;; For use by `;' command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 (defvar vip-f-forward nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 ;; For use by `;' command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 (defvar vip-f-offset nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 ;; Last search string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 (defvar vip-s-string "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 (defvar vip-quote-string "> "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 "String inserted at the beginning of quoted region.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 ;; If t, search is forward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 (defvar vip-s-forward nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 (defconst vip-case-fold-search nil
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
611 "*If not nil, search ignores cases.")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 (defconst vip-re-search t
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
614 "*If not nil, search is reg-exp search, otherwise vanilla search.")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
615
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
616 (defvar vip-search-scroll-threshold 2
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
617 "*If search lands within this threshnold from the window top/bottom,
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
618 the window will be scrolled up or down appropriately, to reveal context.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
619 If you want Viper search to behave as usual in Vi, set this variable to a
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
620 negative number.")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 (defconst vip-re-query-replace t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 "*If t then do regexp replace, if nil then do string replace.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 (defconst vip-re-replace t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 "*If t, do regexp replace. nil means do string replace.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 (vip-deflocalvar vip-ex-style-motion t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 "*Ex-style: the commands l,h do not cross lines, etc.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 (vip-deflocalvar vip-ex-style-editing-in-insert t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 "*The keys ^H, ^? don't jump lines in insert, ESC moves cursor back, etc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 Note: this doesn't preclude ^H and ^? from deleting characters by moving
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 past the insertion point. This is a feature, not a bug. ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 (vip-deflocalvar vip-delete-backwards-in-replace nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 "*If t, DEL key will delete characters while moving the cursor backwards.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 If nil, the cursor will move backwards without deleting anything.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 (defconst vip-buffer-search-char nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 "*Key bound for buffer-searching.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 (defconst vip-search-wrap-around-t t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 "*If t, search wraps around.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 (vip-deflocalvar vip-related-files-and-buffers-ring nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 "*Ring of file and buffer names that are considered to be related to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 These buffers can be cycled through via :R and :P commands.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 (put 'vip-related-files-and-buffers-ring 'permanent-local t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 ;; Used to find out if we are done with searching the current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 (vip-deflocalvar vip-local-search-start-marker nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 ;; As above, but global
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 (defvar vip-search-start-marker (make-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 ;; the search overlay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 (vip-deflocalvar vip-search-overlay nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 (defvar vip-heading-start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 (concat "^\\s-*(\\s-*defun\\s-\\|" ; lisp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 "^{\\s-*$\\|^[_a-zA-Z][^()]*[()].*{\\s-*$\\|" ; C/C++
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 "^\\s-*class.*{\\|^\\s-*struct.*{\\|^\\s-*enum.*{\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 "^\\\\[sb][a-z]*{.*}\\s-*$\\|" ; latex
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 "^@node\\|@table\\|^@m?enu\\|^@itemize\\|^@if\\|" ; texinfo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 "^.+:-") ; prolog
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 "*Regexps for Headings. Used by \[\[ and \]\].")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 (defvar vip-heading-end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 (concat "^}\\|" ; C/C++
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 "^\\\\end{\\|" ; latex
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 "^@end \\|" ; texinfo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 ")\n\n[ \t\n]*\\|" ; lisp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 "\\.\\s-*$") ; prolog
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 "*Regexps to end Headings/Sections. Used by \[\].")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 ;; These two vars control the interaction of jumps performed by ' and `.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 ;; In this new version, '' doesn't erase the marks set by ``, so one can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 ;; use both kinds of jumps interchangeably and without loosing positions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 ;; inside the lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 ;; Remembers position of the last jump done using ``'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 (vip-deflocalvar vip-last-jump nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 ;; Remembers position of the last jump done using `''.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 (vip-deflocalvar vip-last-jump-ignore 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 ;; History variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 ;; History of search strings.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 (defvar vip-search-history (list ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 ;; History of query-replace strings used as a source.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 (defvar vip-replace1-history nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 ;; History of query-replace strings used as replacement.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 (defvar vip-replace2-history nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 ;; History of region quoting strings.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 (defvar vip-quote-region-history (list vip-quote-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 ;; History of Ex-style commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 (defvar vip-ex-history nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 ;; History of shell commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 (defvar vip-shell-history nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 ;; Last shell command. There are two of these, one for Ex (in viper-ex)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 ;; and one for Vi.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 ;; Last shell command executed with ! command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 (defvar vip-last-shell-com nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 ;;; Miscellaneous
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 ;; don't bark when mark is inactive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 (setq mark-even-if-inactive t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 (defvar vip-inhibit-startup-message nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 "Whether Viper startup message should be inhibited.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 (defvar vip-always t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 "t means, arrange that vi-state will be a default.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
724 (defvar vip-custom-file-name (vip-convert-standard-file-name "~/.vip")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 "Viper customisation file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 This variable must be set _before_ loading Viper.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 (defvar vip-spell-function 'ispell-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 "Spell function used by #s<move> command to spell.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 (defvar vip-tags-file-name "TAGS"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 "The tags file used by Viper.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
735 ;; Indicates if we are in the middle of executing a command that takes another
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
736 ;; command as an argument, e.g., cw, dw, etc.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
737 (defvar vip-inside-command-argument-action nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
738
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 ;; Minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 (defvar vip-vi-style-in-minibuffer t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 "If t, use vi-style editing in minibuffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 Should be set in `~/.vip' file.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 ;; overlay used in the minibuffer to indicate which state it is in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 (vip-deflocalvar vip-minibuffer-overlay nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 ;; Hook, specific to Viper, which is run just *before* exiting the minibuffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 ;; Beginning with Emacs 19.26, the standard `minibuffer-exit-hook' is run
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 ;; *after* exiting the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 (defvar vip-minibuffer-exit-hook nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 ;; setup emacs-supported vi-style feel
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 (setq next-line-add-newlines nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 require-final-newline t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 (make-variable-buffer-local 'require-final-newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 ;; Mode line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 (defconst vip-vi-state-id "<V> "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 "Mode line tag identifying the Vi mode of Viper.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 (defconst vip-emacs-state-id "<E> "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 "Mode line tag identifying the Emacs mode of Viper.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 (defconst vip-insert-state-id "<I> "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 "Mode line tag identifying the Insert mode of Viper.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 (defconst vip-replace-state-id "<R> "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 "Mode line tag identifying the Replace mode of Viper.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 ;; Viper changes the default mode-line-buffer-identification
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 (setq-default mode-line-buffer-identification '(" %b"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 ;; Variable displaying the current Viper state in the mode line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 (vip-deflocalvar vip-mode-string vip-emacs-state-id)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 (or (memq 'vip-mode-string global-mode-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 (setq global-mode-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 (append '("" vip-mode-string) (cdr global-mode-string))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 (defvar vip-vi-state-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 "*Hooks run just before the switch to Vi mode is completed.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 (defvar vip-insert-state-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 "*Hooks run just before the switch to Insert mode is completed.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 (defvar vip-replace-state-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 "*Hooks run just before the switch to Replace mode is completed.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 (defvar vip-emacs-state-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 "*Hooks run just before the switch to Emacs mode is completed.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 (defvar vip-load-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 "Hooks run just after loading Viper.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 ;; Generic predicates
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 ;; These test functions are shamelessly lifted from vip 4.4.2 by Aamod Sane
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 ;; generate test functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 ;; given symbol foo, foo-p is the test function, foos is the set of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 ;; Viper command keys
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 ;; (macroexpand '(vip-test-com-defun foo))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 ;; (defun foo-p (com) (consp (memq (if (< com 0) (- com) com) foos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 (defmacro vip-test-com-defun (name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 (let* ((snm (symbol-name name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 (nm-p (intern (concat snm "-p")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 (nms (intern (concat snm "s"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 (` (defun (, nm-p) (com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 (consp (memq (if (< com 0) (- com) com) (, nms)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 ;; Variables for defining VI commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 ;; Modifying commands that can be prefixes to movement commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 (defconst vip-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\"))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
814 ;; define vip-prefix-command-p
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 (vip-test-com-defun vip-prefix-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 ;; Commands that are pairs eg. dd. r and R here are a hack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 (defconst vip-charpair-commands '(?c ?d ?y ?! ?= ?< ?> ?r ?R))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
819 ;; define vip-charpair-command-p
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 (vip-test-com-defun vip-charpair-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 (defconst vip-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?H ?j ?k ?l
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 ?H ?M ?n ?t ?T ?w ?W ?$ ?%
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 ?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?`
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 ?; ?, ?0 ?? ?/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 "Movement commands")
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
828 ;; define vip-movement-command-p
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 (vip-test-com-defun vip-movement-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
831 ;; Commands that can be repeated by . (dotted)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
832 (defconst vip-dotable-commands '(?c ?d ?C ?s ?S ?D ?> ?<))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
833 ;; define vip-dotable-command-p
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 (vip-test-com-defun vip-dotable-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 ;; Commands that can follow a #
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
837 (defconst vip-hash-commands '(?c ?C ?g ?q ?s))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
838 ;; define vip-hash-command-p
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
839 (vip-test-com-defun vip-hash-command)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 ;; Commands that may have registers as prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 (defconst vip-regsuffix-commands '(?d ?y ?Y ?D ?p ?P ?x ?X))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
843 ;; define vip-regsuffix-command-p
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 (vip-test-com-defun vip-regsuffix-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
846 (defconst vip-vi-commands (append vip-movement-commands
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
847 vip-dotable-commands
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
848 vip-charpair-commands
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
849 vip-hash-commands
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
850 vip-prefix-commands
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
851 vip-regsuffix-commands)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
852 "The list of all commands in Vi-state.")
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
853 ;; define vip-vi-command-p
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
854 (vip-test-com-defun vip-vi-command)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 ;;; CODE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 ;; sentinels
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 ;; Runs vip-after-change-functions inside after-change-functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 (defun vip-after-change-sentinel (beg end len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 (let ((list vip-after-change-functions))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 (while list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 (funcall (car list) beg end len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 (setq list (cdr list)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 ;; Runs vip-before-change-functions inside before-change-functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 (defun vip-before-change-sentinel (beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 (let ((list vip-before-change-functions))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 (while list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 (funcall (car list) beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 (setq list (cdr list)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 (defsubst vip-post-command-sentinel ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 (run-hooks 'vip-post-command-hooks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 (defsubst vip-pre-command-sentinel ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 (run-hooks 'vip-pre-command-hooks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 ;; Needed so that Viper will be able to figure the last inserted
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 ;; chunk of text with reasonable accuracy.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 (defsubst vip-insert-state-post-command-sentinel ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 (if (and (memq vip-current-state '(insert-state replace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 vip-insert-point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 (>= (point) vip-insert-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 (setq vip-last-posn-while-in-insert-state (point-marker)))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
888 (if (eq vip-current-state 'insert-state)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
889 (progn
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
890 (or (stringp vip-saved-cursor-color)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
891 (string= (vip-get-cursor-color) vip-insert-state-cursor-color)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
892 (setq vip-saved-cursor-color (vip-get-cursor-color)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
893 (if (stringp vip-saved-cursor-color)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
894 (vip-change-cursor-color vip-insert-state-cursor-color))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
895 ))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 (if (and (eq this-command 'dabbrev-expand)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 (integerp vip-pre-command-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 (> vip-insert-point vip-pre-command-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 (move-marker vip-insert-point vip-pre-command-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 (defsubst vip-insert-state-pre-command-sentinel ()
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
903 (or (memq this-command '(self-insert-command))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
904 (memq (vip-event-key last-command-event)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
905 '(up down left right (meta f) (meta b)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
906 (control n) (control p) (control f) (control b)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
907 (vip-restore-cursor-color-after-insert))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 (if (and (eq this-command 'dabbrev-expand)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 (markerp vip-insert-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 (marker-position vip-insert-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 (setq vip-pre-command-point (marker-position vip-insert-point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 (defsubst vip-R-state-post-command-sentinel ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 ;; Restoring cursor color is needed despite
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 ;; vip-replace-state-pre-command-sentinel: When you jump to another buffer in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 ;; another frame, the pre-command hook won't change cursor color to default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 ;; in that other frame. So, if the second frame cursor was red and we set
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 ;; the point outside the replacement region, then the cursor color will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 ;; remain red. Restoring the default, below, prevents this.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 (if (and (<= (vip-replace-start) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 (<= (point) (vip-replace-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 (vip-change-cursor-color vip-replace-overlay-cursor-color)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
923 (vip-restore-cursor-color-after-replace)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 ;; to speed up, don't change cursor color before self-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 ;; and common move commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 (defsubst vip-replace-state-pre-command-sentinel ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 (or (memq this-command '(self-insert-command))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 (memq (vip-event-key last-command-event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 '(up down left right (meta f) (meta b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 (control n) (control p) (control f) (control b)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
933 (vip-restore-cursor-color-after-replace)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 (defun vip-replace-state-post-command-sentinel ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 ;; Restoring cursor color is needed despite
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 ;; vip-replace-state-pre-command-sentinel: When one jumps to another buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 ;; in another frame, the pre-command hook won't change cursor color to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 ;; default in that other frame. So, if the second frame cursor was red and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 ;; we set the point outside the replacement region, then the cursor color
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 ;; will remain red. Restoring the default, below, fixes this problem.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 ;; We optimize for self-insert-command's here, since they either don't change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 ;; cursor color or, if they terminate replace mode, the color will be changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 ;; in vip-finish-change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 (or (memq this-command '(self-insert-command))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
947 (vip-restore-cursor-color-after-replace))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 ((eq vip-current-state 'replace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 ;; delete characters to compensate for inserted chars.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 (let ((replace-boundary (vip-replace-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 (goto-char vip-last-posn-in-replace-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 (delete-char vip-replace-chars-to-delete)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 (setq vip-replace-chars-to-delete 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 vip-replace-chars-deleted 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 ;; terminate replace mode if reached replace limit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 (if (= vip-last-posn-in-replace-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 (vip-replace-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 (vip-finish-change vip-last-posn-in-replace-region)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 (if (and (<= (vip-replace-start) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 (<= (point) replace-boundary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 ;; the state may have changed in vip-finish-change above
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 (if (eq vip-current-state 'replace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 (vip-change-cursor-color vip-replace-overlay-cursor-color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 (setq vip-last-posn-in-replace-region (point-marker))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 (t ;; terminate replace mode if changed Viper states.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 (vip-finish-change vip-last-posn-in-replace-region))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 ;; changing mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 ;; Change state to NEW-STATE---either emacs-state, vi-state, or insert-state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 (defun vip-change-state (new-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 ;; Keep vip-post/pre-command-hooks fresh.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 ;; We remove then add vip-post/pre-command-sentinel since it is very
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 ;; desirable that vip-pre-command-sentinel is the last hook and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 ;; vip-post-command-sentinel is the first hook.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 (remove-hook 'post-command-hook 'vip-post-command-sentinel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 (add-hook 'post-command-hook 'vip-post-command-sentinel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 (remove-hook 'pre-command-hook 'vip-pre-command-sentinel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 (add-hook 'pre-command-hook 'vip-pre-command-sentinel t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 ;; These hooks will be added back if switching to insert/replace mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 (vip-remove-hook 'vip-post-command-hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 'vip-insert-state-post-command-sentinel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 (vip-remove-hook 'vip-pre-command-hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 'vip-insert-state-pre-command-sentinel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 (cond ((eq new-state 'vi-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 (cond ((member vip-current-state '(insert-state replace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 ;; move vip-last-posn-while-in-insert-state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 ;; This is a normal hook that is executed in insert/replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 ;; states after each command. In Vi/Emacs state, it does
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 ;; nothing. We need to execute it here to make sure that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 ;; the last posn was recorded when we hit ESC.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 ;; It may be left unrecorded if the last thing done in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 ;; insert/repl state was dabbrev-expansion or abbrev
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 ;; expansion caused by hitting ESC
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 (vip-insert-state-post-command-sentinel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 (condition-case conds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 (vip-save-last-insertion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 vip-insert-point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 vip-last-posn-while-in-insert-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 (if vip-began-as-replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 (setq vip-began-as-replace nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 ;; repeat insert commands if numerical arg > 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 (vip-repeat-insert-command))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 (vip-message-conditions conds)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 (if (> (length vip-last-insertion) 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 (vip-push-onto-ring vip-last-insertion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 'vip-insertion-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 (if vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 (or (bolp) (backward-char 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 ;; insert or replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 ((memq new-state '(insert-state replace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 (if (memq vip-current-state '(emacs-state vi-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 (vip-move-marker-locally 'vip-insert-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 (vip-move-marker-locally 'vip-last-posn-while-in-insert-state (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 (vip-add-hook 'vip-post-command-hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 'vip-insert-state-post-command-sentinel t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 (vip-add-hook 'vip-pre-command-hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 'vip-insert-state-pre-command-sentinel t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 ) ; outermost cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 ;; Nothing needs to be done to switch to emacs mode! Just set some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 ;; variables, which is already done in vip-change-state-to-emacs!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 (setq vip-current-state new-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 (vip-normalize-minor-mode-map-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 (vip-adjust-keys-for new-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 (vip-set-mode-vars-for new-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 (vip-refresh-mode-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 (defun vip-adjust-keys-for (state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 "Make necessary adjustments to keymaps before entering STATE."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 (cond ((memq state '(insert-state replace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 (if vip-auto-indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 (define-key vip-insert-basic-map "\C-m" 'vip-autoindent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 (if vip-want-emacs-keys-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 ;; expert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 (define-key vip-insert-basic-map "\C-j" nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 ;; novice
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 (define-key vip-insert-basic-map "\C-j" 'vip-autoindent))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 (setq vip-insert-diehard-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 (not vip-want-emacs-keys-in-insert))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 (if vip-want-ctl-h-help
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 (progn
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1066 (define-key vip-insert-basic-map [(control h)] 'help-command)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1067 (define-key vip-replace-map [(control h)] 'help-command))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 (define-key vip-insert-basic-map
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1069 [(control h)] 'vip-del-backward-char-in-insert)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 (define-key vip-replace-map
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1071 [(control h)] 'vip-del-backward-char-in-replace)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1072
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1073 (t ; Vi state
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 (setq vip-vi-diehard-minor-mode (not vip-want-emacs-keys-in-vi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 (if vip-want-ctl-h-help
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1076 (define-key vip-vi-basic-map [(control h)] 'help-command)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1077 (define-key vip-vi-basic-map [(control h)] 'vip-backward-char)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 ;; Normalizes minor-mode-map-alist by putting Viper keymaps first.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 ;; This ensures that Viper bindings are in effect, regardless of which minor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 ;; modes were turned on by the user or by other packages.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 (defun vip-normalize-minor-mode-map-alist ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 (setq minor-mode-map-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 (vip-append-filter-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 (list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 (cons 'vip-vi-intercept-minor-mode vip-vi-intercept-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 (cons 'vip-vi-minibuffer-minor-mode vip-minibuffer-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 (cons 'vip-vi-local-user-minor-mode vip-vi-local-user-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 (cons 'vip-vi-kbd-minor-mode vip-vi-kbd-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 (cons 'vip-vi-global-user-minor-mode vip-vi-global-user-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 (cons 'vip-vi-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 (if (keymapp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 (cdr (assoc major-mode vip-vi-state-modifier-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 (cdr (assoc major-mode vip-vi-state-modifier-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 vip-empty-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 (cons 'vip-vi-diehard-minor-mode vip-vi-diehard-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 (cons 'vip-vi-basic-minor-mode vip-vi-basic-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 (cons 'vip-insert-intercept-minor-mode vip-insert-intercept-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 (cons 'vip-replace-minor-mode vip-replace-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 ;; vip-insert-minibuffer-minor-mode must come after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 ;; vip-replace-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 (cons 'vip-insert-minibuffer-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 vip-minibuffer-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 (cons 'vip-insert-local-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 vip-insert-local-user-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 (cons 'vip-insert-kbd-minor-mode vip-insert-kbd-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 (cons 'vip-insert-global-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 vip-insert-global-user-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 (cons 'vip-insert-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 (if (keymapp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 (cdr
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 (assoc major-mode vip-insert-state-modifier-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 (cdr
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 (assoc major-mode vip-insert-state-modifier-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 vip-empty-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 (cons 'vip-insert-diehard-minor-mode vip-insert-diehard-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 (cons 'vip-insert-basic-minor-mode vip-insert-basic-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 (cons 'vip-emacs-intercept-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 vip-emacs-intercept-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 (cons 'vip-emacs-local-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 vip-emacs-local-user-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 (cons 'vip-emacs-kbd-minor-mode vip-emacs-kbd-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 (cons 'vip-emacs-global-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 vip-emacs-global-user-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 (cons 'vip-emacs-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 (if (keymapp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 (cdr
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 (assoc major-mode vip-emacs-state-modifier-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 (cdr
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 (assoc major-mode vip-emacs-state-modifier-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 vip-empty-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 minor-mode-map-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 ;; Viper mode-changing commands and utilities
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 ;; Modifies mode-line-buffer-identification.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 (defun vip-refresh-mode-line ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 (setq vip-mode-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 (cond ((eq vip-current-state 'emacs-state) vip-emacs-state-id)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 ((eq vip-current-state 'vi-state) vip-vi-state-id)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 ((eq vip-current-state 'replace-state) vip-replace-state-id)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 ((eq vip-current-state 'insert-state) vip-insert-state-id)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 ;; Sets Viper mode string in global-mode-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 (force-mode-line-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 (defun viper-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 "Turn on Viper emulation of Vi."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 (if (not noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 (if vip-first-time ; This check is important. Without it, startup and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 (progn ; expert-level msgs mix up when viper-mode recurses
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 (setq vip-first-time nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 (if (not vip-inhibit-startup-message)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 (save-window-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 (setq vip-inhibit-startup-message t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 (delete-other-windows)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 (switch-to-buffer "Viper Startup Message")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 (insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 (substitute-command-keys
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 "Viper Is a Package for Emacs Rebels.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 It is also a VI Plan for Emacs Rescue and a venomous VI PERil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 Technically speaking, Viper is a Vi emulation package for GNU Emacs 19 and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 XEmacs 19. It supports virtually all of Vi and Ex functionality, extending
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 and improving upon much of it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 1. Viper supports Vi at several levels. Level 1 is the closest to Vi,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 level 5 provides the most flexibility to depart from many Vi conventions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 You will be asked to specify your user level in a following screen.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 If you select user level 1 then the keys ^X, ^C, ^Z, and ^G will behave
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 as in VI, to smooth transition to Viper for the beginners. However, to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 use Emacs productively, you are advised to reach user level 3 or higher.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 If your user level is 2 or higher, ^X and ^C will invoke Emacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 functions,as usual in Emacs; ^Z will toggle vi/emacs modes, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189 ^G will be the usual Emacs's keyboard-quit (something like ^C in VI).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191 2. Vi exit functions (e.g., :wq, ZZ) work on INDIVIDUAL files -- they
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 do not cause Emacs to quit, except at user level 1 (a novice).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 3. ^X^C EXITS EMACS.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 4. Viper supports multiple undo: `u' will undo. Typing `.' will repeat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 undo. Another `u' changes direction.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1197 6. Emacs Meta functions are invoked by typing `C-\\' or `\\ ESC'.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 On a window system, the best way is to use the Meta-key.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 7. Try \\[keyboard-quit] and \\[abort-recursive-edit] repeatedly,if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 something funny happens. This would abort the current editing command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 You can get more information on Viper by:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 a. Typing `:help' in Vi state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 b. Printing Viper manual, found in ./etc/viper.dvi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 c. Printing ViperCard, the Quick Reference, found in ./etc/viperCard.dvi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 This startup message appears whenever you load Viper, unless you type `y' now."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 (if (y-or-n-p "Inhibit Viper startup message? ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 (vip-save-setting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 'vip-inhibit-startup-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 "Viper startup message inhibited"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 vip-custom-file-name t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 ;;(kill-buffer (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 (message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 "The last message is in buffer `Viper Startup Message'")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 (sit-for 4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 (vip-set-expert-level 'dont-change-unless)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 (vip-change-state-to-vi))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 (defalias 'vip-mode 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 ;; Switch from Insert state to Vi state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 (defun vip-exit-insert-state ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 (vip-change-state-to-vi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 (defun vip-set-mode-vars-for (state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 "Sets Viper minor mode variables to put Viper's state STATE in effect."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 ;; Emacs state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 (setq vip-vi-minibuffer-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 vip-insert-minibuffer-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 vip-vi-intercept-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 vip-insert-intercept-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 vip-vi-local-user-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 vip-vi-kbd-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 vip-vi-global-user-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 vip-vi-state-modifier-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 vip-vi-diehard-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 vip-vi-basic-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 vip-replace-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 vip-insert-local-user-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 vip-insert-kbd-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 vip-insert-global-user-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 vip-insert-state-modifier-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 vip-insert-diehard-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 vip-insert-basic-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 vip-emacs-intercept-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 vip-emacs-local-user-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 vip-emacs-kbd-minor-mode (not (vip-is-in-minibuffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 vip-emacs-global-user-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 vip-emacs-state-modifier-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 ;; Vi state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 (if (eq state 'vi-state) ; adjust for vi-state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 (setq
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 vip-vi-intercept-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 vip-vi-minibuffer-minor-mode (vip-is-in-minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 vip-vi-local-user-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 vip-vi-kbd-minor-mode (not (vip-is-in-minibuffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 vip-vi-global-user-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 vip-vi-state-modifier-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 ;; don't let the diehard keymap block command completion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 ;; and other things in the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 vip-vi-diehard-minor-mode (not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 (or vip-want-emacs-keys-in-vi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 (vip-is-in-minibuffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 vip-vi-basic-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279 vip-emacs-intercept-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 vip-emacs-local-user-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 vip-emacs-kbd-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 vip-emacs-global-user-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 vip-emacs-state-modifier-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 ;; Insert and Replace states
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 (if (member state '(insert-state replace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 (setq
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 vip-insert-intercept-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 vip-replace-minor-mode (eq state 'replace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 vip-insert-minibuffer-minor-mode (vip-is-in-minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 vip-insert-local-user-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 vip-insert-kbd-minor-mode (not (vip-is-in-minibuffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 vip-insert-global-user-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 vip-insert-state-modifier-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 ;; don't let the diehard keymap block command completion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 ;; and other things in the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 vip-insert-diehard-minor-mode (not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 (or vip-want-emacs-keys-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300 (vip-is-in-minibuffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 vip-insert-basic-minor-mode t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 vip-emacs-intercept-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 vip-emacs-local-user-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 vip-emacs-kbd-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 vip-emacs-global-user-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 vip-emacs-state-modifier-minor-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 ;; minibuffer faces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 (if (vip-has-face-support-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 (setq vip-minibuffer-current-face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 (cond ((eq state 'emacs-state) vip-minibuffer-emacs-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 ((eq state 'vi-state) vip-minibuffer-vi-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 ((memq state '(insert-state replace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 vip-minibuffer-insert-face))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 (if (vip-is-in-minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 (vip-set-minibuffer-overlay))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 ;; This also takes care of the annoying incomplete lines in files.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 ;; Also, this fixes `undo' to work vi-style for complex commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 (defun vip-change-state-to-vi ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 "Change Viper state to Vi."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326 (if (and vip-first-time (not (vip-is-in-minibuffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 (viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 (if overwrite-mode (overwrite-mode nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 (if abbrev-mode (expand-abbrev))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 (if (and auto-fill-function (> (current-column) fill-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 (funcall auto-fill-function))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 ;; don't leave whitespace lines around
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333 (if (and (memq last-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 '(vip-autoindent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 vip-open-line vip-Open-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 vip-replace-state-exit-cmd))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 (vip-over-whitespace-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 (indent-to-left-margin))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 (vip-add-newline-at-eob-if-necessary)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 (if vip-undo-needs-adjustment (vip-adjust-undo))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 (vip-change-state 'vi-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 ;; always turn off iso-accents-mode, or else we won't be able to use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 ;; keys `,',^ in Vi state, as they will do accents instead of Vi actions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345 (if (and (boundp 'iso-accents-mode) iso-accents-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 (iso-accents-mode -1))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1347
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1348 (vip-restore-cursor-color-after-insert)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1349
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 ;; Protection against user errors in hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 (condition-case conds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 (run-hooks 'vip-vi-state-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 (vip-message-conditions conds)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 (defun vip-change-state-to-insert ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 "Change Viper state to Insert."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 (vip-change-state 'insert-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 (if (and vip-automatic-iso-accents (fboundp 'iso-accents-mode))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 (iso-accents-mode 1)) ; turn iso accents on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1363 (or (stringp vip-saved-cursor-color)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1364 (string= (vip-get-cursor-color) vip-insert-state-cursor-color)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1365 (setq vip-saved-cursor-color (vip-get-cursor-color)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1366 ;; Commented out, because if vip-change-state-to-insert is executed
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1367 ;; non-interactively then the old cursor color may get lost. Same old Emacs
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1368 ;; bug related to local variables?
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1369 ;;;(if (stringp vip-saved-cursor-color)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1370 ;;; (vip-change-cursor-color vip-insert-state-cursor-color))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 ;; Protection against user errors in hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 (condition-case conds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 (run-hooks 'vip-insert-state-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 (vip-message-conditions conds))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 (defsubst vip-downgrade-to-insert ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 (setq vip-current-state 'insert-state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 vip-replace-minor-mode nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 ;; Change to replace state. When the end of replacement region is reached,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 ;; replace state changes to insert state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 (defun vip-change-state-to-replace (&optional non-R-cmd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 (vip-change-state 'replace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 (if (and vip-automatic-iso-accents (fboundp 'iso-accents-mode))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 (iso-accents-mode 1)) ; turn iso accents on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 ;; Run insert-state-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 (condition-case conds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 (run-hooks 'vip-insert-state-hook 'vip-replace-state-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 (vip-message-conditions conds)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 (if non-R-cmd
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 (vip-start-replace)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 ;; 'R' is implemented using Emacs's overwrite-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 (vip-start-R-mode))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 (defun vip-change-state-to-emacs ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 "Change Viper state to Emacs."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 (vip-change-state 'emacs-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 (if (and vip-automatic-iso-accents (fboundp 'iso-accents-mode))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 (iso-accents-mode 1)) ; turn iso accents on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 ;; Protection agains user errors in hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 (condition-case conds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 (run-hooks 'vip-emacs-state-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 (vip-message-conditions conds))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 ;; escape to emacs mode termporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 (defun vip-escape-to-emacs (arg &optional events)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 "Escape to Emacs state from Vi state for one Emacs command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 ARG is used as the prefix value for the executed command. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 EVENTS is a list of events, which become the beginning of the command."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 (interactive "P")
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1422 (if (= last-command-char ?\\)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1423 (message "Switched to EMACS state for the next command..."))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 (vip-escape-to-state arg events 'emacs-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 ;; escape to Vi mode termporarily
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1427 (defun vip-escape-to-vi (arg)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 "Escape from Emacs state to Vi state for one Vi 1-character command.
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1429 If the Vi command that the user types has a prefix argument, e.g., `d2w', then
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1430 Vi's prefix argument will be used. Otherwise, the prefix argument passed to
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1431 `vip-escape-to-vi' is used."
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1432 (interactive "P")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1433 (message "Switched to VI state for the next command...")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1434 (vip-escape-to-state arg nil 'vi-state))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1435
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 ;; Escape to STATE mode for one Emacs command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 (defun vip-escape-to-state (arg events state)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1438 ;;(let (com key prefix-arg)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1439 (let (com key)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 ;; this temporarily turns off Viper's minor mode keymaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 (vip-set-mode-vars-for state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 (vip-normalize-minor-mode-map-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 (if events (vip-set-unread-command-events events))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 ;; protect against keyboard quit and other errors
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 (condition-case nil
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1447 (let (vip-vi-kbd-minor-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1448 vip-insert-kbd-minor-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1449 vip-emacs-kbd-minor-mode)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 (setq com (key-binding (setq key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 (if vip-xemacs-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 (read-key-sequence nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 (read-key-sequence nil t)))))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1456 ;; In case of binding indirection--chase definitions.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 ;; Have to do it here because we execute this command under
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 ;; different keymaps, so command-execute may not do the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 ;; right thing there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 (while (vectorp com) (setq com (key-binding com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 nil)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1462 ;; Execute command com in the original Viper state, not in state
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1463 ;; `state'. Otherwise, if we switch buffers while executing the
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1464 ;; escaped to command, Viper's mode vars will remain those of
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1465 ;; `state'. When we return to the orig buffer, the bindings will be
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1466 ;; screwed up.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 (vip-set-mode-vars-for vip-current-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 ;; this-command, last-command-char, last-command-event
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 (setq this-command com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 (if vip-xemacs-p ; XEmacs represents key sequences as vectors
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1472 (setq last-command-event (vip-copy-event (vip-seq-last-elt key))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 last-command-char (event-to-character last-command-event))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 ;; Emacs represents them as sequences (str or vec)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1475 (setq last-command-event (vip-copy-event (vip-seq-last-elt key))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476 last-command-char last-command-event))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 (if (commandp com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 (progn
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1480 (setq prefix-arg (or prefix-arg arg))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 (command-execute com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 (quit (ding))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 (error (beep 1))))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1485 ;; set state in the new buffer
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1486 (vip-set-mode-vars-for vip-current-state))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1488 (defun vip-exec-form-in-vi (form)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1489 "Execute FORM in Vi state, regardless of the Ccurrent Vi state."
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1490 (let ((buff (current-buffer))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1491 result)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1492 (vip-set-mode-vars-for 'vi-state)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1493 (setq result (eval form))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1494 (if (not (equal buff (current-buffer))) ; cmd switched buffer
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1495 (save-excursion
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1496 (set-buffer buff)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1497 (vip-set-mode-vars-for vip-current-state)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1498 (vip-set-mode-vars-for vip-current-state)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1499 result))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1500
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501 (defun vip-exec-form-in-emacs (form)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 "Execute FORM in Emacs, temporarily disabling Viper's minor modes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503 Similar to vip-escape-to-emacs, but accepts forms rather than keystrokes."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 (let ((buff (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 result)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 (vip-set-mode-vars-for 'emacs-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 (setq result (eval form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 (if (not (equal buff (current-buffer))) ; cmd switched buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 (set-buffer buff)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 (vip-set-mode-vars-for vip-current-state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 (vip-set-mode-vars-for vip-current-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 result))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 ;; This is needed because minor modes sometimes override essential Viper
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 ;; bindings. By letting Viper know which files these modes are in, it will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 ;; arrange to reorganize minor-mode-map-alist so that things will work right.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 (defun vip-harness-minor-mode (load-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 "Familiarize Viper with a minor mode defined in LOAD_FILE.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 Minor modes that have their own keymaps may overshadow Viper keymaps.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 This function is designed to make Viper aware of the packages that define
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 such minor modes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 Usage:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 (vip-harness-minor-mode load-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 LOAD-FILE is a name of the file where the specific minor mode is defined.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 Suffixes such as .el or .elc should be stripped."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 (interactive "sEnter name of the load file: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 (vip-eval-after-load load-file '(vip-normalize-minor-mode-map-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 ;; Change the default for minor-mode-map-alist each time a harnessed minor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 ;; mode adds its own keymap to the a-list.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 (vip-eval-after-load
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 load-file '(setq-default minor-mode-map-alist minor-mode-map-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 (defun vip-ESC (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 "Emulate ESC key in Emacs.
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1543 Prevents multiple escape keystrokes if vip-no-multiple-ESC is true.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1544 If vip-no-multiple-ESC is 'twice double ESC would ding in vi-state.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1545 Other ESC sequences are emulated via the current Emacs's major mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1546 keymap. This is more convenient on TTYs, since this won't block
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1547 function keys such as up,down, etc. ESC will also will also work as
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1548 a Meta key in this case. When vip-no-multiple-ESC is nil, ESC functions
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1549 as a Meta key and any number of multiple escapes is allowed."
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 (let (char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 (cond ((and (not vip-no-multiple-ESC) (eq vip-current-state 'vi-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 (setq char (vip-read-char-exclusive))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 (vip-escape-to-emacs arg (list ?\e char) ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 ((and (eq vip-no-multiple-ESC 'twice)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 (eq vip-current-state 'vi-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 (setq char (vip-read-char-exclusive))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 (if (= char (string-to-char vip-ESC-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 (ding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 (vip-escape-to-emacs arg (list ?\e char) )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 (t (ding)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1564 (defun vip-alternate-Meta-key (arg)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1565 "Simulate Emacs Meta key."
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 (interactive "P")
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1567 (sit-for 1) (message "ESC-")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 (vip-escape-to-emacs arg '(?\e)))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1569
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1570 (defun vip-toggle-key-action ()
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1571 "Action bound to `vip-toggle-key'."
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1572 (interactive)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1573 (if (and (< vip-expert-level 2) (equal vip-toggle-key "\C-z"))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1574 (if (vip-window-display-p)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1575 (vip-iconify)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1576 (suspend-emacs))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1577 (vip-change-state-to-emacs)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1578
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 ;; Intercept ESC sequences on dumb terminals.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 ;; Based on the idea contributed by Marcelino Veiga Tuimil <mveiga@dit.upm.es>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 ;; Check if last key was ESC and if so try to reread it as a function key.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 ;; But only if there are characters to read during a very short time.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 ;; Returns the last event, if any.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586 (defun vip-envelop-ESC-key ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 (let ((event last-input-event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 (keyseq [nil])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 inhibit-quit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 (if (vip-ESC-event-p event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 (if (vip-fast-keysequence-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 (let (minor-mode-map-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 (vip-set-unread-command-events event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 (setq keyseq
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 (funcall
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598 (ad-get-orig-definition 'read-key-sequence) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 ) ; let
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 ;; If keyseq translates into something that still has ESC
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 ;; at the beginning, separate ESC from the rest of the seq.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 ;; In XEmacs we check for events that are keypress meta-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 ;; and convert them into [escape key]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 ;; This is needed for the following reason:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 ;; If ESC is the first symbol, we interpret it as if the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 ;; user typed ESC and then quickly some other symbols.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 ;; If ESC is not the first one, then the key sequence
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 ;; entered was apparently translated into a function key or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 ;; something (e.g., one may have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 ;; (define-key function-key-map "\e[192z" [f11])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 ;; which would translate the escape-sequence generated by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 ;; f11 in an xterm window into the symbolic key f11.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615 ;; If `first-key' is not an ESC event, we make it into the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 ;; last-command-event in order to pretend that this key was
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 ;; pressed. This is needed to allow arrow keys to be bound to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 ;; macros. Otherwise, vip-exec-mapped-kbd-macro will think that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 ;; the last event was ESC and so it'll execute whatever is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 ;; bound to ESC. (Viper macros can't be bound to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 ;; ESC-sequences).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622 (let* ((first-key (elt keyseq 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 (key-mod (event-modifiers first-key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 (cond ((vip-ESC-event-p first-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 ;; put keys following ESC on the unread list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 ;; and return ESC as the key-sequence
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 (vip-set-unread-command-events (subseq keyseq 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 (setq last-input-event event
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 keyseq (if vip-emacs-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630 "\e"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 (vector (character-to-event ?\e)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 ((and vip-xemacs-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 (key-press-event-p first-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 (equal '(meta) key-mod))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 (vip-set-unread-command-events
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 (vconcat (vector
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 (character-to-event (event-key first-key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 (subseq keyseq 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639 (setq last-input-event event
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 keyseq (vector (character-to-event ?\e))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 ((eventp first-key)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1642 (setq last-command-event (vip-copy-event first-key)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 ) ; end progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646 ;; this is escape event with nothing after it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647 ;; put in unread-command-event and then re-read
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 (vip-set-unread-command-events event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 (setq keyseq
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 (funcall (ad-get-orig-definition 'read-key-sequence) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 ;; not an escape event
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653 (setq keyseq (vector event)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 keyseq))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 (defadvice read-key-sequence (around vip-read-keyseq-ad activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 "Harness to work for Viper. This advice is harmless---don't worry!"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660 (let (inhibit-quit event keyseq)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 (setq keyseq ad-do-it)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662 (setq event (if vip-xemacs-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 (elt keyseq 0) ; XEmacs returns vector of events
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664 (elt (listify-key-sequence keyseq) 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 (if (vip-ESC-event-p event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 (let (unread-command-events)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 (vip-set-unread-command-events keyseq)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 (if (vip-fast-keysequence-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 (let ((vip-vi-global-user-minor-mode nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 (vip-vi-local-user-minor-mode nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671 (vip-replace-minor-mode nil) ; actually unnecessary
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 (vip-insert-global-user-minor-mode nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673 (vip-insert-local-user-minor-mode nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 (setq keyseq ad-do-it))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 (setq keyseq ad-do-it))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 keyseq))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 (defadvice describe-key (before vip-read-keyseq-ad protect activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 "Force to read key via `read-key-sequence'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 (interactive (list (vip-events-to-keys
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 (read-key-sequence "Describe key: ")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 (defadvice describe-key-briefly (before vip-read-keyseq-ad protect activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 "Force to read key via `read-key-sequence'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 (interactive (list (vip-events-to-keys
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 (read-key-sequence "Describe key briefly: ")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 ;; Listen to ESC key.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 ;; If a sequence of keys starting with ESC is issued with very short delays,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 ;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 (defun vip-intercept-ESC-key ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692 "Function that implements ESC key in Viper emulation of Vi."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 (let ((cmd (or (key-binding (vip-envelop-ESC-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 '(lambda () (interactive) (error "")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 ;; call the actual function to execute ESC (if no other symbols followed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 ;; or the key bound to the ESC sequence (if the sequence was issued
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 ;; with very short delay between characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 (if (eq cmd 'vip-intercept-ESC-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 (setq cmd
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702 (cond ((eq vip-current-state 'vi-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 'vip-ESC)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 ((eq vip-current-state 'insert-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 'vip-exit-insert-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 ((eq vip-current-state 'replace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 'vip-replace-state-exit-cmd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 (t 'vip-change-state-to-vi)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 (call-interactively cmd)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 ;; prefix argument for Vi mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 ;; In Vi mode, prefix argument is a dotted pair (NUM . COM) where NUM
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 ;; represents the numeric value of the prefix argument and COM represents
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 ;; command prefix such as "c", "d", "m" and "y".
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 ;; Get value part of prefix-argument ARG.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 (defsubst vip-p-val (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 (cond ((null arg) 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 ((consp arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 (if (or (null (car arg)) (equal (car arg) '(nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 1 (car arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 (t arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 ;; Get raw value part of prefix-argument ARG.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 (defsubst vip-P-val (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 (cond ((consp arg) (car arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 (t arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 ;; Get com part of prefix-argument ARG.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 (defsubst vip-getcom (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 (cond ((null arg) nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 ((consp arg) (cdr arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 (t nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 ;; Get com part of prefix-argument ARG and modify it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 (defun vip-getCom (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741 (let ((com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 (cond ((equal com ?c) ?C)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 ((equal com ?d) ?D)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744 ((equal com ?y) ?Y)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745 (t com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 ;; Compute numeric prefix arg value.
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1749 ;; Invoked by EVENT. COM is the command part obtained so far.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 (defun vip-prefix-arg-value (event com)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1751 (let (value func)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 ;; read while number
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 (while (and (vip-characterp event) (>= event ?0) (<= event ?9))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 (setq value (+ (* (if (vip-characterp value) value 0) 10) (- event ?0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 (setq event (vip-read-event-convert-to-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 (setq prefix-arg value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758 (if com (setq prefix-arg (cons prefix-arg com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 (while (eq event ?U)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 (vip-describe-arg prefix-arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 (setq event (vip-read-event-convert-to-char)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1762
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1763 (if (or com (and (not (eq vip-current-state 'vi-state))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1764 ;; make sure it is a Vi command
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1765 (vip-characterp event) (vip-vi-command-p event)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1766 ))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1767 ;; If appears to be one of the vi commands,
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1768 ;; then execute it with funcall and clear prefix-arg in order to not
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1769 ;; confuse subsequent commands
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1770 (progn
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1771 ;; last-command-char is the char we want emacs to think was typed
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1772 ;; last. If com is not nil, the vip-digit-argument command was called
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1773 ;; from within vip-prefix-arg command, such as `d', `w', etc., i.e.,
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1774 ;; the user typed, say, d2. In this case, `com' would be `d', `w',
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1775 ;; etc.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1776 ;; If vip-digit-argument was invoked by vip-escape-to-vi (which is
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1777 ;; indicated by the fact that the current state is not vi-state,
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1778 ;; then `event' represents the vi command to be executed (e.g., `d',
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1779 ;; `w', etc). Again, last-command-char must make emacs believe that
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1780 ;; this is the command we typed.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1781 (setq last-command-char (or com event))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1782 (setq func (vip-exec-form-in-vi
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1783 (` (key-binding (char-to-string (, event))))))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1784 (funcall func prefix-arg)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1785 (setq prefix-arg nil))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1786 ;; some other command -- let emacs do it in its own way
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1787 (vip-set-unread-command-events event))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1788 ))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1789
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 ;; Vi operator as prefix argument."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 (defun vip-prefix-arg-com (char value com)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1793 (let ((cont t)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1794 cmd-info mv-or-digit-cmd)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 (while (and cont
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 (memq char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 (list ?c ?d ?y ?! ?< ?> ?= ?# ?r ?R ?\"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 vip-buffer-search-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 ;; this means that we already have a command character, so we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 ;; construct a com list and exit while. however, if char is "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 ;; it is an error.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 ;; new com is (CHAR . OLDCOM)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 (if (memq char '(?# ?\")) (error ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 (setq com (cons char com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 (setq cont nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 ;; If com is nil we set com as char, and read more. Again, if char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 ;; is ", we read the name of register and store it in vip-use-register.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 ;; if char is !, =, or #, a complete com is formed so we exit the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 ;; while loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 (cond ((memq char '(?! ?=))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 (setq com char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 (setq char (read-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 (setq cont nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 ((= char ?#)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817 ;; read a char and encode it as com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 (setq com (+ 128 (read-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 (setq char (read-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820 ((= char ?\")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 (let ((reg (read-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 (if (vip-valid-register reg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823 (setq vip-use-register reg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824 (error ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 (setq char (read-char))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 (setq com char)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1828 (setq char (read-char))))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1829
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 (if (atom com)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1831 ;; `com' is a single char, so we construct the command argument
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1832 ;; and if `char' is `?', we describe the arg; otherwise
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1833 ;; we prepare the command that will be executed at the end.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 (progn
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1835 (setq cmd-info (cons value com))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 (while (= char ?U)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1837 (vip-describe-arg cmd-info)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 (setq char (read-char)))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1839 ;; `char' is a movement command or a digit arg command---so we execute
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1840 ;; it at the very end
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1841 (setq mv-or-digit-cmd
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1842 (vip-exec-form-in-vi
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1843 (` (key-binding (char-to-string (, char)))))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1844
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 ;; as com is non-nil, this means that we have a command to execute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 (if (memq (car com) '(?r ?R))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 ;; execute apropriate region command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 (let ((char (car com)) (com (cdr com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 (setq prefix-arg (cons value com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 (if (= char ?r) (vip-region prefix-arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 (vip-Region prefix-arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 ;; reset prefix-arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 (setq prefix-arg nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 ;; otherwise, reset prefix arg and call appropriate command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 (setq value (if (null value) 1 value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 (setq prefix-arg nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 (cond ((equal com '(?c . ?c)) (vip-line (cons value ?C)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 ((equal com '(?d . ?d)) (vip-line (cons value ?D)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 ((equal com '(?d . ?y)) (vip-yank-defun))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 ((equal com '(?y . ?y)) (vip-line (cons value ?Y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 ((equal com '(?< . ?<)) (vip-line (cons value ?<)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 ((equal com '(?> . ?>)) (vip-line (cons value ?>)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 ((equal com '(?! . ?!)) (vip-line (cons value ?!)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 ((equal com '(?= . ?=)) (vip-line (cons value ?=)))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1865 (t (error "")))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1866
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1867 (if mv-or-digit-cmd
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1868 (progn
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1869 (setq last-command-char char)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1870 (setq last-command-event
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1871 (vip-copy-event
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1872 (if vip-xemacs-p (character-to-event char) char)))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1873 (funcall mv-or-digit-cmd cmd-info)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1874 ))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 (defun vip-describe-arg (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877 (let (val com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 (setq val (vip-P-val arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 com (vip-getcom arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 (if (null val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 (if (null com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 (message "Value is nil, and command is nil")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 (message "Value is nil, and command is `%c'" com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 (if (null com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 (message "Value is `%d', and command is nil" val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886 (message "Value is `%d', and command is `%c'" val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1887
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1888 (defun vip-digit-argument (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 "Begin numeric argument for the next command."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 (vip-leave-region-active)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1892 (vip-prefix-arg-value
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
1893 last-command-char (if (consp arg) (cdr arg) nil)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 (defun vip-command-argument (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 "Accept a motion command as an argument."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 (interactive "P")
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1898 (let ((vip-inside-command-argument-action t))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1899 (condition-case nil
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1900 (vip-prefix-arg-com
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1901 last-command-char
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1902 (cond ((null arg) nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1903 ((consp arg) (car arg))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1904 ((integerp arg) arg)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1905 (t (error vip-InvalidCommandArgument)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1906 (cond ((null arg) nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1907 ((consp arg) (cdr arg))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1908 ((integerp arg) nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1909 (t (error vip-InvalidCommandArgument))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1910 (quit (setq vip-use-register nil)
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1911 (signal 'quit nil)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1912 (vip-deactivate-mark)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 ;; repeat last destructive command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 ;; Append region to text in register REG.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 ;; START and END are buffer positions indicating what to append.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919 (defsubst vip-append-to-register (reg start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 (set-register reg (concat (if (stringp (get-register reg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 (get-register reg) "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922 (buffer-substring start end))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924 ;; Saves last inserted text for possible use by vip-repeat command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 (defun vip-save-last-insertion (beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 (setq vip-last-insertion (buffer-substring beg end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 (or (< (length vip-d-com) 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 (setcar (nthcdr 4 vip-d-com) vip-last-insertion))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 (or (null vip-command-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930 (ring-empty-p vip-command-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 (setcar (nthcdr 4 (vip-current-ring-item vip-command-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933 vip-last-insertion)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934 ;; del most recent elt, if identical to the second most-recent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 (vip-cleanup-ring vip-command-ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 (defsubst vip-yank-last-insertion ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 "Inserts the text saved by the previous vip-save-last-insertion command."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941 (insert vip-last-insertion)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 (error nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 ;; define functions to be executed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 ;; invoked by the `C' command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 (defun vip-exec-change (m-com com)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1949 (or (and (markerp vip-com-point) (marker-position vip-com-point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1950 (set-marker vip-com-point (point) (current-buffer)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 ;; handle C cmd at the eol and at eob.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 (if (or (and (eolp) (= vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 (= vip-com-point (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 (insert " ")(backward-char 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 (if (= vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 (vip-forward-char-carefully))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 (if (= com ?c)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 (vip-change vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 (vip-change-subr vip-com-point (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 ;; this is invoked by vip-substitute-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 (defun vip-exec-Change (m-com com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 (set-mark vip-com-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 (vip-enlarge-region (mark t) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 (cond ((vip-valid-register vip-use-register '(letter digit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 ;;(vip-valid-register vip-use-register '(letter)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 (copy-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 vip-use-register (mark t) (point) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973 ((vip-valid-register vip-use-register '(Letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 (vip-append-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 (downcase vip-use-register) (mark t) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 (t (setq vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 (error vip-InvalidRegister vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 (setq vip-use-register nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 (delete-region (mark t) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 (open-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981 (if (= com ?C) (vip-change-mode-to-insert) (vip-yank-last-insertion)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 (defun vip-exec-delete (m-com com)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1984 (or (and (markerp vip-com-point) (marker-position vip-com-point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
1985 (set-marker vip-com-point (point) (current-buffer)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 (cond ((vip-valid-register vip-use-register '(letter digit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 ;;(vip-valid-register vip-use-register '(letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 (copy-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 vip-use-register vip-com-point (point) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992 ((vip-valid-register vip-use-register '(Letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993 (vip-append-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 (downcase vip-use-register) vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 (t (setq vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 (error vip-InvalidRegister vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 (setq vip-use-register nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 (setq last-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 (if (eq last-command 'd-command) 'kill-region nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000 (kill-region vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 (setq this-command 'd-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 (if vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 (if (and (eolp) (not (bolp))) (backward-char 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 (defun vip-exec-Delete (m-com com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007 (set-mark vip-com-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008 (vip-enlarge-region (mark t) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 (cond ((vip-valid-register vip-use-register '(letter digit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 ;;(vip-valid-register vip-use-register '(letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013 (copy-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014 vip-use-register (mark t) (point) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015 ((vip-valid-register vip-use-register '(Letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 (vip-append-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 (downcase vip-use-register) (mark t) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 (t (setq vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 (error vip-InvalidRegister vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020 (setq vip-use-register nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021 (setq last-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 (if (eq last-command 'D-command) 'kill-region nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 (kill-region (mark t) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 (if (eq m-com 'vip-line) (setq this-command 'D-command)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 (back-to-indentation))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 (defun vip-exec-yank (m-com com)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
2028 (or (and (markerp vip-com-point) (marker-position vip-com-point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
2029 (set-marker vip-com-point (point) (current-buffer)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 (cond ((vip-valid-register vip-use-register '(letter digit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 ;; (vip-valid-register vip-use-register '(letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 (copy-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 vip-use-register vip-com-point (point) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 ((vip-valid-register vip-use-register '(Letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 (vip-append-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038 (downcase vip-use-register) vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 (t (setq vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 (error vip-InvalidRegister vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041 (setq vip-use-register nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 (setq last-command nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 (copy-region-as-kill vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 (goto-char vip-com-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046 (defun vip-exec-Yank (m-com com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 (set-mark vip-com-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 (vip-enlarge-region (mark t) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 (cond ((vip-valid-register vip-use-register '(letter digit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 (copy-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 vip-use-register (mark t) (point) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 ((vip-valid-register vip-use-register '(Letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056 (vip-append-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057 (downcase vip-use-register) (mark t) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 (t (setq vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 (error vip-InvalidRegister vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 (setq vip-use-register nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 (setq last-command nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 (copy-region-as-kill (mark t) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063 (vip-deactivate-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 (goto-char vip-com-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 (defun vip-exec-bang (m-com com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068 (set-mark vip-com-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 (vip-enlarge-region (mark t) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 (shell-command-on-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 (mark t) (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 (if (= com ?!)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 (setq vip-last-shell-com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 (vip-read-string-with-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 "!"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 'vip-shell-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 (car vip-shell-history)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 vip-last-shell-com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 (defun vip-exec-equals (m-com com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 (set-mark vip-com-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 (vip-enlarge-region (mark t) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 (if (> (mark t) (point)) (exchange-point-and-mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088 (indent-region (mark t) (point) nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 (defun vip-exec-shift (m-com com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092 (set-mark vip-com-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 (vip-enlarge-region (mark t) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 (if (> (mark t) (point)) (exchange-point-and-mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 (indent-rigidly (mark t) (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 (if (= com ?>)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 vip-shift-width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 (- vip-shift-width))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099 ;; return point to where it was before shift
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 (goto-char vip-com-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 ;; this is needed because some commands fake com by setting it to ?r, which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 ;; denotes repeated insert command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 (defsubst vip-exec-dummy (m-com com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107 (defun vip-exec-buffer-search (m-com com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 (setq vip-s-string (buffer-substring (point) vip-com-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 (setq vip-s-forward t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110 (setq vip-search-history (cons vip-s-string vip-search-history))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 (vip-search vip-s-string vip-s-forward 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 (defvar vip-exec-array (make-vector 128 nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 ;; Using a dispatch array allows adding functions like buffer search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 ;; without affecting other functions. Buffer search can now be bound
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 ;; to any character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119 (aset vip-exec-array ?c 'vip-exec-change)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 (aset vip-exec-array ?C 'vip-exec-Change)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121 (aset vip-exec-array ?d 'vip-exec-delete)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 (aset vip-exec-array ?D 'vip-exec-Delete)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 (aset vip-exec-array ?y 'vip-exec-yank)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 (aset vip-exec-array ?Y 'vip-exec-Yank)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 (aset vip-exec-array ?r 'vip-exec-dummy)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 (aset vip-exec-array ?! 'vip-exec-bang)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 (aset vip-exec-array ?< 'vip-exec-shift)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128 (aset vip-exec-array ?> 'vip-exec-shift)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 (aset vip-exec-array ?= 'vip-exec-equals)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 ;; This function is called by various movement commands to execute a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134 ;; destructive command on the region specified by the movement command. For
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 ;; instance, if the user types cw, then the command vip-forward-word will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 ;; call vip-execute-com to execute vip-exec-change, which eventually will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 ;; call vip-change to invoke the replace mode on the region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 ;; The list (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS) is set to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140 ;; vip-d-com for later use by vip-repeat.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 (defun vip-execute-com (m-com val com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 (let ((reg vip-use-register))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143 ;; this is the special command `#'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 (if (> com 128)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145 (vip-special-prefix-com (- com 128))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 (let ((fn (aref vip-exec-array (if (< com 0) (- com) com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 (if (null fn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 (error "%c: %s" com vip-InvalidViCommand)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 (funcall fn m-com com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 (if (vip-dotable-command-p com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 (vip-set-destructive-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152 (list m-com val
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 (if (memq com (list ?c ?C ?!)) (- com) com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 reg nil nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 (defun vip-repeat (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 "Re-execute last destructive command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 Use the info in vip-d-com, which has the form
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 \(com val ch reg inserted-text command-keys\),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 where `com' is the command to be re-executed, `val' is the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 argument to `com', `ch' is a flag for repeat, and `reg' is optional;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 if it exists, it is the name of the register for `com'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165 If the prefix argument, ARG, is non-nil, it is used instead of `val'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 (let ((save-point (point)) ; save point before repeating prev cmd
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 ;; Pass along that we are repeating a destructive command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169 ;; This tells vip-set-destructive-command not to update
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 ;; vip-command-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171 (vip-intermediate-command 'vip-repeat))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172 (if (eq last-command 'vip-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 ;; if the last command was vip-undo, then undo-more
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 (vip-undo-more)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 ;; otherwise execute the command stored in vip-d-com. if arg is non-nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 ;; its prefix value is used as new prefix value for the command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 (let ((m-com (car vip-d-com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 (val (vip-P-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 (com (nth 2 vip-d-com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180 (reg (nth 3 vip-d-com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181 (if (null val) (setq val (nth 1 vip-d-com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 (if (null m-com) (error "No previous command to repeat."))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 (setq vip-use-register reg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 (if (nth 4 vip-d-com) ; text inserted by command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 (setq vip-last-insertion (nth 4 vip-d-com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 vip-d-char (nth 4 vip-d-com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187 (funcall m-com (cons val com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 (if (and vip-keep-point-on-repeat (< save-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189 (goto-char save-point)) ; go back to before repeat.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190 (if (and (eolp) (not (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 (backward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2193 (if vip-undo-needs-adjustment (vip-adjust-undo)) ; take care of undo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2194 ;; If the prev cmd was rotating the command ring, this means that `.' has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195 ;; just executed a command from that ring. So, push it on the ring again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196 ;; If we are just executing previous command , then don't push vip-d-com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2197 ;; because vip-d-com is not fully constructed in this case (its keys and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2198 ;; the inserted text may be nil). Besides, in this case, the command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2199 ;; executed by `.' is already on the ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2200 (if (eq last-command 'vip-display-current-destructive-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2201 (vip-push-onto-ring vip-d-com 'vip-command-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2202 (vip-deactivate-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2203 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 (defun vip-repeat-from-history ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 "Repeat a destructive command from history.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207 Doesn't change vip-command-ring in any way, so `.' will work as before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208 executing this command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2209 This command is supposed to be bound to a two-character Vi macro where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2210 the second character is a digit 0 to 9. The digit indicates which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2211 history command to execute. `<char>0' is equivalent to `.', `<char>1'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2212 invokes the command before that, etc."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2213 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2214 (let* ((vip-intermediate-command 'repeating-display-destructive-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2215 (idx (cond (vip-this-kbd-macro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2216 (string-to-number
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2217 (symbol-name (elt vip-this-kbd-macro 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2218 (t 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2219 (num idx)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2220 (vip-d-com vip-d-com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2222 (or (and (numberp num) (<= 0 num) (<= num 9))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2223 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2224 (setq idx 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2225 num 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2226 (message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2227 "`vip-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2228 (while (< 0 num)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2229 (setq vip-d-com (vip-special-ring-rotate1 vip-command-ring -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2230 (setq num (1- num)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2231 (vip-repeat nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2232 (while (> idx num)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2233 (vip-special-ring-rotate1 vip-command-ring 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2234 (setq num (1+ num)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2235 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2237
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
2238 ;; The hash-command. It is invoked interactively by the key sequence #<char>.
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
2239 ;; The chars that can follow `#' are determined by vip-hash-command-p
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2240 (defun vip-special-prefix-com (char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2241 (cond ((= char ?c)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2242 (downcase-region (min vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2243 (max vip-com-point (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2244 ((= char ?C)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2245 (upcase-region (min vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2246 (max vip-com-point (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2247 ((= char ?g)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2248 (push-mark vip-com-point t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2249 (vip-global-execute))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2250 ((= char ?q)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2251 (push-mark vip-com-point t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2252 (vip-quote-region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2253 ((= char ?s) (funcall vip-spell-function vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2254 (t (error "#%c: %s" char vip-InvalidViCommand))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2255
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2256
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2257 ;; undoing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2259 (defun vip-undo ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2260 "Undo previous change."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2261 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2262 (message "undo!")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2263 (let ((modified (buffer-modified-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2264 (before-undo-pt (point-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2265 (after-change-functions after-change-functions)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2266 undo-beg-posn undo-end-posn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2267
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2268 ;; no need to remove this hook, since this var has scope inside a let.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2269 (add-hook 'after-change-functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2270 '(lambda (beg end len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2271 (setq undo-beg-posn beg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2272 undo-end-posn (or end beg))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2273
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2274 (undo-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2275 (undo-more 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2276 (setq undo-beg-posn (or undo-beg-posn before-undo-pt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2277 undo-end-posn (or undo-end-posn undo-beg-posn))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2279 (goto-char undo-beg-posn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2280 (sit-for 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2281 (if (and vip-keep-point-on-undo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2282 (pos-visible-in-window-p before-undo-pt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2283 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2284 (push-mark (point-marker) t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2285 (vip-sit-for-short 300)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2286 (goto-char undo-end-posn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2287 (vip-sit-for-short 300)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2288 (if (and (> (abs (- undo-beg-posn before-undo-pt)) 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2289 (> (abs (- undo-end-posn before-undo-pt)) 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2290 (goto-char before-undo-pt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2291 (goto-char undo-beg-posn)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2292 (push-mark before-undo-pt t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2293 (if (and (eolp) (not (bolp))) (backward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2294 (if (not modified) (set-buffer-modified-p t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2295 (setq this-command 'vip-undo))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2297 ;; Continue undoing previous changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2298 (defun vip-undo-more ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2299 (message "undo more!")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2300 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2301 (undo-more 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2302 (error (beep)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2303 (message "No further undo information in this buffer")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2304 (if (and (eolp) (not (bolp))) (backward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2305 (setq this-command 'vip-undo))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2307 ;; The following two functions are used to set up undo properly.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2308 ;; In VI, unlike Emacs, if you open a line, say, and add a bunch of lines,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2309 ;; they are undone all at once.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2310 (defun vip-adjust-undo ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2311 (let ((inhibit-quit t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2312 tmp tmp2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2313 (setq vip-undo-needs-adjustment nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2314 (if (listp buffer-undo-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2315 (if (setq tmp (memq vip-buffer-undo-list-mark buffer-undo-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2316 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2317 (setq tmp2 (cdr tmp)) ; the part after mark
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2319 ;; cut tail from buffer-undo-list temporarily by direct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2320 ;; manipulation with pointers in buffer-undo-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2321 (setcdr tmp nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2323 (setq buffer-undo-list (delq nil buffer-undo-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2324 (setq buffer-undo-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2325 (delq vip-buffer-undo-list-mark buffer-undo-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2326 ;; restore tail of buffer-undo-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2327 (setq buffer-undo-list (nconc buffer-undo-list tmp2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2328 (setq buffer-undo-list (delq nil buffer-undo-list))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2331 (defun vip-set-complex-command-for-undo ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2332 (if (listp buffer-undo-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2333 (if (not vip-undo-needs-adjustment)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2334 (let ((inhibit-quit t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2335 (setq buffer-undo-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2336 (cons vip-buffer-undo-list-mark buffer-undo-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2337 (setq vip-undo-needs-adjustment t)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2338
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2339
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2342 (defun vip-display-current-destructive-command ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2343 (let ((text (nth 4 vip-d-com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2344 (keys (nth 5 vip-d-com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2345 (max-text-len 30))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2347 (setq this-command 'vip-display-current-destructive-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2349 (message " `.' runs %s%s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2350 (concat "`" (vip-array-to-string keys) "'")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2351 (vip-abbreviate-string text max-text-len
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2352 " inserting `" "'" " ......."))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2353 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2355
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2356 ;; don't change vip-d-com if it was vip-repeat command invoked with `.'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2357 ;; or in some other way (non-interactively).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2358 (defun vip-set-destructive-command (list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2359 (or (eq vip-intermediate-command 'vip-repeat)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2360 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2361 (setq vip-d-com list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2362 (setcar (nthcdr 5 vip-d-com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2363 (vip-array-to-string (this-command-keys)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2364 (vip-push-onto-ring vip-d-com 'vip-command-ring))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2365
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2366 (defun vip-prev-destructive-command (next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2367 "Find previous destructive command in the history of destructive commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2368 With prefix argument, find next destructive command."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2369 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2370 (let (cmd vip-intermediate-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2371 (if (eq last-command 'vip-display-current-destructive-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2372 ;; repeated search through command history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2373 (setq vip-intermediate-command 'repeating-display-destructive-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2374 ;; first search through command history--set temp ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2375 (setq vip-temp-command-ring (copy-list vip-command-ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2376 (setq cmd (if next
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2377 (vip-special-ring-rotate1 vip-temp-command-ring 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2378 (vip-special-ring-rotate1 vip-temp-command-ring -1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2379 (if (null cmd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2380 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2381 (setq vip-d-com cmd))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2382 (vip-display-current-destructive-command)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2383
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2384 (defun vip-next-destructive-command ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2385 "Find next destructive command in the history of destructive commands."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2386 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2387 (vip-prev-destructive-command 'next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2389 (defun vip-insert-prev-from-insertion-ring (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2390 "Cycle through insertion ring in the direction of older insertions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2391 Undoes previous insertion and inserts new.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2392 With prefix argument, cycles in the direction of newer elements.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2393 In minibuffer, this command executes whatever the invocation key is bound
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2394 to in the global map, instead of cycling through the insertion ring."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2395 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2396 (let (vip-intermediate-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2397 (if (eq last-command 'vip-insert-from-insertion-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2398 (progn ; repeated search through insertion history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2399 (setq vip-intermediate-command 'repeating-insertion-from-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2400 (if (eq vip-current-state 'replace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2401 (undo 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2402 (if vip-last-inserted-string-from-insertion-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2403 (backward-delete-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2404 (length vip-last-inserted-string-from-insertion-ring))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2405 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2406 ;;first search through insertion history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2407 (setq vip-temp-insertion-ring (copy-list vip-insertion-ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2408 (setq this-command 'vip-insert-from-insertion-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2409 ;; so that things will be undone properly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2410 (setq buffer-undo-list (cons nil buffer-undo-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2411 (setq vip-last-inserted-string-from-insertion-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2412 (vip-special-ring-rotate1 vip-temp-insertion-ring (if arg 1 -1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2414 ;; this change of vip-intermediate-command must come after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2415 ;; vip-special-ring-rotate1, so that the ring will rotate, but before the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2416 ;; insertion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2417 (setq vip-intermediate-command nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2418 (if vip-last-inserted-string-from-insertion-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2419 (insert vip-last-inserted-string-from-insertion-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2420 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2421
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2422 (defun vip-insert-next-from-insertion-ring ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2423 "Cycle through insertion ring in the direction of older insertions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2424 Undo previous insertion and inserts new."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2425 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2426 (vip-insert-prev-from-insertion-ring 'next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2428
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2429 ;; some region utilities
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2431 ;; If at the last line of buffer, add \\n before eob, if newline is missing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2432 (defun vip-add-newline-at-eob-if-necessary ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2433 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2434 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2435 ;; make sure all lines end with newline, unless in the minibuffer or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2436 ;; when requested otherwise (require-final-newline is nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2437 (if (and (eobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2438 (not (bolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2439 require-final-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2440 (not (vip-is-in-minibuffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2441 (not buffer-read-only))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2442 (insert "\n"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2444 (defun vip-yank-defun ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2445 (mark-defun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2446 (copy-region-as-kill (point) (mark t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2448 ;; Enlarge region between BEG and END.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2449 (defun vip-enlarge-region (beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2450 (or beg (setq beg end)) ; if beg is nil, set to end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2451 (or end (setq end beg)) ; if end is nil, set to beg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2453 (if (< beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2454 (progn (goto-char beg) (set-mark end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2455 (goto-char end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2456 (set-mark beg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2457 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2458 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2459 (if (or (not (eobp)) (not (bolp))) (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2460 (if (not (eobp)) (beginning-of-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2461 (if (> beg end) (exchange-point-and-mark)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2464 ;; Quote region by each line with a user supplied string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2465 (defun vip-quote-region ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2466 (setq vip-quote-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2467 (vip-read-string-with-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2468 "Quote string: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2469 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2470 'vip-quote-region-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2471 vip-quote-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2472 (vip-enlarge-region (point) (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2473 (if (> (point) (mark t)) (exchange-point-and-mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2474 (insert vip-quote-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2475 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2476 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2477 (while (and (< (point) (mark t)) (bolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2478 (insert vip-quote-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2479 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2480 (forward-line 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2481
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2482 ;; Tells whether BEG is on the same line as END.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2483 ;; If one of the args is nil, it'll return nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2484 (defun vip-same-line (beg end)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2485 (let ((selective-display nil)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2486 (incr 0)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2487 temp)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2488 (if (and beg end (> beg end))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2489 (setq temp beg
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2490 beg end
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2491 end temp))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2492 (if (and beg end)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2493 (cond ((or (> beg (point-max)) (> end (point-max))) ; out of range
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2494 nil)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2495 (t
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2496 ;; This 'if' is needed because Emacs treats the next empty line
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2497 ;; as part of the previous line.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2498 (if (= (vip-line-pos 'start) end)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2499 (setq incr 1))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2500 (<= (+ incr (count-lines beg end)) 1))))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2501 ))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
2502
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
2503
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2504 ;; Check if the string ends with a newline.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2505 (defun vip-end-with-a-newline-p (string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2506 (or (string= string "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2507 (= (vip-seq-last-elt string) ?\n)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2508
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2509 (defun vip-tmp-insert-at-eob (msg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2510 (let ((savemax (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2511 (goto-char savemax)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2512 (insert msg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2513 (sit-for 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2514 (goto-char savemax) (delete-region (point) (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2515 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2516
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2519 ;;; Minibuffer business
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2521 (defsubst vip-set-minibuffer-style ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2522 (add-hook 'minibuffer-setup-hook 'vip-minibuffer-setup-sentinel))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2524
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2525 (defun vip-minibuffer-setup-sentinel ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2526 (let ((hook (if vip-vi-style-in-minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2527 'vip-change-state-to-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2528 'vip-change-state-to-emacs)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2529 (funcall hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2530 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2532 ;; Interpret last event in the local map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2533 (defun vip-exit-minibuffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2534 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2535 (let (command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2536 (setq command (local-key-binding (char-to-string last-command-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2537 (if command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2538 (command-execute command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2539 (exit-minibuffer))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2540
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2542 (defun vip-set-search-face ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2543 (if (vip-has-face-support-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2544 (defvar vip-search-face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2545 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2546 (make-face 'vip-search-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2547 (vip-hide-face 'vip-search-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2548 (or (face-differs-from-default-p 'vip-search-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2549 ;; face wasn't set in .vip or .Xdefaults
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2550 (if (vip-can-use-colors "Black" "khaki")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2551 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2552 (set-face-background 'vip-search-face "khaki")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2553 (set-face-foreground 'vip-search-face "Black"))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2554 (set-face-underline-p 'vip-search-face t)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2555 (vip-set-face-pixmap 'vip-search-face vip-search-face-pixmap)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2556 'vip-search-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2557 "*Face used to flash out the search pattern.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2558 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2559
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2560
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2561 (defun vip-set-minibuffer-faces ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2562 (if (not (vip-has-face-support-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2563 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2564 (defvar vip-minibuffer-emacs-face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2565 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2566 (make-face 'vip-minibuffer-emacs-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2567 (vip-hide-face 'vip-minibuffer-emacs-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2568 (or (face-differs-from-default-p 'vip-minibuffer-emacs-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2569 ;; face wasn't set in .vip or .Xdefaults
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2570 (if vip-vi-style-in-minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2571 ;; emacs state is an exception in the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2572 (if (vip-can-use-colors "darkseagreen2" "Black")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2573 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2574 (set-face-background
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2575 'vip-minibuffer-emacs-face "darkseagreen2")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2576 (set-face-foreground
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2577 'vip-minibuffer-emacs-face "Black"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2578 (copy-face 'modeline 'vip-minibuffer-emacs-face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2579 ;; emacs state is the main state in the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2580 (if (vip-can-use-colors "Black" "pink")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2581 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2582 (set-face-background 'vip-minibuffer-emacs-face "pink")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2583 (set-face-foreground
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2584 'vip-minibuffer-emacs-face "Black"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2585 (copy-face 'italic 'vip-minibuffer-emacs-face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2586 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2587 'vip-minibuffer-emacs-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2588 "Face used in the Minibuffer when it is in Emacs state.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2590 (defvar vip-minibuffer-insert-face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2591 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2592 (make-face 'vip-minibuffer-insert-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2593 (vip-hide-face 'vip-minibuffer-insert-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2594 (or (face-differs-from-default-p 'vip-minibuffer-insert-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2595 (if vip-vi-style-in-minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2596 (if (vip-can-use-colors "Black" "pink")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2597 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2598 (set-face-background 'vip-minibuffer-insert-face "pink")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2599 (set-face-foreground
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2600 'vip-minibuffer-insert-face "Black"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2601 (copy-face 'italic 'vip-minibuffer-insert-face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2602 ;; If Insert state is an exception
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2603 (if (vip-can-use-colors "darkseagreen2" "Black")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2604 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2605 (set-face-background
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2606 'vip-minibuffer-insert-face "darkseagreen2")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2607 (set-face-foreground
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2608 'vip-minibuffer-insert-face "Black"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2609 (copy-face 'modeline 'vip-minibuffer-insert-face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2610 (vip-italicize-face 'vip-minibuffer-insert-face)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2611 'vip-minibuffer-insert-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2612 "Face used in the Minibuffer when it is in Insert state.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2613
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2614 (defvar vip-minibuffer-vi-face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2615 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2616 (make-face 'vip-minibuffer-vi-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2617 (vip-hide-face 'vip-minibuffer-vi-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2618 (or (face-differs-from-default-p 'vip-minibuffer-vi-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2619 (if vip-vi-style-in-minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2620 (if (vip-can-use-colors "Black" "grey")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2621 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2622 (set-face-background 'vip-minibuffer-vi-face "grey")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2623 (set-face-foreground 'vip-minibuffer-vi-face "Black"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2624 (copy-face 'bold 'vip-minibuffer-vi-face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2625 (copy-face 'bold 'vip-minibuffer-vi-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2626 (invert-face 'vip-minibuffer-vi-face)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2627 'vip-minibuffer-vi-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2628 "Face used in the Minibuffer when it is in Vi state.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2630 ;; the current face used in the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2631 (vip-deflocalvar vip-minibuffer-current-face vip-minibuffer-emacs-face "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2632 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2633
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2634
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2636 ;;; Reading string with history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2637
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2638 (defun vip-read-string-with-history (prompt &optional initial
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2639 history-var default keymap)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2640 ;; Read string, prompting with PROMPT and inserting the INITIAL
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2641 ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2642 ;; input is an empty string. Use KEYMAP, if given, or the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2643 ;; minibuffer-local-map.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2644 ;; Default value is displayed until the user types something in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2645 ;; minibuffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2646 (let ((minibuffer-setup-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2647 '(lambda ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2648 (if (stringp initial)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2649 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2650 ;; don't wait if we have unread events or in kbd macro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2651 (or unread-command-events
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2652 executing-kbd-macro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2653 (sit-for 840))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2654 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2655 (insert initial)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2656 (vip-minibuffer-setup-sentinel)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2657 (val "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2658 (padding "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2659 temp-msg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2661 (setq keymap (or keymap minibuffer-local-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2662 initial (or initial "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2663 temp-msg (if default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2664 (format "(default: %s) " default)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2665 ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2666
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2667 (setq vip-incomplete-ex-cmd nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2668 (setq val (read-from-minibuffer prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2669 (concat temp-msg initial val padding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2670 keymap nil history-var))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2671 (setq minibuffer-setup-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2672 padding (vip-array-to-string (this-command-keys))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2673 temp-msg "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2674 ;; the following tries to be smart about what to put in history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2675 (if (not (string= val (car (eval history-var))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2676 (set history-var (cons val (eval history-var))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2677 (if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2678 (string= (nth 0 (eval history-var)) ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2679 (set history-var (cdr (eval history-var))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2680 ;; If the user enters nothing but the prev cmd wasn't vip-ex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2681 ;; vip-command-argument, or `! shell-command', this probably means
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2682 ;; that the user typed something then erased. Return "" in this case, not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2683 ;; the default---the default is too confusing in this case.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2684 (cond ((and (string= val "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2685 (not (string= prompt "!")) ; was a `! shell-command'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2686 (not (memq last-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2687 '(vip-ex
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2688 vip-command-argument
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2689 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2690 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2691 "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2692 ((string= val "") (or default ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2693 (t val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2694 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2695
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2697
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2698 ;; insertion commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2699
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2700 ;; Called when state changes from Insert Vi command mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2701 ;; Repeats the insertion command if Insert state was entered with prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2702 ;; argument > 1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2703 (defun vip-repeat-insert-command ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2704 (let ((i-com (car vip-d-com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2705 (val (nth 1 vip-d-com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2706 (char (nth 2 vip-d-com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2707 (if (and val (> val 1)) ; first check that val is non-nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2708 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2709 (setq vip-d-com (list i-com (1- val) ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2710 (vip-repeat nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2711 (setq vip-d-com (list i-com val char nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2712 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2714 (defun vip-insert (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2715 "Insert before point."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2716 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2717 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2718 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2719 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2720 (vip-set-destructive-command (list 'vip-insert val ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2721 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2722 (vip-loop val (vip-yank-last-insertion))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2723 (vip-change-state-to-insert))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2724
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2725 (defun vip-append (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2726 "Append after point."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2727 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2728 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2729 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2730 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2731 (vip-set-destructive-command (list 'vip-append val ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2732 (if (not (eolp)) (forward-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2733 (if (equal com ?r)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2734 (vip-loop val (vip-yank-last-insertion))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2735 (vip-change-state-to-insert))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2736
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2737 (defun vip-Append (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2738 "Append at end of line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2739 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2740 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2741 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2742 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2743 (vip-set-destructive-command (list 'vip-Append val ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2744 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2745 (if (equal com ?r)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2746 (vip-loop val (vip-yank-last-insertion))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2747 (vip-change-state-to-insert))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2748
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2749 (defun vip-Insert (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2750 "Insert before first non-white."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2751 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2752 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2753 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2754 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2755 (vip-set-destructive-command (list 'vip-Insert val ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2756 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2757 (if (equal com ?r)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2758 (vip-loop val (vip-yank-last-insertion))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2759 (vip-change-state-to-insert))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2760
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2761 (defun vip-open-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2762 "Open line below."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2763 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2764 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2765 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2766 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2767 (vip-set-destructive-command (list 'vip-open-line val ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2768 (let ((col (current-indentation)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2769 (if (equal com ?r)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2770 (vip-loop val
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2771 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2772 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2773 (newline 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2774 (if vip-auto-indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2775 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2776 (setq vip-cted t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2777 (if vip-electric-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2778 (indent-according-to-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2779 (indent-to col))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2780 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2781 (vip-yank-last-insertion)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2782 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2783 (newline 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2784 (if vip-auto-indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2785 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2786 (setq vip-cted t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2787 (if vip-electric-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2788 (indent-according-to-mode)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2789 (indent-to col))))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2790 (vip-change-state-to-insert)))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2791
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2792 (defun vip-Open-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2793 "Open line above."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2794 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2795 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2796 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2797 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2798 (vip-set-destructive-command (list 'vip-Open-line val ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2799 (let ((col (current-indentation)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2800 (if (equal com ?r)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2801 (vip-loop val
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2802 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2803 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2804 (open-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2805 (if vip-auto-indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2806 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2807 (setq vip-cted t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2808 (if vip-electric-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2809 (indent-according-to-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2810 (indent-to col))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2811 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2812 (vip-yank-last-insertion)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2813 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2814 (open-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2815 (if vip-auto-indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2816 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2817 (setq vip-cted t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2818 (if vip-electric-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2819 (indent-according-to-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2820 (indent-to col))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2821 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2822 (vip-change-state-to-insert)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2824 (defun vip-open-line-at-point (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2825 "Open line at point."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2826 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2827 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2828 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2829 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2830 (vip-set-destructive-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2831 (list 'vip-open-line-at-point val ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2832 (if (equal com ?r)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2833 (vip-loop val
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2834 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2835 (open-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2836 (vip-yank-last-insertion)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2837 (open-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2838 (vip-change-state-to-insert))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2839
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2840 (defun vip-substitute (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2841 "Substitute characters."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2842 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2843 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2844 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2845 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2846 (forward-char val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2847 (if (equal com ?r)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2848 (vip-change-subr (mark t) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2849 (vip-change (mark t) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2850 (vip-set-destructive-command (list 'vip-substitute val ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2851 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2852
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2853 (defun vip-substitute-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2854 "Substitute lines."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2855 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2856 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2857 (vip-line (cons arg ?C)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2859 ;; Prepare for replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2860 (defun vip-start-replace ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2861 (setq vip-began-as-replace t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2862 vip-sitting-in-replace t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2863 vip-replace-chars-to-delete 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2864 vip-replace-chars-deleted 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2865 (vip-add-hook 'vip-after-change-functions 'vip-replace-mode-spy-after t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2866 (vip-add-hook 'vip-before-change-functions 'vip-replace-mode-spy-before t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2867 ;; this will get added repeatedly, but no harm
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2868 (add-hook 'after-change-functions 'vip-after-change-sentinel t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2869 (add-hook 'before-change-functions 'vip-before-change-sentinel t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2870 (vip-move-marker-locally 'vip-last-posn-in-replace-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2871 (vip-replace-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2872 (vip-add-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2873 'vip-post-command-hooks 'vip-replace-state-post-command-sentinel t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2874 (vip-add-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2875 'vip-pre-command-hooks 'vip-replace-state-pre-command-sentinel t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2876 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2877
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2878
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2879 ;; checks how many chars were deleted by the last change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2880 (defun vip-replace-mode-spy-before (beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2881 (setq vip-replace-chars-deleted
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2882 (- end beg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2883 (max 0 (- end (vip-replace-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2884 (max 0 (- (vip-replace-start) beg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2885 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2887 ;; Invoked as an after-change-function to set up parameters of the last change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2888 (defun vip-replace-mode-spy-after (beg end length)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2889 (if (memq vip-intermediate-command '(repeating-insertion-from-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2890 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2891 (setq vip-replace-chars-to-delete 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2892 (vip-move-marker-locally
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2893 'vip-last-posn-in-replace-region (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2894
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2895 (let (beg-col end-col real-end chars-to-delete)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2896 (setq real-end (min end (vip-replace-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2897 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2898 (goto-char beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2899 (setq beg-col (current-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2900 (goto-char real-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2901 (setq end-col (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2902
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2903 ;; If beg of change is outside the replacement region, then don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2904 ;; delete anything in the repl region (set chars-to-delete to 0).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2905 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2906 ;; This works fine except that we have to take special care of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2907 ;; dabbrev-expand. The problem stems from new-dabbrev.el, which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2908 ;; sometimes simply shifts the repl region rightwards, without
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2909 ;; deleting an equal amount of characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2910 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2911 ;; The reason why new-dabbrev.el causes this are this:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2912 ;; if one dinamically completes a partial word that starts before the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2913 ;; replacement region (but ends inside) then new-dabbrev.el first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2914 ;; moves cursor backwards, to the beginning of the word to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2915 ;; completed (say, pt A). Then it inserts the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2916 ;; completed word and then deletes the old, incomplete part.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2917 ;; Since the complete word is inserted at position before the repl
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2918 ;; region, the next If-statement would have set chars-to-delete to 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2919 ;; unless we check for the current command, which must be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2920 ;; dabbrev-expand.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2921 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2922 ;; In fact, it might be also useful to have overlays for insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2923 ;; regions as well, since this will let us capture the situation when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2924 ;; dabbrev-expand goes back past the insertion point to find the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2925 ;; beginning of the word to be expanded.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2926 (if (or (and (<= (vip-replace-start) beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2927 (<= beg (vip-replace-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2928 (and (= length 0) (eq this-command 'dabbrev-expand)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2929 (setq chars-to-delete
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2930 (max (- end-col beg-col) (- real-end beg) 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2931 (setq chars-to-delete 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2932
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2933 ;; if beg = last change position, it means that we are within the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2934 ;; same command that does multiple changes. Moreover, it means
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2935 ;; that we have two subsequent changes (insert/delete) that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2936 ;; complement each other.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2937 (if (= beg (marker-position vip-last-posn-in-replace-region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2938 (setq vip-replace-chars-to-delete
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2939 (- (+ chars-to-delete vip-replace-chars-to-delete)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2940 vip-replace-chars-deleted))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2941 (setq vip-replace-chars-to-delete chars-to-delete))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2942
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2943 (vip-move-marker-locally
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2944 'vip-last-posn-in-replace-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2945 (max (if (> end (vip-replace-end)) (vip-replace-start) end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2946 (or (marker-position vip-last-posn-in-replace-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2947 (vip-replace-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2948 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2949
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2950 (setq vip-replace-chars-to-delete
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2951 (max 0 (min vip-replace-chars-to-delete
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2952 (- (vip-replace-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2953 vip-last-posn-in-replace-region))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2954 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2955
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2956
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2957 ;; Delete stuff between posn and the end of vip-replace-overlay-marker, if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2958 ;; posn is within the overlay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2959 (defun vip-finish-change (posn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2960 (vip-remove-hook 'vip-after-change-functions 'vip-replace-mode-spy-after)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2961 (vip-remove-hook 'vip-before-change-functions 'vip-replace-mode-spy-before)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2962 (vip-remove-hook 'vip-post-command-hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2963 'vip-replace-state-post-command-sentinel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2964 (vip-remove-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2965 'vip-pre-command-hooks 'vip-replace-state-pre-command-sentinel)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
2966 (vip-restore-cursor-color-after-replace)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2967 (setq vip-sitting-in-replace nil) ; just in case we'll need to know it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2968 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2969 (if (and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2970 vip-replace-overlay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2971 (>= posn (vip-replace-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2972 (< posn (vip-replace-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2973 (delete-region posn (vip-replace-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2974 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2975
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2976 (if (eq vip-current-state 'replace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2977 (vip-downgrade-to-insert))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2978 ;; replace mode ended => nullify vip-last-posn-in-replace-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2979 (vip-move-marker-locally 'vip-last-posn-in-replace-region nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2980 (vip-hide-replace-overlay)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2981 (vip-refresh-mode-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2982 (vip-put-string-on-kill-ring vip-last-replace-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2983 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2985 ;; Make STRING be the first element of the kill ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2986 (defun vip-put-string-on-kill-ring (string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2987 (setq kill-ring (cons string kill-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2988 (if (> (length kill-ring) kill-ring-max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2989 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2990 (setq kill-ring-yank-pointer kill-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2992 (defun vip-finish-R-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2993 (vip-remove-hook 'vip-post-command-hooks 'vip-R-state-post-command-sentinel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2994 (vip-remove-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2995 'vip-pre-command-hooks 'vip-replace-state-pre-command-sentinel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2996 (vip-downgrade-to-insert))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2997
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2998 (defun vip-start-R-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2999 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3000 (overwrite-mode 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3001 (vip-add-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3002 'vip-post-command-hooks 'vip-R-state-post-command-sentinel t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3003 (vip-add-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3004 'vip-pre-command-hooks 'vip-replace-state-pre-command-sentinel t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3005 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3009 (defun vip-replace-state-exit-cmd ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3010 "Binding for keys that cause Replace state to switch to Vi or to Insert.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3011 These keys are ESC, RET, and LineFeed"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3012 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3013 (if overwrite-mode ;; If you are in replace mode invoked via 'R'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3014 (vip-finish-R-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3015 (vip-finish-change vip-last-posn-in-replace-region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3016 (let (com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3017 (if (eq this-command 'vip-intercept-ESC-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3018 (setq com 'vip-exit-insert-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3019 (vip-set-unread-command-events last-input-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3020 (setq com (key-binding (read-key-sequence nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3022 (condition-case conds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3023 (command-execute com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3024 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3025 (vip-message-conditions conds)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3026 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3027 (vip-hide-replace-overlay))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3029
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3030 ;; This is the function bound to 'R'---unlimited replace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3031 ;; Similar to Emacs's own overwrite-mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3032 (defun vip-overwrite (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3033 "Begin overwrite mode."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3034 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3035 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3036 (com (vip-getcom arg)) (len))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3037 (vip-set-destructive-command (list 'vip-overwrite val ?r nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3038 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3039 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3040 ;; Viper saves inserted text in vip-last-insertion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3041 (setq len (length vip-last-insertion))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3042 (delete-char len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3043 (vip-loop val (vip-yank-last-insertion)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3044 (setq last-command 'vip-overwrite)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3045 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3046 (vip-set-replace-overlay (point) (vip-line-pos 'end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3047 (vip-change-state-to-replace)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3048 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3049
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3050
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3051 ;; line commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3052
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3053 (defun vip-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3054 (let ((val (car arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3055 (com (cdr arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3056 (vip-move-marker-locally 'vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3057 (if (not (eobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3058 (vip-next-line-carefully (1- val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3059 ;; this ensures that dd, cc, D, yy will do the right thing on the last
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3060 ;; line of buffer when this line has no \n.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3061 (vip-add-newline-at-eob-if-necessary)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3062 (vip-execute-com 'vip-line val com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3063 (if (and (eobp) (not (bobp))) (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3064 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3065
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3066 (defun vip-yank-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3067 "Yank ARG lines (in Vi's sense)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3068 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3069 (let ((val (vip-p-val arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3070 (vip-line (cons val ?Y))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3073 ;; region commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3074
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3075 (defun vip-region (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3076 "Execute command on a region."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3077 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3078 (let ((val (vip-P-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3079 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3080 (vip-move-marker-locally 'vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3081 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3082 (vip-execute-com 'vip-region val com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3084 (defun vip-Region (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3085 "Execute command on a Region."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3086 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3087 (let ((val (vip-P-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3088 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3089 (vip-move-marker-locally 'vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3090 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3091 (vip-execute-com 'vip-Region val com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3092
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3093 (defun vip-replace-char (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3094 "Replace the following ARG chars by the character read."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3095 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3096 (if (and (eolp) (bolp)) (error "No character to replace here"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3097 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3098 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3099 (vip-replace-char-subr com val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3100 (if (and (eolp) (not (bolp))) (forward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3101 (vip-set-destructive-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3102 (list 'vip-replace-char val ?r nil vip-d-char nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3103 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3105 (defun vip-replace-char-subr (com arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3106 (let ((take-care-of-iso-accents
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3107 (and (boundp 'iso-accents-mode) vip-automatic-iso-accents))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3108 char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3109 (setq char (if (equal com ?r)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3110 vip-d-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3111 (read-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3112 (if (and take-care-of-iso-accents (memq char '(?' ?\" ?^ ?~)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3113 ;; get European characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3114 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3115 (iso-accents-mode 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3116 (vip-set-unread-command-events char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3117 (setq char (aref (read-key-sequence nil) 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3118 (iso-accents-mode -1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3119 (delete-char arg t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3120 (setq vip-d-char char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3121 (vip-loop (if (> arg 0) arg (- arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3122 (if (eq char ?\C-m) (insert "\n") (insert char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3123 (backward-char arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3126 ;; basic cursor movement. j, k, l, h commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3127
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3128 (defun vip-forward-char (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3129 "Move point right ARG characters (left if ARG negative).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3130 On reaching end of line, stop and signal error."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3131 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3132 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3133 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3134 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3135 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3136 (if vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3137 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3138 ;; the boundary condition check gets weird here because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3139 ;; forward-char may be the parameter of a delete, and 'dl' works
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3140 ;; just like 'x' for the last char on a line, so we have to allow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3141 ;; the forward motion before the 'vip-execute-com', but, of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3142 ;; course, 'dl' doesn't work on an empty line, so we have to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3143 ;; catch that condition before 'vip-execute-com'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3144 (if (and (eolp) (bolp)) (error "") (forward-char val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3145 (if com (vip-execute-com 'vip-forward-char val com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3146 (if (eolp) (progn (backward-char 1) (error ""))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3147 (forward-char val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3148 (if com (vip-execute-com 'vip-forward-char val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3150 (defun vip-backward-char (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3151 "Move point left ARG characters (right if ARG negative).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3152 On reaching beginning of line, stop and signal error."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3153 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3154 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3155 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3156 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3157 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3158 (if vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3159 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3160 (if (bolp) (error "") (backward-char val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3161 (if com (vip-execute-com 'vip-backward-char val com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3162 (backward-char val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3163 (if com (vip-execute-com 'vip-backward-char val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3164
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3165 ;; Like forward-char, but doesn't move at end of buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3166 (defun vip-forward-char-carefully (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3167 (setq arg (or arg 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3168 (if (>= (point-max) (+ (point) arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3169 (forward-char arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3170 (goto-char (point-max))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3172 ;; Like backward-char, but doesn't move at end of buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3173 (defun vip-backward-char-carefully (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3174 (setq arg (or arg 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3175 (if (<= (point-min) (- (point) arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3176 (backward-char arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3177 (goto-char (point-min))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3179 (defun vip-next-line-carefully (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3180 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3181 (next-line arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3182 (error nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3186 ;;; Word command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3188 ;; Words are formed from alpha's and nonalphas - <sp>,\t\n are separators
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3189 ;; for word movement. When executed with a destructive command, \n is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3190 ;; usually left untouched for the last word.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3191 ;; Viper uses syntax table to determine what is a word and what is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3192 ;; separator. However, \n is always a separator. Also, if vip-syntax-preference
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3193 ;; is 'vi, then `_' is part of the word.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3195 ;; skip only one \n
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3196 (defun vip-skip-separators (forward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3197 (if forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3198 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3199 (vip-skip-all-separators-forward 'within-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3200 (if (looking-at "\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3201 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3202 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3203 (vip-skip-all-separators-forward 'within-line))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3204 (vip-skip-all-separators-backward 'within-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3205 (backward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3206 (if (looking-at "\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3207 (vip-skip-all-separators-backward 'within-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3208 (forward-char))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3210 (defun vip-forward-word-kernel (val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3211 (while (> val 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3212 (cond ((vip-looking-at-alpha)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3213 (vip-skip-alpha-forward "_")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3214 (vip-skip-separators t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3215 ((vip-looking-at-separator)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3216 (vip-skip-separators t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3217 ((not (vip-looking-at-alphasep))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3218 (vip-skip-nonalphasep-forward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3219 (vip-skip-separators t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3220 (setq val (1- val))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3222 ;; first search backward for pat. Then skip chars backwards using aux-pat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3223 (defun vip-fwd-skip (pat aux-pat lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3224 (if (and (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3225 (re-search-backward pat lim t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3226 (= (point) (match-end 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3227 (goto-char (match-beginning 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3228 (skip-chars-backward aux-pat lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3229 (if (= (point) lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3230 (vip-forward-char-carefully))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3231 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3232
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3234 (defun vip-forward-word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3235 "Forward word."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3236 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3237 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3238 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3239 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3240 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3241 (vip-forward-word-kernel val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3242 (if com (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3243 (cond ((memq com (list ?c (- ?c)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3244 (vip-fwd-skip "\n[ \t]*" " \t" vip-com-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3245 ;; Yank words including the whitespace, but not newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3246 ((memq com (list ?y (- ?y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3247 (vip-fwd-skip "\n[ \t]*" "" vip-com-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3248 ((vip-dotable-command-p com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3249 (vip-fwd-skip "\n[ \t]*" "" vip-com-point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3250 (vip-execute-com 'vip-forward-word val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3251
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3252
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3253 (defun vip-forward-Word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3254 "Forward word delimited by white characters."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3255 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3256 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3257 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3258 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3259 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3260 (vip-loop val
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3261 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3262 (vip-skip-nonseparators 'forward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3263 (vip-skip-separators t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3264 (if com (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3265 (cond ((memq com (list ?c (- ?c)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3266 (vip-fwd-skip "\n[ \t]*" " \t" vip-com-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3267 ;; Yank words including the whitespace, but not newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3268 ((memq com (list ?y (- ?y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3269 (vip-fwd-skip "\n[ \t]*" "" vip-com-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3270 ((vip-dotable-command-p com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3271 (vip-fwd-skip "\n[ \t]*" "" vip-com-point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3272 (vip-execute-com 'vip-forward-Word val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3273
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3275 ;; this is a bit different from Vi, but Vi's end of word
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3276 ;; makes no sense whatsoever
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3277 (defun vip-end-of-word-kernel ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3278 (if (vip-end-of-word-p) (forward-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3279 (if (vip-looking-at-separator)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3280 (vip-skip-all-separators-forward))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3281
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3282 (cond ((vip-looking-at-alpha) (vip-skip-alpha-forward "_"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3283 ((not (vip-looking-at-alphasep)) (vip-skip-nonalphasep-forward)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3284 (vip-backward-char-carefully))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3286 (defun vip-end-of-word-p ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3287 (or (eobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3288 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3289 (cond ((vip-looking-at-alpha)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3290 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3291 (not (vip-looking-at-alpha)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3292 ((not (vip-looking-at-alphasep))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3293 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3294 (vip-looking-at-alphasep))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3295
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3297 (defun vip-end-of-word (arg &optional careful)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3298 "Move point to end of current word."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3299 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3300 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3301 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3302 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3303 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3304 (vip-loop val (vip-end-of-word-kernel))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3305 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3306 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3307 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3308 (vip-execute-com 'vip-end-of-word val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3310 (defun vip-end-of-Word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3311 "Forward to end of word delimited by white character."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3312 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3313 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3314 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3315 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3316 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3317 (vip-loop val
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3318 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3319 (vip-end-of-word-kernel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3320 (vip-skip-nonseparators 'forward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3321 (backward-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3322 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3323 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3324 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3325 (vip-execute-com 'vip-end-of-Word val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3327 (defun vip-backward-word-kernel (val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3328 (while (> val 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3329 (backward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3330 (cond ((vip-looking-at-alpha)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3331 (vip-skip-alpha-backward "_"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3332 ((vip-looking-at-separator)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3333 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3334 (vip-skip-separators nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3335 (backward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3336 (cond ((vip-looking-at-alpha)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3337 (vip-skip-alpha-backward "_"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3338 ((not (vip-looking-at-alphasep))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3339 (vip-skip-nonalphasep-backward))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3340 (t (forward-char))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3341 ((not (vip-looking-at-alphasep))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3342 (vip-skip-nonalphasep-backward)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3343 (setq val (1- val))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3344
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3345 (defun vip-backward-word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3346 "Backward word."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3347 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3348 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3349 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3350 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3351 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3352 (let (i)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3353 (if (setq i (save-excursion (backward-char) (looking-at "\n")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3354 (backward-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3355 (vip-move-marker-locally 'vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3356 (if i (forward-char))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3357 (vip-backward-word-kernel val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3358 (if com (vip-execute-com 'vip-backward-word val com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3360 (defun vip-backward-Word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3361 "Backward word delimited by white character."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3362 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3363 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3364 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3365 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3366 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3367 (let (i)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3368 (if (setq i (save-excursion (backward-char) (looking-at "\n")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3369 (backward-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3370 (vip-move-marker-locally 'vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3371 (if i (forward-char))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3372 (vip-loop val
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3373 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3374 (vip-skip-separators nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3375 (vip-skip-nonseparators 'backward)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3376 (if com (vip-execute-com 'vip-backward-Word val com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3379
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3380 ;; line commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3382 (defun vip-beginning-of-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3383 "Go to beginning of line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3384 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3385 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3386 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3387 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3388 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3389 (beginning-of-line val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3390 (if com (vip-execute-com 'vip-beginning-of-line val com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3392 (defun vip-bol-and-skip-white (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3393 "Beginning of line at first non-white character."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3394 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3395 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3396 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3397 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3398 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3399 (forward-to-indentation (1- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3400 (if com (vip-execute-com 'vip-bol-and-skip-white val com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3401
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3402 (defun vip-goto-eol (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3403 "Go to end of line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3404 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3405 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3406 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3407 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3408 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3409 (end-of-line val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3410 (if com (vip-execute-com 'vip-goto-eol val com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3411 (if vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3412 (if (and (eolp) (not (bolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3413 ;; a fix for vip-change-to-eol
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3414 (not (equal vip-current-state 'insert-state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3415 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3416 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3417
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3419 (defun vip-goto-col (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3420 "Go to ARG's column."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3421 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3422 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3423 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3424 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3425 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3426 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3427 (if (> val (1+ (current-column))) (error "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3428 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3429 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3430 (forward-char (1- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3431 (if com (vip-execute-com 'vip-goto-col val com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3432
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3433
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3434 (defun vip-next-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3435 "Go to next line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3436 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3437 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3438 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3439 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3440 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3441 (next-line val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3442 (if vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3443 (if (and (eolp) (not (bolp))) (backward-char 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3444 (setq this-command 'next-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3445 (if com (vip-execute-com 'vip-next-line val com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3447 (defun vip-next-line-at-bol (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3448 "Next line at beginning of line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3449 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3450 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3451 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3452 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3453 (if (eobp) (error "Last line in buffer")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3454 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3455 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3456 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3457 (forward-line val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3458 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3459 (if com (vip-execute-com 'vip-next-line-at-bol val com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3461 (defun vip-previous-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3462 "Go to previous line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3463 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3464 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3465 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3466 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3467 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3468 (previous-line val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3469 (if vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3470 (if (and (eolp) (not (bolp))) (backward-char 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3471 (setq this-command 'previous-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3472 (if com (vip-execute-com 'vip-previous-line val com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3475 (defun vip-previous-line-at-bol (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3476 "Previous line at beginning of line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3477 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3478 (vip-leave-region-active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3479 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3480 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3481 (if (bobp) (error "First line in buffer")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3482 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3483 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3484 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3485 (forward-line (- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3486 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3487 (if com (vip-execute-com 'vip-previous-line val com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3489 (defun vip-change-to-eol (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3490 "Change to end of line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3491 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3492 (vip-goto-eol (cons arg ?c)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3494 (defun vip-kill-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3495 "Delete line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3496 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3497 (vip-goto-eol (cons arg ?d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3498
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3499 (defun vip-erase-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3500 "Erase line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3501 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3502 (vip-beginning-of-line (cons arg ?d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3504
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3505 ;;; Moving around
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3506
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3507 (defun vip-goto-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3508 "Go to ARG's line. Without ARG go to end of buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3509 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3510 (let ((val (vip-P-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3511 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3512 (vip-move-marker-locally 'vip-com-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3513 (vip-deactivate-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3514 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3515 (if (null val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3516 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3517 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3518 (forward-line (1- val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3520 ;; positioning is done twice: before and after command execution
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3521 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3522 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3524 (if com (vip-execute-com 'vip-goto-line val com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3526 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3527 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3528 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3529
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3530 ;; Find ARG's occurrence of CHAR on the current line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3531 ;; If FORWARD then search is forward, otherwise backward. OFFSET is used to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3532 ;; adjust point after search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3533 (defun vip-find-char (arg char forward offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3534 (or (char-or-string-p char) (error ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3535 (let ((arg (if forward arg (- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3536 (cmd (if (eq vip-intermediate-command 'vip-repeat)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3537 (nth 5 vip-d-com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3538 (vip-array-to-string (this-command-keys))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3539 point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3540 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3541 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3542 (if (> arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3543 (narrow-to-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3544 ;; forward search begins here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3545 (if (eolp) (error "Command `%s': At end of line" cmd) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3546 ;; forward search ends here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3547 (progn (end-of-line) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3548 (narrow-to-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3549 ;; backward search begins from here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3550 (if (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3551 (error "Command `%s': At beginning of line" cmd) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3552 ;; backward search ends here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3553 (progn (beginning-of-line) (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3554 ;; if arg > 0, point is forwarded before search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3555 (if (> arg 0) (goto-char (1+ (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3556 (goto-char (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3557 (if (let ((case-fold-search nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3558 (search-forward (char-to-string char) nil 0 arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3559 (setq point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3560 (error "Command `%s': `%c' not found" cmd char))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3561 (goto-char (+ point (if (> arg 0) (if offset -2 -1) (if offset 1 0))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3562
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3563 (defun vip-find-char-forward (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3564 "Find char on the line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3565 If called interactively read the char to find from the terminal, and if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3566 called from vip-repeat, the char last used is used. This behaviour is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3567 controlled by the sign of prefix numeric value."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3568 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3569 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3570 (com (vip-getcom arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3571 (cmd-representation (nth 5 vip-d-com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3572 (if (> val 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3573 ;; this means that the function was called interactively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3574 (setq vip-f-char (read-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3575 vip-f-forward t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3576 vip-f-offset nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3577 ;; vip-repeat --- set vip-F-char from command-keys
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3578 (setq vip-F-char (if (stringp cmd-representation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3579 (vip-seq-last-elt cmd-representation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3580 vip-F-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3581 vip-f-char vip-F-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3582 (setq val (- val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3583 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3584 (vip-find-char val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) t nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3585 (setq val (- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3586 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3587 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3588 (setq vip-F-char vip-f-char) ; set new vip-F-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3589 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3590 (vip-execute-com 'vip-find-char-forward val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3592 (defun vip-goto-char-forward (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3593 "Go up to char ARG forward on line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3594 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3595 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3596 (com (vip-getcom arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3597 (cmd-representation (nth 5 vip-d-com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3598 (if (> val 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3599 ;; this means that the function was called interactively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3600 (setq vip-f-char (read-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3601 vip-f-forward t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3602 vip-f-offset t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3603 ;; vip-repeat --- set vip-F-char from command-keys
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3604 (setq vip-F-char (if (stringp cmd-representation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3605 (vip-seq-last-elt cmd-representation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3606 vip-F-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3607 vip-f-char vip-F-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3608 (setq val (- val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3609 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3610 (vip-find-char val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) t t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3611 (setq val (- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3612 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3613 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3614 (setq vip-F-char vip-f-char) ; set new vip-F-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3615 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3616 (vip-execute-com 'vip-goto-char-forward val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3618 (defun vip-find-char-backward (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3619 "Find char ARG on line backward."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3620 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3621 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3622 (com (vip-getcom arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3623 (cmd-representation (nth 5 vip-d-com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3624 (if (> val 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3625 ;; this means that the function was called interactively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3626 (setq vip-f-char (read-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3627 vip-f-forward nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3628 vip-f-offset nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3629 ;; vip-repeat --- set vip-F-char from command-keys
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3630 (setq vip-F-char (if (stringp cmd-representation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3631 (vip-seq-last-elt cmd-representation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3632 vip-F-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3633 vip-f-char vip-F-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3634 (setq val (- val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3635 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3636 (vip-find-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3637 val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) nil nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3638 (setq val (- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3639 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3640 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3641 (setq vip-F-char vip-f-char) ; set new vip-F-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3642 (vip-execute-com 'vip-find-char-backward val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3643
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3644 (defun vip-goto-char-backward (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3645 "Go up to char ARG backward on line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3646 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3647 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3648 (com (vip-getcom arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3649 (cmd-representation (nth 5 vip-d-com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3650 (if (> val 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3651 ;; this means that the function was called interactively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3652 (setq vip-f-char (read-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3653 vip-f-forward nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3654 vip-f-offset t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3655 ;; vip-repeat --- set vip-F-char from command-keys
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3656 (setq vip-F-char (if (stringp cmd-representation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3657 (vip-seq-last-elt cmd-representation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3658 vip-F-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3659 vip-f-char vip-F-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3660 (setq val (- val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3661 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3662 (vip-find-char val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3663 (setq val (- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3664 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3665 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3666 (setq vip-F-char vip-f-char) ; set new vip-F-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3667 (vip-execute-com 'vip-goto-char-backward val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3668
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3669 (defun vip-repeat-find (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3670 "Repeat previous find command."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3671 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3672 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3673 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3674 (vip-deactivate-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3675 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3676 (vip-find-char val vip-f-char vip-f-forward vip-f-offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3677 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3678 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3679 (if vip-f-forward (forward-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3680 (vip-execute-com 'vip-repeat-find val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3682 (defun vip-repeat-find-opposite (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3683 "Repeat previous find command in the opposite direction."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3684 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3685 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3686 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3687 (vip-deactivate-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3688 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3689 (vip-find-char val vip-f-char (not vip-f-forward) vip-f-offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3690 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3691 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3692 (if vip-f-forward (forward-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3693 (vip-execute-com 'vip-repeat-find-opposite val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3694
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3695
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3696 ;; window scrolling etc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3697
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3698 (defun vip-other-window (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3699 "Switch to other window."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3700 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3701 (other-window arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3702 (or (not (eq vip-current-state 'emacs-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3703 (string= (buffer-name (current-buffer)) " *Minibuf-1*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3704 (vip-change-state-to-vi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3705
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3706 (defun vip-window-top (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3707 "Go to home window line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3708 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3709 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3710 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3711 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3712 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3713 (move-to-window-line (1- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3714
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3715 ;; positioning is done twice: before and after command execution
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3716 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3717 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3718
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3719 (if com (vip-execute-com 'vip-window-top val com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3720
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3721 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3722 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3723 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3724
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3725 (defun vip-window-middle (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3726 "Go to middle window line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3727 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3728 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3729 (com (vip-getCom arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3730 lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3731 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3732 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3733 (if (not (pos-visible-in-window-p (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3734 (move-to-window-line (+ (/ (1- (window-height)) 2) (1- val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3735 (setq lines (count-lines (window-start) (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3736 (move-to-window-line (+ (/ lines 2) (1- val))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3738 ;; positioning is done twice: before and after command execution
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3739 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3740 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3742 (if com (vip-execute-com 'vip-window-middle val com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3743
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3744 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3745 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3746 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3748 (defun vip-window-bottom (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3749 "Go to last window line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3750 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3751 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3752 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3753 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3754 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3755 (move-to-window-line (- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3757 ;; positioning is done twice: before and after command execution
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3758 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3759 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3760
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3761 (if com (vip-execute-com 'vip-window-bottom val com))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3762
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3763 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3764 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3765 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3766
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3767 (defun vip-line-to-top (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3768 "Put current line on the home line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3769 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3770 (recenter (1- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3772 (defun vip-line-to-middle (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3773 "Put current line on the middle line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3774 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3775 (recenter (+ (1- arg) (/ (1- (window-height)) 2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3776
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3777 (defun vip-line-to-bottom (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3778 "Put current line on the last line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3779 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3780 (recenter (- (window-height) (1+ arg))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3781
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3782 ;; If point is within vip-search-scroll-threshold of window top or bottom,
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3783 ;; scroll up or down 1/7 of window height, depending on whether we are at the
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3784 ;; bottom or at the top of the window. This function is called by vip-search
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3785 ;; (which is called from vip-search-forward/backward/next). If the value of
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3786 ;; vip-search-scroll-threshold is negative - don't scroll.
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3787 (defun vip-adjust-window ()
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3788 (let ((win-height (if vip-emacs-p
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3789 (1- (window-height)) ; adjust for modeline
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3790 (window-displayed-height)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3791 (pt (point))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3792 at-top-p at-bottom-p
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3793 min-scroll direction)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3794 (save-excursion
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3795 (move-to-window-line 0) ; top
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3796 (setq at-top-p
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3797 (<= (count-lines pt (point))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3798 vip-search-scroll-threshold))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3799 (move-to-window-line -1) ; bottom
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3800 (setq at-bottom-p
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3801 (<= (count-lines pt (point)) vip-search-scroll-threshold))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3802 )
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3803 (cond (at-top-p (setq min-scroll (1- vip-search-scroll-threshold)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3804 direction 1))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3805 (at-bottom-p (setq min-scroll (1+ vip-search-scroll-threshold)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3806 direction -1)))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
3807 (if min-scroll
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3808 (recenter
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3809 (* (max min-scroll (/ win-height 7)) direction)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3810 ))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3811
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3813 ;; paren match
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3814 ;; must correct this to only match ( to ) etc. On the other hand
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3815 ;; it is good that paren match gets confused, because that way you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3816 ;; catch _all_ imbalances.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3817
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3818 (defun vip-paren-match (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3819 "Go to the matching parenthesis."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3820 (interactive "P")
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3821 (vip-leave-region-active)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3822 (let ((com (vip-getcom arg))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3823 parse-sexp-ignore-comments anchor-point)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3824 (if (integerp arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3825 (if (or (> arg 99) (< arg 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3826 (error "Prefix must be between 1 and 99")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3827 (goto-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3828 (if (> (point-max) 80000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3829 (* (/ (point-max) 100) arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3830 (/ (* (point-max) arg) 100)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3831 (back-to-indentation))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3832 (let (beg-lim end-lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3833 (if (and (eolp) (not (bolp))) (forward-char -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3834 (if (not (looking-at "[][(){}]"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3835 (setq anchor-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3836 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3837 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3838 (setq beg-lim (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3839 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3840 (setq end-lim (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3841 (cond ((re-search-forward "[][(){}]" end-lim t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3842 (backward-char) )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3843 ((re-search-backward "[][(){}]" beg-lim t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3844 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3845 (error "No matching character on line"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3846 (cond ((looking-at "[\(\[{]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3847 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3848 (forward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3849 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3850 (vip-execute-com 'vip-paren-match nil com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3851 (backward-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3852 (anchor-point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3853 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3854 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3855 (vip-move-marker-locally 'vip-com-point anchor-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3856 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3857 (vip-execute-com 'vip-paren-match nil com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3858 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3859 ((looking-at "[])}]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3860 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3861 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3862 (backward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3863 (if com (vip-execute-com 'vip-paren-match nil com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3864 (t (error ""))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3865
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3867 ;; sentence ,paragraph and heading
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3869 (defun vip-forward-sentence (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3870 "Forward sentence."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3871 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3872 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3873 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3874 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3875 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3876 (forward-sentence val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3877 (if com (vip-execute-com 'vip-forward-sentence nil com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3878
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3879 (defun vip-backward-sentence (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3880 "Backward sentence."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3881 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3882 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3883 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3884 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3885 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3886 (backward-sentence val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3887 (if com (vip-execute-com 'vip-backward-sentence nil com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3888
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3889 (defun vip-forward-paragraph (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3890 "Forward paragraph."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3891 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3892 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3893 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3894 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3895 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3896 (forward-paragraph val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3897 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3898 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3899 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3900 (vip-execute-com 'vip-forward-paragraph nil com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3901
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3902 (defun vip-backward-paragraph (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3903 "Backward paragraph."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3904 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3905 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3906 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3907 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3908 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3909 (backward-paragraph val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3910 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3911 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3912 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3913 (vip-execute-com 'vip-backward-paragraph nil com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3914 (backward-char 1)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3916 ;; should be mode-specific etc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3917
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3918 (defun vip-prev-heading (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3919 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3920 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3921 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3922 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3923 (re-search-backward vip-heading-start nil t val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3924 (goto-char (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3925 (if com (vip-execute-com 'vip-prev-heading nil com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3926
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3927 (defun vip-heading-end (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3928 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3929 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3930 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3931 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3932 (re-search-forward vip-heading-end nil t val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3933 (goto-char (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3934 (if com (vip-execute-com 'vip-heading-end nil com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3935
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3936 (defun vip-next-heading (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3937 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3938 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3939 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3940 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3941 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3942 (re-search-forward vip-heading-start nil t val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3943 (goto-char (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3944 (if com (vip-execute-com 'vip-next-heading nil com))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3947 ;; scrolling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3948
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3949 (setq scroll-step 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3950
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3951 (defun vip-scroll-screen (arg)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3952 "Scroll to next screen."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3953 (interactive "p")
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3954 (condition-case nil
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3955 (if (> arg 0)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3956 (while (> arg 0)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3957 (scroll-up)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3958 (setq arg (1- arg)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3959 (while (> 0 arg)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3960 (scroll-down)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3961 (setq arg (1+ arg))))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3962 (error (beep 1)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3963 (if (> arg 0)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3964 (progn
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3965 (message "End of buffer")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3966 (goto-char (point-max)))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3967 (message "Beginning of buffer")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3968 (goto-char (point-min))))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3969 ))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3970
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3971 (defun vip-scroll-screen-back (arg)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3972 "Scroll to previous screen."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3973 (interactive "p")
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
3974 (vip-scroll-screen (- arg)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3975
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3976 (defun vip-scroll-down (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3977 "Pull down half screen."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3978 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3979 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3980 (if (null arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3981 (scroll-down (/ (window-height) 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3982 (scroll-down arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3983 (error (beep 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3984 (message "Beginning of buffer")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3985 (goto-char (point-min)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3987 (defun vip-scroll-down-one (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3988 "Scroll up one line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3989 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3990 (scroll-down arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3992 (defun vip-scroll-up (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3993 "Pull up half screen."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3994 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3995 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3996 (if (null arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3997 (scroll-up (/ (window-height) 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3998 (scroll-up arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3999 (error (beep 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4000 (message "End of buffer")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4001 (goto-char (point-max)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4003 (defun vip-scroll-up-one (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4004 "Scroll down one line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4005 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4006 (scroll-up arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4009 ;; searching
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4011 (defun vip-if-string (prompt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4012 (let ((s (vip-read-string-with-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4013 prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4014 nil ; no initial
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4015 'vip-search-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4016 (car vip-search-history))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4017 (if (not (string= s ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4018 (setq vip-s-string s))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4021 (defun vip-toggle-search-style (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4022 "Toggle the value of vip-case-fold-search/vip-re-search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4023 Without prefix argument, will ask which search style to toggle. With prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4024 arg 1,toggles vip-case-fold-search; with arg 2 toggles vip-re-search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4025
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4026 Although this function is bound to \\[vip-toggle-search-style], the most
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4027 convenient way to use it is to bind `//' to the macro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4028 `1 M-x vip-toggle-search-style' and `///' to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4029 `2 M-x vip-toggle-search-style'. In this way, hitting `//' quickly will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4030 toggle case-fold-search and hitting `/' three times witth toggle regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4031 search. Macros are more convenient in this case because they don't affect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4032 the Emacs binding of `/'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4033 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4034 (let (msg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4035 (cond ((or (eq arg 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4036 (and (null arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4037 (y-or-n-p (format "Search style: '%s'. Want '%s'? "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4038 (if vip-case-fold-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4039 "case-insensitive" "case-sensitive")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4040 (if vip-case-fold-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4041 "case-sensitive"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4042 "case-insensitive")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4043 (setq vip-case-fold-search (null vip-case-fold-search))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4044 (if vip-case-fold-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4045 (setq msg "Search becomes case-insensitive")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4046 (setq msg "Search becomes case-sensitive")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4047 ((or (eq arg 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4048 (and (null arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4049 (y-or-n-p (format "Search style: '%s'. Want '%s'? "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4050 (if vip-re-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4051 "regexp-search" "vanilla-search")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4052 (if vip-re-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4053 "vanilla-search"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4054 "regexp-search")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4055 (setq vip-re-search (null vip-re-search))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4056 (if vip-re-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4057 (setq msg "Search becomes regexp-style")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4058 (setq msg "Search becomes vanilla-style")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4059 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4060 (setq msg "Search style remains unchanged")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4061 (prin1 msg t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4062
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4063 (defun vip-set-vi-search-style-macros (unset)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4064 "Set the macros for toggling the search style in Viper's vi-state.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4065 The macro that toggles case sensitivity is bound to `//', and the one that
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4066 toggles regexp search is bound to `///'.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4067 With a prefix argument, this function unsets the macros. "
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4068 (interactive "P")
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4069 (or noninteractive
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4070 (if (not unset)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4071 (progn
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4072 ;; toggle case sensitivity in search
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4073 (vip-record-kbd-macro
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4074 "//" 'vi-state
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4075 [1 (meta x) v i p - t o g g l e - s e a r c h - s t y l e return]
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4076 't)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4077 ;; toggle regexp/vanila search
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4078 (vip-record-kbd-macro
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4079 "///" 'vi-state
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4080 [2 (meta x) v i p - t o g g l e - s e a r c h - s t y l e return]
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4081 't)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4082 (if (interactive-p)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4083 (message
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4084 "// and /// now toggle case-sensitivity and regexp search.")))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4085 (vip-unrecord-kbd-macro "//" 'vi-state)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4086 (sit-for 2)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4087 (vip-unrecord-kbd-macro "///" 'vi-state))))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4088
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4089 (defun vip-set-emacs-search-style-macros (unset &optional arg-majormode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4090 "Set the macros for toggling the search style in Viper's emacs-state.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4091 The macro that toggles case sensitivity is bound to `//', and the one that
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4092 toggles regexp search is bound to `///'.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4093 With a prefix argument, this function unsets the macros.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4094 If the optional prefix argument is non-nil and specifies a valid major mode,
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4095 this sets the macros only in the macros in that major mode. Otherwise,
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4096 the macros are set in the current major mode.
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4097 \(When unsetting the macros, the second argument has no effect.\)"
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4098 (interactive "P")
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4099 (or noninteractive
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4100 (if (not unset)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4101 (progn
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4102 ;; toggle case sensitivity in search
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4103 (vip-record-kbd-macro
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4104 "//" 'emacs-state
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4105 [1 (meta x) v i p - t o g g l e - s e a r c h - s t y l e return]
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4106 (or arg-majormode major-mode))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4107 ;; toggle regexp/vanila search
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4108 (vip-record-kbd-macro
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4109 "///" 'emacs-state
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4110 [2 (meta x) v i p - t o g g l e - s e a r c h - s t y l e return]
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4111 (or arg-majormode major-mode))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4112 (if (interactive-p)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4113 (message
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4114 "// and /// now toggle case-sensitivity and regexp search.")))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4115 (vip-unrecord-kbd-macro "//" 'emacs-state)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4116 (sit-for 2)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4117 (vip-unrecord-kbd-macro "///" 'emacs-state))))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4118
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4120 (defun vip-search-forward (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4121 "Search a string forward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4122 ARG is used to find the ARG's occurrence of the string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4123 Null string will repeat previous search."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4124 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4125 (let ((val (vip-P-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4126 (com (vip-getcom arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4127 (old-str vip-s-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4128 (setq vip-s-forward t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4129 (vip-if-string "/")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4130 ;; this is not used at present, but may be used later
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4131 (if (or (not (equal old-str vip-s-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4132 (not (markerp vip-local-search-start-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4133 (not (marker-buffer vip-local-search-start-marker)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4134 (setq vip-local-search-start-marker (point-marker)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4135 (vip-search vip-s-string t val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4136 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4137 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4138 (vip-move-marker-locally 'vip-com-point (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4139 (vip-execute-com 'vip-search-next val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4140
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4141 (defun vip-search-backward (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4142 "Search a string backward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4143 ARG is used to find the ARG's occurrence of the string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4144 Null string will repeat previous search."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4145 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4146 (let ((val (vip-P-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4147 (com (vip-getcom arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4148 (old-str vip-s-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4149 (setq vip-s-forward nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4150 (vip-if-string "?")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4151 ;; this is not used at present, but may be used later
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4152 (if (or (not (equal old-str vip-s-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4153 (not (markerp vip-local-search-start-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4154 (not (marker-buffer vip-local-search-start-marker)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4155 (setq vip-local-search-start-marker (point-marker)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4156 (vip-search vip-s-string nil val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4157 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4158 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4159 (vip-move-marker-locally 'vip-com-point (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4160 (vip-execute-com 'vip-search-next val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4163 ;; Search for COUNT's occurrence of STRING.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4164 ;; Search is forward if FORWARD is non-nil, otherwise backward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4165 ;; INIT-POINT is the position where search is to start.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4166 ;; Arguments:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4167 ;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4168 (defun vip-search (string forward arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4169 &optional no-offset init-point fail-if-not-found)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4170 (if (not (equal string ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4171 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4172 (com (vip-getcom arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4173 (offset (not no-offset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4174 (case-fold-search vip-case-fold-search)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4175 (start-point (or init-point (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4176 (vip-deactivate-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4177 (if forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4178 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4179 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4180 (if offset (vip-forward-char-carefully))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4181 (if vip-re-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4182 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4183 (re-search-forward string nil nil val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4184 (re-search-backward string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4185 (search-forward string nil nil val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4186 (search-backward string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4187 (if (not (equal start-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4188 (push-mark start-point t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4189 (search-failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4190 (if (and (not fail-if-not-found) vip-search-wrap-around-t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4191 (progn
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4192 (message "Search wrapped around BOTTOM of buffer")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4193 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4194 (vip-search string forward (cons 1 com) t start-point 'fail)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4195 ;; don't wait in macros
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4196 (or executing-kbd-macro (sit-for 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4197 ;; delete the wrap-around message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4198 (message "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4199 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4200 (goto-char start-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4201 (error "`%s': %s not found"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4202 string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4203 (if vip-re-search "Pattern" "String"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4204 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4205 ;; backward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4206 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4207 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4208 (if vip-re-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4209 (re-search-backward string nil nil val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4210 (search-backward string nil nil val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4211 (if (not (equal start-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4212 (push-mark start-point t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4213 (search-failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4214 (if (and (not fail-if-not-found) vip-search-wrap-around-t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4215 (progn
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4216 (message "Search wrapped around TOP of buffer")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4217 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4218 (vip-search string forward (cons 1 com) t start-point 'fail)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4219 ;; don't wait in macros
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4220 (or executing-kbd-macro (sit-for 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4221 ;; delete the wrap-around message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4222 (message "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4223 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4224 (goto-char start-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4225 (error "`%s': %s not found"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4226 string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4227 (if vip-re-search "Pattern" "String"))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4228 ))))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4229 ;; pull up or down if at top/bottom of window
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4230 (vip-adjust-window)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4231 ;; highlight the result of search
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4232 ;; don't wait and don't highlight in macros
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4233 (or executing-kbd-macro
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4234 vip-inside-command-argument-action
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4235 (vip-flash-search-pattern))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4236 )))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4237
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4238 (defun vip-search-next (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4239 "Repeat previous search."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4240 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4241 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4242 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4243 (if (null vip-s-string) (error vip-NoPrevSearch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4244 (vip-search vip-s-string vip-s-forward arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4245 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4246 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4247 (vip-move-marker-locally 'vip-com-point (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4248 (vip-execute-com 'vip-search-next val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4250 (defun vip-search-Next (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4251 "Repeat previous search in the reverse direction."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4252 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4253 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4254 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4255 (if (null vip-s-string) (error vip-NoPrevSearch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4256 (vip-search vip-s-string (not vip-s-forward) arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4257 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4258 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4259 (vip-move-marker-locally 'vip-com-point (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4260 (vip-execute-com 'vip-search-Next val com)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4263 ;; Search contents of buffer defined by one of Viper's motion commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4264 ;; Repeatable via `n' and `N'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4265 (defun vip-buffer-search-enable (&optional c)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4266 (cond (c (setq vip-buffer-search-char c))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4267 ((null vip-buffer-search-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4268 (setq vip-buffer-search-char ?g)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4269 (define-key vip-vi-basic-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4270 (char-to-string vip-buffer-search-char) 'vip-command-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4271 (aset vip-exec-array vip-buffer-search-char 'vip-exec-buffer-search)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4272 (setq vip-prefix-commands (cons vip-buffer-search-char vip-prefix-commands)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4273
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4274 ;; This is a Viper wraper for isearch-forward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4275 (defun vip-isearch-forward (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4276 "Do incremental search forward."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4277 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4278 ;; emacs bug workaround
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4279 (if (listp arg) (setq arg (car arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4280 (vip-exec-form-in-emacs (list 'isearch-forward arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4281
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4282 ;; This is a Viper wraper for isearch-backward."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4283 (defun vip-isearch-backward (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4284 "Do incremental search backward."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4285 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4286 ;; emacs bug workaround
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4287 (if (listp arg) (setq arg (car arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4288 (vip-exec-form-in-emacs (list 'isearch-backward arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4289
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4291 ;; visiting and killing files, buffers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4292
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4293 (defun vip-switch-to-buffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4294 "Switch to buffer in the current window."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4295 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4296 (let (buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4297 (setq buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4298 (read-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4299 (format "Switch to buffer in this window \(%s\): "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4300 (buffer-name (other-buffer (current-buffer))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4301 (switch-to-buffer buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4302 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4303
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4304 (defun vip-switch-to-buffer-other-window ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4305 "Switch to buffer in another window."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4306 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4307 (let (buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4308 (setq buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4309 (read-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4310 (format "Switch to buffer in another window \(%s\): "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4311 (buffer-name (other-buffer (current-buffer))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4312 (switch-to-buffer-other-window buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4313 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4314
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4315 (defun vip-kill-buffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4316 "Kill a buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4317 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4318 (let (buffer buffer-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4319 (setq buffer-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4320 (read-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4321 (format "Kill buffer \(%s\): "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4322 (buffer-name (current-buffer)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4323 (setq buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4324 (if (null buffer-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4325 (current-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4326 (get-buffer buffer-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4327 (if (null buffer) (error "`%s': No such buffer" buffer-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4328 (if (or (not (buffer-modified-p buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4329 (y-or-n-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4330 (format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4331 "Buffer `%s' is modified, are you sure you want to kill it? "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4332 buffer-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4333 (kill-buffer buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4334 (error "Buffer not killed"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4337 (defvar vip-smart-suffix-list '("" "tex" "c" "cc" "el" "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4338 "*List of suffixes that Viper automatically tries to append to filenames ending with a `.'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4339 This is useful when you the current directory contains files with the same
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4340 prefix and many different suffixes. Usually, only one of the suffixes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4341 represents an editable file. However, file completion will stop at the `.'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4342 The smart suffix feature lets you hit RET in such a case, and Viper will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4343 select the appropriate suffix.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4344
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4345 Suffixes are tried in the order given and the first suffix for which a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4346 corresponding file exists is selected. If no file exists for any of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4347 suffixes, the user is asked to confirm.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4349 To turn this feature off, set this variable to nil.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4351 ;; Try to add suffix to files ending with a `.'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4352 ;; Useful when the user hits RET on a non-completed file name.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4353 (defun vip-file-add-suffix ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4354 (let ((count 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4355 (len (length vip-smart-suffix-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4356 (file (buffer-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4357 found key cmd suff)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4358 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4359 (if (and vip-smart-suffix-list (string-match "\\.$" file))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4360 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4361 (while (and (not found) (< count len))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4362 (setq suff (nth count vip-smart-suffix-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4363 count (1+ count))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4364 (if (file-exists-p (format "%s%s" file suff))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4365 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4366 (setq found t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4367 (insert suff))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4369 (if found
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4370 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4371 (vip-tmp-insert-at-eob " [Please complete file name]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4372 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4373 (while (not (memq cmd '(exit-minibuffer vip-exit-minibuffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4374 (setq cmd
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4375 (key-binding (setq key (read-key-sequence nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4376 (cond ((eq cmd 'self-insert-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4377 (if vip-xemacs-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4378 (insert (events-to-keys key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4379 (insert key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4380 ((memq cmd '(exit-minibuffer vip-exit-minibuffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4381 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4382 (t (command-execute cmd)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4383 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4384 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4385 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4386
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4388 ;; Advice for use in find-file and read-file-name commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4389 (defadvice exit-minibuffer (before vip-exit-minibuffer-advice activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4390 "Run `vip-minibuffer-exit-hook' just before exiting the minibuffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4391 (run-hooks 'vip-minibuffer-exit-hook))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4392
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4393 (defadvice find-file (before vip-add-suffix-advice activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4394 "Use `read-file-name' for reading arguments."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4395 (interactive (list (read-file-name "Find file: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4396 nil default-directory))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4398 (defadvice find-file-other-window (before vip-add-suffix-advice activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4399 "Use `read-file-name' for reading arguments."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4400 (interactive (list (read-file-name "Find file in other window: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4401 nil default-directory))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4402
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4403 (defadvice find-file-other-frame (before vip-add-suffix-advice activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4404 "Use `read-file-name' for reading arguments."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4405 (interactive (list (read-file-name "Find file in other frame: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4406 nil default-directory))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4408 (defadvice read-file-name (around vip-suffix-advice activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4409 "Tell `exit-minibuffer' to run `vip-file-add-suffix' as a hook."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4410 (let ((vip-minibuffer-exit-hook 'vip-file-add-suffix))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4411 ad-do-it))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4412
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4414
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4415 ;; yank and pop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4416
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4417 (defsubst vip-yank (text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4418 "Yank TEXT silently. This works correctly with Emacs's yank-pop command."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4419 (insert text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4420 (setq this-command 'yank))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4421
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4422 (defun vip-put-back (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4423 "Put back after point/below line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4424 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4425 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4426 (text (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4427 (cond ((vip-valid-register vip-use-register '(digit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4428 (current-kill (- vip-use-register ?1) 'do-not-rotate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4429 ((vip-valid-register vip-use-register)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4430 (get-register (downcase vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4431 (t (error vip-InvalidRegister vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4432 (current-kill 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4433 (if (null text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4434 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4435 (let ((reg vip-use-register))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4436 (setq vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4437 (error vip-EmptyRegister reg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4438 (error "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4439 (setq vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4440 (if (vip-end-with-a-newline-p text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4441 (progn
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4442 (end-of-line)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4443 (if (eobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4444 (insert "\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4445 (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4446 (beginning-of-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4447 (if (not (eolp)) (vip-forward-char-carefully)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4448 (set-marker (vip-mark-marker) (point) (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4449 (vip-set-destructive-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4450 (list 'vip-put-back val nil vip-use-register nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4451 (vip-loop val (vip-yank text)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4452 ;; Vi puts cursor on the last char when the yanked text doesn't contain a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4453 ;; newline; it leaves the cursor at the beginning when the text contains
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4454 ;; a newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4455 (if (vip-same-line (point) (mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4456 (or (= (point) (mark)) (vip-backward-char-carefully))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4457 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4458 (if (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4459 (back-to-indentation)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4460 (vip-deactivate-mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4462 (defun vip-Put-back (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4463 "Put back at point/above line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4464 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4465 (let ((val (vip-p-val arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4466 (text (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4467 (cond ((vip-valid-register vip-use-register '(digit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4468 (current-kill (- vip-use-register ?1) 'do-not-rotate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4469 ((vip-valid-register vip-use-register)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4470 (get-register (downcase vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4471 (t (error vip-InvalidRegister vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4472 (current-kill 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4473 (if (null text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4474 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4475 (let ((reg vip-use-register))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4476 (setq vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4477 (error vip-EmptyRegister reg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4478 (error "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4479 (setq vip-use-register nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4480 (if (vip-end-with-a-newline-p text) (beginning-of-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4481 (vip-set-destructive-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4482 (list 'vip-Put-back val nil vip-use-register nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4483 (set-marker (vip-mark-marker) (point) (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4484 (vip-loop val (vip-yank text)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4485 ;; Vi puts cursor on the last char when the yanked text doesn't contain a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4486 ;; newline; it leaves the cursor at the beginning when the text contains
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4487 ;; a newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4488 (if (vip-same-line (point) (mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4489 (or (= (point) (mark)) (vip-backward-char-carefully))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4490 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4491 (if (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4492 (back-to-indentation)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4493 (vip-deactivate-mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4494
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4495
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4496 ;; Copy region to kill-ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4497 ;; If BEG and END do not belong to the same buffer, copy empty region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4498 (defun vip-copy-region-as-kill (beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4499 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4500 (copy-region-as-kill beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4501 (error (copy-region-as-kill beg beg))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4502
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4504 (defun vip-delete-char (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4505 "Delete character."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4506 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4507 (let ((val (vip-p-val arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4508 (vip-set-destructive-command (list 'vip-delete-char val nil nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4509 (if (> val 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4510 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4511 (let ((here (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4512 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4513 (if (> val (- (point) here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4514 (setq val (- (point) here))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4515 (if (and (eq val 0) (not vip-ex-style-motion)) (setq val 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4516 (if (and vip-ex-style-motion (eolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4517 (if (bolp) (error "") (setq val 0))) ; not bol---simply back 1 ch
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4518 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4519 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4520 (cond ((vip-valid-register vip-use-register '((Letter)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4521 (vip-append-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4522 (downcase vip-use-register) (point) (- (point) val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4523 ((vip-valid-register vip-use-register)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4524 (copy-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4525 vip-use-register (point) (- (point) val) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4526 (t (error vip-InvalidRegister vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4527 (setq vip-use-register nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4528 (if vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4529 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4530 (delete-char val t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4531 (if (and (eolp) (not (bolp))) (backward-char 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4532 (if (eolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4533 (delete-backward-char val t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4534 (delete-char val t)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4535
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4536 (defun vip-delete-backward-char (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4537 "Delete previous character. On reaching beginning of line, stop and beep."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4538 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4539 (let ((val (vip-p-val arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4540 (vip-set-destructive-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4541 (list 'vip-delete-backward-char val nil nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4542 (if (> val 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4543 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4544 (let ((here (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4545 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4546 (if (> val (- here (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4547 (setq val (- here (point)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4548 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4549 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4550 (cond ((vip-valid-register vip-use-register '(Letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4551 (vip-append-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4552 (downcase vip-use-register) (point) (+ (point) val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4553 ((vip-valid-register vip-use-register)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4554 (copy-to-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4555 vip-use-register (point) (+ (point) val) nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4556 (t (error vip-InvalidRegister vip-use-register)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4557 (setq vip-use-register nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4558 (if (bolp) (ding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4559 (delete-backward-char val t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4560
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4561 (defun vip-del-backward-char-in-insert ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4562 "Delete 1 char backwards while in insert mode."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4563 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4564 (if (and vip-ex-style-editing-in-insert (bolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4565 (beep 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4566 (delete-backward-char 1 t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4567
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4568 (defun vip-del-backward-char-in-replace ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4569 "Delete one character in replace mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4570 If `vip-delete-backwards-in-replace' is t, then DEL key actually deletes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4571 charecters. If it is nil, then the cursor just moves backwards, similarly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4572 to Vi. The variable `vip-ex-style-editing-in-insert', if t, doesn't let the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4573 cursor move past the beginning of line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4574 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4575 (cond (vip-delete-backwards-in-replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4576 (cond ((not (bolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4577 (delete-backward-char 1 t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4578 (vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4579 (beep 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4580 ((bobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4581 (beep 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4582 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4583 (delete-backward-char 1 t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4584 (vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4585 (if (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4586 (beep 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4587 (backward-char 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4588 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4589 (backward-char 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4590
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4593 ;; join lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4595 (defun vip-join-lines (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4596 "Join this line to next, if ARG is nil. Otherwise, join ARG lines."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4597 (interactive "*P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4598 (let ((val (vip-P-val arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4599 (vip-set-destructive-command (list 'vip-join-lines val nil nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4600 (vip-loop (if (null val) 1 (1- val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4601 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4602 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4603 (if (not (eobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4604 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4605 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4606 (delete-region (point) (1- (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4607 (fixup-whitespace)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4610 ;; Replace state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4612 (defun vip-change (beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4613 (if (markerp beg) (setq beg (marker-position beg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4614 (if (markerp end) (setq end (marker-position end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4615 ;; beg is sometimes (mark t), which may be nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4616 (or beg (setq beg end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4618 (vip-set-complex-command-for-undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4619 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4620 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4621 (copy-to-register vip-use-register beg end nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4622 (setq vip-use-register nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4623 (vip-set-replace-overlay beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4624 (setq last-command nil) ; separate repl text from prev kills
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4626 (if (= (vip-replace-start) (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4627 (error "End of buffer"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4629 (setq vip-last-replace-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4630 (buffer-substring (vip-replace-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4631 (vip-replace-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4633 ;; protect against error while inserting "@" and other disasters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4634 ;; (e.g., read-only buff)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4635 (condition-case conds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4636 (if (vip-same-line (vip-replace-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4637 (vip-replace-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4638 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4639 ;; tabs cause problems in replace, so untabify
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4640 (goto-char (vip-replace-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4641 (insert-before-markers "@") ; put placeholder after the TAB
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4642 (untabify (vip-replace-start) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4643 ;; del @, don't put on kill ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4644 (delete-backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4645
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4646 (vip-set-replace-overlay-glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4647 vip-replace-region-start-delimiter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4648 vip-replace-region-end-delimiter)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4649 ;; this move takes care of the last posn in the overlay, which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4650 ;; has to be shifted because of insert. We can't simply insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4651 ;; "$" before-markers because then overlay-start will shift the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4652 ;; beginning of the overlay in case we are replacing a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4653 ;; character. This fixes the bug with `s' and `cl' commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4654 (vip-move-replace-overlay (vip-replace-start) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4655 (goto-char (vip-replace-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4656 (vip-change-state-to-replace t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4657 (kill-region (vip-replace-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4658 (vip-replace-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4659 (vip-hide-replace-overlay)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4660 (vip-change-state-to-insert))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4661 (error ;; make sure that the overlay doesn't stay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4662 ;; go back to the original point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4663 (goto-char (vip-replace-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4664 (vip-hide-replace-overlay)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4665 (vip-message-conditions conds))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4666
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4667
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4668 (defun vip-change-subr (beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4669 ;; beg is sometimes (mark t), which may be nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4670 (or beg (setq beg end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4672 (if vip-use-register
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4673 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4674 (copy-to-register vip-use-register beg end nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4675 (setq vip-use-register nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4676 (kill-region beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4677 (setq this-command 'vip-change)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4678 (vip-yank-last-insertion))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4679
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4680 (defun vip-toggle-case (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4681 "Toggle character case."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4682 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4683 (let ((val (vip-p-val arg)) (c))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4684 (vip-set-destructive-command (list 'vip-toggle-case val nil nil nil nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4685 (while (> val 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4686 (setq c (following-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4687 (delete-char 1 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4688 (if (eq c (upcase c))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4689 (insert-char (downcase c) 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4690 (insert-char (upcase c) 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4691 (if (eolp) (backward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4692 (setq val (1- val)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4693
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4694
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4695 ;; query replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4697 (defun vip-query-replace ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4698 "Query replace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4699 If a null string is suplied as the string to be replaced,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4700 the query replace mode will toggle between string replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4701 and regexp replace."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4702 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4703 (let (str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4704 (setq str (vip-read-string-with-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4705 (if vip-re-query-replace "Query replace regexp: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4706 "Query replace: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4707 nil ; no initial
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4708 'vip-replace1-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4709 (car vip-replace1-history) ; default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4710 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4711 (if (string= str "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4712 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4713 (setq vip-re-query-replace (not vip-re-query-replace))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4714 (message "Query replace mode changed to %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4715 (if vip-re-query-replace "regexp replace"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4716 "string replace")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4717 (if vip-re-query-replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4718 (query-replace-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4719 str
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4720 (vip-read-string-with-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4721 (format "Query replace regexp `%s' with: " str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4722 nil ; no initial
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4723 'vip-replace1-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4724 (car vip-replace1-history) ; default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4725 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4726 (query-replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4727 str
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4728 (vip-read-string-with-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4729 (format "Query replace `%s' with: " str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4730 nil ; no initial
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4731 'vip-replace1-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4732 (car vip-replace1-history) ; default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4733 ))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4735
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4736 ;; marking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4738 (defun vip-mark-beginning-of-buffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4739 "Mark beginning of buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4740 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4741 (push-mark (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4742 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4743 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4744 (message "Mark set at the beginning of buffer"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4745
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4746 (defun vip-mark-end-of-buffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4747 "Mark end of buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4748 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4749 (push-mark (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4750 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4751 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4752 (message "Mark set at the end of buffer"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4753
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4754 (defun vip-mark-point ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4755 "Set mark at point of buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4756 (interactive)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4757 (let ((char (read-char)))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4758 (cond ((and (<= ?a char) (<= char ?z))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4759 (point-to-register (1+ (- char ?a))))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4760 ((= char ?<) (vip-mark-beginning-of-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4761 ((= char ?>) (vip-mark-end-of-buffer))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4762 ((= char ?.) (vip-set-mark-if-necessary))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4763 ((= char ?,) (vip-cycle-through-mark-ring))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4764 ((= char ?D) (mark-defun))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4765 (t (error ""))
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
4766 )))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4768 ;; Algorithm: If first invocation of this command save mark on ring, goto
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4769 ;; mark, M0, and pop the most recent elt from the mark ring into mark,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4770 ;; making it into the new mark, M1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4771 ;; Push this mark back and set mark to the original point position, p1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4772 ;; So, if you hit '' or `` then you can return to p1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4773 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4774 ;; If repeated command, pop top elt from the ring into mark and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4775 ;; jump there. This forgets the position, p1, and puts M1 back into mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4776 ;; Then we save the current pos, which is M0, jump to M1 and pop M2 from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4777 ;; the ring into mark. Push M2 back on the ring and set mark to M0.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4778 ;; etc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4779 (defun vip-cycle-through-mark-ring ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4780 "Visit previous locations on the mark ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4781 One can use `` and '' to temporarily jump 1 step back."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4782 (let* ((sv-pt (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4783 ;; if repeated `m,' command, pop the previously saved mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4784 ;; Prev saved mark is actually prev saved point. It is used if the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4785 ;; user types `` or '' and is discarded
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4786 ;; from the mark ring by the next `m,' command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4787 ;; In any case, go to the previous or previously saved mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4788 ;; Then push the current mark (popped off the ring) and set current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4789 ;; point to be the mark. Current pt as mark is discarded by the next
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4790 ;; m, command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4791 (if (eq last-command 'vip-cycle-through-mark-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4792 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4793 ;; save current mark if the first iteration
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4794 (setq mark-ring (delete (vip-mark-marker) mark-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4795 (if (mark t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4796 (push-mark (mark t) t)) )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4797 (pop-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4798 (set-mark-command 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4799 ;; don't duplicate mark on the ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4800 (setq mark-ring (delete (vip-mark-marker) mark-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4801 (push-mark sv-pt t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4802 (vip-deactivate-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4803 (setq this-command 'vip-cycle-through-mark-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4804 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4805
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4806
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4807 (defun vip-goto-mark (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4808 "Go to mark."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4809 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4810 (let ((char (read-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4811 (com (vip-getcom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4812 (vip-goto-mark-subr char com nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4814 (defun vip-goto-mark-and-skip-white (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4815 "Go to mark and skip to first non-white character on line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4816 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4817 (let ((char (read-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4818 (com (vip-getCom arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4819 (vip-goto-mark-subr char com t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4820
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4821 (defun vip-goto-mark-subr (char com skip-white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4822 (if (eobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4823 (if (bobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4824 (error "Empty buffer")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4825 (backward-char 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4826 (cond ((vip-valid-register char '(letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4827 (let* ((buff (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4828 (reg (1+ (- char ?a)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4829 (text-marker (get-register reg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4830 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4831 (if (not (vip-valid-marker text-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4832 (error vip-EmptyTextmarker char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4833 (if (and (vip-same-line (point) vip-last-jump)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4834 (= (point) vip-last-jump-ignore))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4835 (push-mark vip-last-jump t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4836 (push-mark nil t)) ; no msg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4837 (vip-register-to-point reg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4838 (setq vip-last-jump (point-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4839 (cond (skip-white
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4840 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4841 (setq vip-last-jump-ignore (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4842 (if com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4843 (if (equal buff (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4844 (vip-execute-com (if skip-white
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4845 'vip-goto-mark-and-skip-white
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4846 'vip-goto-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4847 nil com)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4848 (switch-to-buffer buff)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4849 (goto-char vip-com-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4850 (vip-change-state-to-vi)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4851 (error "")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4852 ((and (not skip-white) (= char ?`))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4853 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4854 (if (and (vip-same-line (point) vip-last-jump)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4855 (= (point) vip-last-jump-ignore))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4856 (goto-char vip-last-jump))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4857 (if (null (mark t)) (error "Mark is not set in this buffer"))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4858 (if (= (point) (mark t)) (pop-mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4859 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4860 (setq vip-last-jump (point-marker)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4861 vip-last-jump-ignore 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4862 (if com (vip-execute-com 'vip-goto-mark nil com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4863 ((and skip-white (= char ?'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4864 (if com (vip-move-marker-locally 'vip-com-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4865 (if (and (vip-same-line (point) vip-last-jump)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4866 (= (point) vip-last-jump-ignore))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4867 (goto-char vip-last-jump))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4868 (if (= (point) (mark t)) (pop-mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4869 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4870 (setq vip-last-jump (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4871 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4872 (setq vip-last-jump-ignore (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4873 (if com (vip-execute-com 'vip-goto-mark-and-skip-white nil com)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4874 (t (error vip-InvalidTextmarker char))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4876 (defun vip-insert-tab ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4877 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4878 (insert-tab))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4879
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4880 (defun vip-exchange-point-and-mark ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4881 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4882 (exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4883 (back-to-indentation))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4884
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4885 ;; Input Mode Indentation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4887 ;; Returns t, if the string before point matches the regexp STR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4888 (defsubst vip-looking-back (str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4889 (and (save-excursion (re-search-backward str nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4890 (= (point) (match-end 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4891
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4892
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4893 (defun vip-forward-indent ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4894 "Indent forward -- `C-t' in Vi."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4895 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4896 (setq vip-cted t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4897 (indent-to (+ (current-column) vip-shift-width)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4898
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4899 (defun vip-backward-indent ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4900 "Backtab, C-d in VI"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4901 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4902 (if vip-cted
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4903 (let ((p (point)) (c (current-column)) bol (indent t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4904 (if (vip-looking-back "[0^]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4905 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4906 (if (eq ?^ (preceding-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4907 (setq vip-preserve-indent t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4908 (delete-backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4909 (setq p (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4910 (setq indent nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4911 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4912 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4913 (setq bol (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4914 (if (re-search-backward "[^ \t]" bol 1) (forward-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4915 (delete-region (point) p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4916 (if indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4917 (indent-to (- c vip-shift-width)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4918 (if (or (bolp) (vip-looking-back "[^ \t]"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4919 (setq vip-cted nil)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4920
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4921 (defun vip-autoindent ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4922 "Auto Indentation, Vi-style."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4923 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4924 (let ((col (current-indentation)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4925 (if vip-preserve-indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4926 (setq vip-preserve-indent nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4927 (setq vip-current-indent col))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4928 ;; don't leave whitespace lines around
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4929 (if (memq last-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4930 '(vip-autoindent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4931 vip-open-line vip-Open-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4932 vip-replace-state-exit-cmd))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4933 (indent-to-left-margin))
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4934 ;; use \n instead of newline, or else <Return> will move the insert point
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4935 ;;(newline 1)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
4936 (insert "\n")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4937 (if vip-auto-indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4938 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4939 (setq vip-cted t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4940 (if vip-electric-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4941 (indent-according-to-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4942 (indent-to vip-current-indent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4943 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4944 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4947 ;; Viewing registers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4948
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4949 (defun vip-ket-function (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4950 "Function called by \], the ket. View registers and call \]\]."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4951 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4952 (let ((reg (read-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4953 (cond ((vip-valid-register reg '(letter Letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4954 (view-register (downcase reg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4955 ((vip-valid-register reg '(digit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4956 (let ((text (current-kill (- reg ?1) 'do-not-rotate)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4957 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4958 (set-buffer (get-buffer-create "*Output*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4959 (delete-region (point-min) (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4960 (insert (format "Register %c contains the string:\n" reg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4961 (insert text)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4962 (goto-char (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4963 (display-buffer "*Output*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4964 ((= ?\] reg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4965 (vip-next-heading arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4966 (t (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4967 vip-InvalidRegister reg)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4969 (defun vip-brac-function (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4970 "Function called by \[, the brac. View textmarkers and call \[\["
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4971 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4972 (let ((reg (read-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4973 (cond ((= ?\[ reg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4974 (vip-prev-heading arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4975 ((= ?\] reg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4976 (vip-heading-end arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4977 ((vip-valid-register reg '(letter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4978 (let* ((val (get-register (1+ (- reg ?a))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4979 (buf (if (not val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4980 (error vip-EmptyTextmarker reg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4981 (marker-buffer val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4982 (pos (marker-position val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4983 line-no text (s pos) (e pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4984 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4985 (set-buffer (get-buffer-create "*Output*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4986 (delete-region (point-min) (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4987 (if (and buf pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4988 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4989 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4990 (set-buffer buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4991 (setq line-no (1+ (count-lines (point-min) val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4992 (goto-char pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4993 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4994 (if (re-search-backward "[^ \t]" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4995 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4996 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4997 (setq s (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4998 (goto-char pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4999 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5000 (if (re-search-forward "[^ \t]" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5001 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5002 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5003 (setq e (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5004 (setq text (buffer-substring s e))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5005 (setq text (format "%s<%c>%s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5006 (substring text 0 (- pos s))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5007 reg (substring text (- pos s)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5008 (insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5009 (format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5010 "Textmarker `%c' is in buffer `%s' at line %d.\n"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5011 reg (buffer-name buf) line-no))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5012 (insert (format "Here is some text around %c:\n\n %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5013 reg text)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5014 (insert (format vip-EmptyTextmarker reg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5015 (goto-char (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5016 (display-buffer "*Output*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5017 (t (error vip-InvalidTextmarker reg)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5021 ;; commands in insertion mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5022
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5023 (defun vip-delete-backward-word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5024 "Delete previous word."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5025 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5026 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5027 (push-mark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5028 (backward-word arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5029 (delete-region (point) (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5030 (pop-mark)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5032
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5033 (defun vip-set-expert-level (&optional dont-change-unless)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5034 "Sets the expert level for a Viper user.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5035 Can be called interactively to change (temporarily or permanently) the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5036 current expert level.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5038 The optional argument DONT-CHANGE-UNLESS if not nil, says that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5039 the level should not be changed, unless its current value is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5040 meaningless (i.e., not one of 1,2,3,4,5).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5042 User level determines the setting of Viper variables that are most
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5043 sensitive for VI-style look-and-feel."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5044
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5045 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5047 (if (not (natnump vip-expert-level)) (setq vip-expert-level 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5049 (save-window-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5050 (delete-other-windows)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5051 ;; if 0 < vip-expert-level < vip-max-expert-level
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5052 ;; & dont-change-unless = t -- use it; else ask
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5053 (vip-ask-level dont-change-unless))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5054
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5055 (setq vip-always t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5056 vip-ex-style-motion t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5057 vip-ex-style-editing-in-insert t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5058 vip-want-ctl-h-help nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5059
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5060 (cond ((eq vip-expert-level 1) ; novice or beginner
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5061 (global-set-key ; in emacs-state
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5062 vip-toggle-key
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5063 (if (vip-window-display-p) 'vip-iconify 'suspend-emacs))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5064 (setq vip-no-multiple-ESC t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5065 vip-re-search t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5066 vip-vi-style-in-minibuffer t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5067 vip-search-wrap-around-t t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5068 vip-want-emacs-keys-in-vi nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5069 vip-want-emacs-keys-in-insert nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5070
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5071 ((and (> vip-expert-level 1) (< vip-expert-level 5))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
5072 ;; intermediate to guru
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5073 (setq vip-no-multiple-ESC (if (vip-window-display-p) t 'twice)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5074 vip-want-emacs-keys-in-vi t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5075 vip-want-emacs-keys-in-insert (> vip-expert-level 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5076
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5077 (if (eq vip-expert-level 4) ; respect user's ex-style motions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5078 ; and vip-no-multiple-ESC
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5079 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5080 (setq-default vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5081 (cdr (assoc 'vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5082 vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5083 vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5084 (cdr (assoc 'vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5085 vip-saved-user-settings)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5086 (setq vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5087 (cdr (assoc 'vip-ex-style-motion vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5088 vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5089 (cdr (assoc 'vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5090 vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5091 vip-re-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5092 (cdr (assoc 'vip-re-search vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5093 vip-no-multiple-ESC
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5094 (cdr (assoc 'vip-no-multiple-ESC
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5095 vip-saved-user-settings))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5096
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5097 ;; A wizard!!
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5098 ;; Ideally, if 5 is selected, a buffer should pop up to let the
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5099 ;; user toggle the values of variables.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5100 (t (setq-default vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5101 (cdr (assoc 'vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5102 vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5103 vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5104 (cdr (assoc 'vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5105 vip-saved-user-settings)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5106 (setq vip-want-ctl-h-help
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5107 (cdr (assoc 'vip-want-ctl-h-help vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5108 vip-always
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5109 (cdr (assoc 'vip-always vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5110 vip-no-multiple-ESC
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5111 (cdr (assoc 'vip-no-multiple-ESC vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5112 vip-ex-style-motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5113 (cdr (assoc 'vip-ex-style-motion vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5114 vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5115 (cdr (assoc 'vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5116 vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5117 vip-re-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5118 (cdr (assoc 'vip-re-search vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5119 vip-want-emacs-keys-in-vi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5120 (cdr (assoc 'vip-want-emacs-keys-in-vi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5121 vip-saved-user-settings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5122 vip-want-emacs-keys-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5123 (cdr (assoc 'vip-want-emacs-keys-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5124 vip-saved-user-settings)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5125 (vip-set-mode-vars-for vip-current-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5126 (if (or vip-always
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5127 (and (> vip-expert-level 0) (> 5 vip-expert-level)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5128 (vip-set-hooks)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5130 ;; Ask user expert level.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5131 (defun vip-ask-level (dont-change-unless)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5132 (let ((ask-buffer " *vip-ask-level*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5133 level-changed repeated)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5134 (save-window-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5135 (switch-to-buffer ask-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5136
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5137 (or (eq this-command 'vip-set-expert-level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5138 (and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5139 (<= vip-expert-level vip-max-expert-level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5140 (>= vip-expert-level 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5141 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5142 (insert "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5143
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5144 *** Important Notice for VIP users***
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5146 This is VIPER
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5148 @joke
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5149 Viper Is a Package for Emacs Rebels,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5150 a VI Plan for Emacs Rescue,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5151 and a venomous VI PERil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5152 @end joke
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5154 Technically speaking, Viper is a new Vi emulator that replaces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5155 the old VIP package.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5156
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5157 Viper emulates Vi much better than VIP. It also significantly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5158 extends and improves upon Vi in many useful ways.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5159
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5160 Although many VIP settings in your ~/.vip are compatible with Viper,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5161 you may have to change some of them. Please refer to the documentation,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5162 which can be obtained by executing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5164 :help
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5166 when Viper is in Vi state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5168 If you will be so lucky as to find a bug, report it via the command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5170 :submitReport
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5172 Type any key to continue... ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5174 (read-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5175 (erase-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5177 (while (or (> vip-expert-level vip-max-expert-level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5178 (< vip-expert-level 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5179 (null dont-change-unless))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5180 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5181 (if repeated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5182 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5183 (message "Invalid user level")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5184 (beep 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5185 (setq repeated t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5186 (setq dont-change-unless t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5187 level-changed t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5188 (insert "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5189 Please specify your level of familiarity with the venomous VI PERil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5190 (and the VI Plan for Emacs Rescue).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5191 You can change it at any time by typing `M-x vip-set-expert-level RET'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5193 1 -- BEGINNER: Almost all Emacs features are suppressed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5194 Feels almost like straight Vi. File name completion and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5195 command history in the minibuffer are thrown in as a bonus.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5196 To use Emacs productively, you must reach level 3 or higher.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5197 2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5198 so most Emacs commands can be used when Viper is in Vi state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5199 Good progress---you are well on the way to level 3!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5200 3 -- GRAND MASTER: Like 3, but most Emacs commands are available also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5201 in Viper's insert state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5202 4 -- GURU: Like 3, but user settings are respected for vip-no-multiple-ESC,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5203 vip-re-search, vip-ex-style-motion, & vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5204 variables. Adjust these settings to your taste.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5205 5 -- WIZARD: Like 4, but user settings are also respected for vip-always,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5206 vip-want-ctl-h-help, vip-want-emacs-keys-in-vi, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5207 vip-want-emacs-keys-in-insert. Adjust these to your taste.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5209 Please, specify your level now: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5210
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5211 (setq vip-expert-level (- (vip-read-char-exclusive) ?0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5212 ) ; end while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5214 ;; tell the user if level was changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5215 (and level-changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5216 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5217 (insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5218 (format "\n\n\n\n\n\t\tYou have selected user level %d"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5219 vip-expert-level))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5220 (if (y-or-n-p "Do you wish to make this change permanent? ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5221 ;; save the setting for vip-expert-level
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5222 (vip-save-setting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5223 'vip-expert-level
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5224 (format "Saving user level %d ..." vip-expert-level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5225 vip-custom-file-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5226 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5227 (bury-buffer) ; remove ask-buffer from screen
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5228 (message "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5229 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5232 (defun viper-version ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5233 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5234 (message "Viper version is %s" viper-version))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5235
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5236 (defalias 'vip-version 'viper-version)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5237
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5238 (defun vip-nil ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5239 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5240 (beep 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5242
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5243 ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5244 (defun vip-register-to-point (char &optional enforce-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5245 "Like jump-to-register, but switches to another buffer in another window."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5246 (interactive "cViper register to point: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5247 (let ((val (get-register char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5248 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5249 ((and (fboundp 'frame-configuration-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5250 (frame-configuration-p val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5251 (set-frame-configuration val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5252 ((window-configuration-p val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5253 (set-window-configuration val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5254 ((vip-valid-marker val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5255 (if (and enforce-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5256 (not (equal (current-buffer) (marker-buffer val))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5257 (error (concat vip-EmptyTextmarker " in this buffer")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5258 (1- (+ char ?a))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5259 (pop-to-buffer (marker-buffer val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5260 (goto-char val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5261 ((and (consp val) (eq (car val) 'file))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5262 (find-file (cdr val)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5263 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5264 (error vip-EmptyTextmarker (1- (+ char ?a)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5265
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5266
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5267 (defun vip-save-kill-buffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5268 "Save then kill current buffer. "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5269 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5270 (if (< vip-expert-level 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5271 (save-buffers-kill-emacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5272 (save-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5273 (kill-buffer (current-buffer))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5275
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5276
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5277 ;;; Bug Report
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5279 (defun vip-submit-report ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5280 "Submit bug report on Viper."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5281 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5282 (let ((reporter-prompt-for-summary-p t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5283 (vip-device-type (vip-device-type))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5284 color-display-p frame-parameters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5285 minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5286 varlist salutation window-config)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5288 ;; If mode info is needed, add variable to `let' and then set it below,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5289 ;; like we did with color-display-p.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5290 (setq color-display-p (if (vip-window-display-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5291 (vip-color-display-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5292 'non-x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5293 minibuffer-vi-face (if (vip-has-face-support-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5294 (vip-get-face vip-minibuffer-vi-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5295 'non-x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5296 minibuffer-insert-face (if (vip-has-face-support-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5297 (vip-get-face vip-minibuffer-insert-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5298 'non-x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5299 minibuffer-emacs-face (if (vip-has-face-support-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5300 (vip-get-face vip-minibuffer-emacs-face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5301 'non-x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5302 frame-parameters (if (fboundp 'frame-parameters)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5303 (frame-parameters (selected-frame))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5304
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5305 (setq varlist (list 'vip-vi-minibuffer-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5306 'vip-insert-minibuffer-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5307 'vip-vi-intercept-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5308 'vip-vi-local-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5309 'vip-vi-kbd-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5310 'vip-vi-global-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5311 'vip-vi-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5312 'vip-vi-diehard-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5313 'vip-vi-basic-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5314 'vip-replace-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5315 'vip-insert-intercept-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5316 'vip-insert-local-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5317 'vip-insert-kbd-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5318 'vip-insert-global-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5319 'vip-insert-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5320 'vip-insert-diehard-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5321 'vip-insert-basic-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5322 'vip-emacs-intercept-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5323 'vip-emacs-local-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5324 'vip-emacs-kbd-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5325 'vip-emacs-global-user-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5326 'vip-emacs-state-modifier-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5327 'vip-automatic-iso-accents
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5328 'vip-want-emacs-keys-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5329 'vip-want-emacs-keys-in-vi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5330 'vip-keep-point-on-undo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5331 'vip-no-multiple-ESC
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5332 'vip-ESC-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5333 'vip-want-ctl-h-help
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5334 'vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5335 'vip-delete-backwards-in-replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5336 'vip-vi-style-in-minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5337 'vip-vi-state-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5338 'vip-insert-state-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5339 'vip-replace-state-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5340 'vip-emacs-state-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5341 'ex-cycle-other-window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5342 'ex-cycle-through-non-files
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5343 'vip-expert-level
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5344 'major-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5345 'vip-device-type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5346 'color-display-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5347 'frame-parameters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5348 'minibuffer-vi-face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5349 'minibuffer-insert-face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5350 'minibuffer-emacs-face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5351 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5352 (setq salutation "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5353 Congratulations! You may have unearthed a bug in Viper!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5354 Please mail a concise, accurate summary of the problem to the address above.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5355
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5356 -------------------------------------------------------------------")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5357 (setq window-config (current-window-configuration))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5358 (with-output-to-temp-buffer " *vip-info*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5359 (switch-to-buffer " *vip-info*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5360 (delete-other-windows)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5361 (princ "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5362 PLEASE FOLLOW THESE PROCEDURES
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5363 ------------------------------
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5365 Before reporting a bug, please verify that it is related to Viper, and is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5366 not cause by other packages you are using.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5367
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5368 Don't report compilation warnings, unless you are certain that there is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5369 problem. These warnings are normal and unavoidable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5370
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5371 Please note that users should not modify variables and keymaps other than
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5372 those advertised in the manual. Such `customization' is likely to crash
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5373 Viper, as it would any other improperly customized Emacs package.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5374
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5375 If you are reporting an error message received while executing one of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5376 Viper commands, type:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5378 M-x set-variable <Return> debug-on-error <Return> t <Return>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5379
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5380 Then reproduce the error. The above command will cause Emacs to produce a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5381 back trace of the execution that leads to the error. Please include this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5382 trace in your bug report.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5383
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5384 If you believe that one of Viper's commands goes into an infinite loop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5385 \(e.g., Emacs freezes\), type:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5386
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5387 M-x set-variable <Return> debug-on-quit <Return> t <Return>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5389 Then reproduce the problem. Wait for a few seconds, then type C-g to abort
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5390 the current command. Include the resulting back trace in the bug report.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5392 Mail anyway (y or n)? ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5393 (if (y-or-n-p "Mail anyway? ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5394 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5395 (set-window-configuration window-config)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5396 (error "Bug report aborted")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5398 (require 'reporter)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5399 (set-window-configuration window-config)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5401 (reporter-submit-bug-report "kifer@cs.sunysb.edu"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5402 (vip-version)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5403 varlist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5404 nil 'delete-other-windows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5405 salutation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5406 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5409
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5410
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5411 ;; Smoothes out the difference between Emacs' unread-command-events
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5412 ;; and XEmacs unread-command-event. Arg is a character, an event, a list of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5413 ;; events or a sequence of keys.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5414 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5415 ;; Due to the way unread-command-events in Emacs (not XEmacs), a non-event
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5416 ;; symbol in unread-command-events list may cause Emacs to turn this symbol
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5417 ;; into an event. Below, we delete nil from event lists, since nil is the most
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5418 ;; common symbol that might appear in this wrong context.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5419 (defun vip-set-unread-command-events (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5420 (if vip-emacs-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5421 (setq
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5422 unread-command-events
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5423 (let ((new-events
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5424 (cond ((eventp arg) (list arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5425 ((listp arg) arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5426 ((sequencep arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5427 (listify-key-sequence arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5428 (t (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5429 "vip-set-unread-command-events: Invalid argument, %S"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5430 arg)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5431 (if (not (eventp nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5432 (setq new-events (delq nil new-events)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5433 (append new-events unread-command-events)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5434 ;; XEmacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5435 (setq
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5436 unread-command-events
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5437 (append
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5438 (cond ((vip-characterp arg) (list (character-to-event arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5439 ((eventp arg) (list arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5440 ((stringp arg) (mapcar 'character-to-event arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5441 ((vectorp arg) (append arg nil)) ; turn into list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5442 ((listp arg) (vip-eventify-list-xemacs arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5443 (t (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5444 "vip-set-unread-command-events: Invalid argument, %S" arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5445 unread-command-events))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5447 ;; list is assumed to be a list of events of characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5448 (defun vip-eventify-list-xemacs (lis)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5449 (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5450 (function (lambda (elt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5451 (cond ((vip-characterp elt) (character-to-event elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5452 ((eventp elt) elt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5453 (t (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5454 "vip-eventify-list-xemacs: can't convert to event, %S"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5455 elt)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5456 lis))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5460 ;; The following is provided for compatibility with older VIP's
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5462 (defalias 'vip-change-mode-to-vi 'vip-change-state-to-vi)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5463 (defalias 'vip-change-mode-to-insert 'vip-change-state-to-insert)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5464 (defalias 'vip-change-mode-to-emacs 'vip-change-state-to-emacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5468 ;;; Load .vip and set up hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5469
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5470 ;; This hook designed to enable Vi-style editing in comint-based modes."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5471 (defun vip-comint-mode-hook ()
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5472 (setq require-final-newline nil
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5473 vip-ex-style-editing-in-insert nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5474 vip-ex-style-motion nil)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5475 (vip-change-state-to-insert))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5476
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5478 ;; This sets major mode hooks to make them come up in vi-state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5479 (defun vip-set-hooks ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5481 ;; It is of course a misnomer to call viper-mode a `major mode'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5482 ;; However, this has the effect that if the user didn't specify the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5483 ;; default mode, new buffers that fall back on the default will come up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5484 ;; in Fundamental Mode and Vi state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5485 (setq default-major-mode 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5486
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5487 ;; The following major modes should come up in vi-state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5488 (defadvice fundamental-mode (after vip-fundamental-mode-ad activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5489 "Run `vip-change-state-to-vi' on entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5490 (vip-change-state-to-vi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5491
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5492 (defvar makefile-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5493 (add-hook 'makefile-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5494
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5495 (defvar help-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5496 (add-hook 'help-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5497
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5498 (defvar awk-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5499 (add-hook 'awk-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5501 (defvar html-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5502 (add-hook 'html-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5503 (defvar html-helper-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5504 (add-hook 'html-helper-mode-hook 'viper-mode)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5505 (defvar java-mode-hook)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5506 (add-hook 'java-mode-hook 'viper-mode)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5507
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5508 (defvar emacs-lisp-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5509 (add-hook 'emacs-lisp-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5510
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5511 (defvar lisp-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5512 (add-hook 'lisp-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5514 (defvar bibtex-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5515 (add-hook 'bibtex-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5516
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5517 (defvar cc-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5518 (add-hook 'cc-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5520 (defvar c-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5521 (add-hook 'c-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5523 (defvar c++-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5524 (add-hook 'c++-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5526 (defvar lisp-interaction-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5527 (add-hook 'lisp-interaction-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5529 (defvar fortran-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5530 (add-hook 'fortran-mode-hook 'vip-mode)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
5531
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5532 (defvar basic-mode-hook)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5533 (add-hook 'basic-mode-hook 'vip-mode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5534 (defvar bat-mode-hook)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5535 (add-hook 'bat-mode-hook 'vip-mode)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
5536
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5537 (defvar text-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5538 (add-hook 'text-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5540 (add-hook 'completion-list-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5541 (add-hook 'compilation-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5542
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5543 (add-hook 'perl-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5544 (add-hook 'tcl-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5546 (defvar emerge-startup-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5547 (add-hook 'emerge-startup-hook 'vip-change-state-to-emacs)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5548
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5549 ;; Tell vc-diff to put *vc* in Vi mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5550 (if (featurep 'vc)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5551 (defadvice vc-diff (after vip-vc-ad activate)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5552 "Force Vi state in VC diff buffer."
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5553 (vip-change-state-to-vi))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5554 (vip-eval-after-load
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5555 "vc"
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5556 '(defadvice vc-diff (after vip-vc-ad activate)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5557 "Force Vi state in VC diff buffer."
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5558 (vip-change-state-to-vi))))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
5559
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5560 (vip-eval-after-load
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5561 "emerge"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5562 '(defadvice emerge-quit (after vip-emerge-advice activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5563 "Run `vip-change-state-to-vi' after quitting emerge."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5564 (vip-change-state-to-vi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5565 ;; In case Emerge was loaded before Viper.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5566 (defadvice emerge-quit (after vip-emerge-advice activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5567 "Run `vip-change-state-to-vi' after quitting emerge."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5568 (vip-change-state-to-vi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5569
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5570 (vip-eval-after-load
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5571 "asm-mode"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5572 '(defadvice asm-mode (after vip-asm-mode-ad activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5573 "Run `vip-change-state-to-vi' on entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5574 (vip-change-state-to-vi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5576 ;; passwd.el sets up its own buffer, which turns up in Vi mode,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5577 ;; thus overriding the local map. We don't need Vi mode here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5578 (vip-eval-after-load
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5579 "passwd"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5580 '(defadvice read-passwd-1 (before vip-passwd-ad activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5581 "Switch to emacs state while reading password."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5582 (vip-change-state-to-emacs)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5584 (vip-eval-after-load
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5585 "prolog"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5586 '(defadvice prolog-mode (after vip-prolog-ad activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5587 "Switch to Vi state in Prolog mode."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5588 (vip-change-state-to-vi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5590 ;; Emacs shell, ange-ftp, and comint-based modes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5591 (defvar comint-mode-hook)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5592 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5593 'comint-mode 'insert-state vip-comint-mode-modifier-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5594 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5595 'comint-mode 'vi-state vip-comint-mode-modifier-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5596 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5597 'shell-mode 'insert-state vip-comint-mode-modifier-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5598 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5599 'shell-mode 'vi-state vip-comint-mode-modifier-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5600 ;; ange-ftp in XEmacs
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5601 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5602 'ange-ftp-shell-mode 'insert-state vip-comint-mode-modifier-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5603 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5604 'ange-ftp-shell-mode 'vi-state vip-comint-mode-modifier-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5605 ;; ange-ftp in Emacs
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5606 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5607 'internal-ange-ftp-mode 'insert-state vip-comint-mode-modifier-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5608 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5609 'internal-ange-ftp-mode 'vi-state vip-comint-mode-modifier-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5610 ;; set hook
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5611 (add-hook 'comint-mode-hook 'vip-comint-mode-hook)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
5612
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5613 ;; Shell scripts
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5614 (defvar sh-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5615 (add-hook 'sh-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5616 (defvar ksh-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5617 (add-hook 'ksh-mode-hook 'viper-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5618
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5619 ;; Dired
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5620 (vip-modify-major-mode 'dired-mode 'emacs-state vip-dired-modifier-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5621 (vip-set-emacs-search-style-macros nil 'dired-mode)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5622 (add-hook 'dired-mode-hook 'vip-change-state-to-emacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5623
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5624 ;; Tar
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5625 (vip-modify-major-mode 'tar-mode 'emacs-state vip-slash-and-colon-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5626 (vip-set-emacs-search-style-macros nil 'tar-mode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5627
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5628 ;; MH-E
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5629 (vip-modify-major-mode 'mh-folder-mode 'emacs-state vip-slash-and-colon-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5630 (vip-set-emacs-search-style-macros nil 'mh-folder-mode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5631 ;; changing state to emacs is needed so the preceding will take hold
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5632 (add-hook 'mh-folder-mode-hook 'vip-change-state-to-emacs)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5633 (add-hook 'mh-show-mode-hook 'viper-mode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5634
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5635 ;; Gnus
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5636 (vip-modify-major-mode 'gnus-group-mode 'emacs-state vip-slash-and-colon-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5637 (vip-set-emacs-search-style-macros nil 'gnus-group-mode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5638 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5639 'gnus-summary-mode 'emacs-state vip-slash-and-colon-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5640 (vip-set-emacs-search-style-macros nil 'gnus-summary-mode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5641 ;; changing state to emacs is needed so the preceding will take hold
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5642 (add-hook 'gnus-group-mode-hook 'vip-change-state-to-emacs)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5643 (add-hook 'gnus-summary-mode-hook 'vip-change-state-to-emacs)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5644 (add-hook 'gnus-article-mode-hook 'viper-mode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5645
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5646 ;; Info
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5647 (vip-modify-major-mode 'Info-mode 'emacs-state vip-slash-and-colon-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5648 (vip-set-emacs-search-style-macros nil 'Info-mode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5649 ;; Switching to emacs is needed so the above will take hold
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5650 (defadvice Info-mode (after vip-Info-ad activate)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5651 "Switch to emacs mode."
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5652 (vip-change-state-to-emacs))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5653
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5654 ;; Buffer menu
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5655 (vip-modify-major-mode
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5656 'Buffer-menu-mode 'emacs-state vip-slash-and-colon-map)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5657 (vip-set-emacs-search-style-macros nil 'Buffer-menu-mode)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5658 ;; Switching to emacs is needed so the above will take hold
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5659 (defadvice Buffer-menu-mode (after vip-Buffer-menu-ad activate)
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5660 "Switch to emacs mode."
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5661 (vip-change-state-to-emacs))
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5662
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5663 ;; View mode
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5664 (if vip-emacs-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5665 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5666 (defvar view-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5667 (add-hook 'view-mode-hook 'vip-change-state-to-emacs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5668 (defadvice view-minor-mode (after vip-view-ad activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5669 "Switch to Emacs state in View mode."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5670 (vip-change-state-to-emacs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5671 (defvar view-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5672 (add-hook 'view-hook 'vip-change-state-to-emacs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5673
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5674 ;; For VM users.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5675 ;; Put summary and other VM buffers in Emacs state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5676 (defvar vm-mode-hooks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5677 (defvar vm-summary-mode-hooks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5678 (add-hook 'vm-mode-hooks 'vip-change-state-to-emacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5679 (add-hook 'vm-summary-mode-hooks 'vip-change-state-to-emacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5680
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5681 ;; For RMAIL users.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5682 ;; Put buf in Emacs state after edit.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5683 (vip-eval-after-load
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5684 "rmailedit"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5685 '(defadvice rmail-cease-edit (after vip-rmail-advice activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5686 "Switch to emacs state when done editing message."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5687 (vip-change-state-to-emacs)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5688 ;; In case RMAIL was loaded before Viper.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5689 (defadvice rmail-cease-edit (after vip-rmail-advice activate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5690 "Switch to emacs state when done editing message."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5691 (vip-change-state-to-emacs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5692 ) ; vip-set-hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5693
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5694 ;; Set some useful macros
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5695 ;; These must be before we load .vip, so the user can unrecord them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5697 ;; repeat the 2nd previous command without rotating the command history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5698 (vip-record-kbd-macro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5699 (vector vip-repeat-from-history-key '\1) 'vi-state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5700 [(meta x) v i p - r e p e a t - f r o m - h i s t o r y return] 't)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5701 ;; repeat the 3d previous command without rotating the command history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5702 (vip-record-kbd-macro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5703 (vector vip-repeat-from-history-key '\2) 'vi-state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5704 [(meta x) v i p - r e p e a t - f r o m - h i s t o r y return] 't)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5705
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5706 ;; set the toggle case sensitivity and regexp search macros
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5707 (vip-set-vi-search-style-macros nil)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 12
diff changeset
5708
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5710 ;; ~/.vip is loaded if it exists
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5711 (if (and (file-exists-p vip-custom-file-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5712 (not noninteractive))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5713 (load vip-custom-file-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5714
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5715 ;; VIP compatibility: merge whatever the user has in vip-mode-map into
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5716 ;; Viper's basic map.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5717 (vip-add-keymap vip-mode-map vip-vi-global-user-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5718
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5720 ;; Applying Viper customization -- runs after (load .vip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5721
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5722 ;; Save user settings or Viper defaults for vars controled by vip-expert-level
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5723 (setq vip-saved-user-settings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5724 (list (cons 'vip-want-ctl-h-help vip-want-ctl-h-help)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5725 (cons 'vip-always vip-always)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5726 (cons 'vip-no-multiple-ESC vip-no-multiple-ESC)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5727 (cons 'vip-ex-style-motion vip-ex-style-motion)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5728 (cons 'vip-ex-style-editing-in-insert
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5729 vip-ex-style-editing-in-insert)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5730 (cons 'vip-want-emacs-keys-in-vi vip-want-emacs-keys-in-vi)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5731 (cons 'vip-want-emacs-keys-in-insert vip-want-emacs-keys-in-insert)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5732 (cons 'vip-re-search vip-re-search)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5733
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5735 (vip-set-minibuffer-style)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5736 (vip-set-minibuffer-faces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5737 (vip-set-search-face)
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5738 (vip-set-replace-overlay-face)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5739 (if vip-buffer-search-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5740 (vip-buffer-search-enable))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5741 (vip-update-alphanumeric-class)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5742
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5743 ;;; Familiarize Viper with some minor modes that have their own keymaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5744 (vip-harness-minor-mode "compile")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5745 (vip-harness-minor-mode "outline")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5746 (vip-harness-minor-mode "allout")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5747 (vip-harness-minor-mode "xref")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5748 (vip-harness-minor-mode "lmenu")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5749 (vip-harness-minor-mode "vc")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5750 (vip-harness-minor-mode "ltx-math") ; LaTeX-math-mode in AUC-TeX
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5751 (vip-harness-minor-mode "latex") ; which is in one of these two files
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5752 (vip-harness-minor-mode "cyrillic")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5753 (vip-harness-minor-mode "russian")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5754 (vip-harness-minor-mode "view-less")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5755 (vip-harness-minor-mode "view")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5757
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5758 ;; Intercept maps could go in viper-keym.el
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5759 ;; We keep them here in case someone redefines them in ~/.vip
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5760
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5761 (define-key vip-vi-intercept-map vip-ESC-key 'vip-intercept-ESC-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5762 (define-key vip-insert-intercept-map vip-ESC-key 'vip-intercept-ESC-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5764 ;; This is taken care of by vip-insert-global-user-map.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5765 ;;(define-key vip-replace-map vip-ESC-key 'vip-intercept-ESC-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5766
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5767
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5768 ;; The default vip-toggle-key is \C-z; for the novice, it suspends or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5769 ;; iconifies Emacs
12
bcdc7deadc19 Import from CVS: tag r19-15b7
cvs
parents: 0
diff changeset
5770 (define-key vip-vi-intercept-map vip-toggle-key 'vip-toggle-key-action)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5771 (define-key vip-emacs-intercept-map vip-toggle-key 'vip-change-state-to-vi)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5772
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5773
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5774 (if (or vip-always
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5775 (and (< vip-expert-level 5) (> vip-expert-level 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5776 (vip-set-hooks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5777
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5778 ;; Let all minor modes take effect after loading
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5779 ;; this may not be enough, so we also set default minor-mode-alist.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5780 ;; Without setting the default, new buffers that come up in emacs mode have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5781 ;; minor-mode-map-alist = nil, unless we call vip-change-state-*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5782 (if (eq vip-current-state 'emacs-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5783 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5784 (vip-change-state-to-emacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5785 (setq-default minor-mode-map-alist minor-mode-map-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5786 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5788
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5789 (run-hooks 'vip-load-hook) ; the last chance to change something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5791 (provide 'vip19)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5792 (provide 'vip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5794 ;;; viper.el ends here