Mercurial > emacs
annotate lisp/emulation/viper-cmd.el @ 74194:9b921eb5917f
(gdb): Explain how to run in text command mode
more clearly. Say in error message that multiple debugging
requires restarting GDB.
author | Nick Roberts <nickrob@snap.net.nz> |
---|---|
date | Sun, 26 Nov 2006 08:40:43 +0000 |
parents | db25befb2938 |
children | 2e5f946f7726 7eeafaaa9eab |
rev | line source |
---|---|
18129 | 1 ;;; viper-cmd.el --- Vi command support for Viper |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2 |
64701
34bd8e434dd7
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64485
diff
changeset
|
3 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
68648
067115a6e738
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
65856
diff
changeset
|
4 ;; 2005, 2006 Free Software Foundation, Inc. |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
5 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
7 |
19905
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
8 ;; This file is part of GNU Emacs. |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
9 |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
10 ;; GNU Emacs is free software; you can redistribute it and/or modify |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
11 ;; it under the terms of the GNU General Public License as published by |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
13 ;; any later version. |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
14 |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
15 ;; GNU Emacs is distributed in the hope that it will be useful, |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
18 ;; GNU General Public License for more details. |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
19 |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
20 ;; You should have received a copy of the GNU General Public License |
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
18129 | 24 |
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33842
diff
changeset
|
25 ;;; Commentary: |
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33842
diff
changeset
|
26 |
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33842
diff
changeset
|
27 ;;; Code: |
18129 | 28 |
29 (provide 'viper-cmd) | |
18172 | 30 (require 'advice) |
18129 | 31 |
32 ;; Compiler pacifier | |
19078 | 33 (defvar viper-minibuffer-current-face) |
34 (defvar viper-minibuffer-insert-face) | |
35 (defvar viper-minibuffer-vi-face) | |
36 (defvar viper-minibuffer-emacs-face) | |
18289 | 37 (defvar viper-always) |
19078 | 38 (defvar viper-mode-string) |
39 (defvar viper-custom-file-name) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
40 (defvar viper--key-maps) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
41 (defvar viper--intercept-key-maps) |
18129 | 42 (defvar iso-accents-mode) |
19462 | 43 (defvar quail-mode) |
44 (defvar quail-current-str) | |
18129 | 45 (defvar zmacs-region-stays) |
46 (defvar mark-even-if-inactive) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
47 (defvar init-message) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
48 (defvar initial) |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
49 (defvar undo-beg-posn) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
50 (defvar undo-end-posn) |
18129 | 51 |
18172 | 52 ;; loading happens only in non-interactive compilation |
53 ;; in order to spare non-viperized emacs from being viperized | |
54 (if noninteractive | |
55 (eval-when-compile | |
56 (let ((load-path (cons (expand-file-name ".") load-path))) | |
57 (or (featurep 'viper-util) | |
58 (load "viper-util.el" nil nil 'nosuffix)) | |
59 (or (featurep 'viper-keym) | |
60 (load "viper-keym.el" nil nil 'nosuffix)) | |
61 (or (featurep 'viper-mous) | |
62 (load "viper-mous.el" nil nil 'nosuffix)) | |
63 (or (featurep 'viper-macs) | |
64 (load "viper-macs.el" nil nil 'nosuffix)) | |
65 (or (featurep 'viper-ex) | |
66 (load "viper-ex.el" nil nil 'nosuffix)) | |
67 ))) | |
18129 | 68 ;; end pacifier |
69 | |
70 | |
71 (require 'viper-util) | |
72 (require 'viper-keym) | |
73 (require 'viper-mous) | |
74 (require 'viper-macs) | |
75 (require 'viper-ex) | |
76 | |
77 | |
78 | |
79 ;; Generic predicates | |
80 | |
81 ;; These test functions are shamelessly lifted from vip 4.4.2 by Aamod Sane | |
82 | |
83 ;; generate test functions | |
84 ;; given symbol foo, foo-p is the test function, foos is the set of | |
85 ;; Viper command keys | |
19078 | 86 ;; (macroexpand '(viper-test-com-defun foo)) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
87 ;; (defun foo-p (com) (consp (memq com foos))) |
18129 | 88 |
19078 | 89 (defmacro viper-test-com-defun (name) |
18129 | 90 (let* ((snm (symbol-name name)) |
91 (nm-p (intern (concat snm "-p"))) | |
92 (nms (intern (concat snm "s")))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
93 `(defun ,nm-p (com) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
94 (consp (viper-memq-char com ,nms) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
95 )))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
96 |
18129 | 97 ;; Variables for defining VI commands |
98 | |
99 ;; Modifying commands that can be prefixes to movement commands | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
100 (defvar viper-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\")) |
19078 | 101 ;; define viper-prefix-command-p |
102 (viper-test-com-defun viper-prefix-command) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
103 |
18129 | 104 ;; Commands that are pairs eg. dd. r and R here are a hack |
19078 | 105 (defconst viper-charpair-commands '(?c ?d ?y ?! ?= ?< ?> ?r ?R)) |
106 ;; define viper-charpair-command-p | |
107 (viper-test-com-defun viper-charpair-command) | |
108 | |
109 (defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?H ?j ?k ?l | |
18129 | 110 ?H ?M ?L ?n ?t ?T ?w ?W ?$ ?% |
111 ?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?` | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
112 ?\; ?, ?0 ?? ?/ ?\ ?\C-m |
19078 | 113 space return |
114 delete backspace | |
18129 | 115 ) |
116 "Movement commands") | |
19078 | 117 ;; define viper-movement-command-p |
118 (viper-test-com-defun viper-movement-command) | |
18129 | 119 |
18839 | 120 ;; Vi digit commands |
19078 | 121 (defconst viper-digit-commands '(?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9)) |
122 | |
123 ;; define viper-digit-command-p | |
124 (viper-test-com-defun viper-digit-command) | |
18129 | 125 |
126 ;; Commands that can be repeated by . (dotted) | |
19078 | 127 (defconst viper-dotable-commands '(?c ?d ?C ?s ?S ?D ?> ?<)) |
128 ;; define viper-dotable-command-p | |
129 (viper-test-com-defun viper-dotable-command) | |
18129 | 130 |
131 ;; Commands that can follow a # | |
19078 | 132 (defconst viper-hash-commands '(?c ?C ?g ?q ?s)) |
133 ;; define viper-hash-command-p | |
134 (viper-test-com-defun viper-hash-command) | |
18129 | 135 |
136 ;; Commands that may have registers as prefix | |
19078 | 137 (defconst viper-regsuffix-commands '(?d ?y ?Y ?D ?p ?P ?x ?X)) |
138 ;; define viper-regsuffix-command-p | |
139 (viper-test-com-defun viper-regsuffix-command) | |
140 | |
141 (defconst viper-vi-commands (append viper-movement-commands | |
142 viper-digit-commands | |
143 viper-dotable-commands | |
144 viper-charpair-commands | |
145 viper-hash-commands | |
146 viper-prefix-commands | |
147 viper-regsuffix-commands) | |
18129 | 148 "The list of all commands in Vi-state.") |
19078 | 149 ;; define viper-vi-command-p |
150 (viper-test-com-defun viper-vi-command) | |
18129 | 151 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
152 ;; Where viper saves mark. This mark is resurrected by m^ |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
153 (defvar viper-saved-mark nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
154 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
155 ;; Contains user settings for vars affected by viper-set-expert-level function. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
156 ;; Not a user option. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
157 (defvar viper-saved-user-settings nil) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
158 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
159 |
18129 | 160 |
161 ;;; CODE | |
162 | |
163 ;; sentinels | |
164 | |
19078 | 165 ;; Runs viper-after-change-functions inside after-change-functions |
166 (defun viper-after-change-sentinel (beg end len) | |
21940 | 167 (run-hook-with-args 'viper-after-change-functions beg end len)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
168 |
19078 | 169 ;; Runs viper-before-change-functions inside before-change-functions |
170 (defun viper-before-change-sentinel (beg end) | |
21940 | 171 (run-hook-with-args 'viper-before-change-functions beg end)) |
18129 | 172 |
19078 | 173 (defsubst viper-post-command-sentinel () |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
174 (run-hooks 'viper-post-command-hooks) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
175 (if (eq viper-current-state 'vi-state) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
176 (viper-restore-cursor-color 'after-insert-mode))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
177 |
19078 | 178 (defsubst viper-pre-command-sentinel () |
179 (run-hooks 'viper-pre-command-hooks)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
180 |
18129 | 181 ;; Needed so that Viper will be able to figure the last inserted |
182 ;; chunk of text with reasonable accuracy. | |
19078 | 183 (defsubst viper-insert-state-post-command-sentinel () |
184 (if (and (memq viper-current-state '(insert-state replace-state)) | |
185 viper-insert-point | |
186 (>= (point) viper-insert-point)) | |
187 (setq viper-last-posn-while-in-insert-state (point-marker))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
188 (or (viper-overlay-p viper-replace-overlay) |
18129 | 189 (progn |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
190 (viper-set-replace-overlay (point-min) (point-min)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
191 (viper-hide-replace-overlay))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
192 (if (eq viper-current-state 'insert-state) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
193 (let ((has-saved-cursor-color-in-insert-mode |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
194 (stringp (viper-get-saved-cursor-color-in-insert-mode)))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
195 (or has-saved-cursor-color-in-insert-mode |
19078 | 196 (string= (viper-get-cursor-color) viper-insert-state-cursor-color) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
197 ;; save current color, if not already saved |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
198 (viper-save-cursor-color 'before-insert-mode)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
199 ;; set insert mode cursor color |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
200 (viper-change-cursor-color viper-insert-state-cursor-color))) |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
201 (if (and viper-emacs-state-cursor-color (eq viper-current-state 'emacs-state)) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
202 (let ((has-saved-cursor-color-in-emacs-mode |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
203 (stringp (viper-get-saved-cursor-color-in-emacs-mode)))) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
204 (or has-saved-cursor-color-in-emacs-mode |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
205 (string= (viper-get-cursor-color) viper-emacs-state-cursor-color) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
206 ;; save current color, if not already saved |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
207 (viper-save-cursor-color 'before-emacs-mode)) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
208 ;; set emacs mode cursor color |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
209 (viper-change-cursor-color viper-emacs-state-cursor-color))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
210 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
211 (if (and (memq this-command '(dabbrev-expand hippie-expand)) |
19078 | 212 (integerp viper-pre-command-point) |
19756 | 213 (markerp viper-insert-point) |
214 (marker-position viper-insert-point) | |
19078 | 215 (> viper-insert-point viper-pre-command-point)) |
19756 | 216 (viper-move-marker-locally viper-insert-point viper-pre-command-point)) |
18129 | 217 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
218 |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
219 (defsubst viper-preserve-cursor-color () |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
220 (or (memq this-command '(self-insert-command |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
221 viper-del-backward-char-in-insert |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
222 viper-del-backward-char-in-replace |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
223 viper-delete-backward-char |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
224 viper-join-lines |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
225 viper-delete-char)) |
19078 | 226 (memq (viper-event-key last-command-event) |
18129 | 227 '(up down left right (meta f) (meta b) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
228 (control n) (control p) (control f) (control b))))) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
229 |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
230 (defsubst viper-insert-state-pre-command-sentinel () |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
231 (or (viper-preserve-cursor-color) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
232 (viper-restore-cursor-color 'after-insert-mode)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
233 (if (and (memq this-command '(dabbrev-expand hippie-expand)) |
19078 | 234 (markerp viper-insert-point) |
235 (marker-position viper-insert-point)) | |
236 (setq viper-pre-command-point (marker-position viper-insert-point)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
237 |
19078 | 238 (defsubst viper-R-state-post-command-sentinel () |
18129 | 239 ;; Restoring cursor color is needed despite |
19078 | 240 ;; viper-replace-state-pre-command-sentinel: When you jump to another buffer |
241 ;; in another frame, the pre-command hook won't change cursor color to | |
242 ;; default in that other frame. So, if the second frame cursor was red and | |
243 ;; we set the point outside the replacement region, then the cursor color | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
244 ;; will remain red. Restoring the default, below, prevents this. |
19078 | 245 (if (and (<= (viper-replace-start) (point)) |
246 (<= (point) (viper-replace-end))) | |
247 (viper-change-cursor-color viper-replace-overlay-cursor-color) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
248 (viper-restore-cursor-color 'after-replace-mode) |
18129 | 249 )) |
250 | |
251 ;; to speed up, don't change cursor color before self-insert | |
252 ;; and common move commands | |
19078 | 253 (defsubst viper-replace-state-pre-command-sentinel () |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
254 (or (viper-preserve-cursor-color) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
255 (viper-restore-cursor-color 'after-replace-mode))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
256 |
26702
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
257 |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
258 ;; Make sure we don't delete more than needed. |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
259 ;; This is executed at viper-last-posn-in-replace-region |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
260 (defsubst viper-trim-replace-chars-to-delete-if-necessary () |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
261 (setq viper-replace-chars-to-delete |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
262 (max 0 |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
263 (min viper-replace-chars-to-delete |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
264 ;; Don't delete more than to the end of repl overlay |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
265 (viper-chars-in-region |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
266 (viper-replace-end) viper-last-posn-in-replace-region) |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
267 ;; point is viper-last-posn-in-replace-region now |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
268 ;; So, this limits deletion to the end of line |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
269 (viper-chars-in-region (point) (viper-line-pos 'end)) |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
270 )))) |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
271 |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
272 |
19078 | 273 (defun viper-replace-state-post-command-sentinel () |
18129 | 274 ;; Restoring cursor color is needed despite |
19078 | 275 ;; viper-replace-state-pre-command-sentinel: When one jumps to another buffer |
18129 | 276 ;; in another frame, the pre-command hook won't change cursor color to |
277 ;; default in that other frame. So, if the second frame cursor was red and | |
278 ;; we set the point outside the replacement region, then the cursor color | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
279 ;; will remain red. Restoring the default, below, fixes this problem. |
18129 | 280 ;; |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
281 ;; We optimize for some commands, like self-insert-command, |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
282 ;; viper-delete-backward-char, etc., since they either don't change |
18129 | 283 ;; cursor color or, if they terminate replace mode, the color will be changed |
19078 | 284 ;; in viper-finish-change |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
285 (or (viper-preserve-cursor-color) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
286 (viper-restore-cursor-color 'after-replace-mode)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
287 (cond |
19078 | 288 ((eq viper-current-state 'replace-state) |
18129 | 289 ;; delete characters to compensate for inserted chars. |
19078 | 290 (let ((replace-boundary (viper-replace-end))) |
18129 | 291 (save-excursion |
19078 | 292 (goto-char viper-last-posn-in-replace-region) |
19462 | 293 (viper-trim-replace-chars-to-delete-if-necessary) |
19078 | 294 (delete-char viper-replace-chars-to-delete) |
19462 | 295 (setq viper-replace-chars-to-delete 0) |
18129 | 296 ;; terminate replace mode if reached replace limit |
19462 | 297 (if (= viper-last-posn-in-replace-region (viper-replace-end)) |
298 (viper-finish-change))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
299 |
19462 | 300 (if (viper-pos-within-region |
301 (point) (viper-replace-start) replace-boundary) | |
18129 | 302 (progn |
19078 | 303 ;; the state may have changed in viper-finish-change above |
304 (if (eq viper-current-state 'replace-state) | |
305 (viper-change-cursor-color viper-replace-overlay-cursor-color)) | |
306 (setq viper-last-posn-in-replace-region (point-marker)))) | |
18129 | 307 )) |
19462 | 308 ;; terminate replace mode if changed Viper states. |
309 (t (viper-finish-change)))) | |
18129 | 310 |
311 | |
312 ;; changing mode | |
313 | |
314 ;; Change state to NEW-STATE---either emacs-state, vi-state, or insert-state. | |
19078 | 315 (defun viper-change-state (new-state) |
316 ;; Keep viper-post/pre-command-hooks fresh. | |
317 ;; We remove then add viper-post/pre-command-sentinel since it is very | |
318 ;; desirable that viper-pre-command-sentinel is the last hook and | |
319 ;; viper-post-command-sentinel is the first hook. | |
21940 | 320 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
321 (viper-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
322 ;; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
323 (progn |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
324 (make-local-hook 'viper-after-change-functions) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
325 (make-local-hook 'viper-before-change-functions) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
326 (make-local-hook 'viper-post-command-hooks) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
327 (make-local-hook 'viper-pre-command-hooks)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
328 nil ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
329 ) |
21940 | 330 |
19078 | 331 (remove-hook 'post-command-hook 'viper-post-command-sentinel) |
332 (add-hook 'post-command-hook 'viper-post-command-sentinel) | |
333 (remove-hook 'pre-command-hook 'viper-pre-command-sentinel) | |
334 (add-hook 'pre-command-hook 'viper-pre-command-sentinel t) | |
18129 | 335 ;; These hooks will be added back if switching to insert/replace mode |
21940 | 336 (remove-hook 'viper-post-command-hooks |
337 'viper-insert-state-post-command-sentinel 'local) | |
338 (remove-hook 'viper-pre-command-hooks | |
339 'viper-insert-state-pre-command-sentinel 'local) | |
19078 | 340 (setq viper-intermediate-command nil) |
18129 | 341 (cond ((eq new-state 'vi-state) |
19078 | 342 (cond ((member viper-current-state '(insert-state replace-state)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
343 |
19078 | 344 ;; move viper-last-posn-while-in-insert-state |
18129 | 345 ;; This is a normal hook that is executed in insert/replace |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
346 ;; states after each command. In Vi/Emacs state, it does |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
347 ;; nothing. We need to execute it here to make sure that |
18129 | 348 ;; the last posn was recorded when we hit ESC. |
349 ;; It may be left unrecorded if the last thing done in | |
350 ;; insert/repl state was dabbrev-expansion or abbrev | |
351 ;; expansion caused by hitting ESC | |
19078 | 352 (viper-insert-state-post-command-sentinel) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
353 |
18129 | 354 (condition-case conds |
355 (progn | |
19078 | 356 (viper-save-last-insertion |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
357 viper-insert-point |
19078 | 358 viper-last-posn-while-in-insert-state) |
359 (if viper-began-as-replace | |
360 (setq viper-began-as-replace nil) | |
18129 | 361 ;; repeat insert commands if numerical arg > 1 |
362 (save-excursion | |
19078 | 363 (viper-repeat-insert-command)))) |
18129 | 364 (error |
19078 | 365 (viper-message-conditions conds))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
366 |
19078 | 367 (if (> (length viper-last-insertion) 0) |
368 (viper-push-onto-ring viper-last-insertion | |
369 'viper-insertion-ring)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
370 |
26702
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
371 (if viper-ESC-moves-cursor-back |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
372 (or (bolp) (viper-beginning-of-field) (backward-char 1)))) |
18129 | 373 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
374 |
18129 | 375 ;; insert or replace |
376 ((memq new-state '(insert-state replace-state)) | |
19078 | 377 (if (memq viper-current-state '(emacs-state vi-state)) |
378 (viper-move-marker-locally 'viper-insert-point (point))) | |
379 (viper-move-marker-locally | |
380 'viper-last-posn-while-in-insert-state (point)) | |
21940 | 381 (add-hook 'viper-post-command-hooks |
382 'viper-insert-state-post-command-sentinel t 'local) | |
383 (add-hook 'viper-pre-command-hooks | |
384 'viper-insert-state-pre-command-sentinel t 'local)) | |
18129 | 385 ) ; outermost cond |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
386 |
18129 | 387 ;; Nothing needs to be done to switch to emacs mode! Just set some |
19078 | 388 ;; variables, which is already done in viper-change-state-to-emacs! |
389 | |
19462 | 390 ;; ISO accents |
391 ;; always turn off iso-accents-mode in vi-state, or else we won't be able to | |
392 ;; use the keys `,',^ , as they will do accents instead of Vi actions. | |
393 (cond ((eq new-state 'vi-state) (viper-set-iso-accents-mode nil));accents off | |
394 (viper-automatic-iso-accents (viper-set-iso-accents-mode t));accents on | |
395 (t (viper-set-iso-accents-mode nil))) | |
396 ;; Always turn off quail mode in vi state | |
397 (cond ((eq new-state 'vi-state) (viper-set-input-method nil)) ;intl input off | |
398 (viper-special-input-method (viper-set-input-method t)) ;intl input on | |
399 (t (viper-set-input-method nil))) | |
400 | |
19078 | 401 (setq viper-current-state new-state) |
19462 | 402 |
403 (viper-update-syntax-classes) | |
19078 | 404 (viper-normalize-minor-mode-map-alist) |
405 (viper-adjust-keys-for new-state) | |
406 (viper-set-mode-vars-for new-state) | |
407 (viper-refresh-mode-line) | |
18129 | 408 ) |
409 | |
410 | |
19078 | 411 (defun viper-adjust-keys-for (state) |
18129 | 412 "Make necessary adjustments to keymaps before entering STATE." |
413 (cond ((memq state '(insert-state replace-state)) | |
19078 | 414 (if viper-auto-indent |
18129 | 415 (progn |
19078 | 416 (define-key viper-insert-basic-map "\C-m" 'viper-autoindent) |
417 (if viper-want-emacs-keys-in-insert | |
18129 | 418 ;; expert |
19078 | 419 (define-key viper-insert-basic-map "\C-j" nil) |
18129 | 420 ;; novice |
19078 | 421 (define-key viper-insert-basic-map "\C-j" 'viper-autoindent))) |
422 (define-key viper-insert-basic-map "\C-m" nil) | |
423 (define-key viper-insert-basic-map "\C-j" nil)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
424 |
19078 | 425 (setq viper-insert-diehard-minor-mode |
426 (not viper-want-emacs-keys-in-insert)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
427 |
19078 | 428 (if viper-want-ctl-h-help |
19891 | 429 (progn |
430 (define-key viper-insert-basic-map "\C-h" 'help-command) | |
431 (define-key viper-replace-map "\C-h" 'help-command)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
432 (define-key viper-insert-basic-map |
19891 | 433 "\C-h" 'viper-del-backward-char-in-insert) |
19462 | 434 (define-key viper-replace-map |
19891 | 435 "\C-h" 'viper-del-backward-char-in-replace)) |
436 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't. | |
437 (define-key viper-insert-basic-map | |
438 [backspace] 'viper-del-backward-char-in-insert) | |
439 (define-key viper-replace-map | |
440 [backspace] 'viper-del-backward-char-in-replace) | |
441 ) ; end insert/replace case | |
18129 | 442 (t ; Vi state |
19078 | 443 (setq viper-vi-diehard-minor-mode (not viper-want-emacs-keys-in-vi)) |
444 (if viper-want-ctl-h-help | |
19891 | 445 (define-key viper-vi-basic-map "\C-h" 'help-command) |
446 (define-key viper-vi-basic-map "\C-h" 'viper-backward-char)) | |
447 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't. | |
448 (define-key viper-vi-basic-map [backspace] 'viper-backward-char)) | |
18129 | 449 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
450 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
451 |
18129 | 452 ;; Normalizes minor-mode-map-alist by putting Viper keymaps first. |
453 ;; This ensures that Viper bindings are in effect, regardless of which minor | |
454 ;; modes were turned on by the user or by other packages. | |
19078 | 455 (defun viper-normalize-minor-mode-map-alist () |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
456 (setq viper--intercept-key-maps |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
457 (list |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
458 (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
459 (cons 'viper-insert-intercept-minor-mode viper-insert-intercept-map) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
460 (cons 'viper-emacs-intercept-minor-mode viper-emacs-intercept-map) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
461 )) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
462 (setq viper--key-maps |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
463 (list (cons 'viper-vi-minibuffer-minor-mode viper-minibuffer-map) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
464 (cons 'viper-vi-local-user-minor-mode viper-vi-local-user-map) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
465 (cons 'viper-vi-kbd-minor-mode viper-vi-kbd-map) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
466 (cons 'viper-vi-global-user-minor-mode viper-vi-global-user-map) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
467 (cons 'viper-vi-state-modifier-minor-mode |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
468 (if (keymapp |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
469 (cdr (assoc major-mode viper-vi-state-modifier-alist))) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
470 (cdr (assoc major-mode viper-vi-state-modifier-alist)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
471 viper-empty-keymap)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
472 (cons 'viper-vi-diehard-minor-mode viper-vi-diehard-map) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
473 (cons 'viper-vi-basic-minor-mode viper-vi-basic-map) |
19078 | 474 (cons 'viper-replace-minor-mode viper-replace-map) |
475 ;; viper-insert-minibuffer-minor-mode must come after | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
476 ;; viper-replace-minor-mode |
19078 | 477 (cons 'viper-insert-minibuffer-minor-mode |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
478 viper-minibuffer-map) |
19078 | 479 (cons 'viper-insert-local-user-minor-mode |
480 viper-insert-local-user-map) | |
481 (cons 'viper-insert-kbd-minor-mode viper-insert-kbd-map) | |
482 (cons 'viper-insert-global-user-minor-mode | |
483 viper-insert-global-user-map) | |
484 (cons 'viper-insert-state-modifier-minor-mode | |
18129 | 485 (if (keymapp |
19203 | 486 (cdr (assoc major-mode |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
487 viper-insert-state-modifier-alist))) |
19203 | 488 (cdr (assoc major-mode |
489 viper-insert-state-modifier-alist)) | |
19078 | 490 viper-empty-keymap)) |
491 (cons 'viper-insert-diehard-minor-mode viper-insert-diehard-map) | |
492 (cons 'viper-insert-basic-minor-mode viper-insert-basic-map) | |
493 (cons 'viper-emacs-local-user-minor-mode | |
494 viper-emacs-local-user-map) | |
495 (cons 'viper-emacs-kbd-minor-mode viper-emacs-kbd-map) | |
496 (cons 'viper-emacs-global-user-minor-mode | |
497 viper-emacs-global-user-map) | |
498 (cons 'viper-emacs-state-modifier-minor-mode | |
18129 | 499 (if (keymapp |
500 (cdr | |
19078 | 501 (assoc major-mode viper-emacs-state-modifier-alist))) |
18129 | 502 (cdr |
19078 | 503 (assoc major-mode viper-emacs-state-modifier-alist)) |
504 viper-empty-keymap)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
505 )) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
506 |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
507 ;; This var is not local in Emacs, so we make it local. It must be local |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
508 ;; because although the stack of minor modes can be the same for all buffers, |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
509 ;; the associated *keymaps* can be different. In Viper, |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
510 ;; viper-vi-local-user-map, viper-insert-local-user-map, and others can have |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
511 ;; different keymaps for different buffers. Also, the keymaps associated |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
512 ;; with viper-vi/insert-state-modifier-minor-mode can be different. |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
513 ;; ***This is needed only in case emulation-mode-map-alists is not defined. |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
514 ;; In emacs with emulation-mode-map-alists, nothing needs to be done |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
515 (unless |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
516 (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
517 (set (make-local-variable 'minor-mode-map-alist) |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
518 (viper-append-filter-alist |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
519 (append viper--intercept-key-maps viper--key-maps) |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
520 minor-mode-map-alist))) |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
521 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
522 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
523 |
18129 | 524 |
525 ;; Viper mode-changing commands and utilities | |
526 | |
527 ;; Modifies mode-line-buffer-identification. | |
19078 | 528 (defun viper-refresh-mode-line () |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
529 (set (make-local-variable 'viper-mode-string) |
19078 | 530 (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id) |
531 ((eq viper-current-state 'vi-state) viper-vi-state-id) | |
532 ((eq viper-current-state 'replace-state) viper-replace-state-id) | |
533 ((eq viper-current-state 'insert-state) viper-insert-state-id))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
534 |
18129 | 535 ;; Sets Viper mode string in global-mode-string |
536 (force-mode-line-update)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
537 |
18129 | 538 |
539 ;; Switch from Insert state to Vi state. | |
19078 | 540 (defun viper-exit-insert-state () |
18129 | 541 (interactive) |
19078 | 542 (viper-change-state-to-vi)) |
543 | |
544 (defun viper-set-mode-vars-for (state) | |
18129 | 545 "Sets Viper minor mode variables to put Viper's state STATE in effect." |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
546 |
18129 | 547 ;; Emacs state |
19078 | 548 (setq viper-vi-minibuffer-minor-mode nil |
549 viper-insert-minibuffer-minor-mode nil | |
550 viper-vi-intercept-minor-mode nil | |
551 viper-insert-intercept-minor-mode nil | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
552 |
19078 | 553 viper-vi-local-user-minor-mode nil |
554 viper-vi-kbd-minor-mode nil | |
555 viper-vi-global-user-minor-mode nil | |
556 viper-vi-state-modifier-minor-mode nil | |
557 viper-vi-diehard-minor-mode nil | |
558 viper-vi-basic-minor-mode nil | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
559 |
19078 | 560 viper-replace-minor-mode nil |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
561 |
19078 | 562 viper-insert-local-user-minor-mode nil |
563 viper-insert-kbd-minor-mode nil | |
564 viper-insert-global-user-minor-mode nil | |
565 viper-insert-state-modifier-minor-mode nil | |
566 viper-insert-diehard-minor-mode nil | |
567 viper-insert-basic-minor-mode nil | |
568 viper-emacs-intercept-minor-mode t | |
569 viper-emacs-local-user-minor-mode t | |
570 viper-emacs-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
571 viper-emacs-global-user-minor-mode t | |
572 viper-emacs-state-modifier-minor-mode t | |
18129 | 573 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
574 |
18129 | 575 ;; Vi state |
576 (if (eq state 'vi-state) ; adjust for vi-state | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
577 (setq |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
578 viper-vi-intercept-minor-mode t |
19078 | 579 viper-vi-minibuffer-minor-mode (viper-is-in-minibuffer) |
580 viper-vi-local-user-minor-mode t | |
581 viper-vi-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
582 viper-vi-global-user-minor-mode t | |
583 viper-vi-state-modifier-minor-mode t | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
584 ;; don't let the diehard keymap block command completion |
18129 | 585 ;; and other things in the minibuffer |
19078 | 586 viper-vi-diehard-minor-mode (not |
587 (or viper-want-emacs-keys-in-vi | |
588 (viper-is-in-minibuffer))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
589 viper-vi-basic-minor-mode t |
19078 | 590 viper-emacs-intercept-minor-mode nil |
591 viper-emacs-local-user-minor-mode nil | |
592 viper-emacs-kbd-minor-mode nil | |
593 viper-emacs-global-user-minor-mode nil | |
594 viper-emacs-state-modifier-minor-mode nil | |
18129 | 595 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
596 |
18129 | 597 ;; Insert and Replace states |
598 (if (member state '(insert-state replace-state)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
599 (setq |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
600 viper-insert-intercept-minor-mode t |
19078 | 601 viper-replace-minor-mode (eq state 'replace-state) |
602 viper-insert-minibuffer-minor-mode (viper-is-in-minibuffer) | |
603 viper-insert-local-user-minor-mode t | |
604 viper-insert-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
605 viper-insert-global-user-minor-mode t | |
606 viper-insert-state-modifier-minor-mode t | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
607 ;; don't let the diehard keymap block command completion |
18129 | 608 ;; and other things in the minibuffer |
19078 | 609 viper-insert-diehard-minor-mode (not |
610 (or | |
611 viper-want-emacs-keys-in-insert | |
612 (viper-is-in-minibuffer))) | |
613 viper-insert-basic-minor-mode t | |
614 viper-emacs-intercept-minor-mode nil | |
615 viper-emacs-local-user-minor-mode nil | |
616 viper-emacs-kbd-minor-mode nil | |
617 viper-emacs-global-user-minor-mode nil | |
618 viper-emacs-state-modifier-minor-mode nil | |
18129 | 619 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
620 |
18129 | 621 ;; minibuffer faces |
19078 | 622 (if (viper-has-face-support-p) |
623 (setq viper-minibuffer-current-face | |
624 (cond ((eq state 'emacs-state) viper-minibuffer-emacs-face) | |
625 ((eq state 'vi-state) viper-minibuffer-vi-face) | |
18129 | 626 ((memq state '(insert-state replace-state)) |
19078 | 627 viper-minibuffer-insert-face)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
628 |
19078 | 629 (if (viper-is-in-minibuffer) |
630 (viper-set-minibuffer-overlay)) | |
18129 | 631 ) |
632 | |
633 ;; This also takes care of the annoying incomplete lines in files. | |
634 ;; Also, this fixes `undo' to work vi-style for complex commands. | |
19078 | 635 (defun viper-change-state-to-vi () |
18129 | 636 "Change Viper state to Vi." |
637 (interactive) | |
19078 | 638 (if (and viper-first-time (not (viper-is-in-minibuffer))) |
18129 | 639 (viper-mode) |
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
640 (if overwrite-mode (overwrite-mode -1)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
641 (or (viper-overlay-p viper-replace-overlay) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
642 (viper-set-replace-overlay (point-min) (point-min))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
643 (viper-hide-replace-overlay) |
18129 | 644 (if abbrev-mode (expand-abbrev)) |
645 (if (and auto-fill-function (> (current-column) fill-column)) | |
646 (funcall auto-fill-function)) | |
647 ;; don't leave whitespace lines around | |
648 (if (and (memq last-command | |
19078 | 649 '(viper-autoindent |
650 viper-open-line viper-Open-line | |
651 viper-replace-state-exit-cmd)) | |
652 (viper-over-whitespace-line)) | |
18129 | 653 (indent-to-left-margin)) |
19078 | 654 (viper-add-newline-at-eob-if-necessary) |
19462 | 655 (viper-adjust-undo) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
656 |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
657 (if (eq viper-current-state 'emacs-state) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
658 (viper-restore-cursor-color 'after-emacs-mode) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
659 (viper-restore-cursor-color 'after-insert-mode)) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
660 |
19078 | 661 (viper-change-state 'vi-state) |
18129 | 662 |
19462 | 663 ;; Protect against user errors in hooks |
18129 | 664 (condition-case conds |
19078 | 665 (run-hooks 'viper-vi-state-hook) |
18129 | 666 (error |
19078 | 667 (viper-message-conditions conds))))) |
668 | |
669 (defun viper-change-state-to-insert () | |
18129 | 670 "Change Viper state to Insert." |
671 (interactive) | |
19078 | 672 (viper-change-state 'insert-state) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
673 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
674 (or (viper-overlay-p viper-replace-overlay) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
675 (viper-set-replace-overlay (point-min) (point-min))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
676 (viper-hide-replace-overlay) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
677 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
678 (let ((has-saved-cursor-color-in-insert-mode |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
679 (stringp (viper-get-saved-cursor-color-in-insert-mode)))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
680 (or has-saved-cursor-color-in-insert-mode |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
681 (string= (viper-get-cursor-color) viper-insert-state-cursor-color) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
682 (viper-save-cursor-color 'before-insert-mode)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
683 (viper-change-cursor-color viper-insert-state-cursor-color)) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
684 |
19462 | 685 ;; Protect against user errors in hooks |
18129 | 686 (condition-case conds |
19078 | 687 (run-hooks 'viper-insert-state-hook) |
18129 | 688 (error |
19078 | 689 (viper-message-conditions conds)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
690 |
19078 | 691 (defsubst viper-downgrade-to-insert () |
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
692 ;; Protect against user errors in hooks |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
693 (condition-case conds |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
694 (run-hooks 'viper-insert-state-hook) |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
695 (error |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
696 (viper-message-conditions conds))) |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
697 (setq viper-current-state 'insert-state |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
698 viper-replace-minor-mode nil)) |
18129 | 699 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
700 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
701 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
702 ;; Change to replace state. When the end of replacement region is reached, |
18129 | 703 ;; replace state changes to insert state. |
19078 | 704 (defun viper-change-state-to-replace (&optional non-R-cmd) |
705 (viper-change-state 'replace-state) | |
18129 | 706 ;; Run insert-state-hook |
707 (condition-case conds | |
19078 | 708 (run-hooks 'viper-insert-state-hook 'viper-replace-state-hook) |
18129 | 709 (error |
19078 | 710 (viper-message-conditions conds))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
711 |
18129 | 712 (if non-R-cmd |
19078 | 713 (viper-start-replace) |
18129 | 714 ;; 'R' is implemented using Emacs's overwrite-mode |
19078 | 715 (viper-start-R-mode)) |
18129 | 716 ) |
717 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
718 |
19078 | 719 (defun viper-change-state-to-emacs () |
18129 | 720 "Change Viper state to Emacs." |
721 (interactive) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
722 (or (viper-overlay-p viper-replace-overlay) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
723 (viper-set-replace-overlay (point-min) (point-min))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
724 (viper-hide-replace-overlay) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
725 |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
726 (if viper-emacs-state-cursor-color |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
727 (let ((has-saved-cursor-color-in-emacs-mode |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
728 (stringp (viper-get-saved-cursor-color-in-emacs-mode)))) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
729 (or has-saved-cursor-color-in-emacs-mode |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
730 (string= (viper-get-cursor-color) viper-emacs-state-cursor-color) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
731 (viper-save-cursor-color 'before-emacs-mode)) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
732 (viper-change-cursor-color viper-emacs-state-cursor-color))) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
733 |
19078 | 734 (viper-change-state 'emacs-state) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
735 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
736 ;; Protect against user errors in hooks |
18129 | 737 (condition-case conds |
19078 | 738 (run-hooks 'viper-emacs-state-hook) |
18129 | 739 (error |
19078 | 740 (viper-message-conditions conds)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
741 |
18129 | 742 ;; escape to emacs mode termporarily |
19078 | 743 (defun viper-escape-to-emacs (arg &optional events) |
18129 | 744 "Escape to Emacs state from Vi state for one Emacs command. |
745 ARG is used as the prefix value for the executed command. If | |
746 EVENTS is a list of events, which become the beginning of the command." | |
747 (interactive "P") | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
748 (if (viper= last-command-char ?\\) |
18129 | 749 (message "Switched to EMACS state for the next command...")) |
19078 | 750 (viper-escape-to-state arg events 'emacs-state)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
751 |
18129 | 752 ;; escape to Vi mode termporarily |
19078 | 753 (defun viper-escape-to-vi (arg) |
18129 | 754 "Escape from Emacs state to Vi state for one Vi 1-character command. |
755 If the Vi command that the user types has a prefix argument, e.g., `d2w', then | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
756 Vi's prefix argument will be used. Otherwise, the prefix argument passed to |
19078 | 757 `viper-escape-to-vi' is used." |
18129 | 758 (interactive "P") |
759 (message "Switched to VI state for the next command...") | |
19078 | 760 (viper-escape-to-state arg nil 'vi-state)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
761 |
18129 | 762 ;; Escape to STATE mode for one Emacs command. |
19078 | 763 (defun viper-escape-to-state (arg events state) |
18129 | 764 ;;(let (com key prefix-arg) |
765 (let (com key) | |
766 ;; this temporarily turns off Viper's minor mode keymaps | |
19078 | 767 (viper-set-mode-vars-for state) |
768 (viper-normalize-minor-mode-map-alist) | |
769 (if events (viper-set-unread-command-events events)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
770 |
18129 | 771 ;; protect against keyboard quit and other errors |
772 (condition-case nil | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
773 (let (viper-vi-kbd-minor-mode |
19078 | 774 viper-insert-kbd-minor-mode |
775 viper-emacs-kbd-minor-mode) | |
18129 | 776 (unwind-protect |
777 (progn | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
778 (setq com |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
779 (key-binding (setq key (viper-read-key-sequence nil)))) |
18129 | 780 ;; In case of binding indirection--chase definitions. |
781 ;; Have to do it here because we execute this command under | |
782 ;; different keymaps, so command-execute may not do the | |
783 ;; right thing there | |
784 (while (vectorp com) (setq com (key-binding com)))) | |
785 nil) | |
786 ;; Execute command com in the original Viper state, not in state | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
787 ;; `state'. Otherwise, if we switch buffers while executing the |
18129 | 788 ;; escaped to command, Viper's mode vars will remain those of |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
789 ;; `state'. When we return to the orig buffer, the bindings will be |
18129 | 790 ;; screwed up. |
19078 | 791 (viper-set-mode-vars-for viper-current-state) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
792 |
18129 | 793 ;; this-command, last-command-char, last-command-event |
794 (setq this-command com) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
795 (viper-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
796 ;; XEmacs represents key sequences as vectors |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
797 (setq last-command-event |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
798 (viper-copy-event (viper-seq-last-elt key)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
799 last-command-char (event-to-character last-command-event)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
800 ;; Emacs represents them as sequences (str or vec) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
801 (setq last-command-event |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
802 (viper-copy-event (viper-seq-last-elt key)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
803 last-command-char last-command-event) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
804 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
805 |
18129 | 806 (if (commandp com) |
64485
2273b7101b27
* viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64215
diff
changeset
|
807 ;; pretend that current state is the state we excaped to |
2273b7101b27
* viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64215
diff
changeset
|
808 (let ((viper-current-state state)) |
18129 | 809 (setq prefix-arg (or prefix-arg arg)) |
810 (command-execute com))) | |
811 ) | |
812 (quit (ding)) | |
813 (error (beep 1)))) | |
814 ;; set state in the new buffer | |
19078 | 815 (viper-set-mode-vars-for viper-current-state)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
816 |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
817 ;; This is used in order to allow reading characters according to the input |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
818 ;; method. The character is read in emacs and inserted into the buffer. |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
819 ;; If an input method is in effect, this might |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
820 ;; cause several characters to be combined into one. |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
821 ;; Also takes care of the iso-accents mode |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
822 (defun viper-special-read-and-insert-char () |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
823 (viper-set-mode-vars-for 'emacs-state) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
824 (viper-normalize-minor-mode-map-alist) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
825 (if viper-special-input-method |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
826 (viper-set-input-method t)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
827 (if viper-automatic-iso-accents |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
828 (viper-set-iso-accents-mode t)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
829 (condition-case nil |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
830 (let (viper-vi-kbd-minor-mode |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
831 viper-insert-kbd-minor-mode |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
832 viper-emacs-kbd-minor-mode |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
833 ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
834 (cond ((and viper-special-input-method |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
835 viper-emacs-p |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
836 (fboundp 'quail-input-method)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
837 ;; (let ...) is used to restore unread-command-events to the |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
838 ;; original state. We don't want anything left in there after |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
839 ;; key translation. (Such left-overs are possible if the user |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
840 ;; types a regular key.) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
841 (let (unread-command-events) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
842 ;; The next cmd and viper-set-unread-command-events |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
843 ;; are intended to prevent the input method |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
844 ;; from swallowing ^M, ^Q and other special characters |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
845 (setq ch (read-char-exclusive)) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
846 ;; replace ^M with the newline |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
847 (if (eq ch ?\C-m) (setq ch ?\n)) |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
848 ;; Make sure ^V and ^Q work as quotation chars |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
849 (if (memq ch '(?\C-v ?\C-q)) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
850 (setq ch (read-char-exclusive))) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
851 (viper-set-unread-command-events ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
852 (quail-input-method nil) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
853 |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
854 (if (and ch (string= quail-current-str "")) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
855 (insert ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
856 (insert quail-current-str)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
857 (setq ch (or ch |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
858 (aref quail-current-str |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
859 (1- (length quail-current-str))))) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
860 )) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
861 ((and viper-special-input-method |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
862 viper-xemacs-p |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
863 (fboundp 'quail-start-translation)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
864 ;; same as above but for XEmacs, which doesn't have |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
865 ;; quail-input-method |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
866 (let (unread-command-events) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
867 (setq ch (read-char-exclusive)) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
868 ;; replace ^M with the newline |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
869 (if (eq ch ?\C-m) (setq ch ?\n)) |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
870 ;; Make sure ^V and ^Q work as quotation chars |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
871 (if (memq ch '(?\C-v ?\C-q)) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
872 (setq ch (read-char-exclusive))) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
873 (viper-set-unread-command-events ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
874 (quail-start-translation nil) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
875 |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
876 (if (and ch (string= quail-current-str "")) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
877 (insert ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
878 (insert quail-current-str)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
879 (setq ch (or ch |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
880 (aref quail-current-str |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
881 (1- (length quail-current-str))))) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
882 )) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
883 ((and (boundp 'iso-accents-mode) iso-accents-mode) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
884 (setq ch (aref (read-key-sequence nil) 0)) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
885 ;; replace ^M with the newline |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
886 (if (eq ch ?\C-m) (setq ch ?\n)) |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
887 ;; Make sure ^V and ^Q work as quotation chars |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
888 (if (memq ch '(?\C-v ?\C-q)) |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
889 (setq ch (aref (read-key-sequence nil) 0))) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
890 (insert ch)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
891 (t |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
892 ;;(setq ch (read-char-exclusive)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
893 (setq ch (aref (read-key-sequence nil) 0)) |
72579
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
894 (if viper-xemacs-p |
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
895 (setq ch (event-to-character ch))) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
896 ;; replace ^M with the newline |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
897 (if (eq ch ?\C-m) (setq ch ?\n)) |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
898 ;; Make sure ^V and ^Q work as quotation chars |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
899 (if (memq ch '(?\C-v ?\C-q)) |
72579
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
900 (progn |
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
901 ;;(setq ch (read-char-exclusive)) |
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
902 (setq ch (aref (read-key-sequence nil) 0)) |
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
903 (if viper-xemacs-p |
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
904 (setq ch (event-to-character ch)))) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
905 ) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
906 (insert ch)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
907 ) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
908 (setq last-command-event |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
909 (viper-copy-event (if viper-xemacs-p |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
910 (character-to-event ch) ch))) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
911 ) ; let |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
912 (error nil) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
913 ) ; condition-case |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
914 |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
915 (viper-set-input-method nil) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
916 (viper-set-iso-accents-mode nil) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
917 (viper-set-mode-vars-for viper-current-state) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
918 ) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
919 |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
920 |
19078 | 921 (defun viper-exec-form-in-vi (form) |
18129 | 922 "Execute FORM in Vi state, regardless of the Ccurrent Vi state." |
923 (let ((buff (current-buffer)) | |
924 result) | |
19078 | 925 (viper-set-mode-vars-for 'vi-state) |
18129 | 926 |
927 (condition-case nil | |
19078 | 928 (let (viper-vi-kbd-minor-mode) ; execute without kbd macros |
929 (setq result (eval form)) | |
930 ) | |
18129 | 931 (error |
932 (signal 'quit nil))) | |
933 | |
934 (if (not (equal buff (current-buffer))) ; cmd switched buffer | |
935 (save-excursion | |
936 (set-buffer buff) | |
19078 | 937 (viper-set-mode-vars-for viper-current-state))) |
938 (viper-set-mode-vars-for viper-current-state) | |
18129 | 939 result)) |
940 | |
19078 | 941 (defun viper-exec-form-in-emacs (form) |
18129 | 942 "Execute FORM in Emacs, temporarily disabling Viper's minor modes. |
19078 | 943 Similar to viper-escape-to-emacs, but accepts forms rather than keystrokes." |
18129 | 944 (let ((buff (current-buffer)) |
945 result) | |
19078 | 946 (viper-set-mode-vars-for 'emacs-state) |
18129 | 947 (setq result (eval form)) |
948 (if (not (equal buff (current-buffer))) ; cmd switched buffer | |
949 (save-excursion | |
950 (set-buffer buff) | |
19078 | 951 (viper-set-mode-vars-for viper-current-state))) |
952 (viper-set-mode-vars-for viper-current-state) | |
18129 | 953 result)) |
954 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
955 ;; This executes the last kbd event in emacs mode. Is used when we want to |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
956 ;; interpret certain keys directly in emacs (as, for example, in comint mode). |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
957 (defun viper-exec-key-in-emacs (arg) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
958 (interactive "P") |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
959 (viper-escape-to-emacs arg last-command-event)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
960 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
961 |
18129 | 962 ;; This is needed because minor modes sometimes override essential Viper |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
963 ;; bindings. By letting Viper know which files these modes are in, it will |
18129 | 964 ;; arrange to reorganize minor-mode-map-alist so that things will work right. |
19078 | 965 (defun viper-harness-minor-mode (load-file) |
18129 | 966 "Familiarize Viper with a minor mode defined in LOAD_FILE. |
967 Minor modes that have their own keymaps may overshadow Viper keymaps. | |
968 This function is designed to make Viper aware of the packages that define | |
969 such minor modes. | |
970 Usage: | |
19078 | 971 (viper-harness-minor-mode load-file) |
18129 | 972 |
973 LOAD-FILE is a name of the file where the specific minor mode is defined. | |
974 Suffixes such as .el or .elc should be stripped." | |
975 | |
976 (interactive "sEnter name of the load file: ") | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
977 |
19078 | 978 (eval-after-load load-file '(viper-normalize-minor-mode-map-alist)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
979 |
18129 | 980 ;; Change the default for minor-mode-map-alist each time a harnessed minor |
981 ;; mode adds its own keymap to the a-list. | |
64750
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
982 (unless |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
983 (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
984 (eval-after-load |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
985 load-file '(setq-default minor-mode-map-alist minor-mode-map-alist))) |
18129 | 986 ) |
987 | |
988 | |
19078 | 989 (defun viper-ESC (arg) |
18129 | 990 "Emulate ESC key in Emacs. |
19078 | 991 Prevents multiple escape keystrokes if viper-no-multiple-ESC is true. |
992 If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state. | |
18129 | 993 Other ESC sequences are emulated via the current Emacs's major mode |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
994 keymap. This is more convenient on TTYs, since this won't block |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
995 function keys such as up,down, etc. ESC will also will also work as |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
996 a Meta key in this case. When viper-no-multiple-ESC is nil, ESC functions |
18129 | 997 as a Meta key and any number of multiple escapes is allowed." |
998 (interactive "P") | |
999 (let (char) | |
19078 | 1000 (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state)) |
1001 (setq char (viper-read-char-exclusive)) | |
1002 (viper-escape-to-emacs arg (list ?\e char) )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1003 ((and (eq viper-no-multiple-ESC 'twice) |
19078 | 1004 (eq viper-current-state 'vi-state)) |
1005 (setq char (viper-read-char-exclusive)) | |
1006 (if (= char (string-to-char viper-ESC-key)) | |
18129 | 1007 (ding) |
19078 | 1008 (viper-escape-to-emacs arg (list ?\e char) ))) |
18129 | 1009 (t (ding))) |
1010 )) | |
1011 | |
19078 | 1012 (defun viper-alternate-Meta-key (arg) |
18129 | 1013 "Simulate Emacs Meta key." |
1014 (interactive "P") | |
1015 (sit-for 1) (message "ESC-") | |
19078 | 1016 (viper-escape-to-emacs arg '(?\e))) |
1017 | |
1018 (defun viper-toggle-key-action () | |
1019 "Action bound to `viper-toggle-key'." | |
18129 | 1020 (interactive) |
19078 | 1021 (if (and (< viper-expert-level 2) (equal viper-toggle-key "\C-z")) |
1022 (if (viper-window-display-p) | |
1023 (viper-iconify) | |
18129 | 1024 (suspend-emacs)) |
19078 | 1025 (viper-change-state-to-emacs))) |
18129 | 1026 |
1027 | |
1028 ;; Intercept ESC sequences on dumb terminals. | |
1029 ;; Based on the idea contributed by Marcelino Veiga Tuimil <mveiga@dit.upm.es> | |
1030 | |
1031 ;; Check if last key was ESC and if so try to reread it as a function key. | |
1032 ;; But only if there are characters to read during a very short time. | |
1033 ;; Returns the last event, if any. | |
19078 | 1034 (defun viper-envelop-ESC-key () |
18129 | 1035 (let ((event last-input-event) |
1036 (keyseq [nil]) | |
39288
25dc021070bc
2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1037 (inhibit-quit t)) |
19078 | 1038 (if (viper-ESC-event-p event) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1039 (progn |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1040 ;; Some versions of Emacs (eg., 22.50.8 have a bug, which makes even |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1041 ;; a single ESC into ;; a fast keyseq. To guard against this, we |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1042 ;; added a check if there are other events as well. Keep the next |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1043 ;; line for the next time the bug reappears, so that will remember to |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1044 ;; report it. |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1045 ;;(if (and (viper-fast-keysequence-p) unread-command-events) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1046 (if (viper-fast-keysequence-p) ;; for Emacsen without the above bug |
18129 | 1047 (progn |
64485
2273b7101b27
* viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64215
diff
changeset
|
1048 (let (minor-mode-map-alist emulation-mode-map-alists) |
19078 | 1049 (viper-set-unread-command-events event) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1050 (setq keyseq (read-key-sequence nil 'continue-echo)) |
18129 | 1051 ) ; let |
1052 ;; If keyseq translates into something that still has ESC | |
1053 ;; at the beginning, separate ESC from the rest of the seq. | |
1054 ;; In XEmacs we check for events that are keypress meta-key | |
1055 ;; and convert them into [escape key] | |
1056 ;; | |
1057 ;; This is needed for the following reason: | |
1058 ;; If ESC is the first symbol, we interpret it as if the | |
1059 ;; user typed ESC and then quickly some other symbols. | |
1060 ;; If ESC is not the first one, then the key sequence | |
1061 ;; entered was apparently translated into a function key or | |
1062 ;; something (e.g., one may have | |
1063 ;; (define-key function-key-map "\e[192z" [f11]) | |
1064 ;; which would translate the escape-sequence generated by | |
1065 ;; f11 in an xterm window into the symbolic key f11. | |
1066 ;; | |
1067 ;; If `first-key' is not an ESC event, we make it into the | |
1068 ;; last-command-event in order to pretend that this key was | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1069 ;; pressed. This is needed to allow arrow keys to be bound to |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1070 ;; macros. Otherwise, viper-exec-mapped-kbd-macro will think |
19078 | 1071 ;; that the last event was ESC and so it'll execute whatever is |
18129 | 1072 ;; bound to ESC. (Viper macros can't be bound to |
1073 ;; ESC-sequences). | |
1074 (let* ((first-key (elt keyseq 0)) | |
1075 (key-mod (event-modifiers first-key))) | |
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
1076 (cond ((and (viper-ESC-event-p first-key) |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
1077 (not viper-translate-all-ESC-keysequences)) |
18129 | 1078 ;; put keys following ESC on the unread list |
1079 ;; and return ESC as the key-sequence | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
1080 (viper-set-unread-command-events (viper-subseq keyseq 1)) |
18129 | 1081 (setq last-input-event event |
19078 | 1082 keyseq (if viper-emacs-p |
18129 | 1083 "\e" |
1084 (vector (character-to-event ?\e))))) | |
19078 | 1085 ((and viper-xemacs-p |
18129 | 1086 (key-press-event-p first-key) |
1087 (equal '(meta) key-mod)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1088 (viper-set-unread-command-events |
18129 | 1089 (vconcat (vector |
1090 (character-to-event (event-key first-key))) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
1091 (viper-subseq keyseq 1))) |
18129 | 1092 (setq last-input-event event |
1093 keyseq (vector (character-to-event ?\e)))) | |
1094 ((eventp first-key) | |
19078 | 1095 (setq last-command-event |
1096 (viper-copy-event first-key))) | |
18129 | 1097 )) |
1098 ) ; end progn | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1099 |
18129 | 1100 ;; this is escape event with nothing after it |
1101 ;; put in unread-command-event and then re-read | |
19078 | 1102 (viper-set-unread-command-events event) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1103 (setq keyseq (read-key-sequence nil)) |
18129 | 1104 )) |
1105 ;; not an escape event | |
1106 (setq keyseq (vector event))) | |
1107 keyseq)) | |
1108 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1109 |
18129 | 1110 |
1111 ;; Listen to ESC key. | |
1112 ;; If a sequence of keys starting with ESC is issued with very short delays, | |
1113 ;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key. | |
19078 | 1114 (defun viper-intercept-ESC-key () |
18129 | 1115 "Function that implements ESC key in Viper emulation of Vi." |
1116 (interactive) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1117 (let ((cmd (or (key-binding (viper-envelop-ESC-key)) |
18129 | 1118 '(lambda () (interactive) (error ""))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1119 |
18129 | 1120 ;; call the actual function to execute ESC (if no other symbols followed) |
1121 ;; or the key bound to the ESC sequence (if the sequence was issued | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
1122 ;; with very short delay between characters). |
19078 | 1123 (if (eq cmd 'viper-intercept-ESC-key) |
18129 | 1124 (setq cmd |
19078 | 1125 (cond ((eq viper-current-state 'vi-state) |
1126 'viper-ESC) | |
1127 ((eq viper-current-state 'insert-state) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1128 'viper-exit-insert-state) |
19078 | 1129 ((eq viper-current-state 'replace-state) |
1130 'viper-replace-state-exit-cmd) | |
1131 (t 'viper-change-state-to-vi) | |
18129 | 1132 ))) |
1133 (call-interactively cmd))) | |
1134 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1135 |
18129 | 1136 |
1137 | |
1138 ;; prefix argument for Vi mode | |
1139 | |
1140 ;; In Vi mode, prefix argument is a dotted pair (NUM . COM) where NUM | |
1141 ;; represents the numeric value of the prefix argument and COM represents | |
1142 ;; command prefix such as "c", "d", "m" and "y". | |
1143 | |
1144 ;; Get value part of prefix-argument ARG. | |
19078 | 1145 (defsubst viper-p-val (arg) |
18129 | 1146 (cond ((null arg) 1) |
1147 ((consp arg) | |
1148 (if (or (null (car arg)) (equal (car arg) '(nil))) | |
1149 1 (car arg))) | |
1150 (t arg))) | |
1151 | |
1152 ;; Get raw value part of prefix-argument ARG. | |
19078 | 1153 (defsubst viper-P-val (arg) |
18129 | 1154 (cond ((consp arg) (car arg)) |
1155 (t arg))) | |
1156 | |
1157 ;; Get com part of prefix-argument ARG. | |
19078 | 1158 (defsubst viper-getcom (arg) |
18129 | 1159 (cond ((null arg) nil) |
1160 ((consp arg) (cdr arg)) | |
1161 (t nil))) | |
1162 | |
1163 ;; Get com part of prefix-argument ARG and modify it. | |
19078 | 1164 (defun viper-getCom (arg) |
1165 (let ((com (viper-getcom arg))) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1166 (cond ((viper= com ?c) ?c) |
19078 | 1167 ;; Previously, ?c was being converted to ?C, but this prevented |
1168 ;; multiline replace regions. | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1169 ;;((viper= com ?c) ?C) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1170 ((viper= com ?d) ?D) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1171 ((viper= com ?y) ?Y) |
18129 | 1172 (t com)))) |
1173 | |
1174 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1175 ;; Compute numeric prefix arg value. |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1176 ;; Invoked by EVENT-CHAR. COM is the command part obtained so far. |
21940 | 1177 (defun viper-prefix-arg-value (event-char com) |
19078 | 1178 (let ((viper-intermediate-command 'viper-digit-argument) |
1179 value func) | |
18129 | 1180 ;; read while number |
21940 | 1181 (while (and (viper-characterp event-char) |
1182 (>= event-char ?0) (<= event-char ?9)) | |
1183 (setq value (+ (* (if (integerp value) value 0) 10) (- event-char ?0))) | |
1184 (setq event-char (viper-read-event-convert-to-char))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1185 |
18129 | 1186 (setq prefix-arg value) |
1187 (if com (setq prefix-arg (cons prefix-arg com))) | |
21940 | 1188 (while (eq event-char ?U) |
19078 | 1189 (viper-describe-arg prefix-arg) |
21940 | 1190 (setq event-char (viper-read-event-convert-to-char))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1191 |
19078 | 1192 (if (or com (and (not (eq viper-current-state 'vi-state)) |
18129 | 1193 ;; make sure it is a Vi command |
21940 | 1194 (viper-characterp event-char) |
1195 (viper-vi-command-p event-char) | |
18129 | 1196 )) |
1197 ;; If appears to be one of the vi commands, | |
1198 ;; then execute it with funcall and clear prefix-arg in order to not | |
1199 ;; confuse subsequent commands | |
1200 (progn | |
1201 ;; last-command-char is the char we want emacs to think was typed | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1202 ;; last. If com is not nil, the viper-digit-argument command was |
19078 | 1203 ;; called from within viper-prefix-arg command, such as `d', `w', |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1204 ;; etc., i.e., the user typed, say, d2. In this case, `com' would be |
19078 | 1205 ;; `d', `w', etc. If viper-digit-argument was invoked by |
1206 ;; viper-escape-to-vi (which is indicated by the fact that the | |
21940 | 1207 ;; current state is not vi-state), then `event-char' represents the |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1208 ;; vi command to be executed (e.g., `d', `w', etc). Again, |
19078 | 1209 ;; last-command-char must make emacs believe that this is the command |
1210 ;; we typed. | |
21940 | 1211 (cond ((eq event-char 'return) (setq event-char ?\C-m)) |
1212 ((eq event-char 'delete) (setq event-char ?\C-?)) | |
1213 ((eq event-char 'backspace) (setq event-char ?\C-h)) | |
1214 ((eq event-char 'space) (setq event-char ?\ ))) | |
1215 (setq last-command-char (or com event-char)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1216 (setq func (viper-exec-form-in-vi |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1217 `(key-binding (char-to-string ,event-char)))) |
18129 | 1218 (funcall func prefix-arg) |
1219 (setq prefix-arg nil)) | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1220 ;; some other command -- let emacs do it in its own way |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1221 (viper-set-unread-command-events event-char)) |
18129 | 1222 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1223 |
18129 | 1224 |
1225 ;; Vi operator as prefix argument." | |
19078 | 1226 (defun viper-prefix-arg-com (char value com) |
18129 | 1227 (let ((cont t) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1228 cmd-info |
18958 | 1229 cmd-to-exec-at-end) |
18129 | 1230 (while (and cont |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1231 (viper-memq-char char |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1232 (list ?c ?d ?y ?! ?< ?> ?= ?# ?r ?R ?\" |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1233 viper-buffer-search-char))) |
18129 | 1234 (if com |
1235 ;; this means that we already have a command character, so we | |
1236 ;; construct a com list and exit while. however, if char is " | |
1237 ;; it is an error. | |
1238 (progn | |
1239 ;; new com is (CHAR . OLDCOM) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1240 (if (viper-memq-char char '(?# ?\")) (error "")) |
18129 | 1241 (setq com (cons char com)) |
1242 (setq cont nil)) | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1243 ;; If com is nil we set com as char, and read more. Again, if char is |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1244 ;; ", we read the name of register and store it in viper-use-register. |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1245 ;; if char is !, =, or #, a complete com is formed so we exit the while |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1246 ;; loop. |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1247 (cond ((viper-memq-char char '(?! ?=)) |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1248 (setq com char) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1249 (setq char (read-char)) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1250 (setq cont nil)) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1251 ((viper= char ?#) |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1252 ;; read a char and encode it as com |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1253 (setq com (+ 128 (read-char))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1254 (setq char (read-char))) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1255 ((viper= char ?\") |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1256 (let ((reg (read-char))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1257 (if (viper-valid-register reg) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1258 (setq viper-use-register reg) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1259 (error "")) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1260 (setq char (read-char)))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1261 (t |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1262 (setq com char) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1263 (setq char (read-char)))))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1264 |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1265 (if (atom com) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1266 ;; `com' is a single char, so we construct the command argument |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1267 ;; and if `char' is `?', we describe the arg; otherwise |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1268 ;; we prepare the command that will be executed at the end. |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1269 (progn |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1270 (setq cmd-info (cons value com)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1271 (while (viper= char ?U) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1272 (viper-describe-arg cmd-info) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1273 (setq char (read-char))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1274 ;; `char' is a movement cmd, a digit arg cmd, or a register cmd---so |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1275 ;; we execute it at the very end |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1276 (or (viper-movement-command-p char) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1277 (viper-digit-command-p char) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1278 (viper-regsuffix-command-p char) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1279 (viper= char ?!) ; bang command |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1280 (viper= char ?g) ; the gg command (like G0) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1281 (error "")) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1282 (setq cmd-to-exec-at-end |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1283 (viper-exec-form-in-vi |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1284 `(key-binding (char-to-string ,char))))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1285 |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1286 ;; as com is non-nil, this means that we have a command to execute |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1287 (if (viper-memq-char (car com) '(?r ?R)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1288 ;; execute apropriate region command. |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1289 (let ((char (car com)) (com (cdr com))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1290 (setq prefix-arg (cons value com)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1291 (if (viper= char ?r) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1292 (viper-region prefix-arg) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1293 (viper-Region prefix-arg)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1294 ;; reset prefix-arg |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1295 (setq prefix-arg nil)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1296 ;; otherwise, reset prefix arg and call appropriate command |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1297 (setq value (if (null value) 1 value)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1298 (setq prefix-arg nil) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1299 (cond |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1300 ;; If we change ?C to ?c here, then cc will enter replacement mode |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1301 ;; rather than deleting lines. However, it will affect 1 less line |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1302 ;; than normal. We decided to not use replacement mode here and |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1303 ;; follow Vi, since replacement mode on n full lines can be achieved |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1304 ;; with nC. |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1305 ((equal com '(?c . ?c)) (viper-line (cons value ?C))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1306 ((equal com '(?d . ?d)) (viper-line (cons value ?D))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1307 ((equal com '(?d . ?y)) (viper-yank-defun)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1308 ((equal com '(?y . ?y)) (viper-line (cons value ?Y))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1309 ((equal com '(?< . ?<)) (viper-line (cons value ?<))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1310 ((equal com '(?> . ?>)) (viper-line (cons value ?>))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1311 ((equal com '(?! . ?!)) (viper-line (cons value ?!))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1312 ((equal com '(?= . ?=)) (viper-line (cons value ?=))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1313 ;; gg acts as G0 |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1314 ((equal (car com) ?g) (viper-goto-line 0)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1315 (t (error ""))))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1316 |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1317 (if cmd-to-exec-at-end |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1318 (progn |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1319 (setq last-command-char char) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1320 (setq last-command-event |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1321 (viper-copy-event |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1322 (if viper-xemacs-p (character-to-event char) char))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1323 (condition-case nil |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1324 (funcall cmd-to-exec-at-end cmd-info) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1325 (error |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1326 (error ""))))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1327 )) |
18129 | 1328 |
19078 | 1329 (defun viper-describe-arg (arg) |
18129 | 1330 (let (val com) |
19078 | 1331 (setq val (viper-P-val arg) |
1332 com (viper-getcom arg)) | |
18129 | 1333 (if (null val) |
1334 (if (null com) | |
1335 (message "Value is nil, and command is nil") | |
1336 (message "Value is nil, and command is `%c'" com)) | |
1337 (if (null com) | |
1338 (message "Value is `%d', and command is nil" val) | |
1339 (message "Value is `%d', and command is `%c'" val com))))) | |
1340 | |
19078 | 1341 (defun viper-digit-argument (arg) |
18129 | 1342 "Begin numeric argument for the next command." |
1343 (interactive "P") | |
19078 | 1344 (viper-leave-region-active) |
1345 (viper-prefix-arg-value | |
18129 | 1346 last-command-char (if (consp arg) (cdr arg) nil))) |
1347 | |
19078 | 1348 (defun viper-command-argument (arg) |
18129 | 1349 "Accept a motion command as an argument." |
1350 (interactive "P") | |
19078 | 1351 (let ((viper-intermediate-command 'viper-command-argument)) |
18129 | 1352 (condition-case nil |
19078 | 1353 (viper-prefix-arg-com |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1354 last-command-char |
18129 | 1355 (cond ((null arg) nil) |
1356 ((consp arg) (car arg)) | |
1357 ((integerp arg) arg) | |
19078 | 1358 (t (error viper-InvalidCommandArgument))) |
18129 | 1359 (cond ((null arg) nil) |
1360 ((consp arg) (cdr arg)) | |
1361 ((integerp arg) nil) | |
19078 | 1362 (t (error viper-InvalidCommandArgument)))) |
1363 (quit (setq viper-use-register nil) | |
18129 | 1364 (signal 'quit nil))) |
19078 | 1365 (viper-deactivate-mark))) |
18129 | 1366 |
1367 | |
1368 ;; repeat last destructive command | |
1369 | |
1370 ;; Append region to text in register REG. | |
1371 ;; START and END are buffer positions indicating what to append. | |
19078 | 1372 (defsubst viper-append-to-register (reg start end) |
18129 | 1373 (set-register reg (concat (if (stringp (get-register reg)) |
1374 (get-register reg) "") | |
1375 (buffer-substring start end)))) | |
1376 | |
19078 | 1377 ;; Saves last inserted text for possible use by viper-repeat command. |
1378 (defun viper-save-last-insertion (beg end) | |
19756 | 1379 (condition-case nil |
1380 (setq viper-last-insertion (buffer-substring beg end)) | |
1381 (error | |
1382 ;; beg or end marker are somehow screwed up | |
1383 (setq viper-last-insertion nil))) | |
19078 | 1384 (setq viper-last-insertion (buffer-substring beg end)) |
1385 (or (< (length viper-d-com) 5) | |
1386 (setcar (nthcdr 4 viper-d-com) viper-last-insertion)) | |
1387 (or (null viper-command-ring) | |
1388 (ring-empty-p viper-command-ring) | |
18129 | 1389 (progn |
19078 | 1390 (setcar (nthcdr 4 (viper-current-ring-item viper-command-ring)) |
1391 viper-last-insertion) | |
18129 | 1392 ;; del most recent elt, if identical to the second most-recent |
19078 | 1393 (viper-cleanup-ring viper-command-ring))) |
18129 | 1394 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1395 |
19078 | 1396 (defsubst viper-yank-last-insertion () |
1397 "Inserts the text saved by the previous viper-save-last-insertion command." | |
18129 | 1398 (condition-case nil |
19078 | 1399 (insert viper-last-insertion) |
18129 | 1400 (error nil))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1401 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1402 |
18129 | 1403 ;; define functions to be executed |
1404 | |
1405 ;; invoked by the `C' command | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1406 (defun viper-exec-change (m-com com) |
19078 | 1407 (or (and (markerp viper-com-point) (marker-position viper-com-point)) |
1408 (set-marker viper-com-point (point) (current-buffer))) | |
18129 | 1409 ;; handle C cmd at the eol and at eob. |
19078 | 1410 (if (or (and (eolp) (= viper-com-point (point))) |
1411 (= viper-com-point (point-max))) | |
18129 | 1412 (progn |
1413 (insert " ")(backward-char 1))) | |
19078 | 1414 (if (= viper-com-point (point)) |
1415 (viper-forward-char-carefully)) | |
1416 (set-mark viper-com-point) | |
1417 (if (eq m-com 'viper-next-line-at-bol) | |
1418 (viper-enlarge-region (mark t) (point))) | |
1419 (if (< (point) (mark t)) | |
1420 (exchange-point-and-mark)) | |
1421 (if (eq (preceding-char) ?\n) | |
1422 (viper-backward-char-carefully)) ; give back the newline | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1423 (if (eq viper-intermediate-command 'viper-repeat) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1424 (viper-change-subr (mark t) (point)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1425 (viper-change (mark t) (point)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1426 )) |
19078 | 1427 |
1428 ;; this is invoked by viper-substitute-line | |
1429 (defun viper-exec-Change (m-com com) | |
18129 | 1430 (save-excursion |
19078 | 1431 (set-mark viper-com-point) |
1432 (viper-enlarge-region (mark t) (point)) | |
1433 (if viper-use-register | |
18129 | 1434 (progn |
19078 | 1435 (cond ((viper-valid-register viper-use-register '(letter digit)) |
18129 | 1436 (copy-to-register |
19078 | 1437 viper-use-register (mark t) (point) nil)) |
1438 ((viper-valid-register viper-use-register '(Letter)) | |
1439 (viper-append-to-register | |
1440 (downcase viper-use-register) (mark t) (point))) | |
1441 (t (setq viper-use-register nil) | |
1442 (error viper-InvalidRegister viper-use-register))) | |
1443 (setq viper-use-register nil))) | |
18129 | 1444 (delete-region (mark t) (point))) |
1445 (open-line 1) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1446 (if (eq viper-intermediate-command 'viper-repeat) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1447 (viper-yank-last-insertion) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1448 (viper-change-state-to-insert) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1449 )) |
19078 | 1450 |
1451 (defun viper-exec-delete (m-com com) | |
1452 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
1453 (set-marker viper-com-point (point) (current-buffer))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1454 (let (chars-deleted) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1455 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1456 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1457 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1458 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1459 viper-use-register viper-com-point (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1460 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1461 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1462 (downcase viper-use-register) viper-com-point (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1463 (t (setq viper-use-register nil) |
19078 | 1464 (error viper-InvalidRegister viper-use-register))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1465 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1466 (setq last-command |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1467 (if (eq last-command 'd-command) 'kill-region nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1468 (setq chars-deleted (abs (- (point) viper-com-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1469 (if (> chars-deleted viper-change-notification-threshold) |
64750
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
1470 (unless (viper-is-in-minibuffer) |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
1471 (message "Deleted %d characters" chars-deleted))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1472 (kill-region viper-com-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1473 (setq this-command 'd-command) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1474 (if viper-ex-style-motion |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1475 (if (and (eolp) (not (bolp))) (backward-char 1))))) |
18129 | 1476 |
19078 | 1477 (defun viper-exec-Delete (m-com com) |
18129 | 1478 (save-excursion |
19078 | 1479 (set-mark viper-com-point) |
1480 (viper-enlarge-region (mark t) (point)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1481 (let (lines-deleted) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1482 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1483 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1484 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1485 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1486 viper-use-register (mark t) (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1487 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1488 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1489 (downcase viper-use-register) (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1490 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1491 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1492 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1493 (setq last-command |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1494 (if (eq last-command 'D-command) 'kill-region nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1495 (setq lines-deleted (count-lines (point) viper-com-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1496 (if (> lines-deleted viper-change-notification-threshold) |
64750
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
1497 (unless (viper-is-in-minibuffer) |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
1498 (message "Deleted %d lines" lines-deleted))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1499 (kill-region (mark t) (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1500 (if (eq m-com 'viper-line) (setq this-command 'D-command))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1501 (back-to-indentation))) |
18129 | 1502 |
21940 | 1503 ;; save region |
19078 | 1504 (defun viper-exec-yank (m-com com) |
1505 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
1506 (set-marker viper-com-point (point) (current-buffer))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1507 (let (chars-saved) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1508 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1509 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1510 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1511 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1512 viper-use-register viper-com-point (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1513 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1514 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1515 (downcase viper-use-register) viper-com-point (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1516 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1517 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1518 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1519 (setq last-command nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1520 (copy-region-as-kill viper-com-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1521 (setq chars-saved (abs (- (point) viper-com-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1522 (if (> chars-saved viper-change-notification-threshold) |
64750
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
1523 (unless (viper-is-in-minibuffer) |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
1524 (message "Saved %d characters" chars-saved))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1525 (goto-char viper-com-point))) |
19078 | 1526 |
21940 | 1527 ;; save lines |
19078 | 1528 (defun viper-exec-Yank (m-com com) |
18129 | 1529 (save-excursion |
19078 | 1530 (set-mark viper-com-point) |
1531 (viper-enlarge-region (mark t) (point)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1532 (let (lines-saved) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1533 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1534 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1535 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1536 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1537 viper-use-register (mark t) (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1538 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1539 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1540 (downcase viper-use-register) (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1541 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1542 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1543 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1544 (setq last-command nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1545 (copy-region-as-kill (mark t) (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1546 (setq lines-saved (count-lines (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1547 (if (> lines-saved viper-change-notification-threshold) |
64750
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
1548 (unless (viper-is-in-minibuffer) |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
1549 (message "Saved %d lines" lines-saved))))) |
19078 | 1550 (viper-deactivate-mark) |
1551 (goto-char viper-com-point)) | |
1552 | |
1553 (defun viper-exec-bang (m-com com) | |
18129 | 1554 (save-excursion |
19078 | 1555 (set-mark viper-com-point) |
1556 (viper-enlarge-region (mark t) (point)) | |
18958 | 1557 (exchange-point-and-mark) |
18129 | 1558 (shell-command-on-region |
1559 (mark t) (point) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1560 (if (viper= com ?!) |
19078 | 1561 (setq viper-last-shell-com |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1562 (viper-read-string-with-history |
18129 | 1563 "!" |
1564 nil | |
19078 | 1565 'viper-shell-history |
1566 (car viper-shell-history) | |
18129 | 1567 )) |
19078 | 1568 viper-last-shell-com) |
18129 | 1569 t))) |
1570 | |
19078 | 1571 (defun viper-exec-equals (m-com com) |
18129 | 1572 (save-excursion |
19078 | 1573 (set-mark viper-com-point) |
1574 (viper-enlarge-region (mark t) (point)) | |
18129 | 1575 (if (> (mark t) (point)) (exchange-point-and-mark)) |
1576 (indent-region (mark t) (point) nil))) | |
1577 | |
19078 | 1578 (defun viper-exec-shift (m-com com) |
18129 | 1579 (save-excursion |
19078 | 1580 (set-mark viper-com-point) |
1581 (viper-enlarge-region (mark t) (point)) | |
18129 | 1582 (if (> (mark t) (point)) (exchange-point-and-mark)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1583 (indent-rigidly (mark t) (point) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1584 (if (viper= com ?>) |
19078 | 1585 viper-shift-width |
1586 (- viper-shift-width)))) | |
18129 | 1587 ;; return point to where it was before shift |
19078 | 1588 (goto-char viper-com-point)) |
18129 | 1589 |
1590 ;; this is needed because some commands fake com by setting it to ?r, which | |
1591 ;; denotes repeated insert command. | |
19078 | 1592 (defsubst viper-exec-dummy (m-com com) |
18129 | 1593 nil) |
1594 | |
19078 | 1595 (defun viper-exec-buffer-search (m-com com) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
1596 (setq viper-s-string |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
1597 (regexp-quote (buffer-substring (point) viper-com-point))) |
19078 | 1598 (setq viper-s-forward t) |
1599 (setq viper-search-history (cons viper-s-string viper-search-history)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1600 (setq viper-intermediate-command 'viper-exec-buffer-search) |
19078 | 1601 (viper-search viper-s-string viper-s-forward 1)) |
1602 | |
1603 (defvar viper-exec-array (make-vector 128 nil)) | |
18129 | 1604 |
1605 ;; Using a dispatch array allows adding functions like buffer search | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1606 ;; without affecting other functions. Buffer search can now be bound |
18129 | 1607 ;; to any character. |
1608 | |
19078 | 1609 (aset viper-exec-array ?c 'viper-exec-change) |
1610 (aset viper-exec-array ?C 'viper-exec-Change) | |
1611 (aset viper-exec-array ?d 'viper-exec-delete) | |
1612 (aset viper-exec-array ?D 'viper-exec-Delete) | |
1613 (aset viper-exec-array ?y 'viper-exec-yank) | |
1614 (aset viper-exec-array ?Y 'viper-exec-Yank) | |
1615 (aset viper-exec-array ?r 'viper-exec-dummy) | |
1616 (aset viper-exec-array ?! 'viper-exec-bang) | |
1617 (aset viper-exec-array ?< 'viper-exec-shift) | |
1618 (aset viper-exec-array ?> 'viper-exec-shift) | |
1619 (aset viper-exec-array ?= 'viper-exec-equals) | |
18129 | 1620 |
1621 | |
1622 | |
1623 ;; This function is called by various movement commands to execute a | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1624 ;; destructive command on the region specified by the movement command. For |
19078 | 1625 ;; instance, if the user types cw, then the command viper-forward-word will |
1626 ;; call viper-execute-com to execute viper-exec-change, which eventually will | |
1627 ;; call viper-change to invoke the replace mode on the region. | |
18129 | 1628 ;; |
19078 | 1629 ;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS) |
1630 ;; via a call to viper-set-destructive-command, for later use by viper-repeat. | |
1631 (defun viper-execute-com (m-com val com) | |
1632 (let ((reg viper-use-register)) | |
18129 | 1633 ;; this is the special command `#' |
1634 (if (> com 128) | |
19078 | 1635 (viper-special-prefix-com (- com 128)) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1636 (let ((fn (aref viper-exec-array com))) |
18129 | 1637 (if (null fn) |
19078 | 1638 (error "%c: %s" com viper-InvalidViCommand) |
18129 | 1639 (funcall fn m-com com)))) |
19078 | 1640 (if (viper-dotable-command-p com) |
1641 (viper-set-destructive-command | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1642 (list m-com val com reg nil nil))) |
18129 | 1643 )) |
1644 | |
1645 | |
19078 | 1646 (defun viper-repeat (arg) |
18129 | 1647 "Re-execute last destructive command. |
19078 | 1648 Use the info in viper-d-com, which has the form |
18129 | 1649 \(com val ch reg inserted-text command-keys\), |
1650 where `com' is the command to be re-executed, `val' is the | |
1651 argument to `com', `ch' is a flag for repeat, and `reg' is optional; | |
1652 if it exists, it is the name of the register for `com'. | |
1653 If the prefix argument, ARG, is non-nil, it is used instead of `val'." | |
1654 (interactive "P") | |
1655 (let ((save-point (point)) ; save point before repeating prev cmd | |
1656 ;; Pass along that we are repeating a destructive command | |
19078 | 1657 ;; This tells viper-set-destructive-command not to update |
1658 ;; viper-command-ring | |
1659 (viper-intermediate-command 'viper-repeat)) | |
1660 (if (eq last-command 'viper-undo) | |
1661 ;; if the last command was viper-undo, then undo-more | |
1662 (viper-undo-more) | |
1663 ;; otherwise execute the command stored in viper-d-com. if arg is | |
1664 ;; non-nil its prefix value is used as new prefix value for the command. | |
1665 (let ((m-com (car viper-d-com)) | |
1666 (val (viper-P-val arg)) | |
1667 (com (nth 2 viper-d-com)) | |
1668 (reg (nth 3 viper-d-com))) | |
1669 (if (null val) (setq val (nth 1 viper-d-com))) | |
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33842
diff
changeset
|
1670 (if (null m-com) (error "No previous command to repeat")) |
19078 | 1671 (setq viper-use-register reg) |
1672 (if (nth 4 viper-d-com) ; text inserted by command | |
1673 (setq viper-last-insertion (nth 4 viper-d-com) | |
1674 viper-d-char (nth 4 viper-d-com))) | |
18129 | 1675 (funcall m-com (cons val com)) |
19078 | 1676 (cond ((and (< save-point (point)) viper-keep-point-on-repeat) |
18839 | 1677 (goto-char save-point)) ; go back to before repeat. |
19462 | 1678 ((and (< save-point (point)) viper-ex-style-editing) |
18839 | 1679 (or (bolp) (backward-char 1)))) |
18129 | 1680 (if (and (eolp) (not (bolp))) |
1681 (backward-char 1)) | |
1682 )) | |
19462 | 1683 (viper-adjust-undo) ; take care of undo |
18129 | 1684 ;; If the prev cmd was rotating the command ring, this means that `.' has |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1685 ;; just executed a command from that ring. So, push it on the ring again. |
19078 | 1686 ;; If we are just executing previous command , then don't push viper-d-com |
1687 ;; because viper-d-com is not fully constructed in this case (its keys and | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1688 ;; the inserted text may be nil). Besides, in this case, the command |
18129 | 1689 ;; executed by `.' is already on the ring. |
19078 | 1690 (if (eq last-command 'viper-display-current-destructive-command) |
1691 (viper-push-onto-ring viper-d-com 'viper-command-ring)) | |
1692 (viper-deactivate-mark) | |
18129 | 1693 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1694 |
19078 | 1695 (defun viper-repeat-from-history () |
18129 | 1696 "Repeat a destructive command from history. |
19078 | 1697 Doesn't change viper-command-ring in any way, so `.' will work as before |
18129 | 1698 executing this command. |
1699 This command is supposed to be bound to a two-character Vi macro where | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1700 the second character is a digit 0 to 9. The digit indicates which |
18129 | 1701 history command to execute. `<char>0' is equivalent to `.', `<char>1' |
1702 invokes the command before that, etc." | |
1703 (interactive) | |
19078 | 1704 (let* ((viper-intermediate-command 'repeating-display-destructive-command) |
1705 (idx (cond (viper-this-kbd-macro | |
18129 | 1706 (string-to-number |
19078 | 1707 (symbol-name (elt viper-this-kbd-macro 1)))) |
18129 | 1708 (t 0))) |
1709 (num idx) | |
19078 | 1710 (viper-d-com viper-d-com)) |
18129 | 1711 |
1712 (or (and (numberp num) (<= 0 num) (<= num 9)) | |
1713 (progn | |
1714 (setq idx 0 | |
1715 num 0) | |
1716 (message | |
19078 | 1717 "`viper-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'"))) |
18129 | 1718 (while (< 0 num) |
19078 | 1719 (setq viper-d-com (viper-special-ring-rotate1 viper-command-ring -1)) |
18129 | 1720 (setq num (1- num))) |
19078 | 1721 (viper-repeat nil) |
18129 | 1722 (while (> idx num) |
19078 | 1723 (viper-special-ring-rotate1 viper-command-ring 1) |
18129 | 1724 (setq num (1+ num))) |
1725 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1726 |
18129 | 1727 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1728 ;; The hash-command. It is invoked interactively by the key sequence #<char>. |
19078 | 1729 ;; The chars that can follow `#' are determined by viper-hash-command-p |
1730 (defun viper-special-prefix-com (char) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1731 (cond ((viper= char ?c) |
19078 | 1732 (downcase-region (min viper-com-point (point)) |
1733 (max viper-com-point (point)))) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1734 ((viper= char ?C) |
19078 | 1735 (upcase-region (min viper-com-point (point)) |
1736 (max viper-com-point (point)))) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1737 ((viper= char ?g) |
19078 | 1738 (push-mark viper-com-point t) |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1739 ;; execute the last emacs kbd macro on each line of the region |
19078 | 1740 (viper-global-execute)) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1741 ((viper= char ?q) |
19078 | 1742 (push-mark viper-com-point t) |
1743 (viper-quote-region)) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1744 ((viper= char ?s) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1745 (funcall viper-spell-function viper-com-point (point))) |
19078 | 1746 (t (error "#%c: %s" char viper-InvalidViCommand)))) |
18129 | 1747 |
1748 | |
1749 ;; undoing | |
1750 | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1751 ;; hook used inside undo |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1752 (defvar viper-undo-functions nil) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1753 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1754 ;; Runs viper-before-change-functions inside before-change-functions |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1755 (defun viper-undo-sentinel (beg end length) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1756 (run-hook-with-args 'viper-undo-functions beg end length)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1757 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1758 (add-hook 'after-change-functions 'viper-undo-sentinel) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1759 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1760 ;; Hook used in viper-undo |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1761 (defun viper-after-change-undo-hook (beg end len) |
72579
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
1762 (if (and (boundp 'undo-in-progress) undo-in-progress) |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1763 (setq undo-beg-posn beg |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1764 undo-end-posn (or end beg)) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1765 ;; some other hooks may be changing various text properties in |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1766 ;; the buffer in response to 'undo'; so remove this hook to avoid |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1767 ;; its repeated invocation |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1768 (remove-hook 'viper-undo-functions 'viper-after-change-undo-hook 'local) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1769 )) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1770 |
19078 | 1771 (defun viper-undo () |
18129 | 1772 "Undo previous change." |
1773 (interactive) | |
1774 (message "undo!") | |
1775 (let ((modified (buffer-modified-p)) | |
1776 (before-undo-pt (point-marker)) | |
1777 undo-beg-posn undo-end-posn) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1778 |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1779 ;; the viper-after-change-undo-hook removes itself after the 1st invocation |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1780 (add-hook 'viper-undo-functions 'viper-after-change-undo-hook nil 'local) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1781 |
18129 | 1782 (undo-start) |
1783 (undo-more 2) | |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1784 ;;(setq undo-beg-posn (or undo-beg-posn (point)) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1785 ;; undo-end-posn (or undo-end-posn (point))) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1786 ;;(setq undo-beg-posn (or undo-beg-posn before-undo-pt) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1787 ;; undo-end-posn (or undo-end-posn undo-beg-posn)) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1788 |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1789 (if (and undo-beg-posn undo-end-posn) |
18129 | 1790 (progn |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1791 (goto-char undo-beg-posn) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1792 (sit-for 0) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1793 (if (and viper-keep-point-on-undo |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1794 (pos-visible-in-window-p before-undo-pt)) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1795 (progn |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1796 (push-mark (point-marker) t) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1797 (viper-sit-for-short 300) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1798 (goto-char undo-end-posn) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1799 (viper-sit-for-short 300) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1800 (if (pos-visible-in-window-p undo-beg-posn) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1801 (goto-char before-undo-pt) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1802 (goto-char undo-beg-posn))) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1803 (push-mark before-undo-pt t)) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1804 )) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1805 |
18129 | 1806 (if (and (eolp) (not (bolp))) (backward-char 1)) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1807 ) |
19078 | 1808 (setq this-command 'viper-undo)) |
18129 | 1809 |
1810 ;; Continue undoing previous changes. | |
19078 | 1811 (defun viper-undo-more () |
18129 | 1812 (message "undo more!") |
1813 (condition-case nil | |
1814 (undo-more 1) | |
1815 (error (beep) | |
1816 (message "No further undo information in this buffer"))) | |
1817 (if (and (eolp) (not (bolp))) (backward-char 1)) | |
19078 | 1818 (setq this-command 'viper-undo)) |
18129 | 1819 |
1820 ;; The following two functions are used to set up undo properly. | |
1821 ;; In VI, unlike Emacs, if you open a line, say, and add a bunch of lines, | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1822 ;; they are undone all at once. |
19078 | 1823 (defun viper-adjust-undo () |
19462 | 1824 (if viper-undo-needs-adjustment |
1825 (let ((inhibit-quit t) | |
1826 tmp tmp2) | |
1827 (setq viper-undo-needs-adjustment nil) | |
1828 (if (listp buffer-undo-list) | |
1829 (if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list)) | |
1830 (progn | |
1831 (setq tmp2 (cdr tmp)) ; the part after mark | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1832 |
19462 | 1833 ;; cut tail from buffer-undo-list temporarily by direct |
1834 ;; manipulation with pointers in buffer-undo-list | |
1835 (setcdr tmp nil) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1836 |
19462 | 1837 (setq buffer-undo-list (delq nil buffer-undo-list)) |
1838 (setq buffer-undo-list | |
1839 (delq viper-buffer-undo-list-mark buffer-undo-list)) | |
1840 ;; restore tail of buffer-undo-list | |
1841 (setq buffer-undo-list (nconc buffer-undo-list tmp2))) | |
1842 (setq buffer-undo-list (delq nil buffer-undo-list))))) | |
1843 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1844 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1845 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1846 (defun viper-set-complex-command-for-undo () |
18129 | 1847 (if (listp buffer-undo-list) |
19078 | 1848 (if (not viper-undo-needs-adjustment) |
18129 | 1849 (let ((inhibit-quit t)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1850 (setq buffer-undo-list |
19078 | 1851 (cons viper-buffer-undo-list-mark buffer-undo-list)) |
1852 (setq viper-undo-needs-adjustment t))))) | |
18129 | 1853 |
1854 | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1855 ;;; Viper's destructive Command ring utilities |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1856 |
19078 | 1857 (defun viper-display-current-destructive-command () |
1858 (let ((text (nth 4 viper-d-com)) | |
1859 (keys (nth 5 viper-d-com)) | |
18129 | 1860 (max-text-len 30)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1861 |
19078 | 1862 (setq this-command 'viper-display-current-destructive-command) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1863 |
18129 | 1864 (message " `.' runs %s%s" |
19078 | 1865 (concat "`" (viper-array-to-string keys) "'") |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1866 (viper-abbreviate-string |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1867 (viper-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1868 (replace-in-string ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1869 (cond ((characterp text) (char-to-string text)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1870 ((stringp text) text) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1871 (t "")) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1872 "\n" "^J") |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1873 text ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1874 ) |
19079 | 1875 max-text-len |
1876 " inserting `" "'" " .......")) | |
18129 | 1877 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1878 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1879 |
19078 | 1880 ;; don't change viper-d-com if it was viper-repeat command invoked with `.' |
18129 | 1881 ;; or in some other way (non-interactively). |
19078 | 1882 (defun viper-set-destructive-command (list) |
1883 (or (eq viper-intermediate-command 'viper-repeat) | |
18129 | 1884 (progn |
19078 | 1885 (setq viper-d-com list) |
1886 (setcar (nthcdr 5 viper-d-com) | |
1887 (viper-array-to-string (if (arrayp viper-this-command-keys) | |
1888 viper-this-command-keys | |
1889 (this-command-keys)))) | |
1890 (viper-push-onto-ring viper-d-com 'viper-command-ring))) | |
1891 (setq viper-this-command-keys nil)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1892 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1893 |
19078 | 1894 (defun viper-prev-destructive-command (next) |
18129 | 1895 "Find previous destructive command in the history of destructive commands. |
1896 With prefix argument, find next destructive command." | |
1897 (interactive "P") | |
19078 | 1898 (let (cmd viper-intermediate-command) |
1899 (if (eq last-command 'viper-display-current-destructive-command) | |
18129 | 1900 ;; repeated search through command history |
19078 | 1901 (setq viper-intermediate-command |
1902 'repeating-display-destructive-command) | |
18129 | 1903 ;; first search through command history--set temp ring |
45738 | 1904 (setq viper-temp-command-ring (copy-list viper-command-ring))) |
18129 | 1905 (setq cmd (if next |
19078 | 1906 (viper-special-ring-rotate1 viper-temp-command-ring 1) |
1907 (viper-special-ring-rotate1 viper-temp-command-ring -1))) | |
18129 | 1908 (if (null cmd) |
1909 () | |
19078 | 1910 (setq viper-d-com cmd)) |
1911 (viper-display-current-destructive-command))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1912 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1913 |
19078 | 1914 (defun viper-next-destructive-command () |
18129 | 1915 "Find next destructive command in the history of destructive commands." |
1916 (interactive) | |
19078 | 1917 (viper-prev-destructive-command 'next)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1918 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1919 |
19078 | 1920 (defun viper-insert-prev-from-insertion-ring (arg) |
18129 | 1921 "Cycle through insertion ring in the direction of older insertions. |
1922 Undoes previous insertion and inserts new. | |
1923 With prefix argument, cycles in the direction of newer elements. | |
1924 In minibuffer, this command executes whatever the invocation key is bound | |
1925 to in the global map, instead of cycling through the insertion ring." | |
1926 (interactive "P") | |
19078 | 1927 (let (viper-intermediate-command) |
1928 (if (eq last-command 'viper-insert-from-insertion-ring) | |
18129 | 1929 (progn ; repeated search through insertion history |
19078 | 1930 (setq viper-intermediate-command 'repeating-insertion-from-ring) |
1931 (if (eq viper-current-state 'replace-state) | |
18129 | 1932 (undo 1) |
19078 | 1933 (if viper-last-inserted-string-from-insertion-ring |
18129 | 1934 (backward-delete-char |
19078 | 1935 (length viper-last-inserted-string-from-insertion-ring)))) |
18129 | 1936 ) |
1937 ;;first search through insertion history | |
45738 | 1938 (setq viper-temp-insertion-ring (copy-list viper-insertion-ring))) |
19078 | 1939 (setq this-command 'viper-insert-from-insertion-ring) |
18129 | 1940 ;; so that things will be undone properly |
1941 (setq buffer-undo-list (cons nil buffer-undo-list)) | |
19078 | 1942 (setq viper-last-inserted-string-from-insertion-ring |
1943 (viper-special-ring-rotate1 viper-temp-insertion-ring (if arg 1 -1))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1944 |
19078 | 1945 ;; this change of viper-intermediate-command must come after |
1946 ;; viper-special-ring-rotate1, so that the ring will rotate, but before the | |
18129 | 1947 ;; insertion. |
19078 | 1948 (setq viper-intermediate-command nil) |
1949 (if viper-last-inserted-string-from-insertion-ring | |
1950 (insert viper-last-inserted-string-from-insertion-ring)) | |
18129 | 1951 )) |
1952 | |
19078 | 1953 (defun viper-insert-next-from-insertion-ring () |
18129 | 1954 "Cycle through insertion ring in the direction of older insertions. |
1955 Undo previous insertion and inserts new." | |
1956 (interactive) | |
19078 | 1957 (viper-insert-prev-from-insertion-ring 'next)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1958 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1959 |
18129 | 1960 |
1961 ;; some region utilities | |
1962 | |
1963 ;; If at the last line of buffer, add \\n before eob, if newline is missing. | |
19078 | 1964 (defun viper-add-newline-at-eob-if-necessary () |
18129 | 1965 (save-excursion |
1966 (end-of-line) | |
1967 ;; make sure all lines end with newline, unless in the minibuffer or | |
1968 ;; when requested otherwise (require-final-newline is nil) | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1969 (save-restriction |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1970 (widen) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1971 (if (and (eobp) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1972 (not (bolp)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1973 require-final-newline |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1974 (not (viper-is-in-minibuffer)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1975 (not buffer-read-only)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1976 (insert "\n"))) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1977 )) |
18129 | 1978 |
19078 | 1979 (defun viper-yank-defun () |
18129 | 1980 (mark-defun) |
1981 (copy-region-as-kill (point) (mark t))) | |
1982 | |
1983 ;; Enlarge region between BEG and END. | |
19078 | 1984 (defun viper-enlarge-region (beg end) |
18129 | 1985 (or beg (setq beg end)) ; if beg is nil, set to end |
1986 (or end (setq end beg)) ; if end is nil, set to beg | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1987 |
18129 | 1988 (if (< beg end) |
1989 (progn (goto-char beg) (set-mark end)) | |
1990 (goto-char end) | |
1991 (set-mark beg)) | |
1992 (beginning-of-line) | |
1993 (exchange-point-and-mark) | |
1994 (if (or (not (eobp)) (not (bolp))) (forward-line 1)) | |
1995 (if (not (eobp)) (beginning-of-line)) | |
1996 (if (> beg end) (exchange-point-and-mark))) | |
1997 | |
1998 | |
1999 ;; Quote region by each line with a user supplied string. | |
19078 | 2000 (defun viper-quote-region () |
20343 | 2001 (let ((quote-str viper-quote-string) |
2002 (donot-change-dafault t)) | |
2003 (setq quote-str | |
2004 (viper-read-string-with-history | |
2005 "Quote string: " | |
2006 nil | |
2007 'viper-quote-region-history | |
2008 (cond ((string-match "tex.*-mode" (symbol-name major-mode)) "%%") | |
2009 ((string-match "java.*-mode" (symbol-name major-mode)) "//") | |
2010 ((string-match "perl.*-mode" (symbol-name major-mode)) "#") | |
2011 ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") | |
2012 ((memq major-mode '(c-mode cc-mode c++-mode)) "//") | |
2013 ((memq major-mode '(sh-mode shell-mode)) "#") | |
2014 (t (setq donot-change-dafault nil) | |
2015 quote-str)))) | |
2016 (or donot-change-dafault | |
2017 (setq viper-quote-string quote-str)) | |
2018 (viper-enlarge-region (point) (mark t)) | |
2019 (if (> (point) (mark t)) (exchange-point-and-mark)) | |
2020 (insert quote-str) | |
18129 | 2021 (beginning-of-line) |
20343 | 2022 (forward-line 1) |
2023 (while (and (< (point) (mark t)) (bolp)) | |
2024 (insert quote-str) | |
2025 (beginning-of-line) | |
2026 (forward-line 1)))) | |
18129 | 2027 |
2028 ;; Tells whether BEG is on the same line as END. | |
2029 ;; If one of the args is nil, it'll return nil. | |
19078 | 2030 (defun viper-same-line (beg end) |
18129 | 2031 (let ((selective-display nil) |
2032 (incr 0) | |
2033 temp) | |
2034 (if (and beg end (> beg end)) | |
2035 (setq temp beg | |
2036 beg end | |
2037 end temp)) | |
2038 (if (and beg end) | |
2039 (cond ((or (> beg (point-max)) (> end (point-max))) ; out of range | |
2040 nil) | |
2041 (t | |
2042 ;; This 'if' is needed because Emacs treats the next empty line | |
2043 ;; as part of the previous line. | |
19078 | 2044 (if (= (viper-line-pos 'start) end) |
18129 | 2045 (setq incr 1)) |
2046 (<= (+ incr (count-lines beg end)) 1)))) | |
2047 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2048 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2049 |
18129 | 2050 ;; Check if the string ends with a newline. |
19078 | 2051 (defun viper-end-with-a-newline-p (string) |
18129 | 2052 (or (string= string "") |
19078 | 2053 (= (viper-seq-last-elt string) ?\n))) |
2054 | |
2055 (defun viper-tmp-insert-at-eob (msg) | |
18129 | 2056 (let ((savemax (point-max))) |
2057 (goto-char savemax) | |
2058 (insert msg) | |
2059 (sit-for 2) | |
2060 (goto-char savemax) (delete-region (point) (point-max)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2061 )) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2062 |
18129 | 2063 |
2064 | |
2065 ;;; Minibuffer business | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2066 |
19078 | 2067 (defsubst viper-set-minibuffer-style () |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2068 (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2069 (add-hook 'post-command-hook 'viper-minibuffer-post-command-hook)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2070 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2071 |
19078 | 2072 (defun viper-minibuffer-setup-sentinel () |
2073 (let ((hook (if viper-vi-style-in-minibuffer | |
2074 'viper-change-state-to-insert | |
2075 'viper-change-state-to-emacs))) | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2076 ;; making buffer-local variables so that normal buffers won't affect the |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2077 ;; minibuffer and vice versa. Otherwise, command arguments will affect |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2078 ;; minibuffer ops and insertions from the minibuffer will change those in |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2079 ;; the normal buffers |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2080 (make-local-variable 'viper-d-com) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2081 (make-local-variable 'viper-last-insertion) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2082 (make-local-variable 'viper-command-ring) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2083 (setq viper-d-com nil |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2084 viper-last-insertion nil |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2085 viper-command-ring nil) |
18129 | 2086 (funcall hook) |
2087 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2088 |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2089 ;; Thie is a temp hook that uses free variables init-message and initial. |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2090 ;; A dirty feature, but it is the simplest way to have it do the right thing. |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2091 ;; The INIT-MESSAGE and INITIAL vars come from the scope set by |
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
2092 ;; viper-read-string-with-history |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2093 (defun viper-minibuffer-standard-hook () |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2094 (if (stringp init-message) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2095 (viper-tmp-insert-at-eob init-message)) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2096 (if (stringp initial) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2097 (progn |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2098 ;; don't wait if we have unread events or in kbd macro |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2099 (or unread-command-events |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2100 executing-kbd-macro |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2101 (sit-for 840)) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2102 (if (fboundp 'minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2103 (delete-region (minibuffer-prompt-end) (point-max)) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2104 (erase-buffer)) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2105 (insert initial)))) |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2106 |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2107 (defsubst viper-minibuffer-real-start () |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2108 (if (fboundp 'minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2109 (minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2110 (point-min))) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2111 |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2112 (defun viper-minibuffer-post-command-hook() |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2113 (when (active-minibuffer-window) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2114 (when (< (point) (viper-minibuffer-real-start)) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2115 (goto-char (viper-minibuffer-real-start))))) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2116 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2117 |
19756 | 2118 ;; Interpret last event in the local map first; if fails, use exit-minibuffer. |
2119 ;; Run viper-minibuffer-exit-hook before exiting. | |
19078 | 2120 (defun viper-exit-minibuffer () |
19756 | 2121 "Exit minibuffer Viper way." |
18129 | 2122 (interactive) |
2123 (let (command) | |
2124 (setq command (local-key-binding (char-to-string last-command-char))) | |
19756 | 2125 (run-hooks 'viper-minibuffer-exit-hook) |
18129 | 2126 (if command |
2127 (command-execute command) | |
2128 (exit-minibuffer)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2129 |
19756 | 2130 |
2131 (defcustom viper-smart-suffix-list | |
29412
ecd388a0937d
2000-06-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
2132 '("" "tex" "c" "cc" "C" "java" "el" "html" "htm" "xml" |
ecd388a0937d
2000-06-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
2133 "pl" "flr" "P" "p" "h" "H") |
19905
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
2134 "*List of suffixes that Viper tries to append to filenames ending with a `.'. |
45594
1282cafdee89
(viper-smart-suffix-list, viper-ask-level): Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
2135 This is useful when the current directory contains files with the same |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2136 prefix and many different suffixes. Usually, only one of the suffixes |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2137 represents an editable file. However, file completion will stop at the `.' |
19756 | 2138 The smart suffix feature lets you hit RET in such a case, and Viper will |
2139 select the appropriate suffix. | |
2140 | |
2141 Suffixes are tried in the order given and the first suffix for which a | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2142 corresponding file exists is selected. If no file exists for any of the |
19756 | 2143 suffixes, the user is asked to confirm. |
2144 | |
2145 To turn this feature off, set this variable to nil." | |
19905
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
2146 :type '(repeat string) |
20003 | 2147 :group 'viper-misc) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2148 |
19756 | 2149 |
2150 ;; Try to add a suitable suffix to files whose name ends with a `.' | |
2151 ;; Useful when the user hits RET on a non-completed file name. | |
2152 ;; Used as a minibuffer exit hook in read-file-name | |
2153 (defun viper-file-add-suffix () | |
2154 (let ((count 0) | |
2155 (len (length viper-smart-suffix-list)) | |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2156 (file (buffer-substring-no-properties |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2157 (viper-minibuffer-real-start) (point-max))) |
19756 | 2158 found key cmd suff) |
2159 (goto-char (point-max)) | |
2160 (if (and viper-smart-suffix-list (string-match "\\.$" file)) | |
2161 (progn | |
2162 (while (and (not found) (< count len)) | |
2163 (setq suff (nth count viper-smart-suffix-list) | |
2164 count (1+ count)) | |
2165 (if (file-exists-p | |
2166 (format "%s%s" (substitute-in-file-name file) suff)) | |
2167 (progn | |
2168 (setq found t) | |
2169 (insert suff)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2170 |
19756 | 2171 (if found |
2172 () | |
2173 (viper-tmp-insert-at-eob " [Please complete file name]") | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2174 (unwind-protect |
19756 | 2175 (while (not (memq cmd |
2176 '(exit-minibuffer viper-exit-minibuffer))) | |
2177 (setq cmd | |
2178 (key-binding (setq key (read-key-sequence nil)))) | |
2179 (cond ((eq cmd 'self-insert-command) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2180 (viper-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2181 (insert (events-to-keys key)) ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2182 (insert key) ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2183 )) |
19756 | 2184 ((memq cmd '(exit-minibuffer viper-exit-minibuffer)) |
2185 nil) | |
2186 (t (command-execute cmd))) | |
2187 ))) | |
2188 )))) | |
2189 | |
2190 | |
2191 (defun viper-minibuffer-trim-tail () | |
2192 "Delete junk at the end of the first line of the minibuffer input. | |
2193 Remove this function from `viper-minibuffer-exit-hook', if this causes | |
2194 problems." | |
2195 (if (viper-is-in-minibuffer) | |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
2196 (let ((inhibit-field-text-motion t)) |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2197 (goto-char (viper-minibuffer-real-start)) |
19756 | 2198 (end-of-line) |
2199 (delete-region (point) (point-max))))) | |
2200 | |
18129 | 2201 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2202 ;;; Reading string with history |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2203 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2204 (defun viper-read-string-with-history (prompt &optional initial |
20343 | 2205 history-var default keymap |
2206 init-message) | |
18129 | 2207 ;; Read string, prompting with PROMPT and inserting the INITIAL |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2208 ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the |
20343 | 2209 ;; input is an empty string. |
18129 | 2210 ;; Default value is displayed until the user types something in the |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2211 ;; minibuffer. |
20343 | 2212 ;; KEYMAP is used, if given, instead of minibuffer-local-map. |
2213 ;; INIT-MESSAGE is the message temporarily displayed after entering the | |
2214 ;; minibuffer. | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2215 (let ((minibuffer-setup-hook |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2216 ;; stolen from add-hook |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2217 (let ((old |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2218 (if (boundp 'minibuffer-setup-hook) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2219 minibuffer-setup-hook |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2220 nil))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2221 (cons |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2222 'viper-minibuffer-standard-hook |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2223 (if (or (not (listp old)) (eq (car old) 'lambda)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2224 (list old) old)))) |
18129 | 2225 (val "") |
2226 (padding "") | |
2227 temp-msg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2228 |
18129 | 2229 (setq keymap (or keymap minibuffer-local-map) |
2230 initial (or initial "") | |
2231 temp-msg (if default | |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2232 (format "(default %s) " default) |
18129 | 2233 "")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2234 |
19078 | 2235 (setq viper-incomplete-ex-cmd nil) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2236 (setq val (read-from-minibuffer prompt |
18129 | 2237 (concat temp-msg initial val padding) |
2238 keymap nil history-var)) | |
2239 (setq minibuffer-setup-hook nil | |
19078 | 2240 padding (viper-array-to-string (this-command-keys)) |
18129 | 2241 temp-msg "") |
2242 ;; the following tries to be smart about what to put in history | |
2243 (if (not (string= val (car (eval history-var)))) | |
2244 (set history-var (cons val (eval history-var)))) | |
2245 (if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var))) | |
2246 (string= (nth 0 (eval history-var)) "")) | |
2247 (set history-var (cdr (eval history-var)))) | |
19078 | 2248 ;; If the user enters nothing but the prev cmd wasn't viper-ex, |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2249 ;; viper-command-argument, or `! shell-command', this probably means |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2250 ;; that the user typed something then erased. Return "" in this case, not |
18129 | 2251 ;; the default---the default is too confusing in this case. |
2252 (cond ((and (string= val "") | |
2253 (not (string= prompt "!")) ; was a `! shell-command' | |
2254 (not (memq last-command | |
19078 | 2255 '(viper-ex |
2256 viper-command-argument | |
18129 | 2257 t) |
2258 ))) | |
2259 "") | |
2260 ((string= val "") (or default "")) | |
2261 (t val)) | |
2262 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2263 |
18129 | 2264 |
2265 | |
2266 ;; insertion commands | |
2267 | |
2268 ;; Called when state changes from Insert Vi command mode. | |
2269 ;; Repeats the insertion command if Insert state was entered with prefix | |
2270 ;; argument > 1. | |
19078 | 2271 (defun viper-repeat-insert-command () |
2272 (let ((i-com (car viper-d-com)) | |
2273 (val (nth 1 viper-d-com)) | |
2274 (char (nth 2 viper-d-com))) | |
18129 | 2275 (if (and val (> val 1)) ; first check that val is non-nil |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2276 (progn |
19078 | 2277 (setq viper-d-com (list i-com (1- val) ?r nil nil nil)) |
2278 (viper-repeat nil) | |
2279 (setq viper-d-com (list i-com val char nil nil nil)) | |
18129 | 2280 )))) |
2281 | |
19078 | 2282 (defun viper-insert (arg) |
18129 | 2283 "Insert before point." |
2284 (interactive "P") | |
19078 | 2285 (viper-set-complex-command-for-undo) |
2286 (let ((val (viper-p-val arg)) | |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2287 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2288 ) |
19078 | 2289 (viper-set-destructive-command (list 'viper-insert val ?r nil nil nil)) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2290 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2291 (viper-loop val (viper-yank-last-insertion)) |
2292 (viper-change-state-to-insert)))) | |
2293 | |
2294 (defun viper-append (arg) | |
18129 | 2295 "Append after point." |
2296 (interactive "P") | |
19078 | 2297 (viper-set-complex-command-for-undo) |
2298 (let ((val (viper-p-val arg)) | |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2299 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2300 ) |
19078 | 2301 (viper-set-destructive-command (list 'viper-append val ?r nil nil nil)) |
18129 | 2302 (if (not (eolp)) (forward-char)) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2303 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2304 (viper-loop val (viper-yank-last-insertion)) |
2305 (viper-change-state-to-insert)))) | |
2306 | |
2307 (defun viper-Append (arg) | |
18129 | 2308 "Append at end of line." |
2309 (interactive "P") | |
19078 | 2310 (viper-set-complex-command-for-undo) |
2311 (let ((val (viper-p-val arg)) | |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2312 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2313 ) |
19078 | 2314 (viper-set-destructive-command (list 'viper-Append val ?r nil nil nil)) |
18129 | 2315 (end-of-line) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2316 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2317 (viper-loop val (viper-yank-last-insertion)) |
2318 (viper-change-state-to-insert)))) | |
2319 | |
2320 (defun viper-Insert (arg) | |
18129 | 2321 "Insert before first non-white." |
2322 (interactive "P") | |
19078 | 2323 (viper-set-complex-command-for-undo) |
2324 (let ((val (viper-p-val arg)) | |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2325 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2326 ) |
19078 | 2327 (viper-set-destructive-command (list 'viper-Insert val ?r nil nil nil)) |
18129 | 2328 (back-to-indentation) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2329 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2330 (viper-loop val (viper-yank-last-insertion)) |
2331 (viper-change-state-to-insert)))) | |
2332 | |
2333 (defun viper-open-line (arg) | |
18129 | 2334 "Open line below." |
2335 (interactive "P") | |
19078 | 2336 (viper-set-complex-command-for-undo) |
2337 (let ((val (viper-p-val arg)) | |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2338 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2339 ) |
19078 | 2340 (viper-set-destructive-command (list 'viper-open-line val ?r nil nil nil)) |
18129 | 2341 (let ((col (current-indentation))) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2342 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2343 (viper-loop val |
18129 | 2344 (end-of-line) |
2345 (newline 1) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2346 (viper-indent-line col) |
19462 | 2347 (viper-yank-last-insertion)) |
18129 | 2348 (end-of-line) |
2349 (newline 1) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2350 (viper-indent-line col) |
19078 | 2351 (viper-change-state-to-insert))))) |
2352 | |
2353 (defun viper-Open-line (arg) | |
18129 | 2354 "Open line above." |
2355 (interactive "P") | |
19078 | 2356 (viper-set-complex-command-for-undo) |
2357 (let ((val (viper-p-val arg)) | |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2358 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2359 ) |
19078 | 2360 (viper-set-destructive-command (list 'viper-Open-line val ?r nil nil nil)) |
18129 | 2361 (let ((col (current-indentation))) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2362 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2363 (viper-loop val |
18129 | 2364 (beginning-of-line) |
2365 (open-line 1) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2366 (viper-indent-line col) |
19462 | 2367 (viper-yank-last-insertion)) |
18129 | 2368 (beginning-of-line) |
2369 (open-line 1) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2370 (viper-indent-line col) |
19078 | 2371 (viper-change-state-to-insert))))) |
2372 | |
2373 (defun viper-open-line-at-point (arg) | |
18129 | 2374 "Open line at point." |
2375 (interactive "P") | |
19078 | 2376 (viper-set-complex-command-for-undo) |
2377 (let ((val (viper-p-val arg)) | |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2378 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2379 ) |
19078 | 2380 (viper-set-destructive-command |
2381 (list 'viper-open-line-at-point val ?r nil nil nil)) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2382 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2383 (viper-loop val |
18129 | 2384 (open-line 1) |
19462 | 2385 (viper-yank-last-insertion)) |
18129 | 2386 (open-line 1) |
19078 | 2387 (viper-change-state-to-insert)))) |
2388 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2389 ;; bound to s |
19078 | 2390 (defun viper-substitute (arg) |
18129 | 2391 "Substitute characters." |
2392 (interactive "P") | |
19078 | 2393 (let ((val (viper-p-val arg)) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2394 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2395 ) |
18129 | 2396 (push-mark nil t) |
2397 (forward-char val) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2398 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2399 (viper-change-subr (mark t) (point)) |
2400 (viper-change (mark t) (point))) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2401 ;; com is set to ?r when we repeat this comand with dot |
19078 | 2402 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil)) |
18129 | 2403 )) |
2404 | |
19078 | 2405 ;; Command bound to S |
2406 (defun viper-substitute-line (arg) | |
18129 | 2407 "Substitute lines." |
2408 (interactive "p") | |
19078 | 2409 (viper-set-complex-command-for-undo) |
2410 (viper-line (cons arg ?C))) | |
18129 | 2411 |
2412 ;; Prepare for replace | |
19078 | 2413 (defun viper-start-replace () |
2414 (setq viper-began-as-replace t | |
2415 viper-sitting-in-replace t | |
19462 | 2416 viper-replace-chars-to-delete 0) |
21940 | 2417 (add-hook |
2418 'viper-after-change-functions 'viper-replace-mode-spy-after t 'local) | |
2419 (add-hook | |
2420 'viper-before-change-functions 'viper-replace-mode-spy-before t 'local) | |
18129 | 2421 ;; this will get added repeatedly, but no harm |
19078 | 2422 (add-hook 'after-change-functions 'viper-after-change-sentinel t) |
2423 (add-hook 'before-change-functions 'viper-before-change-sentinel t) | |
21940 | 2424 (viper-move-marker-locally |
2425 'viper-last-posn-in-replace-region (viper-replace-start)) | |
2426 (add-hook | |
2427 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel | |
2428 t 'local) | |
2429 (add-hook | |
2430 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
18129 | 2431 ;; guard against a smartie who switched from R-replace to normal replace |
21940 | 2432 (remove-hook |
2433 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) | |
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
2434 (if overwrite-mode (overwrite-mode -1)) |
18129 | 2435 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2436 |
18129 | 2437 |
19078 | 2438 (defun viper-replace-mode-spy-before (beg end) |
19462 | 2439 (setq viper-replace-region-chars-deleted (viper-chars-in-region beg end)) |
2440 ) | |
2441 | |
2442 ;; Invoked as an after-change-function to calculate how many chars have to be | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2443 ;; deleted. This function may be called several times within a single command, |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2444 ;; if this command performs several separate buffer changes. Therefore, if |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2445 ;; adds up the number of chars inserted and subtracts the number of chars |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2446 ;; deleted. |
19078 | 2447 (defun viper-replace-mode-spy-after (beg end length) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2448 (if (memq viper-intermediate-command |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2449 '(dabbrev-expand hippie-expand repeating-insertion-from-ring)) |
19462 | 2450 ;; Take special care of text insertion from insertion ring inside |
2451 ;; replacement overlays. | |
18129 | 2452 (progn |
19078 | 2453 (setq viper-replace-chars-to-delete 0) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2454 (viper-move-marker-locally |
19078 | 2455 'viper-last-posn-in-replace-region (point))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2456 |
19462 | 2457 (let* ((real-end (min end (viper-replace-end))) |
2458 (column-shift (- (save-excursion (goto-char real-end) | |
2459 (current-column)) | |
2460 (save-excursion (goto-char beg) | |
2461 (current-column)))) | |
2462 (chars-deleted 0)) | |
2463 | |
2464 (if (> length 0) | |
2465 (setq chars-deleted viper-replace-region-chars-deleted)) | |
2466 (setq viper-replace-region-chars-deleted 0) | |
2467 (setq viper-replace-chars-to-delete | |
2468 (+ viper-replace-chars-to-delete | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2469 (- |
19462 | 2470 ;; if column shift is bigger, due to a TAB insertion, take |
2471 ;; column-shift instead of the number of inserted chars | |
2472 (max (viper-chars-in-region beg real-end) | |
2473 ;; This test accounts for Chinese/Japanese/... chars, | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2474 ;; which occupy 2 columns instead of one. If we use |
19462 | 2475 ;; column-shift here, we may delete two chars instead of |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2476 ;; one when the user types one Chinese character. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2477 ;; Deleting two would be OK, if they were European chars, |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2478 ;; but it is not OK if they are Chinese chars. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2479 ;; Since it is hard to |
19462 | 2480 ;; figure out which characters are being deleted in any |
2481 ;; given region, we decided to treat Eastern and European | |
2482 ;; characters equally, even though Eastern chars may | |
2483 ;; occupy more columns. | |
2484 (if (memq this-command '(self-insert-command | |
2485 quoted-insert viper-insert-tab)) | |
2486 column-shift | |
2487 0)) | |
2488 ;; the number of deleted chars | |
2489 chars-deleted))) | |
2490 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2491 (viper-move-marker-locally |
19078 | 2492 'viper-last-posn-in-replace-region |
19462 | 2493 (max (if (> end (viper-replace-end)) (viper-replace-end) end) |
19078 | 2494 (or (marker-position viper-last-posn-in-replace-region) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2495 (viper-replace-start)) |
18129 | 2496 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2497 |
18129 | 2498 ))) |
2499 | |
19462 | 2500 |
2501 ;; Delete stuff between viper-last-posn-in-replace-region and the end of | |
2502 ;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within | |
2503 ;; the overlay and current point is before the end of the overlay. | |
2504 ;; Don't delete anything if current point is past the end of the overlay. | |
2505 (defun viper-finish-change () | |
21940 | 2506 (remove-hook |
2507 'viper-after-change-functions 'viper-replace-mode-spy-after 'local) | |
2508 (remove-hook | |
2509 'viper-before-change-functions 'viper-replace-mode-spy-before 'local) | |
2510 (remove-hook | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2511 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) |
21940 | 2512 (remove-hook |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2513 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2514 (viper-restore-cursor-color 'after-replace-mode) |
19078 | 2515 (setq viper-sitting-in-replace nil) ; just in case we'll need to know it |
18129 | 2516 (save-excursion |
19462 | 2517 (if (and viper-replace-overlay |
2518 (viper-pos-within-region viper-last-posn-in-replace-region | |
2519 (viper-replace-start) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2520 (viper-replace-end)) |
19462 | 2521 (< (point) (viper-replace-end))) |
2522 (delete-region | |
2523 viper-last-posn-in-replace-region (viper-replace-end)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2524 |
19078 | 2525 (if (eq viper-current-state 'replace-state) |
2526 (viper-downgrade-to-insert)) | |
2527 ;; replace mode ended => nullify viper-last-posn-in-replace-region | |
2528 (viper-move-marker-locally 'viper-last-posn-in-replace-region nil) | |
2529 (viper-hide-replace-overlay) | |
2530 (viper-refresh-mode-line) | |
2531 (viper-put-string-on-kill-ring viper-last-replace-region) | |
18129 | 2532 ) |
2533 | |
2534 ;; Make STRING be the first element of the kill ring. | |
19078 | 2535 (defun viper-put-string-on-kill-ring (string) |
18129 | 2536 (setq kill-ring (cons string kill-ring)) |
2537 (if (> (length kill-ring) kill-ring-max) | |
2538 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)) | |
2539 (setq kill-ring-yank-pointer kill-ring)) | |
2540 | |
19078 | 2541 (defun viper-finish-R-mode () |
21940 | 2542 (remove-hook |
2543 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) | |
2544 (remove-hook | |
2545 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local) | |
19078 | 2546 (viper-downgrade-to-insert)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2547 |
19078 | 2548 (defun viper-start-R-mode () |
18129 | 2549 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number |
2550 (overwrite-mode 1) | |
21940 | 2551 (add-hook |
2552 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local) | |
2553 (add-hook | |
2554 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
18129 | 2555 ;; guard against a smartie who switched from R-replace to normal replace |
21940 | 2556 (remove-hook |
2557 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) | |
18129 | 2558 ) |
2559 | |
2560 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2561 |
19078 | 2562 (defun viper-replace-state-exit-cmd () |
18129 | 2563 "Binding for keys that cause Replace state to switch to Vi or to Insert. |
2564 These keys are ESC, RET, and LineFeed" | |
2565 (interactive) | |
19462 | 2566 (if overwrite-mode ; if in replace mode invoked via 'R' |
19078 | 2567 (viper-finish-R-mode) |
19462 | 2568 (viper-finish-change)) |
18129 | 2569 (let (com) |
19078 | 2570 (if (eq this-command 'viper-intercept-ESC-key) |
2571 (setq com 'viper-exit-insert-state) | |
2572 (viper-set-unread-command-events last-input-char) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2573 (setq com (key-binding (viper-read-key-sequence nil)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2574 |
18129 | 2575 (condition-case conds |
2576 (command-execute com) | |
2577 (error | |
19078 | 2578 (viper-message-conditions conds))) |
18129 | 2579 ) |
19078 | 2580 (viper-hide-replace-overlay)) |
2581 | |
2582 | |
2583 (defun viper-replace-state-carriage-return () | |
2584 "Carriage return in Viper replace state." | |
18129 | 2585 (interactive) |
2586 ;; If Emacs start supporting overlay maps, as it currently supports | |
19078 | 2587 ;; text-property maps, we could do away with viper-replace-minor-mode and |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2588 ;; just have keymap attached to replace overlay. Then the "if part" of this |
18129 | 2589 ;; statement can be deleted. |
19078 | 2590 (if (or (< (point) (viper-replace-start)) |
2591 (> (point) (viper-replace-end))) | |
2592 (let (viper-replace-minor-mode com) | |
2593 (viper-set-unread-command-events last-input-char) | |
18129 | 2594 (setq com (key-binding (read-key-sequence nil))) |
2595 (condition-case conds | |
2596 (command-execute com) | |
2597 (error | |
19078 | 2598 (viper-message-conditions conds)))) |
2599 (if (not viper-allow-multiline-replace-regions) | |
2600 (viper-replace-state-exit-cmd) | |
2601 (if (viper-same-line (point) (viper-replace-end)) | |
2602 (viper-replace-state-exit-cmd) | |
2603 ;; delete the rest of line | |
2604 (delete-region (point) (viper-line-pos 'end)) | |
2605 (save-excursion | |
2606 (end-of-line) | |
2607 (if (eobp) (error "Last line in buffer"))) | |
2608 ;; skip to the next line | |
2609 (forward-line 1) | |
2610 (back-to-indentation) | |
2611 )))) | |
18129 | 2612 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2613 |
18129 | 2614 ;; This is the function bound to 'R'---unlimited replace. |
2615 ;; Similar to Emacs's own overwrite-mode. | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2616 (defun viper-overwrite (arg) |
18129 | 2617 "Begin overwrite mode." |
2618 (interactive "P") | |
19078 | 2619 (let ((val (viper-p-val arg)) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2620 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2621 (len)) |
19078 | 2622 (viper-set-destructive-command (list 'viper-overwrite val ?r nil nil nil)) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2623 (if (eq viper-intermediate-command 'viper-repeat) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2624 (progn |
19078 | 2625 ;; Viper saves inserted text in viper-last-insertion |
2626 (setq len (length viper-last-insertion)) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2627 (delete-char (min len (- (point-max) (point) 1))) |
19078 | 2628 (viper-loop val (viper-yank-last-insertion))) |
2629 (setq last-command 'viper-overwrite) | |
2630 (viper-set-complex-command-for-undo) | |
2631 (viper-set-replace-overlay (point) (viper-line-pos 'end)) | |
2632 (viper-change-state-to-replace) | |
18129 | 2633 ))) |
2634 | |
2635 | |
2636 ;; line commands | |
2637 | |
19078 | 2638 (defun viper-line (arg) |
18129 | 2639 (let ((val (car arg)) |
2640 (com (cdr arg))) | |
19078 | 2641 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 2642 (if (not (eobp)) |
19078 | 2643 (viper-next-line-carefully (1- val))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2644 ;; the following ensures that dd, cc, D, yy will do the right thing on the |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2645 ;; last line of buffer when this line has no \n. |
19078 | 2646 (viper-add-newline-at-eob-if-necessary) |
2647 (viper-execute-com 'viper-line val com)) | |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2648 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
18129 | 2649 ) |
2650 | |
19078 | 2651 (defun viper-yank-line (arg) |
18129 | 2652 "Yank ARG lines (in Vi's sense)." |
2653 (interactive "P") | |
19078 | 2654 (let ((val (viper-p-val arg))) |
2655 (viper-line (cons val ?Y)))) | |
18129 | 2656 |
2657 | |
2658 ;; region commands | |
2659 | |
19078 | 2660 (defun viper-region (arg) |
18129 | 2661 "Execute command on a region." |
2662 (interactive "P") | |
19078 | 2663 (let ((val (viper-P-val arg)) |
2664 (com (viper-getcom arg))) | |
2665 (viper-move-marker-locally 'viper-com-point (point)) | |
18129 | 2666 (exchange-point-and-mark) |
19078 | 2667 (viper-execute-com 'viper-region val com))) |
2668 | |
2669 (defun viper-Region (arg) | |
18129 | 2670 "Execute command on a Region." |
2671 (interactive "P") | |
19078 | 2672 (let ((val (viper-P-val arg)) |
2673 (com (viper-getCom arg))) | |
2674 (viper-move-marker-locally 'viper-com-point (point)) | |
18129 | 2675 (exchange-point-and-mark) |
19078 | 2676 (viper-execute-com 'viper-Region val com))) |
2677 | |
2678 (defun viper-replace-char (arg) | |
18129 | 2679 "Replace the following ARG chars by the character read." |
2680 (interactive "P") | |
2681 (if (and (eolp) (bolp)) (error "No character to replace here")) | |
19078 | 2682 (let ((val (viper-p-val arg)) |
2683 (com (viper-getcom arg))) | |
2684 (viper-replace-char-subr com val) | |
18129 | 2685 (if (and (eolp) (not (bolp))) (forward-char 1)) |
19462 | 2686 (setq viper-this-command-keys |
2687 (format "%sr" (if (integerp arg) arg ""))) | |
19078 | 2688 (viper-set-destructive-command |
2689 (list 'viper-replace-char val ?r nil viper-d-char nil)) | |
18129 | 2690 )) |
2691 | |
19078 | 2692 (defun viper-replace-char-subr (com arg) |
39288
25dc021070bc
2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
2693 (let ((inhibit-quit t) |
25dc021070bc
2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
2694 char) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2695 (viper-set-complex-command-for-undo) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2696 (or (eq viper-intermediate-command 'viper-repeat) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2697 (viper-special-read-and-insert-char)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2698 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2699 (delete-char 1 t) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2700 (setq char (if com viper-d-char (viper-char-at-pos 'backward))) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
2701 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2702 (if com (insert char)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2703 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2704 (setq viper-d-char char) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2705 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2706 (viper-loop (1- (if (> arg 0) arg (- arg))) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2707 (delete-char 1 t) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2708 (insert char)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2709 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2710 (viper-adjust-undo) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2711 (backward-char arg) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2712 )) |
18129 | 2713 |
2714 | |
2715 ;; basic cursor movement. j, k, l, h commands. | |
2716 | |
19078 | 2717 (defun viper-forward-char (arg) |
18129 | 2718 "Move point right ARG characters (left if ARG negative). |
2719 On reaching end of line, stop and signal error." | |
2720 (interactive "P") | |
19078 | 2721 (viper-leave-region-active) |
2722 (let ((val (viper-p-val arg)) | |
2723 (com (viper-getcom arg))) | |
2724 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2725 (if viper-ex-style-motion | |
18129 | 2726 (progn |
2727 ;; the boundary condition check gets weird here because | |
2728 ;; forward-char may be the parameter of a delete, and 'dl' works | |
2729 ;; just like 'x' for the last char on a line, so we have to allow | |
19078 | 2730 ;; the forward motion before the 'viper-execute-com', but, of |
18129 | 2731 ;; course, 'dl' doesn't work on an empty line, so we have to |
19078 | 2732 ;; catch that condition before 'viper-execute-com' |
18129 | 2733 (if (and (eolp) (bolp)) (error "") (forward-char val)) |
19078 | 2734 (if com (viper-execute-com 'viper-forward-char val com)) |
18129 | 2735 (if (eolp) (progn (backward-char 1) (error "")))) |
2736 (forward-char val) | |
19078 | 2737 (if com (viper-execute-com 'viper-forward-char val com))))) |
2738 | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2739 |
19078 | 2740 (defun viper-backward-char (arg) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2741 "Move point left ARG characters (right if ARG negative). |
18129 | 2742 On reaching beginning of line, stop and signal error." |
2743 (interactive "P") | |
19078 | 2744 (viper-leave-region-active) |
2745 (let ((val (viper-p-val arg)) | |
2746 (com (viper-getcom arg))) | |
2747 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2748 (if viper-ex-style-motion | |
18129 | 2749 (progn |
2750 (if (bolp) (error "") (backward-char val)) | |
19078 | 2751 (if com (viper-execute-com 'viper-backward-char val com))) |
18129 | 2752 (backward-char val) |
19078 | 2753 (if com (viper-execute-com 'viper-backward-char val com))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2754 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2755 |
18129 | 2756 ;; Like forward-char, but doesn't move at end of buffer. |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2757 ;; Returns distance traveled |
19462 | 2758 ;; (positive or 0, if arg positive; negative if arg negative). |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2759 (defun viper-forward-char-carefully (&optional arg) |
18129 | 2760 (setq arg (or arg 1)) |
19462 | 2761 (let ((pt (point))) |
2762 (condition-case nil | |
2763 (forward-char arg) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2764 (error nil)) |
19462 | 2765 (if (< (point) pt) ; arg was negative |
2766 (- (viper-chars-in-region pt (point))) | |
2767 (viper-chars-in-region pt (point))))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2768 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2769 |
19462 | 2770 ;; Like backward-char, but doesn't move at beg of buffer. |
2771 ;; Returns distance traveled | |
2772 ;; (negative or 0, if arg positive; positive if arg negative). | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2773 (defun viper-backward-char-carefully (&optional arg) |
18129 | 2774 (setq arg (or arg 1)) |
19462 | 2775 (let ((pt (point))) |
2776 (condition-case nil | |
2777 (backward-char arg) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2778 (error nil)) |
19462 | 2779 (if (> (point) pt) ; arg was negative |
2780 (viper-chars-in-region pt (point)) | |
2781 (- (viper-chars-in-region pt (point)))))) | |
18129 | 2782 |
19078 | 2783 (defun viper-next-line-carefully (arg) |
18129 | 2784 (condition-case nil |
2785 (next-line arg) | |
2786 (error nil))) | |
2787 | |
2788 | |
2789 | |
2790 ;;; Word command | |
2791 | |
19078 | 2792 ;; Words are formed from alpha's and nonalphas - <sp>,\t\n are separators for |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2793 ;; word movement. When executed with a destructive command, \n is usually left |
19078 | 2794 ;; untouched for the last word. Viper uses syntax table to determine what is a |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2795 ;; word and what is a separator. However, \n is always a separator. Also, if |
19078 | 2796 ;; viper-syntax-preference is 'vi, then `_' is part of the word. |
18129 | 2797 |
2798 ;; skip only one \n | |
19078 | 2799 (defun viper-skip-separators (forward) |
18129 | 2800 (if forward |
2801 (progn | |
19078 | 2802 (viper-skip-all-separators-forward 'within-line) |
18129 | 2803 (if (looking-at "\n") |
2804 (progn | |
2805 (forward-char) | |
19078 | 2806 (viper-skip-all-separators-forward 'within-line)))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2807 ;; check for eob and white space before it. move off of eob |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2808 (if (and (eobp) (save-excursion |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2809 (viper-backward-char-carefully) |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2810 (viper-looking-at-separator))) |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2811 (viper-backward-char-carefully)) |
19078 | 2812 (viper-skip-all-separators-backward 'within-line) |
19462 | 2813 (viper-backward-char-carefully) |
18129 | 2814 (if (looking-at "\n") |
19078 | 2815 (viper-skip-all-separators-backward 'within-line) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2816 (or (viper-looking-at-separator) (forward-char))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2817 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2818 |
19078 | 2819 (defun viper-forward-word-kernel (val) |
18129 | 2820 (while (> val 0) |
19078 | 2821 (cond ((viper-looking-at-alpha) |
2822 (viper-skip-alpha-forward "_") | |
2823 (viper-skip-separators t)) | |
2824 ((viper-looking-at-separator) | |
2825 (viper-skip-separators t)) | |
2826 ((not (viper-looking-at-alphasep)) | |
2827 (viper-skip-nonalphasep-forward) | |
2828 (viper-skip-separators t))) | |
18129 | 2829 (setq val (1- val)))) |
2830 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2831 ;; first skip non-newline separators backward, then skip \n. Then, if TWICE is |
19462 | 2832 ;; non-nil, skip non-\n back again, but don't overshoot the limit LIM. |
2833 (defun viper-separator-skipback-special (twice lim) | |
2834 (let ((prev-char (viper-char-at-pos 'backward)) | |
2835 (saved-point (point))) | |
2836 ;; skip non-newline separators backward | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2837 (while (and (not (viper-memq-char prev-char '(nil \n))) |
19462 | 2838 (< lim (point)) |
2839 ;; must be non-newline separator | |
2840 (if (eq viper-syntax-preference 'strict-vi) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2841 (viper-memq-char prev-char '(?\ ?\t)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2842 (viper-memq-char (char-syntax prev-char) '(?\ ?-)))) |
19462 | 2843 (viper-backward-char-carefully) |
2844 (setq prev-char (viper-char-at-pos 'backward))) | |
2845 | |
2846 (if (and (< lim (point)) (eq prev-char ?\n)) | |
2847 (backward-char) | |
2848 ;; If we skipped to the next word and the prefix of this line doesn't | |
2849 ;; consist of separators preceded by a newline, then don't skip backwards | |
2850 ;; at all. | |
2851 (goto-char saved-point)) | |
2852 (setq prev-char (viper-char-at-pos 'backward)) | |
2853 | |
2854 ;; skip again, but make sure we don't overshoot the limit | |
2855 (if twice | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2856 (while (and (not (viper-memq-char prev-char '(nil \n))) |
19462 | 2857 (< lim (point)) |
2858 ;; must be non-newline separator | |
2859 (if (eq viper-syntax-preference 'strict-vi) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2860 (viper-memq-char prev-char '(?\ ?\t)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2861 (viper-memq-char (char-syntax prev-char) '(?\ ?-)))) |
19462 | 2862 (viper-backward-char-carefully) |
2863 (setq prev-char (viper-char-at-pos 'backward)))) | |
2864 | |
2865 (if (= (point) lim) | |
2866 (viper-forward-char-carefully)) | |
2867 )) | |
18129 | 2868 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2869 |
19078 | 2870 (defun viper-forward-word (arg) |
18129 | 2871 "Forward word." |
2872 (interactive "P") | |
19078 | 2873 (viper-leave-region-active) |
2874 (let ((val (viper-p-val arg)) | |
2875 (com (viper-getcom arg))) | |
2876 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2877 (viper-forward-word-kernel val) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2878 (if com |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2879 (progn |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2880 (cond ((viper-char-equal com ?c) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2881 (viper-separator-skipback-special 'twice viper-com-point)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2882 ;; Yank words including the whitespace, but not newline |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2883 ((viper-char-equal com ?y) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2884 (viper-separator-skipback-special nil viper-com-point)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2885 ((viper-dotable-command-p com) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2886 (viper-separator-skipback-special nil viper-com-point))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2887 (viper-execute-com 'viper-forward-word val com))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2888 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2889 |
18129 | 2890 |
19078 | 2891 (defun viper-forward-Word (arg) |
18129 | 2892 "Forward word delimited by white characters." |
2893 (interactive "P") | |
19078 | 2894 (viper-leave-region-active) |
2895 (let ((val (viper-p-val arg)) | |
2896 (com (viper-getcom arg))) | |
2897 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2898 (viper-loop val | |
2899 (viper-skip-nonseparators 'forward) | |
19462 | 2900 (viper-skip-separators t)) |
18129 | 2901 (if com (progn |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2902 (cond ((viper-char-equal com ?c) |
19462 | 2903 (viper-separator-skipback-special 'twice viper-com-point)) |
18129 | 2904 ;; Yank words including the whitespace, but not newline |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2905 ((viper-char-equal com ?y) |
19462 | 2906 (viper-separator-skipback-special nil viper-com-point)) |
19078 | 2907 ((viper-dotable-command-p com) |
19462 | 2908 (viper-separator-skipback-special nil viper-com-point))) |
19078 | 2909 (viper-execute-com 'viper-forward-Word val com))))) |
18129 | 2910 |
2911 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2912 ;; this is a bit different from Vi, but Vi's end of word |
18129 | 2913 ;; makes no sense whatsoever |
19078 | 2914 (defun viper-end-of-word-kernel () |
2915 (if (viper-end-of-word-p) (forward-char)) | |
2916 (if (viper-looking-at-separator) | |
2917 (viper-skip-all-separators-forward)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2918 |
19078 | 2919 (cond ((viper-looking-at-alpha) (viper-skip-alpha-forward "_")) |
2920 ((not (viper-looking-at-alphasep)) (viper-skip-nonalphasep-forward))) | |
2921 (viper-backward-char-carefully)) | |
2922 | |
2923 (defun viper-end-of-word-p () | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2924 (or (eobp) |
18129 | 2925 (save-excursion |
19078 | 2926 (cond ((viper-looking-at-alpha) |
18129 | 2927 (forward-char) |
19078 | 2928 (not (viper-looking-at-alpha))) |
2929 ((not (viper-looking-at-alphasep)) | |
18129 | 2930 (forward-char) |
19078 | 2931 (viper-looking-at-alphasep)))))) |
2932 | |
2933 | |
2934 (defun viper-end-of-word (arg &optional careful) | |
18129 | 2935 "Move point to end of current word." |
2936 (interactive "P") | |
19078 | 2937 (viper-leave-region-active) |
2938 (let ((val (viper-p-val arg)) | |
2939 (com (viper-getcom arg))) | |
2940 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2941 (viper-loop val (viper-end-of-word-kernel)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2942 (if com |
18129 | 2943 (progn |
2944 (forward-char) | |
19078 | 2945 (viper-execute-com 'viper-end-of-word val com))))) |
2946 | |
2947 (defun viper-end-of-Word (arg) | |
18129 | 2948 "Forward to end of word delimited by white character." |
2949 (interactive "P") | |
19078 | 2950 (viper-leave-region-active) |
2951 (let ((val (viper-p-val arg)) | |
2952 (com (viper-getcom arg))) | |
2953 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2954 (viper-loop val | |
2955 (viper-end-of-word-kernel) | |
2956 (viper-skip-nonseparators 'forward) | |
19462 | 2957 (backward-char)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2958 (if com |
18129 | 2959 (progn |
2960 (forward-char) | |
19078 | 2961 (viper-execute-com 'viper-end-of-Word val com))))) |
2962 | |
2963 (defun viper-backward-word-kernel (val) | |
18129 | 2964 (while (> val 0) |
19462 | 2965 (viper-backward-char-carefully) |
19078 | 2966 (cond ((viper-looking-at-alpha) |
2967 (viper-skip-alpha-backward "_")) | |
2968 ((viper-looking-at-separator) | |
18129 | 2969 (forward-char) |
19078 | 2970 (viper-skip-separators nil) |
19462 | 2971 (viper-backward-char-carefully) |
19078 | 2972 (cond ((viper-looking-at-alpha) |
2973 (viper-skip-alpha-backward "_")) | |
2974 ((not (viper-looking-at-alphasep)) | |
2975 (viper-skip-nonalphasep-backward)) | |
19462 | 2976 ((bobp)) ; could still be at separator, but at beg of buffer |
18129 | 2977 (t (forward-char)))) |
19078 | 2978 ((not (viper-looking-at-alphasep)) |
2979 (viper-skip-nonalphasep-backward))) | |
18129 | 2980 (setq val (1- val)))) |
2981 | |
19078 | 2982 (defun viper-backward-word (arg) |
18129 | 2983 "Backward word." |
2984 (interactive "P") | |
19078 | 2985 (viper-leave-region-active) |
2986 (let ((val (viper-p-val arg)) | |
2987 (com (viper-getcom arg))) | |
18129 | 2988 (if com |
2989 (let (i) | |
2990 (if (setq i (save-excursion (backward-char) (looking-at "\n"))) | |
2991 (backward-char)) | |
19078 | 2992 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 2993 (if i (forward-char)))) |
19078 | 2994 (viper-backward-word-kernel val) |
2995 (if com (viper-execute-com 'viper-backward-word val com)))) | |
2996 | |
2997 (defun viper-backward-Word (arg) | |
18129 | 2998 "Backward word delimited by white character." |
2999 (interactive "P") | |
19078 | 3000 (viper-leave-region-active) |
3001 (let ((val (viper-p-val arg)) | |
3002 (com (viper-getcom arg))) | |
18129 | 3003 (if com |
3004 (let (i) | |
3005 (if (setq i (save-excursion (backward-char) (looking-at "\n"))) | |
3006 (backward-char)) | |
19078 | 3007 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 3008 (if i (forward-char)))) |
19078 | 3009 (viper-loop val |
19462 | 3010 (viper-skip-separators nil) ; nil means backward here |
3011 (viper-skip-nonseparators 'backward)) | |
19078 | 3012 (if com (viper-execute-com 'viper-backward-Word val com)))) |
18129 | 3013 |
3014 | |
3015 | |
3016 ;; line commands | |
3017 | |
19078 | 3018 (defun viper-beginning-of-line (arg) |
18129 | 3019 "Go to beginning of line." |
3020 (interactive "P") | |
19078 | 3021 (viper-leave-region-active) |
3022 (let ((val (viper-p-val arg)) | |
3023 (com (viper-getcom arg))) | |
3024 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3025 (beginning-of-line val) |
19078 | 3026 (if com (viper-execute-com 'viper-beginning-of-line val com)))) |
3027 | |
3028 (defun viper-bol-and-skip-white (arg) | |
18129 | 3029 "Beginning of line at first non-white character." |
3030 (interactive "P") | |
19078 | 3031 (viper-leave-region-active) |
3032 (let ((val (viper-p-val arg)) | |
3033 (com (viper-getcom arg))) | |
3034 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3035 (forward-to-indentation (1- val)) |
19078 | 3036 (if com (viper-execute-com 'viper-bol-and-skip-white val com)))) |
3037 | |
3038 (defun viper-goto-eol (arg) | |
18129 | 3039 "Go to end of line." |
3040 (interactive "P") | |
19078 | 3041 (viper-leave-region-active) |
3042 (let ((val (viper-p-val arg)) | |
3043 (com (viper-getcom arg))) | |
3044 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3045 (end-of-line val) |
19078 | 3046 (if com (viper-execute-com 'viper-goto-eol val com)) |
3047 (if viper-ex-style-motion | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3048 (if (and (eolp) (not (bolp)) |
19078 | 3049 ;; a fix for viper-change-to-eol |
3050 (not (equal viper-current-state 'insert-state))) | |
18129 | 3051 (backward-char 1) |
3052 )))) | |
3053 | |
3054 | |
19078 | 3055 (defun viper-goto-col (arg) |
18129 | 3056 "Go to ARG's column." |
3057 (interactive "P") | |
19078 | 3058 (viper-leave-region-active) |
3059 (let ((val (viper-p-val arg)) | |
3060 (com (viper-getcom arg)) | |
18129 | 3061 line-len) |
19462 | 3062 (setq line-len |
3063 (viper-chars-in-region | |
3064 (viper-line-pos 'start) (viper-line-pos 'end))) | |
19078 | 3065 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3066 (beginning-of-line) |
3067 (forward-char (1- (min line-len val))) | |
3068 (while (> (current-column) (1- val)) | |
3069 (backward-char 1)) | |
19078 | 3070 (if com (viper-execute-com 'viper-goto-col val com)) |
18129 | 3071 (save-excursion |
3072 (end-of-line) | |
3073 (if (> val (current-column)) (error ""))) | |
3074 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3075 |
18129 | 3076 |
19078 | 3077 (defun viper-next-line (arg) |
18129 | 3078 "Go to next line." |
3079 (interactive "P") | |
19078 | 3080 (viper-leave-region-active) |
3081 (let ((val (viper-p-val arg)) | |
3082 (com (viper-getCom arg))) | |
3083 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3084 (next-line val) |
19078 | 3085 (if viper-ex-style-motion |
18129 | 3086 (if (and (eolp) (not (bolp))) (backward-char 1))) |
3087 (setq this-command 'next-line) | |
19078 | 3088 (if com (viper-execute-com 'viper-next-line val com)))) |
3089 | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3090 |
19078 | 3091 (defun viper-next-line-at-bol (arg) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3092 "Next line at beginning of line. |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3093 If point is on a widget or a button, simulate clicking on that widget/button." |
18129 | 3094 (interactive "P") |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3095 (let* ((field (get-char-property (point) 'field)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3096 (button (get-char-property (point) 'button)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3097 (doc (get-char-property (point) 'widget-doc)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3098 (widget (or field button doc))) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3099 (if (and widget |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3100 (if (symbolp widget) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3101 (get widget 'widget-type) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3102 (and (consp widget) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3103 (get (widget-type widget) 'widget-type)))) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3104 (widget-button-press (point)) |
72974
54ea774c3eed
* viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72579
diff
changeset
|
3105 (if (and (fboundp 'button-at) (fboundp 'push-button) (button-at (point))) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3106 (push-button) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3107 ;; not a widget or a button |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3108 (viper-leave-region-active) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3109 (save-excursion |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3110 (end-of-line) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3111 (if (eobp) (error "Last line in buffer"))) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3112 (let ((val (viper-p-val arg)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3113 (com (viper-getCom arg))) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3114 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3115 (forward-line val) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3116 (back-to-indentation) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3117 (if com (viper-execute-com 'viper-next-line-at-bol val com))))))) |
19078 | 3118 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
3119 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3120 (defun viper-previous-line (arg) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3121 "Go to previous line." |
18129 | 3122 (interactive "P") |
19078 | 3123 (viper-leave-region-active) |
3124 (let ((val (viper-p-val arg)) | |
3125 (com (viper-getCom arg))) | |
3126 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3127 (previous-line val) |
19078 | 3128 (if viper-ex-style-motion |
18129 | 3129 (if (and (eolp) (not (bolp))) (backward-char 1))) |
3130 (setq this-command 'previous-line) | |
19078 | 3131 (if com (viper-execute-com 'viper-previous-line val com)))) |
3132 | |
3133 | |
3134 (defun viper-previous-line-at-bol (arg) | |
18129 | 3135 "Previous line at beginning of line." |
3136 (interactive "P") | |
19078 | 3137 (viper-leave-region-active) |
18129 | 3138 (save-excursion |
3139 (beginning-of-line) | |
3140 (if (bobp) (error "First line in buffer"))) | |
19078 | 3141 (let ((val (viper-p-val arg)) |
3142 (com (viper-getCom arg))) | |
3143 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3144 (forward-line (- val)) |
3145 (back-to-indentation) | |
19078 | 3146 (if com (viper-execute-com 'viper-previous-line val com)))) |
3147 | |
3148 (defun viper-change-to-eol (arg) | |
18129 | 3149 "Change to end of line." |
3150 (interactive "P") | |
19078 | 3151 (viper-goto-eol (cons arg ?c))) |
3152 | |
3153 (defun viper-kill-line (arg) | |
18129 | 3154 "Delete line." |
3155 (interactive "P") | |
19078 | 3156 (viper-goto-eol (cons arg ?d))) |
3157 | |
3158 (defun viper-erase-line (arg) | |
18129 | 3159 "Erase line." |
3160 (interactive "P") | |
19078 | 3161 (viper-beginning-of-line (cons arg ?d))) |
18129 | 3162 |
3163 | |
3164 ;;; Moving around | |
3165 | |
19078 | 3166 (defun viper-goto-line (arg) |
18129 | 3167 "Go to ARG's line. Without ARG go to end of buffer." |
3168 (interactive "P") | |
19078 | 3169 (let ((val (viper-P-val arg)) |
3170 (com (viper-getCom arg))) | |
3171 (viper-move-marker-locally 'viper-com-point (point)) | |
3172 (viper-deactivate-mark) | |
18129 | 3173 (push-mark nil t) |
3174 (if (null val) | |
3175 (goto-char (point-max)) | |
3176 (goto-char (point-min)) | |
3177 (forward-line (1- val))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3178 |
18129 | 3179 ;; positioning is done twice: before and after command execution |
3180 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3181 (back-to-indentation) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3182 |
19078 | 3183 (if com (viper-execute-com 'viper-goto-line val com)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3184 |
18129 | 3185 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3186 (back-to-indentation) | |
3187 )) | |
3188 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3189 ;; Find ARG's occurrence of CHAR on the current line. |
18129 | 3190 ;; If FORWARD then search is forward, otherwise backward. OFFSET is used to |
3191 ;; adjust point after search. | |
19078 | 3192 (defun viper-find-char (arg char forward offset) |
18129 | 3193 (or (char-or-string-p char) (error "")) |
3194 (let ((arg (if forward arg (- arg))) | |
19078 | 3195 (cmd (if (eq viper-intermediate-command 'viper-repeat) |
3196 (nth 5 viper-d-com) | |
3197 (viper-array-to-string (this-command-keys)))) | |
21940 | 3198 point region-beg region-end) |
18129 | 3199 (save-excursion |
3200 (save-restriction | |
21940 | 3201 (if (> arg 0) ; forward |
3202 (progn | |
3203 (setq region-beg (point)) | |
3204 (if viper-allow-multiline-replace-regions | |
3205 (viper-forward-paragraph 1) | |
3206 (end-of-line)) | |
3207 (setq region-end (point))) | |
3208 (setq region-end (point)) | |
3209 (if viper-allow-multiline-replace-regions | |
3210 (viper-backward-paragraph 1) | |
3211 (beginning-of-line)) | |
3212 (setq region-beg (point))) | |
3213 (if (or (and (< arg 0) | |
3214 (< (- region-end region-beg) | |
3215 (if viper-allow-multiline-replace-regions | |
3216 2 1)) | |
3217 (bolp)) | |
3218 (and (> arg 0) | |
3219 (< (- region-end region-beg) | |
3220 (if viper-allow-multiline-replace-regions | |
3221 3 2)) | |
3222 (eolp))) | |
3223 (error "Command `%s': At %s of %s" | |
3224 cmd | |
3225 (if (> arg 0) "end" "beginning") | |
3226 (if viper-allow-multiline-replace-regions | |
3227 "paragraph" "line"))) | |
3228 (narrow-to-region region-beg region-end) | |
18129 | 3229 ;; if arg > 0, point is forwarded before search. |
3230 (if (> arg 0) (goto-char (1+ (point-min))) | |
3231 (goto-char (point-max))) | |
3232 (if (let ((case-fold-search nil)) | |
3233 (search-forward (char-to-string char) nil 0 arg)) | |
3234 (setq point (point)) | |
3235 (error "Command `%s': `%c' not found" cmd char)))) | |
19462 | 3236 (goto-char point) |
3237 (if (> arg 0) | |
3238 (backward-char (if offset 2 1)) | |
3239 (forward-char (if offset 1 0))))) | |
18129 | 3240 |
19078 | 3241 (defun viper-find-char-forward (arg) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3242 "Find char on the line. |
18129 | 3243 If called interactively read the char to find from the terminal, and if |
63268
b9bfb8457681
(viper-find-char-forward): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62440
diff
changeset
|
3244 called from viper-repeat, the char last used is used. This behavior is |
18129 | 3245 controlled by the sign of prefix numeric value." |
3246 (interactive "P") | |
19078 | 3247 (let ((val (viper-p-val arg)) |
3248 (com (viper-getcom arg)) | |
3249 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3250 (if (> val 0) |
3251 ;; this means that the function was called interactively | |
19078 | 3252 (setq viper-f-char (read-char) |
3253 viper-f-forward t | |
3254 viper-f-offset nil) | |
3255 ;; viper-repeat --- set viper-F-char from command-keys | |
3256 (setq viper-F-char (if (stringp cmd-representation) | |
3257 (viper-seq-last-elt cmd-representation) | |
3258 viper-F-char) | |
3259 viper-f-char viper-F-char) | |
18129 | 3260 (setq val (- val))) |
19078 | 3261 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3262 (viper-find-char | |
3263 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t nil) | |
18129 | 3264 (setq val (- val)) |
3265 (if com | |
3266 (progn | |
19078 | 3267 (setq viper-F-char viper-f-char) ; set new viper-F-char |
18129 | 3268 (forward-char) |
19078 | 3269 (viper-execute-com 'viper-find-char-forward val com))))) |
3270 | |
3271 (defun viper-goto-char-forward (arg) | |
18129 | 3272 "Go up to char ARG forward on line." |
3273 (interactive "P") | |
19078 | 3274 (let ((val (viper-p-val arg)) |
3275 (com (viper-getcom arg)) | |
3276 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3277 (if (> val 0) |
3278 ;; this means that the function was called interactively | |
19078 | 3279 (setq viper-f-char (read-char) |
3280 viper-f-forward t | |
3281 viper-f-offset t) | |
3282 ;; viper-repeat --- set viper-F-char from command-keys | |
3283 (setq viper-F-char (if (stringp cmd-representation) | |
3284 (viper-seq-last-elt cmd-representation) | |
3285 viper-F-char) | |
3286 viper-f-char viper-F-char) | |
18129 | 3287 (setq val (- val))) |
19078 | 3288 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3289 (viper-find-char | |
3290 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t t) | |
18129 | 3291 (setq val (- val)) |
3292 (if com | |
3293 (progn | |
19078 | 3294 (setq viper-F-char viper-f-char) ; set new viper-F-char |
18129 | 3295 (forward-char) |
19078 | 3296 (viper-execute-com 'viper-goto-char-forward val com))))) |
3297 | |
3298 (defun viper-find-char-backward (arg) | |
18129 | 3299 "Find char ARG on line backward." |
3300 (interactive "P") | |
19078 | 3301 (let ((val (viper-p-val arg)) |
3302 (com (viper-getcom arg)) | |
3303 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3304 (if (> val 0) |
3305 ;; this means that the function was called interactively | |
19078 | 3306 (setq viper-f-char (read-char) |
3307 viper-f-forward nil | |
3308 viper-f-offset nil) | |
3309 ;; viper-repeat --- set viper-F-char from command-keys | |
3310 (setq viper-F-char (if (stringp cmd-representation) | |
3311 (viper-seq-last-elt cmd-representation) | |
3312 viper-F-char) | |
3313 viper-f-char viper-F-char) | |
18129 | 3314 (setq val (- val))) |
19078 | 3315 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3316 (viper-find-char | |
3317 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil nil) | |
18129 | 3318 (setq val (- val)) |
3319 (if com | |
3320 (progn | |
19078 | 3321 (setq viper-F-char viper-f-char) ; set new viper-F-char |
3322 (viper-execute-com 'viper-find-char-backward val com))))) | |
3323 | |
3324 (defun viper-goto-char-backward (arg) | |
18129 | 3325 "Go up to char ARG backward on line." |
3326 (interactive "P") | |
19078 | 3327 (let ((val (viper-p-val arg)) |
3328 (com (viper-getcom arg)) | |
3329 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3330 (if (> val 0) |
3331 ;; this means that the function was called interactively | |
19078 | 3332 (setq viper-f-char (read-char) |
3333 viper-f-forward nil | |
3334 viper-f-offset t) | |
3335 ;; viper-repeat --- set viper-F-char from command-keys | |
3336 (setq viper-F-char (if (stringp cmd-representation) | |
3337 (viper-seq-last-elt cmd-representation) | |
3338 viper-F-char) | |
3339 viper-f-char viper-F-char) | |
18129 | 3340 (setq val (- val))) |
19078 | 3341 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3342 (viper-find-char | |
3343 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil t) | |
18129 | 3344 (setq val (- val)) |
3345 (if com | |
3346 (progn | |
19078 | 3347 (setq viper-F-char viper-f-char) ; set new viper-F-char |
3348 (viper-execute-com 'viper-goto-char-backward val com))))) | |
3349 | |
3350 (defun viper-repeat-find (arg) | |
18129 | 3351 "Repeat previous find command." |
3352 (interactive "P") | |
19078 | 3353 (let ((val (viper-p-val arg)) |
3354 (com (viper-getcom arg))) | |
3355 (viper-deactivate-mark) | |
3356 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3357 (viper-find-char val viper-f-char viper-f-forward viper-f-offset) | |
18129 | 3358 (if com |
3359 (progn | |
19078 | 3360 (if viper-f-forward (forward-char)) |
3361 (viper-execute-com 'viper-repeat-find val com))))) | |
3362 | |
3363 (defun viper-repeat-find-opposite (arg) | |
18129 | 3364 "Repeat previous find command in the opposite direction." |
3365 (interactive "P") | |
19078 | 3366 (let ((val (viper-p-val arg)) |
3367 (com (viper-getcom arg))) | |
3368 (viper-deactivate-mark) | |
3369 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3370 (viper-find-char val viper-f-char (not viper-f-forward) viper-f-offset) | |
18129 | 3371 (if com |
3372 (progn | |
19078 | 3373 (if viper-f-forward (forward-char)) |
3374 (viper-execute-com 'viper-repeat-find-opposite val com))))) | |
18129 | 3375 |
3376 | |
3377 ;; window scrolling etc. | |
3378 | |
19078 | 3379 (defun viper-window-top (arg) |
18129 | 3380 "Go to home window line." |
3381 (interactive "P") | |
19078 | 3382 (let ((val (viper-p-val arg)) |
3383 (com (viper-getCom arg))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3384 (viper-leave-region-active) |
19078 | 3385 (if com (viper-move-marker-locally 'viper-com-point (point))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3386 (push-mark nil t) |
18129 | 3387 (move-to-window-line (1- val)) |
3388 | |
3389 ;; positioning is done twice: before and after command execution | |
3390 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3391 (back-to-indentation) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3392 |
19078 | 3393 (if com (viper-execute-com 'viper-window-top val com)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3394 |
18129 | 3395 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3396 (back-to-indentation) | |
3397 )) | |
3398 | |
19078 | 3399 (defun viper-window-middle (arg) |
18129 | 3400 "Go to middle window line." |
3401 (interactive "P") | |
19078 | 3402 (let ((val (viper-p-val arg)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3403 (com (viper-getCom arg))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3404 (viper-leave-region-active) |
19078 | 3405 (if com (viper-move-marker-locally 'viper-com-point (point))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3406 (push-mark nil t) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3407 (move-to-window-line (+ (/ (1- (window-height)) 2) (1- val))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3408 |
18129 | 3409 ;; positioning is done twice: before and after command execution |
3410 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3411 (back-to-indentation) | |
3412 | |
19078 | 3413 (if com (viper-execute-com 'viper-window-middle val com)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3414 |
18129 | 3415 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3416 (back-to-indentation) | |
3417 )) | |
3418 | |
19078 | 3419 (defun viper-window-bottom (arg) |
18129 | 3420 "Go to last window line." |
3421 (interactive "P") | |
19078 | 3422 (let ((val (viper-p-val arg)) |
3423 (com (viper-getCom arg))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3424 (viper-leave-region-active) |
19078 | 3425 (if com (viper-move-marker-locally 'viper-com-point (point))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3426 (push-mark nil t) |
18129 | 3427 (move-to-window-line (- val)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3428 |
18129 | 3429 ;; positioning is done twice: before and after command execution |
3430 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3431 (back-to-indentation) | |
3432 | |
19078 | 3433 (if com (viper-execute-com 'viper-window-bottom val com)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3434 |
18129 | 3435 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3436 (back-to-indentation) | |
3437 )) | |
3438 | |
19078 | 3439 (defun viper-line-to-top (arg) |
18129 | 3440 "Put current line on the home line." |
3441 (interactive "p") | |
3442 (recenter (1- arg))) | |
3443 | |
19078 | 3444 (defun viper-line-to-middle (arg) |
18129 | 3445 "Put current line on the middle line." |
3446 (interactive "p") | |
3447 (recenter (+ (1- arg) (/ (1- (window-height)) 2)))) | |
3448 | |
19078 | 3449 (defun viper-line-to-bottom (arg) |
18129 | 3450 "Put current line on the last line." |
3451 (interactive "p") | |
3452 (recenter (- (window-height) (1+ arg)))) | |
3453 | |
19078 | 3454 ;; If point is within viper-search-scroll-threshold of window top or bottom, |
18129 | 3455 ;; scroll up or down 1/7 of window height, depending on whether we are at the |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3456 ;; bottom or at the top of the window. This function is called by viper-search |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3457 ;; (which is called from viper-search-forward/backward/next). If the value of |
19078 | 3458 ;; viper-search-scroll-threshold is negative - don't scroll. |
3459 (defun viper-adjust-window () | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3460 (let ((win-height (viper-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3461 (window-displayed-height) ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3462 ;; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3463 (1- (window-height)) ; adjust for modeline |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3464 )) |
18129 | 3465 (pt (point)) |
3466 at-top-p at-bottom-p | |
3467 min-scroll direction) | |
3468 (save-excursion | |
3469 (move-to-window-line 0) ; top | |
3470 (setq at-top-p | |
3471 (<= (count-lines pt (point)) | |
19078 | 3472 viper-search-scroll-threshold)) |
18129 | 3473 (move-to-window-line -1) ; bottom |
3474 (setq at-bottom-p | |
19078 | 3475 (<= (count-lines pt (point)) viper-search-scroll-threshold)) |
18129 | 3476 ) |
19078 | 3477 (cond (at-top-p (setq min-scroll (1- viper-search-scroll-threshold) |
18129 | 3478 direction 1)) |
19078 | 3479 (at-bottom-p (setq min-scroll (1+ viper-search-scroll-threshold) |
18129 | 3480 direction -1))) |
3481 (if min-scroll | |
3482 (recenter | |
3483 (* (max min-scroll (/ win-height 7)) direction))) | |
3484 )) | |
3485 | |
3486 | |
3487 ;; paren match | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3488 ;; must correct this to only match ( to ) etc. On the other hand |
18129 | 3489 ;; it is good that paren match gets confused, because that way you |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3490 ;; catch _all_ imbalances. |
18129 | 3491 |
19078 | 3492 (defun viper-paren-match (arg) |
18129 | 3493 "Go to the matching parenthesis." |
3494 (interactive "P") | |
19078 | 3495 (viper-leave-region-active) |
3496 (let ((com (viper-getcom arg)) | |
3497 (parse-sexp-ignore-comments viper-parse-sexp-ignore-comments) | |
18129 | 3498 anchor-point) |
3499 (if (integerp arg) | |
3500 (if (or (> arg 99) (< arg 1)) | |
3501 (error "Prefix must be between 1 and 99") | |
3502 (goto-char | |
3503 (if (> (point-max) 80000) | |
3504 (* (/ (point-max) 100) arg) | |
3505 (/ (* (point-max) arg) 100))) | |
3506 (back-to-indentation)) | |
3507 (let (beg-lim end-lim) | |
3508 (if (and (eolp) (not (bolp))) (forward-char -1)) | |
3509 (if (not (looking-at "[][(){}]")) | |
3510 (setq anchor-point (point))) | |
3511 (save-excursion | |
3512 (beginning-of-line) | |
3513 (setq beg-lim (point)) | |
3514 (end-of-line) | |
3515 (setq end-lim (point))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3516 (cond ((re-search-forward "[][(){}]" end-lim t) |
18129 | 3517 (backward-char) ) |
3518 ((re-search-backward "[][(){}]" beg-lim t)) | |
3519 (t | |
3520 (error "No matching character on line")))) | |
3521 (cond ((looking-at "[\(\[{]") | |
19078 | 3522 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3523 (forward-sexp 1) |
3524 (if com | |
19078 | 3525 (viper-execute-com 'viper-paren-match nil com) |
18129 | 3526 (backward-char))) |
3527 (anchor-point | |
3528 (if com | |
3529 (progn | |
19078 | 3530 (viper-move-marker-locally 'viper-com-point anchor-point) |
18129 | 3531 (forward-char 1) |
19078 | 3532 (viper-execute-com 'viper-paren-match nil com) |
18129 | 3533 ))) |
3534 ((looking-at "[])}]") | |
3535 (forward-char) | |
19078 | 3536 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3537 (backward-sexp 1) |
19078 | 3538 (if com (viper-execute-com 'viper-paren-match nil com))) |
18129 | 3539 (t (error "")))))) |
3540 | |
19078 | 3541 (defun viper-toggle-parse-sexp-ignore-comments () |
18129 | 3542 (interactive) |
19078 | 3543 (setq viper-parse-sexp-ignore-comments |
3544 (not viper-parse-sexp-ignore-comments)) | |
18839 | 3545 (princ (format |
3546 "From now on, `%%' will %signore parentheses inside comment fields" | |
19078 | 3547 (if viper-parse-sexp-ignore-comments "" "NOT ")))) |
18129 | 3548 |
3549 | |
21940 | 3550 ;; sentence, paragraph and heading |
18129 | 3551 |
19078 | 3552 (defun viper-forward-sentence (arg) |
18129 | 3553 "Forward sentence." |
3554 (interactive "P") | |
20003 | 3555 (or (eq last-command this-command) |
3556 (push-mark nil t)) | |
19078 | 3557 (let ((val (viper-p-val arg)) |
3558 (com (viper-getcom arg))) | |
3559 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3560 (forward-sentence val) |
19078 | 3561 (if com (viper-execute-com 'viper-forward-sentence nil com)))) |
3562 | |
3563 (defun viper-backward-sentence (arg) | |
18129 | 3564 "Backward sentence." |
3565 (interactive "P") | |
20003 | 3566 (or (eq last-command this-command) |
3567 (push-mark nil t)) | |
19078 | 3568 (let ((val (viper-p-val arg)) |
3569 (com (viper-getcom arg))) | |
3570 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3571 (backward-sentence val) |
19078 | 3572 (if com (viper-execute-com 'viper-backward-sentence nil com)))) |
3573 | |
3574 (defun viper-forward-paragraph (arg) | |
18129 | 3575 "Forward paragraph." |
3576 (interactive "P") | |
20003 | 3577 (or (eq last-command this-command) |
3578 (push-mark nil t)) | |
19078 | 3579 (let ((val (viper-p-val arg)) |
21940 | 3580 ;; if you want d} operate on whole lines, change viper-getcom to |
3581 ;; viper-getCom below | |
3582 (com (viper-getcom arg))) | |
19078 | 3583 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3584 (forward-paragraph val) |
3585 (if com | |
3586 (progn | |
3587 (backward-char 1) | |
19078 | 3588 (viper-execute-com 'viper-forward-paragraph nil com))))) |
3589 | |
3590 (defun viper-backward-paragraph (arg) | |
18129 | 3591 "Backward paragraph." |
3592 (interactive "P") | |
20003 | 3593 (or (eq last-command this-command) |
3594 (push-mark nil t)) | |
19078 | 3595 (let ((val (viper-p-val arg)) |
21940 | 3596 ;; if you want d{ operate on whole lines, change viper-getcom to |
3597 ;; viper-getCom below | |
3598 (com (viper-getcom arg))) | |
19078 | 3599 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3600 (backward-paragraph val) |
3601 (if com | |
3602 (progn | |
3603 (forward-char 1) | |
19078 | 3604 (viper-execute-com 'viper-backward-paragraph nil com) |
18129 | 3605 (backward-char 1))))) |
3606 | |
20003 | 3607 ;; should be mode-specific |
19078 | 3608 (defun viper-prev-heading (arg) |
18129 | 3609 (interactive "P") |
19078 | 3610 (let ((val (viper-p-val arg)) |
3611 (com (viper-getCom arg))) | |
3612 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3613 (re-search-backward viper-heading-start nil t val) | |
18129 | 3614 (goto-char (match-beginning 0)) |
19078 | 3615 (if com (viper-execute-com 'viper-prev-heading nil com)))) |
3616 | |
3617 (defun viper-heading-end (arg) | |
18129 | 3618 (interactive "P") |
19078 | 3619 (let ((val (viper-p-val arg)) |
3620 (com (viper-getCom arg))) | |
3621 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3622 (re-search-forward viper-heading-end nil t val) | |
18129 | 3623 (goto-char (match-beginning 0)) |
19078 | 3624 (if com (viper-execute-com 'viper-heading-end nil com)))) |
3625 | |
3626 (defun viper-next-heading (arg) | |
18129 | 3627 (interactive "P") |
19078 | 3628 (let ((val (viper-p-val arg)) |
3629 (com (viper-getCom arg))) | |
3630 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3631 (end-of-line) |
19078 | 3632 (re-search-forward viper-heading-start nil t val) |
18129 | 3633 (goto-char (match-beginning 0)) |
19078 | 3634 (if com (viper-execute-com 'viper-next-heading nil com)))) |
18129 | 3635 |
3636 | |
3637 ;; scrolling | |
3638 | |
19078 | 3639 (defun viper-scroll-screen (arg) |
18129 | 3640 "Scroll to next screen." |
3641 (interactive "p") | |
3642 (condition-case nil | |
3643 (if (> arg 0) | |
3644 (while (> arg 0) | |
3645 (scroll-up) | |
3646 (setq arg (1- arg))) | |
3647 (while (> 0 arg) | |
3648 (scroll-down) | |
3649 (setq arg (1+ arg)))) | |
3650 (error (beep 1) | |
3651 (if (> arg 0) | |
3652 (progn | |
3653 (message "End of buffer") | |
3654 (goto-char (point-max))) | |
3655 (message "Beginning of buffer") | |
3656 (goto-char (point-min)))) | |
3657 )) | |
3658 | |
19078 | 3659 (defun viper-scroll-screen-back (arg) |
18129 | 3660 "Scroll to previous screen." |
3661 (interactive "p") | |
19078 | 3662 (viper-scroll-screen (- arg))) |
3663 | |
3664 (defun viper-scroll-down (arg) | |
18129 | 3665 "Pull down half screen." |
3666 (interactive "P") | |
3667 (condition-case nil | |
3668 (if (null arg) | |
3669 (scroll-down (/ (window-height) 2)) | |
3670 (scroll-down arg)) | |
3671 (error (beep 1) | |
3672 (message "Beginning of buffer") | |
3673 (goto-char (point-min))))) | |
3674 | |
19078 | 3675 (defun viper-scroll-down-one (arg) |
18129 | 3676 "Scroll up one line." |
3677 (interactive "p") | |
3678 (scroll-down arg)) | |
3679 | |
19078 | 3680 (defun viper-scroll-up (arg) |
18129 | 3681 "Pull up half screen." |
3682 (interactive "P") | |
3683 (condition-case nil | |
3684 (if (null arg) | |
3685 (scroll-up (/ (window-height) 2)) | |
3686 (scroll-up arg)) | |
3687 (error (beep 1) | |
3688 (message "End of buffer") | |
3689 (goto-char (point-max))))) | |
3690 | |
19078 | 3691 (defun viper-scroll-up-one (arg) |
18129 | 3692 "Scroll down one line." |
3693 (interactive "p") | |
3694 (scroll-up arg)) | |
3695 | |
3696 | |
3697 ;; searching | |
3698 | |
19078 | 3699 (defun viper-if-string (prompt) |
3700 (if (memq viper-intermediate-command | |
3701 '(viper-command-argument viper-digit-argument viper-repeat)) | |
3702 (setq viper-this-command-keys (this-command-keys))) | |
3703 (let ((s (viper-read-string-with-history | |
18129 | 3704 prompt |
3705 nil ; no initial | |
19078 | 3706 'viper-search-history |
3707 (car viper-search-history)))) | |
18129 | 3708 (if (not (string= s "")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3709 (setq viper-s-string s)))) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3710 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3711 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3712 (defun viper-toggle-search-style (arg) |
19078 | 3713 "Toggle the value of viper-case-fold-search/viper-re-search. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3714 Without prefix argument, will ask which search style to toggle. With prefix |
19078 | 3715 arg 1,toggles viper-case-fold-search; with arg 2 toggles viper-re-search. |
3716 | |
3717 Although this function is bound to \\[viper-toggle-search-style], the most | |
18129 | 3718 convenient way to use it is to bind `//' to the macro |
19078 | 3719 `1 M-x viper-toggle-search-style' and `///' to |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3720 `2 M-x viper-toggle-search-style'. In this way, hitting `//' quickly will |
18129 | 3721 toggle case-fold-search and hitting `/' three times witth toggle regexp |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3722 search. Macros are more convenient in this case because they don't affect |
18129 | 3723 the Emacs binding of `/'." |
3724 (interactive "P") | |
3725 (let (msg) | |
3726 (cond ((or (eq arg 1) | |
3727 (and (null arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3728 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
19078 | 3729 (if viper-case-fold-search |
18129 | 3730 "case-insensitive" "case-sensitive") |
19078 | 3731 (if viper-case-fold-search |
18129 | 3732 "case-sensitive" |
3733 "case-insensitive"))))) | |
19078 | 3734 (setq viper-case-fold-search (null viper-case-fold-search)) |
3735 (if viper-case-fold-search | |
18129 | 3736 (setq msg "Search becomes case-insensitive") |
3737 (setq msg "Search becomes case-sensitive"))) | |
3738 ((or (eq arg 2) | |
3739 (and (null arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3740 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
19078 | 3741 (if viper-re-search |
18129 | 3742 "regexp-search" "vanilla-search") |
19078 | 3743 (if viper-re-search |
18129 | 3744 "vanilla-search" |
3745 "regexp-search"))))) | |
19078 | 3746 (setq viper-re-search (null viper-re-search)) |
3747 (if viper-re-search | |
18129 | 3748 (setq msg "Search becomes regexp-style") |
3749 (setq msg "Search becomes vanilla-style"))) | |
3750 (t | |
3751 (setq msg "Search style remains unchanged"))) | |
18839 | 3752 (princ msg t))) |
3753 | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3754 (defun viper-set-searchstyle-toggling-macros (unset &optional major-mode) |
18129 | 3755 "Set the macros for toggling the search style in Viper's vi-state. |
3756 The macro that toggles case sensitivity is bound to `//', and the one that | |
3757 toggles regexp search is bound to `///'. | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3758 With a prefix argument, this function unsets the macros. |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3759 If MAJOR-MODE is set, set the macros only in that major mode." |
18129 | 3760 (interactive "P") |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3761 (let (scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3762 (if (and major-mode (symbolp major-mode)) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3763 (setq scope major-mode) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3764 (setq scope 't)) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3765 (or noninteractive |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3766 (if (not unset) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3767 (progn |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3768 ;; toggle case sensitivity in search |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3769 (viper-record-kbd-macro |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3770 "//" 'vi-state |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3771 [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3772 scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3773 ;; toggle regexp/vanila search |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3774 (viper-record-kbd-macro |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3775 "///" 'vi-state |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3776 [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3777 scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3778 (if (interactive-p) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3779 (message |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3780 "// and /// now toggle case-sensitivity and regexp search"))) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3781 (viper-unrecord-kbd-macro "//" 'vi-state) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3782 (sit-for 2) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3783 (viper-unrecord-kbd-macro "///" 'vi-state))) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3784 )) |
63268
b9bfb8457681
(viper-find-char-forward): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62440
diff
changeset
|
3785 |
b9bfb8457681
(viper-find-char-forward): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62440
diff
changeset
|
3786 |
19078 | 3787 (defun viper-set-parsing-style-toggling-macro (unset) |
18839 | 3788 "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses. |
3789 This is used in conjunction with the `%' command. | |
3790 | |
3791 With a prefix argument, unsets the macro." | |
3792 (interactive "P") | |
3793 (or noninteractive | |
3794 (if (not unset) | |
3795 (progn | |
3796 ;; Make %%% toggle parsing comments for matching parentheses | |
19078 | 3797 (viper-record-kbd-macro |
18839 | 3798 "%%%" 'vi-state |
19078 | 3799 [(meta x) v i p e r - t o g g l e - p a r s e - s e x p - i g n o r e - c o m m e n t s return] |
18839 | 3800 't) |
3801 (if (interactive-p) | |
3802 (message | |
3803 "%%%%%% now toggles whether comments should be parsed for matching parentheses"))) | |
19078 | 3804 (viper-unrecord-kbd-macro "%%%" 'vi-state)))) |
3805 | |
3806 | |
3807 (defun viper-set-emacs-state-searchstyle-macros (unset &optional arg-majormode) | |
18129 | 3808 "Set the macros for toggling the search style in Viper's emacs-state. |
3809 The macro that toggles case sensitivity is bound to `//', and the one that | |
3810 toggles regexp search is bound to `///'. | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3811 With a prefix argument, this function unsets the macros. |
18129 | 3812 If the optional prefix argument is non-nil and specifies a valid major mode, |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3813 this sets the macros only in the macros in that major mode. Otherwise, |
18129 | 3814 the macros are set in the current major mode. |
3815 \(When unsetting the macros, the second argument has no effect.\)" | |
3816 (interactive "P") | |
3817 (or noninteractive | |
3818 (if (not unset) | |
3819 (progn | |
3820 ;; toggle case sensitivity in search | |
19078 | 3821 (viper-record-kbd-macro |
18129 | 3822 "//" 'emacs-state |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3823 [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] |
18129 | 3824 (or arg-majormode major-mode)) |
3825 ;; toggle regexp/vanila search | |
19078 | 3826 (viper-record-kbd-macro |
18129 | 3827 "///" 'emacs-state |
19078 | 3828 [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] |
18129 | 3829 (or arg-majormode major-mode)) |
3830 (if (interactive-p) | |
3831 (message | |
3832 "// and /// now toggle case-sensitivity and regexp search."))) | |
19078 | 3833 (viper-unrecord-kbd-macro "//" 'emacs-state) |
18129 | 3834 (sit-for 2) |
19078 | 3835 (viper-unrecord-kbd-macro "///" 'emacs-state)))) |
3836 | |
3837 | |
3838 (defun viper-search-forward (arg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3839 "Search a string forward. |
18129 | 3840 ARG is used to find the ARG's occurrence of the string. |
3841 Null string will repeat previous search." | |
3842 (interactive "P") | |
19078 | 3843 (let ((val (viper-P-val arg)) |
3844 (com (viper-getcom arg)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3845 (old-str viper-s-string) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3846 debug-on-error) |
19078 | 3847 (setq viper-s-forward t) |
3848 (viper-if-string "/") | |
18129 | 3849 ;; this is not used at present, but may be used later |
19078 | 3850 (if (or (not (equal old-str viper-s-string)) |
3851 (not (markerp viper-local-search-start-marker)) | |
3852 (not (marker-buffer viper-local-search-start-marker))) | |
3853 (setq viper-local-search-start-marker (point-marker))) | |
3854 (viper-search viper-s-string t val) | |
18129 | 3855 (if com |
3856 (progn | |
19078 | 3857 (viper-move-marker-locally 'viper-com-point (mark t)) |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3858 (viper-execute-com 'viper-search-next val com))) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3859 )) |
19078 | 3860 |
3861 (defun viper-search-backward (arg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3862 "Search a string backward. |
18129 | 3863 ARG is used to find the ARG's occurrence of the string. |
3864 Null string will repeat previous search." | |
3865 (interactive "P") | |
19078 | 3866 (let ((val (viper-P-val arg)) |
3867 (com (viper-getcom arg)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3868 (old-str viper-s-string) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3869 debug-on-error) |
19078 | 3870 (setq viper-s-forward nil) |
3871 (viper-if-string "?") | |
18129 | 3872 ;; this is not used at present, but may be used later |
19078 | 3873 (if (or (not (equal old-str viper-s-string)) |
3874 (not (markerp viper-local-search-start-marker)) | |
3875 (not (marker-buffer viper-local-search-start-marker))) | |
3876 (setq viper-local-search-start-marker (point-marker))) | |
3877 (viper-search viper-s-string nil val) | |
18129 | 3878 (if com |
3879 (progn | |
19078 | 3880 (viper-move-marker-locally 'viper-com-point (mark t)) |
3881 (viper-execute-com 'viper-search-next val com))))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3882 |
18129 | 3883 |
3884 ;; Search for COUNT's occurrence of STRING. | |
3885 ;; Search is forward if FORWARD is non-nil, otherwise backward. | |
3886 ;; INIT-POINT is the position where search is to start. | |
3887 ;; Arguments: | |
3888 ;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND) | |
19078 | 3889 (defun viper-search (string forward arg |
3890 &optional no-offset init-point fail-if-not-found) | |
18129 | 3891 (if (not (equal string "")) |
19078 | 3892 (let ((val (viper-p-val arg)) |
3893 (com (viper-getcom arg)) | |
18129 | 3894 (offset (not no-offset)) |
19078 | 3895 (case-fold-search viper-case-fold-search) |
18129 | 3896 (start-point (or init-point (point)))) |
19078 | 3897 (viper-deactivate-mark) |
18129 | 3898 (if forward |
3899 (condition-case nil | |
3900 (progn | |
19078 | 3901 (if offset (viper-forward-char-carefully)) |
3902 (if viper-re-search | |
18129 | 3903 (progn |
3904 (re-search-forward string nil nil val) | |
3905 (re-search-backward string)) | |
3906 (search-forward string nil nil val) | |
3907 (search-backward string)) | |
3908 (if (not (equal start-point (point))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3909 (push-mark start-point t))) |
18129 | 3910 (search-failed |
19078 | 3911 (if (and (not fail-if-not-found) viper-search-wrap-around-t) |
18129 | 3912 (progn |
3913 (message "Search wrapped around BOTTOM of buffer") | |
3914 (goto-char (point-min)) | |
19078 | 3915 (viper-search string forward (cons 1 com) t start-point 'fail) |
18129 | 3916 ;; don't wait in macros |
19078 | 3917 (or executing-kbd-macro |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3918 (memq viper-intermediate-command |
19078 | 3919 '(viper-repeat |
3920 viper-digit-argument | |
3921 viper-command-argument)) | |
3922 (sit-for 2)) | |
18129 | 3923 ;; delete the wrap-around message |
3924 (message "") | |
3925 ) | |
3926 (goto-char start-point) | |
3927 (error "`%s': %s not found" | |
3928 string | |
19078 | 3929 (if viper-re-search "Pattern" "String")) |
18129 | 3930 ))) |
3931 ;; backward | |
3932 (condition-case nil | |
3933 (progn | |
19078 | 3934 (if viper-re-search |
18129 | 3935 (re-search-backward string nil nil val) |
3936 (search-backward string nil nil val)) | |
3937 (if (not (equal start-point (point))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3938 (push-mark start-point t))) |
18129 | 3939 (search-failed |
19078 | 3940 (if (and (not fail-if-not-found) viper-search-wrap-around-t) |
18129 | 3941 (progn |
3942 (message "Search wrapped around TOP of buffer") | |
3943 (goto-char (point-max)) | |
19078 | 3944 (viper-search string forward (cons 1 com) t start-point 'fail) |
18129 | 3945 ;; don't wait in macros |
19078 | 3946 (or executing-kbd-macro |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3947 (memq viper-intermediate-command |
19078 | 3948 '(viper-repeat |
3949 viper-digit-argument | |
3950 viper-command-argument)) | |
3951 (sit-for 2)) | |
18129 | 3952 ;; delete the wrap-around message |
3953 (message "") | |
3954 ) | |
3955 (goto-char start-point) | |
3956 (error "`%s': %s not found" | |
3957 string | |
19078 | 3958 (if viper-re-search "Pattern" "String")) |
18129 | 3959 )))) |
3960 ;; pull up or down if at top/bottom of window | |
19078 | 3961 (viper-adjust-window) |
18129 | 3962 ;; highlight the result of search |
3963 ;; don't wait and don't highlight in macros | |
3964 (or executing-kbd-macro | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3965 (memq viper-intermediate-command |
19078 | 3966 '(viper-repeat viper-digit-argument viper-command-argument)) |
3967 (viper-flash-search-pattern)) | |
18129 | 3968 ))) |
3969 | |
19078 | 3970 (defun viper-search-next (arg) |
18129 | 3971 "Repeat previous search." |
3972 (interactive "P") | |
19078 | 3973 (let ((val (viper-p-val arg)) |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3974 (com (viper-getcom arg)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3975 debug-on-error) |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
3976 (if (or (null viper-s-string) (string= viper-s-string "")) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
3977 (error viper-NoPrevSearch)) |
19078 | 3978 (viper-search viper-s-string viper-s-forward arg) |
18129 | 3979 (if com |
3980 (progn | |
19078 | 3981 (viper-move-marker-locally 'viper-com-point (mark t)) |
3982 (viper-execute-com 'viper-search-next val com))))) | |
3983 | |
3984 (defun viper-search-Next (arg) | |
18129 | 3985 "Repeat previous search in the reverse direction." |
3986 (interactive "P") | |
19078 | 3987 (let ((val (viper-p-val arg)) |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3988 (com (viper-getcom arg)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3989 debug-on-error) |
19078 | 3990 (if (null viper-s-string) (error viper-NoPrevSearch)) |
3991 (viper-search viper-s-string (not viper-s-forward) arg) | |
18129 | 3992 (if com |
3993 (progn | |
19078 | 3994 (viper-move-marker-locally 'viper-com-point (mark t)) |
3995 (viper-execute-com 'viper-search-Next val com))))) | |
18129 | 3996 |
3997 | |
3998 ;; Search contents of buffer defined by one of Viper's motion commands. | |
3999 ;; Repeatable via `n' and `N'. | |
19078 | 4000 (defun viper-buffer-search-enable (&optional c) |
4001 (cond (c (setq viper-buffer-search-char c)) | |
4002 ((null viper-buffer-search-char) | |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
4003 ;; ?g acts as a default value for viper-buffer-search-char |
19078 | 4004 (setq viper-buffer-search-char ?g))) |
4005 (define-key viper-vi-basic-map | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4006 (cond ((viper-characterp viper-buffer-search-char) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4007 (char-to-string viper-buffer-search-char)) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39901
diff
changeset
|
4008 (t (error "viper-buffer-search-char: wrong value type, %S" |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4009 viper-buffer-search-char))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4010 'viper-command-argument) |
19078 | 4011 (aset viper-exec-array viper-buffer-search-char 'viper-exec-buffer-search) |
4012 (setq viper-prefix-commands | |
4013 (cons viper-buffer-search-char viper-prefix-commands))) | |
18129 | 4014 |
4015 ;; This is a Viper wraper for isearch-forward. | |
19078 | 4016 (defun viper-isearch-forward (arg) |
18129 | 4017 "Do incremental search forward." |
4018 (interactive "P") | |
4019 ;; emacs bug workaround | |
4020 (if (listp arg) (setq arg (car arg))) | |
19078 | 4021 (viper-exec-form-in-emacs (list 'isearch-forward arg))) |
18129 | 4022 |
4023 ;; This is a Viper wraper for isearch-backward." | |
19078 | 4024 (defun viper-isearch-backward (arg) |
18129 | 4025 "Do incremental search backward." |
4026 (interactive "P") | |
4027 ;; emacs bug workaround | |
4028 (if (listp arg) (setq arg (car arg))) | |
19078 | 4029 (viper-exec-form-in-emacs (list 'isearch-backward arg))) |
18129 | 4030 |
4031 | |
4032 ;; visiting and killing files, buffers | |
4033 | |
19078 | 4034 (defun viper-switch-to-buffer () |
18129 | 4035 "Switch to buffer in the current window." |
4036 (interactive) | |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4037 (let ((other-buffer (other-buffer (current-buffer))) |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4038 buffer) |
18129 | 4039 (setq buffer |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4040 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4041 "Switch to buffer in this window: " other-buffer)) |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4042 (switch-to-buffer buffer))) |
18129 | 4043 |
19078 | 4044 (defun viper-switch-to-buffer-other-window () |
18129 | 4045 "Switch to buffer in another window." |
4046 (interactive) | |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4047 (let ((other-buffer (other-buffer (current-buffer))) |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4048 buffer) |
18129 | 4049 (setq buffer |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4050 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4051 "Switch to buffer in another window: " other-buffer)) |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4052 (switch-to-buffer-other-window buffer))) |
18129 | 4053 |
19078 | 4054 (defun viper-kill-buffer () |
18129 | 4055 "Kill a buffer." |
4056 (interactive) | |
4057 (let (buffer buffer-name) | |
4058 (setq buffer-name | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4059 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4060 (format "Kill buffer \(%s\): " |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4061 (buffer-name (current-buffer))))) |
18129 | 4062 (setq buffer |
4063 (if (null buffer-name) | |
4064 (current-buffer) | |
4065 (get-buffer buffer-name))) | |
4066 (if (null buffer) (error "`%s': No such buffer" buffer-name)) | |
4067 (if (or (not (buffer-modified-p buffer)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4068 (y-or-n-p |
18129 | 4069 (format |
4070 "Buffer `%s' is modified, are you sure you want to kill it? " | |
4071 buffer-name))) | |
4072 (kill-buffer buffer) | |
4073 (error "Buffer not killed")))) | |
4074 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4075 |
18129 | 4076 |
4077 ;; yank and pop | |
4078 | |
19078 | 4079 (defsubst viper-yank (text) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4080 "Yank TEXT silently. This works correctly with Emacs's yank-pop command." |
18129 | 4081 (insert text) |
4082 (setq this-command 'yank)) | |
4083 | |
19078 | 4084 (defun viper-put-back (arg) |
18129 | 4085 "Put back after point/below line." |
4086 (interactive "P") | |
19078 | 4087 (let ((val (viper-p-val arg)) |
4088 (text (if viper-use-register | |
4089 (cond ((viper-valid-register viper-use-register '(digit)) | |
4090 (current-kill | |
4091 (- viper-use-register ?1) 'do-not-rotate)) | |
4092 ((viper-valid-register viper-use-register) | |
4093 (get-register (downcase viper-use-register))) | |
4094 (t (error viper-InvalidRegister viper-use-register))) | |
21940 | 4095 (current-kill 0))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4096 sv-point chars-inserted lines-inserted) |
18129 | 4097 (if (null text) |
19078 | 4098 (if viper-use-register |
4099 (let ((reg viper-use-register)) | |
4100 (setq viper-use-register nil) | |
4101 (error viper-EmptyRegister reg)) | |
18129 | 4102 (error ""))) |
19078 | 4103 (setq viper-use-register nil) |
4104 (if (viper-end-with-a-newline-p text) | |
18129 | 4105 (progn |
4106 (end-of-line) | |
4107 (if (eobp) | |
4108 (insert "\n") | |
4109 (forward-line 1)) | |
4110 (beginning-of-line)) | |
19078 | 4111 (if (not (eolp)) (viper-forward-char-carefully))) |
4112 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
4113 (viper-set-destructive-command | |
4114 (list 'viper-put-back val nil viper-use-register nil nil)) | |
21940 | 4115 (setq sv-point (point)) |
4116 (viper-loop val (viper-yank text)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4117 (setq chars-inserted (abs (- (point) sv-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4118 lines-inserted (abs (count-lines (point) sv-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4119 (if (or (> chars-inserted viper-change-notification-threshold) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4120 (> lines-inserted viper-change-notification-threshold)) |
64750
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
4121 (unless (viper-is-in-minibuffer) |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
4122 (message "Inserted %d character(s), %d line(s)" |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
4123 chars-inserted lines-inserted)))) |
18129 | 4124 ;; Vi puts cursor on the last char when the yanked text doesn't contain a |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4125 ;; newline; it leaves the cursor at the beginning when the text contains |
18129 | 4126 ;; a newline |
19078 | 4127 (if (viper-same-line (point) (mark)) |
4128 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
18129 | 4129 (exchange-point-and-mark) |
4130 (if (bolp) | |
4131 (back-to-indentation))) | |
19078 | 4132 (viper-deactivate-mark)) |
4133 | |
4134 (defun viper-Put-back (arg) | |
18129 | 4135 "Put back at point/above line." |
4136 (interactive "P") | |
19078 | 4137 (let ((val (viper-p-val arg)) |
4138 (text (if viper-use-register | |
4139 (cond ((viper-valid-register viper-use-register '(digit)) | |
4140 (current-kill | |
4141 (- viper-use-register ?1) 'do-not-rotate)) | |
4142 ((viper-valid-register viper-use-register) | |
4143 (get-register (downcase viper-use-register))) | |
4144 (t (error viper-InvalidRegister viper-use-register))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4145 (current-kill 0))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4146 sv-point chars-inserted lines-inserted) |
18129 | 4147 (if (null text) |
19078 | 4148 (if viper-use-register |
4149 (let ((reg viper-use-register)) | |
4150 (setq viper-use-register nil) | |
4151 (error viper-EmptyRegister reg)) | |
18129 | 4152 (error ""))) |
19078 | 4153 (setq viper-use-register nil) |
4154 (if (viper-end-with-a-newline-p text) (beginning-of-line)) | |
4155 (viper-set-destructive-command | |
4156 (list 'viper-Put-back val nil viper-use-register nil nil)) | |
4157 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4158 (setq sv-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4159 (viper-loop val (viper-yank text)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4160 (setq chars-inserted (abs (- (point) sv-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4161 lines-inserted (abs (count-lines (point) sv-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4162 (if (or (> chars-inserted viper-change-notification-threshold) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4163 (> lines-inserted viper-change-notification-threshold)) |
64750
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
4164 (unless (viper-is-in-minibuffer) |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
4165 (message "Inserted %d character(s), %d line(s)" |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
4166 chars-inserted lines-inserted)))) |
18129 | 4167 ;; Vi puts cursor on the last char when the yanked text doesn't contain a |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4168 ;; newline; it leaves the cursor at the beginning when the text contains |
18129 | 4169 ;; a newline |
19078 | 4170 (if (viper-same-line (point) (mark)) |
4171 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
18129 | 4172 (exchange-point-and-mark) |
4173 (if (bolp) | |
4174 (back-to-indentation))) | |
19078 | 4175 (viper-deactivate-mark)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4176 |
18129 | 4177 |
4178 ;; Copy region to kill-ring. | |
4179 ;; If BEG and END do not belong to the same buffer, copy empty region. | |
19078 | 4180 (defun viper-copy-region-as-kill (beg end) |
18129 | 4181 (condition-case nil |
4182 (copy-region-as-kill beg end) | |
4183 (error (copy-region-as-kill beg beg)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4184 |
18129 | 4185 |
19078 | 4186 (defun viper-delete-char (arg) |
19462 | 4187 "Delete next character." |
18129 | 4188 (interactive "P") |
19462 | 4189 (let ((val (viper-p-val arg)) |
4190 end-del-pos) | |
19078 | 4191 (viper-set-destructive-command |
4192 (list 'viper-delete-char val nil nil nil nil)) | |
19462 | 4193 (if (and viper-ex-style-editing |
4194 (> val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
4195 (setq val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
19078 | 4196 (if (and viper-ex-style-motion (eolp)) |
18129 | 4197 (if (bolp) (error "") (setq val 0))) ; not bol---simply back 1 ch |
19462 | 4198 (save-excursion |
4199 (viper-forward-char-carefully val) | |
4200 (setq end-del-pos (point))) | |
19078 | 4201 (if viper-use-register |
18129 | 4202 (progn |
19078 | 4203 (cond ((viper-valid-register viper-use-register '((Letter))) |
4204 (viper-append-to-register | |
19462 | 4205 (downcase viper-use-register) (point) end-del-pos)) |
19078 | 4206 ((viper-valid-register viper-use-register) |
18129 | 4207 (copy-to-register |
19462 | 4208 viper-use-register (point) end-del-pos nil)) |
19078 | 4209 (t (error viper-InvalidRegister viper-use-register))) |
4210 (setq viper-use-register nil))) | |
19462 | 4211 |
4212 (delete-char val t) | |
19078 | 4213 (if viper-ex-style-motion |
19462 | 4214 (if (and (eolp) (not (bolp))) (backward-char 1))) |
4215 )) | |
18129 | 4216 |
19078 | 4217 (defun viper-delete-backward-char (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4218 "Delete previous character. On reaching beginning of line, stop and beep." |
18129 | 4219 (interactive "P") |
19462 | 4220 (let ((val (viper-p-val arg)) |
4221 end-del-pos) | |
19078 | 4222 (viper-set-destructive-command |
4223 (list 'viper-delete-backward-char val nil nil nil nil)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4224 (if (and |
19462 | 4225 viper-ex-style-editing |
4226 (> val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
4227 (setq val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
4228 (save-excursion | |
4229 (viper-backward-char-carefully val) | |
4230 (setq end-del-pos (point))) | |
19078 | 4231 (if viper-use-register |
18129 | 4232 (progn |
19078 | 4233 (cond ((viper-valid-register viper-use-register '(Letter)) |
4234 (viper-append-to-register | |
19462 | 4235 (downcase viper-use-register) end-del-pos (point))) |
19078 | 4236 ((viper-valid-register viper-use-register) |
18129 | 4237 (copy-to-register |
19462 | 4238 viper-use-register end-del-pos (point) nil)) |
19078 | 4239 (t (error viper-InvalidRegister viper-use-register))) |
4240 (setq viper-use-register nil))) | |
19462 | 4241 (if (and (bolp) viper-ex-style-editing) |
4242 (ding)) | |
4243 (delete-backward-char val t))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4244 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4245 |
19078 | 4246 (defun viper-del-backward-char-in-insert () |
18129 | 4247 "Delete 1 char backwards while in insert mode." |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4248 (interactive) |
19462 | 4249 (if (and viper-ex-style-editing (bolp)) |
18129 | 4250 (beep 1) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4251 ;; don't put on kill ring |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4252 (delete-backward-char 1 nil))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4253 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4254 |
19078 | 4255 (defun viper-del-backward-char-in-replace () |
18129 | 4256 "Delete one character in replace mode. |
19078 | 4257 If `viper-delete-backwards-in-replace' is t, then DEL key actually deletes |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4258 charecters. If it is nil, then the cursor just moves backwards, similarly |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4259 to Vi. The variable `viper-ex-style-editing', if t, doesn't let the |
18129 | 4260 cursor move past the beginning of line." |
4261 (interactive) | |
19078 | 4262 (cond (viper-delete-backwards-in-replace |
18129 | 4263 (cond ((not (bolp)) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4264 ;; don't put on kill ring |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4265 (delete-backward-char 1 nil)) |
19462 | 4266 (viper-ex-style-editing |
18129 | 4267 (beep 1)) |
4268 ((bobp) | |
4269 (beep 1)) | |
4270 (t | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4271 ;; don't put on kill ring |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4272 (delete-backward-char 1 nil)))) |
19462 | 4273 (viper-ex-style-editing |
18129 | 4274 (if (bolp) |
4275 (beep 1) | |
4276 (backward-char 1))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4277 (t |
18129 | 4278 (backward-char 1)))) |
4279 | |
4280 | |
4281 | |
4282 ;; join lines. | |
4283 | |
19078 | 4284 (defun viper-join-lines (arg) |
18129 | 4285 "Join this line to next, if ARG is nil. Otherwise, join ARG lines." |
4286 (interactive "*P") | |
19078 | 4287 (let ((val (viper-P-val arg))) |
4288 (viper-set-destructive-command | |
4289 (list 'viper-join-lines val nil nil nil nil)) | |
4290 (viper-loop (if (null val) 1 (1- val)) | |
18129 | 4291 (end-of-line) |
4292 (if (not (eobp)) | |
4293 (progn | |
4294 (forward-line 1) | |
4295 (delete-region (point) (1- (point))) | |
18839 | 4296 (fixup-whitespace) |
4297 ;; fixup-whitespace sometimes does not leave space | |
4298 ;; between objects, so we insert it as in Vi | |
4299 (or (looking-at " ") | |
4300 (insert " ") | |
4301 (backward-char 1)) | |
19462 | 4302 ))))) |
18129 | 4303 |
4304 | |
4305 ;; Replace state | |
4306 | |
19078 | 4307 (defun viper-change (beg end) |
18129 | 4308 (if (markerp beg) (setq beg (marker-position beg))) |
4309 (if (markerp end) (setq end (marker-position end))) | |
4310 ;; beg is sometimes (mark t), which may be nil | |
4311 (or beg (setq beg end)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4312 |
19078 | 4313 (viper-set-complex-command-for-undo) |
4314 (if viper-use-register | |
18129 | 4315 (progn |
19078 | 4316 (copy-to-register viper-use-register beg end nil) |
4317 (setq viper-use-register nil))) | |
4318 (viper-set-replace-overlay beg end) | |
18129 | 4319 (setq last-command nil) ; separate repl text from prev kills |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4320 |
19078 | 4321 (if (= (viper-replace-start) (point-max)) |
18129 | 4322 (error "End of buffer")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4323 |
19078 | 4324 (setq viper-last-replace-region |
4325 (buffer-substring (viper-replace-start) | |
4326 (viper-replace-end))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4327 |
18129 | 4328 ;; protect against error while inserting "@" and other disasters |
4329 ;; (e.g., read-only buff) | |
4330 (condition-case conds | |
19078 | 4331 (if (or viper-allow-multiline-replace-regions |
4332 (viper-same-line (viper-replace-start) | |
19203 | 4333 (viper-replace-end))) |
18129 | 4334 (progn |
4335 ;; tabs cause problems in replace, so untabify | |
19078 | 4336 (goto-char (viper-replace-end)) |
18129 | 4337 (insert-before-markers "@") ; put placeholder after the TAB |
19078 | 4338 (untabify (viper-replace-start) (point)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4339 ;; del @, don't put on kill ring |
18129 | 4340 (delete-backward-char 1) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4341 |
19078 | 4342 (viper-set-replace-overlay-glyphs |
4343 viper-replace-region-start-delimiter | |
4344 viper-replace-region-end-delimiter) | |
18129 | 4345 ;; this move takes care of the last posn in the overlay, which |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4346 ;; has to be shifted because of insert. We can't simply insert |
18129 | 4347 ;; "$" before-markers because then overlay-start will shift the |
4348 ;; beginning of the overlay in case we are replacing a single | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4349 ;; character. This fixes the bug with `s' and `cl' commands. |
19078 | 4350 (viper-move-replace-overlay (viper-replace-start) (point)) |
4351 (goto-char (viper-replace-start)) | |
4352 (viper-change-state-to-replace t)) | |
4353 (kill-region (viper-replace-start) | |
4354 (viper-replace-end)) | |
4355 (viper-hide-replace-overlay) | |
4356 (viper-change-state-to-insert)) | |
18129 | 4357 (error ;; make sure that the overlay doesn't stay. |
4358 ;; go back to the original point | |
19078 | 4359 (goto-char (viper-replace-start)) |
4360 (viper-hide-replace-overlay) | |
4361 (viper-message-conditions conds)))) | |
4362 | |
4363 | |
4364 (defun viper-change-subr (beg end) | |
18129 | 4365 ;; beg is sometimes (mark t), which may be nil |
4366 (or beg (setq beg end)) | |
19078 | 4367 (if viper-use-register |
18129 | 4368 (progn |
19078 | 4369 (copy-to-register viper-use-register beg end nil) |
4370 (setq viper-use-register nil))) | |
18129 | 4371 (kill-region beg end) |
19078 | 4372 (setq this-command 'viper-change) |
4373 (viper-yank-last-insertion)) | |
4374 | |
4375 (defun viper-toggle-case (arg) | |
18129 | 4376 "Toggle character case." |
4377 (interactive "P") | |
19078 | 4378 (let ((val (viper-p-val arg)) (c)) |
4379 (viper-set-destructive-command | |
4380 (list 'viper-toggle-case val nil nil nil nil)) | |
18129 | 4381 (while (> val 0) |
4382 (setq c (following-char)) | |
4383 (delete-char 1 nil) | |
4384 (if (eq c (upcase c)) | |
4385 (insert-char (downcase c) 1) | |
4386 (insert-char (upcase c) 1)) | |
4387 (if (eolp) (backward-char 1)) | |
4388 (setq val (1- val))))) | |
4389 | |
4390 | |
4391 ;; query replace | |
4392 | |
19078 | 4393 (defun viper-query-replace () |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4394 "Query replace. |
18129 | 4395 If a null string is suplied as the string to be replaced, |
4396 the query replace mode will toggle between string replace | |
4397 and regexp replace." | |
4398 (interactive) | |
4399 (let (str) | |
19078 | 4400 (setq str (viper-read-string-with-history |
4401 (if viper-re-query-replace "Query replace regexp: " | |
18129 | 4402 "Query replace: ") |
4403 nil ; no initial | |
19078 | 4404 'viper-replace1-history |
4405 (car viper-replace1-history) ; default | |
18129 | 4406 )) |
4407 (if (string= str "") | |
4408 (progn | |
19078 | 4409 (setq viper-re-query-replace (not viper-re-query-replace)) |
18129 | 4410 (message "Query replace mode changed to %s" |
19078 | 4411 (if viper-re-query-replace "regexp replace" |
18129 | 4412 "string replace"))) |
19078 | 4413 (if viper-re-query-replace |
18129 | 4414 (query-replace-regexp |
4415 str | |
19078 | 4416 (viper-read-string-with-history |
18129 | 4417 (format "Query replace regexp `%s' with: " str) |
4418 nil ; no initial | |
19078 | 4419 'viper-replace1-history |
4420 (car viper-replace1-history) ; default | |
18129 | 4421 )) |
4422 (query-replace | |
4423 str | |
19078 | 4424 (viper-read-string-with-history |
18129 | 4425 (format "Query replace `%s' with: " str) |
4426 nil ; no initial | |
19078 | 4427 'viper-replace1-history |
4428 (car viper-replace1-history) ; default | |
18129 | 4429 )))))) |
4430 | |
4431 | |
4432 ;; marking | |
4433 | |
19078 | 4434 (defun viper-mark-beginning-of-buffer () |
18129 | 4435 "Mark beginning of buffer." |
4436 (interactive) | |
4437 (push-mark (point)) | |
4438 (goto-char (point-min)) | |
4439 (exchange-point-and-mark) | |
4440 (message "Mark set at the beginning of buffer")) | |
4441 | |
19078 | 4442 (defun viper-mark-end-of-buffer () |
18129 | 4443 "Mark end of buffer." |
4444 (interactive) | |
4445 (push-mark (point)) | |
4446 (goto-char (point-max)) | |
4447 (exchange-point-and-mark) | |
4448 (message "Mark set at the end of buffer")) | |
4449 | |
19078 | 4450 (defun viper-mark-point () |
18129 | 4451 "Set mark at point of buffer." |
4452 (interactive) | |
4453 (let ((char (read-char))) | |
4454 (cond ((and (<= ?a char) (<= char ?z)) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4455 (point-to-register (viper-int-to-char (1+ (- char ?a))))) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4456 ((viper= char ?<) (viper-mark-beginning-of-buffer)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4457 ((viper= char ?>) (viper-mark-end-of-buffer)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4458 ((viper= char ?.) (viper-set-mark-if-necessary)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4459 ((viper= char ?,) (viper-cycle-through-mark-ring)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4460 ((viper= char ?^) (push-mark viper-saved-mark t t)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4461 ((viper= char ?D) (mark-defun)) |
18129 | 4462 (t (error "")) |
4463 ))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4464 |
18129 | 4465 ;; Algorithm: If first invocation of this command save mark on ring, goto |
4466 ;; mark, M0, and pop the most recent elt from the mark ring into mark, | |
4467 ;; making it into the new mark, M1. | |
4468 ;; Push this mark back and set mark to the original point position, p1. | |
4469 ;; So, if you hit '' or `` then you can return to p1. | |
4470 ;; | |
4471 ;; If repeated command, pop top elt from the ring into mark and | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4472 ;; jump there. This forgets the position, p1, and puts M1 back into mark. |
18129 | 4473 ;; Then we save the current pos, which is M0, jump to M1 and pop M2 from |
4474 ;; the ring into mark. Push M2 back on the ring and set mark to M0. | |
4475 ;; etc. | |
19078 | 4476 (defun viper-cycle-through-mark-ring () |
18129 | 4477 "Visit previous locations on the mark ring. |
4478 One can use `` and '' to temporarily jump 1 step back." | |
4479 (let* ((sv-pt (point))) | |
4480 ;; if repeated `m,' command, pop the previously saved mark. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4481 ;; Prev saved mark is actually prev saved point. It is used if the |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4482 ;; user types `` or '' and is discarded |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4483 ;; from the mark ring by the next `m,' command. |
18129 | 4484 ;; In any case, go to the previous or previously saved mark. |
4485 ;; Then push the current mark (popped off the ring) and set current | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4486 ;; point to be the mark. Current pt as mark is discarded by the next |
18129 | 4487 ;; m, command. |
19078 | 4488 (if (eq last-command 'viper-cycle-through-mark-ring) |
18129 | 4489 () |
4490 ;; save current mark if the first iteration | |
19078 | 4491 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
18129 | 4492 (if (mark t) |
4493 (push-mark (mark t) t)) ) | |
4494 (pop-mark) | |
4495 (set-mark-command 1) | |
4496 ;; don't duplicate mark on the ring | |
19078 | 4497 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
18129 | 4498 (push-mark sv-pt t) |
19078 | 4499 (viper-deactivate-mark) |
4500 (setq this-command 'viper-cycle-through-mark-ring) | |
18129 | 4501 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4502 |
18129 | 4503 |
19078 | 4504 (defun viper-goto-mark (arg) |
18129 | 4505 "Go to mark." |
4506 (interactive "P") | |
4507 (let ((char (read-char)) | |
19078 | 4508 (com (viper-getcom arg))) |
4509 (viper-goto-mark-subr char com nil))) | |
4510 | |
4511 (defun viper-goto-mark-and-skip-white (arg) | |
18129 | 4512 "Go to mark and skip to first non-white character on line." |
4513 (interactive "P") | |
4514 (let ((char (read-char)) | |
19078 | 4515 (com (viper-getCom arg))) |
4516 (viper-goto-mark-subr char com t))) | |
4517 | |
4518 (defun viper-goto-mark-subr (char com skip-white) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4519 (if (eobp) |
18129 | 4520 (if (bobp) |
4521 (error "Empty buffer") | |
4522 (backward-char 1))) | |
19078 | 4523 (cond ((viper-valid-register char '(letter)) |
18129 | 4524 (let* ((buff (current-buffer)) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4525 (reg (viper-int-to-char (1+ (- char ?a)))) |
18129 | 4526 (text-marker (get-register reg))) |
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4527 ;; If marker points to file that had markers set (and those markers |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4528 ;; were saved (as e.g., in session.el), then restore those markers |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4529 (if (and (consp text-marker) |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4530 (eq (car text-marker) 'file-query) |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4531 (or (find-buffer-visiting (nth 1 text-marker)) |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4532 (y-or-n-p (format "Visit file %s again? " |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4533 (nth 1 text-marker))))) |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4534 (save-excursion |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4535 (find-file (nth 1 text-marker)) |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4536 (when (and (<= (nth 2 text-marker) (point-max)) |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4537 (<= (point-min) (nth 2 text-marker))) |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4538 (setq text-marker (copy-marker (nth 2 text-marker))) |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4539 (set-register reg text-marker)))) |
19078 | 4540 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4541 (if (not (viper-valid-marker text-marker)) | |
4542 (error viper-EmptyTextmarker char)) | |
4543 (if (and (viper-same-line (point) viper-last-jump) | |
4544 (= (point) viper-last-jump-ignore)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4545 (push-mark viper-last-jump t) |
18129 | 4546 (push-mark nil t)) ; no msg |
19078 | 4547 (viper-register-to-point reg) |
4548 (setq viper-last-jump (point-marker)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4549 (cond (skip-white |
18129 | 4550 (back-to-indentation) |
19078 | 4551 (setq viper-last-jump-ignore (point)))) |
18129 | 4552 (if com |
4553 (if (equal buff (current-buffer)) | |
19078 | 4554 (viper-execute-com (if skip-white |
4555 'viper-goto-mark-and-skip-white | |
4556 'viper-goto-mark) | |
18129 | 4557 nil com) |
4558 (switch-to-buffer buff) | |
19078 | 4559 (goto-char viper-com-point) |
4560 (viper-change-state-to-vi) | |
18129 | 4561 (error ""))))) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4562 ((and (not skip-white) (viper= char ?`)) |
19078 | 4563 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4564 (if (and (viper-same-line (point) viper-last-jump) | |
4565 (= (point) viper-last-jump-ignore)) | |
4566 (goto-char viper-last-jump)) | |
18129 | 4567 (if (null (mark t)) (error "Mark is not set in this buffer")) |
4568 (if (= (point) (mark t)) (pop-mark)) | |
4569 (exchange-point-and-mark) | |
19078 | 4570 (setq viper-last-jump (point-marker) |
4571 viper-last-jump-ignore 0) | |
4572 (if com (viper-execute-com 'viper-goto-mark nil com))) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4573 ((and skip-white (viper= char ?')) |
19078 | 4574 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4575 (if (and (viper-same-line (point) viper-last-jump) | |
4576 (= (point) viper-last-jump-ignore)) | |
4577 (goto-char viper-last-jump)) | |
18129 | 4578 (if (= (point) (mark t)) (pop-mark)) |
4579 (exchange-point-and-mark) | |
19078 | 4580 (setq viper-last-jump (point)) |
18129 | 4581 (back-to-indentation) |
19078 | 4582 (setq viper-last-jump-ignore (point)) |
4583 (if com (viper-execute-com 'viper-goto-mark-and-skip-white nil com))) | |
4584 (t (error viper-InvalidTextmarker char)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4585 |
19078 | 4586 (defun viper-insert-tab () |
18129 | 4587 (interactive) |
4588 (insert-tab)) | |
4589 | |
19078 | 4590 (defun viper-exchange-point-and-mark () |
18129 | 4591 (interactive) |
4592 (exchange-point-and-mark) | |
4593 (back-to-indentation)) | |
4594 | |
4595 ;; Input Mode Indentation | |
4596 | |
4597 ;; Returns t, if the string before point matches the regexp STR. | |
19078 | 4598 (defsubst viper-looking-back (str) |
18129 | 4599 (and (save-excursion (re-search-backward str nil t)) |
4600 (= (point) (match-end 0)))) | |
4601 | |
4602 | |
19078 | 4603 (defun viper-forward-indent () |
18129 | 4604 "Indent forward -- `C-t' in Vi." |
4605 (interactive) | |
19078 | 4606 (setq viper-cted t) |
4607 (indent-to (+ (current-column) viper-shift-width))) | |
4608 | |
4609 (defun viper-backward-indent () | |
18129 | 4610 "Backtab, C-d in VI" |
4611 (interactive) | |
19078 | 4612 (if viper-cted |
18129 | 4613 (let ((p (point)) (c (current-column)) bol (indent t)) |
19078 | 4614 (if (viper-looking-back "[0^]") |
18129 | 4615 (progn |
4616 (if (eq ?^ (preceding-char)) | |
19078 | 4617 (setq viper-preserve-indent t)) |
18129 | 4618 (delete-backward-char 1) |
4619 (setq p (point)) | |
4620 (setq indent nil))) | |
4621 (save-excursion | |
4622 (beginning-of-line) | |
4623 (setq bol (point))) | |
4624 (if (re-search-backward "[^ \t]" bol 1) (forward-char)) | |
4625 (delete-region (point) p) | |
4626 (if indent | |
19078 | 4627 (indent-to (- c viper-shift-width))) |
4628 (if (or (bolp) (viper-looking-back "[^ \t]")) | |
4629 (setq viper-cted nil))))) | |
4630 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4631 ;; do smart indent |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4632 (defun viper-indent-line (col) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4633 (if viper-auto-indent |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4634 (progn |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4635 (setq viper-cted t) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4636 (if (and viper-electric-mode |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4637 (not (memq major-mode '(fundamental-mode |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4638 text-mode |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4639 paragraph-indent-text-mode)))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4640 (indent-according-to-mode) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4641 (indent-to col))))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4642 |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4643 |
19078 | 4644 (defun viper-autoindent () |
18129 | 4645 "Auto Indentation, Vi-style." |
4646 (interactive) | |
4647 (let ((col (current-indentation))) | |
4648 (if abbrev-mode (expand-abbrev)) | |
19078 | 4649 (if viper-preserve-indent |
4650 (setq viper-preserve-indent nil) | |
4651 (setq viper-current-indent col)) | |
18129 | 4652 ;; don't leave whitespace lines around |
4653 (if (memq last-command | |
19078 | 4654 '(viper-autoindent |
4655 viper-open-line viper-Open-line | |
4656 viper-replace-state-exit-cmd)) | |
18129 | 4657 (indent-to-left-margin)) |
4658 ;; use \n instead of newline, or else <Return> will move the insert point | |
4659 ;;(newline 1) | |
4660 (insert "\n") | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4661 (viper-indent-line viper-current-indent) |
18129 | 4662 )) |
4663 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4664 |
18129 | 4665 ;; Viewing registers |
4666 | |
19078 | 4667 (defun viper-ket-function (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4668 "Function called by \], the ket. View registers and call \]\]." |
18129 | 4669 (interactive "P") |
4670 (let ((reg (read-char))) | |
19078 | 4671 (cond ((viper-valid-register reg '(letter Letter)) |
18129 | 4672 (view-register (downcase reg))) |
19078 | 4673 ((viper-valid-register reg '(digit)) |
18129 | 4674 (let ((text (current-kill (- reg ?1) 'do-not-rotate))) |
20003 | 4675 (with-output-to-temp-buffer " *viper-info*" |
4676 (princ (format "Register %c contains the string:\n" reg)) | |
4677 (princ text)) | |
4678 )) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4679 ((viper= ?\] reg) |
19078 | 4680 (viper-next-heading arg)) |
18129 | 4681 (t (error |
19078 | 4682 viper-InvalidRegister reg))))) |
4683 | |
4684 (defun viper-brac-function (arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4685 "Function called by \[, the brac. View textmarkers and call \[\[" |
18129 | 4686 (interactive "P") |
4687 (let ((reg (read-char))) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4688 (cond ((viper= ?\[ reg) |
19078 | 4689 (viper-prev-heading arg)) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4690 ((viper= ?\] reg) |
19078 | 4691 (viper-heading-end arg)) |
4692 ((viper-valid-register reg '(letter)) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4693 (let* ((val (get-register (viper-int-to-char (1+ (- reg ?a))))) |
20003 | 4694 (buf (if (not (markerp val)) |
19078 | 4695 (error viper-EmptyTextmarker reg) |
18129 | 4696 (marker-buffer val))) |
4697 (pos (marker-position val)) | |
4698 line-no text (s pos) (e pos)) | |
20003 | 4699 (with-output-to-temp-buffer " *viper-info*" |
18129 | 4700 (if (and buf pos) |
4701 (progn | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4702 (save-excursion |
18129 | 4703 (set-buffer buf) |
4704 (setq line-no (1+ (count-lines (point-min) val))) | |
4705 (goto-char pos) | |
4706 (beginning-of-line) | |
4707 (if (re-search-backward "[^ \t]" nil t) | |
4708 (progn | |
4709 (beginning-of-line) | |
4710 (setq s (point)))) | |
4711 (goto-char pos) | |
4712 (forward-line 1) | |
4713 (if (re-search-forward "[^ \t]" nil t) | |
4714 (progn | |
4715 (end-of-line) | |
4716 (setq e (point)))) | |
4717 (setq text (buffer-substring s e)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4718 (setq text (format "%s<%c>%s" |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4719 (substring text 0 (- pos s)) |
18129 | 4720 reg (substring text (- pos s))))) |
20003 | 4721 (princ |
18129 | 4722 (format |
4723 "Textmarker `%c' is in buffer `%s' at line %d.\n" | |
4724 reg (buffer-name buf) line-no)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4725 (princ (format "Here is some text around %c:\n\n %s" |
18129 | 4726 reg text))) |
20003 | 4727 (princ (format viper-EmptyTextmarker reg)))) |
4728 )) | |
19078 | 4729 (t (error viper-InvalidTextmarker reg))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4730 |
18129 | 4731 |
4732 | |
19078 | 4733 (defun viper-delete-backward-word (arg) |
18129 | 4734 "Delete previous word." |
4735 (interactive "p") | |
4736 (save-excursion | |
4737 (push-mark nil t) | |
4738 (backward-word arg) | |
4739 (delete-region (point) (mark t)) | |
4740 (pop-mark))) | |
4741 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4742 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4743 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4744 ;; Get viper standard value of SYMBOL. If symbol is customized, get its |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4745 ;; standard value. Otherwise, get the value saved in the alist STORAGE. If |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
4746 ;; STORAGE is nil, use viper-saved-user-settings. |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4747 (defun viper-standard-value (symbol &optional storage) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4748 (or (eval (car (get symbol 'customized-value))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4749 (eval (car (get symbol 'saved-value))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4750 (nth 1 (assoc symbol (or storage viper-saved-user-settings))))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4751 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4752 |
18129 | 4753 |
18839 | 4754 (defun viper-set-expert-level (&optional dont-change-unless) |
18129 | 4755 "Sets the expert level for a Viper user. |
4756 Can be called interactively to change (temporarily or permanently) the | |
4757 current expert level. | |
4758 | |
18289 | 4759 The optional argument DONT-CHANGE-UNLESS, if not nil, says that |
18129 | 4760 the level should not be changed, unless its current value is |
4761 meaningless (i.e., not one of 1,2,3,4,5). | |
4762 | |
4763 User level determines the setting of Viper variables that are most | |
4764 sensitive for VI-style look-and-feel." | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4765 |
18129 | 4766 (interactive) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4767 |
18839 | 4768 (if (not (natnump viper-expert-level)) (setq viper-expert-level 0)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4769 |
18129 | 4770 (save-window-excursion |
4771 (delete-other-windows) | |
18839 | 4772 ;; if 0 < viper-expert-level < viper-max-expert-level |
18129 | 4773 ;; & dont-change-unless = t -- use it; else ask |
19078 | 4774 (viper-ask-level dont-change-unless)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4775 |
19078 | 4776 (setq viper-always t |
4777 viper-ex-style-motion t | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4778 viper-ex-style-editing t |
19078 | 4779 viper-want-ctl-h-help nil) |
18129 | 4780 |
18839 | 4781 (cond ((eq viper-expert-level 1) ; novice or beginner |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4782 (global-set-key ; in emacs-state |
19078 | 4783 viper-toggle-key |
4784 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs)) | |
4785 (setq viper-no-multiple-ESC t | |
4786 viper-re-search t | |
4787 viper-vi-style-in-minibuffer t | |
4788 viper-search-wrap-around-t t | |
4789 viper-electric-mode nil | |
4790 viper-want-emacs-keys-in-vi nil | |
4791 viper-want-emacs-keys-in-insert nil)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4792 |
18839 | 4793 ((and (> viper-expert-level 1) (< viper-expert-level 5)) |
18129 | 4794 ;; intermediate to guru |
19078 | 4795 (setq viper-no-multiple-ESC (if (viper-window-display-p) |
4796 t 'twice) | |
4797 viper-electric-mode t | |
4798 viper-want-emacs-keys-in-vi t | |
4799 viper-want-emacs-keys-in-insert (> viper-expert-level 2)) | |
4800 | |
4801 (if (eq viper-expert-level 4) ; respect user's ex-style motion | |
4802 ; and viper-no-multiple-ESC | |
18129 | 4803 (progn |
18839 | 4804 (setq-default |
19462 | 4805 viper-ex-style-editing |
4806 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4807 viper-ex-style-motion |
4808 (viper-standard-value 'viper-ex-style-motion)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4809 (setq viper-ex-style-motion |
19078 | 4810 (viper-standard-value 'viper-ex-style-motion) |
19462 | 4811 viper-ex-style-editing |
4812 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4813 viper-re-search |
4814 (viper-standard-value 'viper-re-search) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4815 viper-no-multiple-ESC |
19078 | 4816 (viper-standard-value 'viper-no-multiple-ESC))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4817 |
18129 | 4818 ;; A wizard!! |
4819 ;; Ideally, if 5 is selected, a buffer should pop up to let the | |
4820 ;; user toggle the values of variables. | |
19462 | 4821 (t (setq-default viper-ex-style-editing |
4822 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4823 viper-ex-style-motion |
4824 (viper-standard-value 'viper-ex-style-motion)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4825 (setq viper-want-ctl-h-help |
19078 | 4826 (viper-standard-value 'viper-want-ctl-h-help) |
18289 | 4827 viper-always |
18839 | 4828 (viper-standard-value 'viper-always) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4829 viper-no-multiple-ESC |
19078 | 4830 (viper-standard-value 'viper-no-multiple-ESC) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4831 viper-ex-style-motion |
19078 | 4832 (viper-standard-value 'viper-ex-style-motion) |
19462 | 4833 viper-ex-style-editing |
4834 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4835 viper-re-search |
4836 (viper-standard-value 'viper-re-search) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4837 viper-electric-mode |
19078 | 4838 (viper-standard-value 'viper-electric-mode) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4839 viper-want-emacs-keys-in-vi |
19078 | 4840 (viper-standard-value 'viper-want-emacs-keys-in-vi) |
4841 viper-want-emacs-keys-in-insert | |
4842 (viper-standard-value 'viper-want-emacs-keys-in-insert)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4843 |
19078 | 4844 (viper-set-mode-vars-for viper-current-state) |
18289 | 4845 (if (or viper-always |
18839 | 4846 (and (> viper-expert-level 0) (> 5 viper-expert-level))) |
19078 | 4847 (viper-set-hooks))) |
18129 | 4848 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4849 |
18129 | 4850 ;; Ask user expert level. |
19078 | 4851 (defun viper-ask-level (dont-change-unless) |
4852 (let ((ask-buffer " *viper-ask-level*") | |
18129 | 4853 level-changed repeated) |
4854 (save-window-excursion | |
4855 (switch-to-buffer ask-buffer) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4856 |
18839 | 4857 (while (or (> viper-expert-level viper-max-expert-level) |
4858 (< viper-expert-level 1) | |
18129 | 4859 (null dont-change-unless)) |
4860 (erase-buffer) | |
4861 (if repeated | |
4862 (progn | |
4863 (message "Invalid user level") | |
4864 (beep 1)) | |
4865 (setq repeated t)) | |
4866 (setq dont-change-unless t | |
4867 level-changed t) | |
4868 (insert " | |
4869 Please specify your level of familiarity with the venomous VI PERil | |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
4870 \(and the VI Plan for Emacs Rescue). |
18839 | 4871 You can change it at any time by typing `M-x viper-set-expert-level RET' |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4872 |
18129 | 4873 1 -- BEGINNER: Almost all Emacs features are suppressed. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4874 Feels almost like straight Vi. File name completion and |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4875 command history in the minibuffer are thrown in as a bonus. |
19078 | 4876 To use Emacs productively, you must reach level 3 or higher. |
18129 | 4877 2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state, |
19078 | 4878 so most Emacs commands can be used when Viper is in Vi state. |
4879 Good progress---you are well on the way to level 3! | |
45594
1282cafdee89
(viper-smart-suffix-list, viper-ask-level): Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
4880 3 -- GRAND MASTER: Like 2, but most Emacs commands are available also |
19078 | 4881 in Viper's insert state. |
4882 4 -- GURU: Like 3, but user settings are respected for viper-no-multiple-ESC, | |
19462 | 4883 viper-ex-style-motion, viper-ex-style-editing, and |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4884 viper-re-search variables. Adjust these settings to your taste. |
18289 | 4885 5 -- WIZARD: Like 4, but user settings are also respected for viper-always, |
19078 | 4886 viper-electric-mode, viper-want-ctl-h-help, viper-want-emacs-keys-in-vi, |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4887 and viper-want-emacs-keys-in-insert. Adjust these to your taste. |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4888 |
18129 | 4889 Please, specify your level now: ") |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4890 |
19078 | 4891 (setq viper-expert-level (- (viper-read-char-exclusive) ?0)) |
18129 | 4892 ) ; end while |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4893 |
18129 | 4894 ;; tell the user if level was changed |
4895 (and level-changed | |
4896 (progn | |
4897 (insert | |
4898 (format "\n\n\n\n\n\t\tYou have selected user level %d" | |
18839 | 4899 viper-expert-level)) |
18129 | 4900 (if (y-or-n-p "Do you wish to make this change permanent? ") |
18839 | 4901 ;; save the setting for viper-expert-level |
19078 | 4902 (viper-save-setting |
18839 | 4903 'viper-expert-level |
4904 (format "Saving user level %d ..." viper-expert-level) | |
19078 | 4905 viper-custom-file-name)) |
18129 | 4906 )) |
4907 (bury-buffer) ; remove ask-buffer from screen | |
4908 (message "") | |
4909 ))) | |
4910 | |
4911 | |
19078 | 4912 (defun viper-nil () |
18129 | 4913 (interactive) |
4914 (beep 1)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4915 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4916 |
18129 | 4917 ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer |
19078 | 4918 (defun viper-register-to-point (char &optional enforce-buffer) |
18129 | 4919 "Like jump-to-register, but switches to another buffer in another window." |
4920 (interactive "cViper register to point: ") | |
4921 (let ((val (get-register char))) | |
4922 (cond | |
4923 ((and (fboundp 'frame-configuration-p) | |
4924 (frame-configuration-p val)) | |
4925 (set-frame-configuration val)) | |
4926 ((window-configuration-p val) | |
4927 (set-window-configuration val)) | |
19078 | 4928 ((viper-valid-marker val) |
18129 | 4929 (if (and enforce-buffer |
4930 (not (equal (current-buffer) (marker-buffer val)))) | |
19078 | 4931 (error (concat viper-EmptyTextmarker " in this buffer") |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4932 (viper-int-to-char (1- (+ char ?a))))) |
18129 | 4933 (pop-to-buffer (marker-buffer val)) |
4934 (goto-char val)) | |
4935 ((and (consp val) (eq (car val) 'file)) | |
4936 (find-file (cdr val))) | |
4937 (t | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4938 (error viper-EmptyTextmarker (viper-int-to-char (1- (+ char ?a)))))))) |
19078 | 4939 |
4940 | |
4941 (defun viper-save-kill-buffer () | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4942 "Save then kill current buffer." |
18129 | 4943 (interactive) |
18839 | 4944 (if (< viper-expert-level 2) |
18129 | 4945 (save-buffers-kill-emacs) |
4946 (save-buffer) | |
4947 (kill-buffer (current-buffer)))) | |
4948 | |
4949 | |
4950 | |
4951 ;;; Bug Report | |
4952 | |
19078 | 4953 (defun viper-submit-report () |
18129 | 4954 "Submit bug report on Viper." |
4955 (interactive) | |
4956 (let ((reporter-prompt-for-summary-p t) | |
19078 | 4957 (viper-device-type (viper-device-type)) |
18129 | 4958 color-display-p frame-parameters |
4959 minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face | |
4960 varlist salutation window-config) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4961 |
18129 | 4962 ;; If mode info is needed, add variable to `let' and then set it below, |
4963 ;; like we did with color-display-p. | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4964 (setq color-display-p (if (viper-window-display-p) |
19078 | 4965 (viper-color-display-p) |
18129 | 4966 'non-x) |
19078 | 4967 minibuffer-vi-face (if (viper-has-face-support-p) |
4968 (viper-get-face viper-minibuffer-vi-face) | |
18129 | 4969 'non-x) |
19078 | 4970 minibuffer-insert-face (if (viper-has-face-support-p) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4971 (viper-get-face |
19078 | 4972 viper-minibuffer-insert-face) |
18129 | 4973 'non-x) |
19078 | 4974 minibuffer-emacs-face (if (viper-has-face-support-p) |
4975 (viper-get-face | |
4976 viper-minibuffer-emacs-face) | |
18129 | 4977 'non-x) |
4978 frame-parameters (if (fboundp 'frame-parameters) | |
4979 (frame-parameters (selected-frame)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4980 |
19078 | 4981 (setq varlist (list 'viper-vi-minibuffer-minor-mode |
4982 'viper-insert-minibuffer-minor-mode | |
4983 'viper-vi-intercept-minor-mode | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4984 'viper-vi-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4985 'viper-vi-kbd-minor-mode |
19078 | 4986 'viper-vi-global-user-minor-mode |
4987 'viper-vi-state-modifier-minor-mode | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4988 'viper-vi-diehard-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4989 'viper-vi-basic-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4990 'viper-replace-minor-mode |
19078 | 4991 'viper-insert-intercept-minor-mode |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4992 'viper-insert-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4993 'viper-insert-kbd-minor-mode |
19078 | 4994 'viper-insert-global-user-minor-mode |
4995 'viper-insert-state-modifier-minor-mode | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4996 'viper-insert-diehard-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4997 'viper-insert-basic-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4998 'viper-emacs-intercept-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4999 'viper-emacs-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5000 'viper-emacs-kbd-minor-mode |
19078 | 5001 'viper-emacs-global-user-minor-mode |
5002 'viper-emacs-state-modifier-minor-mode | |
5003 'viper-automatic-iso-accents | |
19462 | 5004 'viper-special-input-method |
19078 | 5005 'viper-want-emacs-keys-in-insert |
5006 'viper-want-emacs-keys-in-vi | |
5007 'viper-keep-point-on-undo | |
5008 'viper-no-multiple-ESC | |
5009 'viper-electric-mode | |
5010 'viper-ESC-key | |
5011 'viper-want-ctl-h-help | |
19462 | 5012 'viper-ex-style-editing |
19078 | 5013 'viper-delete-backwards-in-replace |
5014 'viper-vi-style-in-minibuffer | |
5015 'viper-vi-state-hook | |
5016 'viper-insert-state-hook | |
5017 'viper-replace-state-hook | |
5018 'viper-emacs-state-hook | |
18129 | 5019 'ex-cycle-other-window |
5020 'ex-cycle-through-non-files | |
18839 | 5021 'viper-expert-level |
18129 | 5022 'major-mode |
19078 | 5023 'viper-device-type |
18129 | 5024 'color-display-p |
5025 'frame-parameters | |
5026 'minibuffer-vi-face | |
5027 'minibuffer-insert-face | |
5028 'minibuffer-emacs-face | |
5029 )) | |
5030 (setq salutation " | |
5031 Congratulations! You may have unearthed a bug in Viper! | |
5032 Please mail a concise, accurate summary of the problem to the address above. | |
5033 | |
5034 -------------------------------------------------------------------") | |
5035 (setq window-config (current-window-configuration)) | |
19078 | 5036 (with-output-to-temp-buffer " *viper-info*" |
5037 (switch-to-buffer " *viper-info*") | |
18129 | 5038 (delete-other-windows) |
5039 (princ " | |
5040 PLEASE FOLLOW THESE PROCEDURES | |
5041 ------------------------------ | |
5042 | |
5043 Before reporting a bug, please verify that it is related to Viper, and is | |
5044 not cause by other packages you are using. | |
5045 | |
5046 Don't report compilation warnings, unless you are certain that there is a | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5047 problem. These warnings are normal and unavoidable. |
18129 | 5048 |
5049 Please note that users should not modify variables and keymaps other than | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5050 those advertised in the manual. Such `customization' is likely to crash |
18129 | 5051 Viper, as it would any other improperly customized Emacs package. |
5052 | |
5053 If you are reporting an error message received while executing one of the | |
5054 Viper commands, type: | |
5055 | |
5056 M-x set-variable <Return> debug-on-error <Return> t <Return> | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5057 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5058 Then reproduce the error. The above command will cause Emacs to produce a |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5059 back trace of the execution that leads to the error. Please include this |
18129 | 5060 trace in your bug report. |
5061 | |
5062 If you believe that one of Viper's commands goes into an infinite loop | |
5063 \(e.g., Emacs freezes\), type: | |
5064 | |
5065 M-x set-variable <Return> debug-on-quit <Return> t <Return> | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5066 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5067 Then reproduce the problem. Wait for a few seconds, then type C-g to abort |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5068 the current command. Include the resulting back trace in the bug report. |
18129 | 5069 |
5070 Mail anyway (y or n)? ") | |
5071 (if (y-or-n-p "Mail anyway? ") | |
5072 () | |
5073 (set-window-configuration window-config) | |
5074 (error "Bug report aborted"))) | |
5075 | |
5076 (require 'reporter) | |
5077 (set-window-configuration window-config) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5078 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
5079 (reporter-submit-bug-report "kifer@cs.stonybrook.edu" |
19078 | 5080 (viper-version) |
18129 | 5081 varlist |
5082 nil 'delete-other-windows | |
5083 salutation) | |
5084 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5085 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5086 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
5087 |
18129 | 5088 |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
5089 ;; arch-tag: 739a6450-5fda-44d0-88b0-325053d888c2 |
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33842
diff
changeset
|
5090 ;;; viper-cmd.el ends here |