Mercurial > emacs
annotate lisp/emulation/viper-cmd.el @ 87498:566965810b9e
*** empty log message ***
author | Magnus Henoch <mange@freemail.hu> |
---|---|
date | Mon, 31 Dec 2007 00:57:51 +0000 |
parents | f9a6598fa930 |
children | 107ccd98fa12 53108e6cea98 |
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, |
75346 | 4 ;; 2005, 2006, 2007 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 |
78218
ac0efac52065
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
12 ;; the Free Software Foundation; either version 3, or (at your option) |
19905
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) | |
30 | |
31 ;; Compiler pacifier | |
19078 | 32 (defvar viper-minibuffer-current-face) |
33 (defvar viper-minibuffer-insert-face) | |
34 (defvar viper-minibuffer-vi-face) | |
35 (defvar viper-minibuffer-emacs-face) | |
18289 | 36 (defvar viper-always) |
19078 | 37 (defvar viper-mode-string) |
38 (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
|
39 (defvar viper--key-maps) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
40 (defvar viper--intercept-key-maps) |
18129 | 41 (defvar iso-accents-mode) |
19462 | 42 (defvar quail-mode) |
43 (defvar quail-current-str) | |
18129 | 44 (defvar zmacs-region-stays) |
45 (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
|
46 (defvar init-message) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
47 (defvar initial) |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
48 (defvar undo-beg-posn) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
49 (defvar undo-end-posn) |
18129 | 50 ;; end pacifier |
51 | |
52 | |
53 (require 'viper-util) | |
54 (require 'viper-keym) | |
55 (require 'viper-mous) | |
56 (require 'viper-macs) | |
57 (require 'viper-ex) | |
58 | |
59 | |
60 | |
61 ;; Generic predicates | |
62 | |
63 ;; These test functions are shamelessly lifted from vip 4.4.2 by Aamod Sane | |
64 | |
65 ;; generate test functions | |
66 ;; given symbol foo, foo-p is the test function, foos is the set of | |
67 ;; Viper command keys | |
19078 | 68 ;; (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
|
69 ;; (defun foo-p (com) (consp (memq com foos))) |
18129 | 70 |
19078 | 71 (defmacro viper-test-com-defun (name) |
18129 | 72 (let* ((snm (symbol-name name)) |
73 (nm-p (intern (concat snm "-p"))) | |
74 (nms (intern (concat snm "s")))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
75 `(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
|
76 (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
|
77 )))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
78 |
18129 | 79 ;; Variables for defining VI commands |
80 | |
81 ;; 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
|
82 (defvar viper-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\")) |
19078 | 83 ;; define viper-prefix-command-p |
84 (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
|
85 |
18129 | 86 ;; Commands that are pairs eg. dd. r and R here are a hack |
19078 | 87 (defconst viper-charpair-commands '(?c ?d ?y ?! ?= ?< ?> ?r ?R)) |
88 ;; define viper-charpair-command-p | |
89 (viper-test-com-defun viper-charpair-command) | |
90 | |
81331
c3779fe5830e
2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75346
diff
changeset
|
91 (defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?j ?k ?l |
18129 | 92 ?H ?M ?L ?n ?t ?T ?w ?W ?$ ?% |
93 ?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?` | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
94 ?\; ?, ?0 ?? ?/ ?\ ?\C-m |
19078 | 95 space return |
96 delete backspace | |
18129 | 97 ) |
98 "Movement commands") | |
19078 | 99 ;; define viper-movement-command-p |
100 (viper-test-com-defun viper-movement-command) | |
18129 | 101 |
18839 | 102 ;; Vi digit commands |
19078 | 103 (defconst viper-digit-commands '(?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9)) |
104 | |
105 ;; define viper-digit-command-p | |
106 (viper-test-com-defun viper-digit-command) | |
18129 | 107 |
108 ;; Commands that can be repeated by . (dotted) | |
19078 | 109 (defconst viper-dotable-commands '(?c ?d ?C ?s ?S ?D ?> ?<)) |
110 ;; define viper-dotable-command-p | |
111 (viper-test-com-defun viper-dotable-command) | |
18129 | 112 |
113 ;; Commands that can follow a # | |
19078 | 114 (defconst viper-hash-commands '(?c ?C ?g ?q ?s)) |
115 ;; define viper-hash-command-p | |
116 (viper-test-com-defun viper-hash-command) | |
18129 | 117 |
118 ;; Commands that may have registers as prefix | |
19078 | 119 (defconst viper-regsuffix-commands '(?d ?y ?Y ?D ?p ?P ?x ?X)) |
120 ;; define viper-regsuffix-command-p | |
121 (viper-test-com-defun viper-regsuffix-command) | |
122 | |
123 (defconst viper-vi-commands (append viper-movement-commands | |
124 viper-digit-commands | |
125 viper-dotable-commands | |
126 viper-charpair-commands | |
127 viper-hash-commands | |
128 viper-prefix-commands | |
129 viper-regsuffix-commands) | |
18129 | 130 "The list of all commands in Vi-state.") |
19078 | 131 ;; define viper-vi-command-p |
132 (viper-test-com-defun viper-vi-command) | |
18129 | 133 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
134 ;; Where viper saves mark. This mark is resurrected by m^ |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
135 (defvar viper-saved-mark nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
136 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
137 ;; 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
|
138 ;; Not a user option. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
139 (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
|
140 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
141 |
18129 | 142 |
143 ;;; CODE | |
144 | |
145 ;; sentinels | |
146 | |
19078 | 147 ;; Runs viper-after-change-functions inside after-change-functions |
148 (defun viper-after-change-sentinel (beg end len) | |
21940 | 149 (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
|
150 |
19078 | 151 ;; Runs viper-before-change-functions inside before-change-functions |
152 (defun viper-before-change-sentinel (beg end) | |
21940 | 153 (run-hook-with-args 'viper-before-change-functions beg end)) |
18129 | 154 |
19078 | 155 (defsubst viper-post-command-sentinel () |
74857
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
156 (condition-case conds |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
157 (run-hooks 'viper-post-command-hooks) |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
158 (error (viper-message-conditions conds))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
159 (if (eq viper-current-state 'vi-state) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
160 (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
|
161 |
19078 | 162 (defsubst viper-pre-command-sentinel () |
163 (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
|
164 |
18129 | 165 ;; Needed so that Viper will be able to figure the last inserted |
166 ;; chunk of text with reasonable accuracy. | |
19078 | 167 (defsubst viper-insert-state-post-command-sentinel () |
168 (if (and (memq viper-current-state '(insert-state replace-state)) | |
169 viper-insert-point | |
170 (>= (point) viper-insert-point)) | |
171 (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
|
172 (or (viper-overlay-p viper-replace-overlay) |
18129 | 173 (progn |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
174 (viper-set-replace-overlay (point-min) (point-min)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
175 (viper-hide-replace-overlay))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
176 (if (eq viper-current-state 'insert-state) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
177 (let ((has-saved-cursor-color-in-insert-mode |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
178 (stringp (viper-get-saved-cursor-color-in-insert-mode)))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
179 (or has-saved-cursor-color-in-insert-mode |
19078 | 180 (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
|
181 ;; save current color, if not already saved |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
182 (viper-save-cursor-color 'before-insert-mode)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
183 ;; set insert mode cursor color |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
184 (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
|
185 (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
|
186 (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
|
187 (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
|
188 (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
|
189 (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
|
190 ;; 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
|
191 (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
|
192 ;; 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
|
193 (viper-change-cursor-color viper-emacs-state-cursor-color))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
194 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
195 (if (and (memq this-command '(dabbrev-expand hippie-expand)) |
19078 | 196 (integerp viper-pre-command-point) |
19756 | 197 (markerp viper-insert-point) |
198 (marker-position viper-insert-point) | |
19078 | 199 (> viper-insert-point viper-pre-command-point)) |
19756 | 200 (viper-move-marker-locally viper-insert-point viper-pre-command-point)) |
18129 | 201 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
202 |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
203 (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
|
204 (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
|
205 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
|
206 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
|
207 viper-delete-backward-char |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
208 viper-join-lines |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
209 viper-delete-char)) |
19078 | 210 (memq (viper-event-key last-command-event) |
18129 | 211 '(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
|
212 (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
|
213 |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
214 (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
|
215 (or (viper-preserve-cursor-color) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
216 (viper-restore-cursor-color 'after-insert-mode)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
217 (if (and (memq this-command '(dabbrev-expand hippie-expand)) |
19078 | 218 (markerp viper-insert-point) |
219 (marker-position viper-insert-point)) | |
220 (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
|
221 |
19078 | 222 (defsubst viper-R-state-post-command-sentinel () |
18129 | 223 ;; Restoring cursor color is needed despite |
19078 | 224 ;; viper-replace-state-pre-command-sentinel: When you jump to another buffer |
225 ;; in another frame, the pre-command hook won't change cursor color to | |
226 ;; default in that other frame. So, if the second frame cursor was red and | |
227 ;; 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
|
228 ;; will remain red. Restoring the default, below, prevents this. |
19078 | 229 (if (and (<= (viper-replace-start) (point)) |
230 (<= (point) (viper-replace-end))) | |
231 (viper-change-cursor-color viper-replace-overlay-cursor-color) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
232 (viper-restore-cursor-color 'after-replace-mode) |
18129 | 233 )) |
234 | |
235 ;; to speed up, don't change cursor color before self-insert | |
236 ;; and common move commands | |
19078 | 237 (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
|
238 (or (viper-preserve-cursor-color) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
239 (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
|
240 |
26702
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
241 |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
242 ;; 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
|
243 ;; 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
|
244 (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
|
245 (setq viper-replace-chars-to-delete |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
246 (max 0 |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
247 (min viper-replace-chars-to-delete |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
248 ;; 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
|
249 (viper-chars-in-region |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
250 (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
|
251 ;; 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
|
252 ;; 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
|
253 (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
|
254 )))) |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
255 |
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
256 |
19078 | 257 (defun viper-replace-state-post-command-sentinel () |
18129 | 258 ;; Restoring cursor color is needed despite |
19078 | 259 ;; viper-replace-state-pre-command-sentinel: When one jumps to another buffer |
18129 | 260 ;; in another frame, the pre-command hook won't change cursor color to |
261 ;; default in that other frame. So, if the second frame cursor was red and | |
262 ;; 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
|
263 ;; will remain red. Restoring the default, below, fixes this problem. |
18129 | 264 ;; |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
265 ;; 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
|
266 ;; viper-delete-backward-char, etc., since they either don't change |
18129 | 267 ;; cursor color or, if they terminate replace mode, the color will be changed |
19078 | 268 ;; 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
|
269 (or (viper-preserve-cursor-color) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
270 (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
|
271 (cond |
19078 | 272 ((eq viper-current-state 'replace-state) |
18129 | 273 ;; delete characters to compensate for inserted chars. |
19078 | 274 (let ((replace-boundary (viper-replace-end))) |
18129 | 275 (save-excursion |
19078 | 276 (goto-char viper-last-posn-in-replace-region) |
19462 | 277 (viper-trim-replace-chars-to-delete-if-necessary) |
19078 | 278 (delete-char viper-replace-chars-to-delete) |
19462 | 279 (setq viper-replace-chars-to-delete 0) |
18129 | 280 ;; terminate replace mode if reached replace limit |
19462 | 281 (if (= viper-last-posn-in-replace-region (viper-replace-end)) |
282 (viper-finish-change))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
283 |
19462 | 284 (if (viper-pos-within-region |
285 (point) (viper-replace-start) replace-boundary) | |
18129 | 286 (progn |
19078 | 287 ;; the state may have changed in viper-finish-change above |
288 (if (eq viper-current-state 'replace-state) | |
289 (viper-change-cursor-color viper-replace-overlay-cursor-color)) | |
290 (setq viper-last-posn-in-replace-region (point-marker)))) | |
18129 | 291 )) |
19462 | 292 ;; terminate replace mode if changed Viper states. |
293 (t (viper-finish-change)))) | |
18129 | 294 |
295 | |
296 ;; changing mode | |
297 | |
298 ;; Change state to NEW-STATE---either emacs-state, vi-state, or insert-state. | |
19078 | 299 (defun viper-change-state (new-state) |
300 ;; Keep viper-post/pre-command-hooks fresh. | |
301 ;; We remove then add viper-post/pre-command-sentinel since it is very | |
302 ;; desirable that viper-pre-command-sentinel is the last hook and | |
303 ;; viper-post-command-sentinel is the first hook. | |
21940 | 304 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
305 (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
|
306 ;; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
307 (progn |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
308 (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
|
309 (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
|
310 (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
|
311 (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
|
312 nil ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
313 ) |
21940 | 314 |
19078 | 315 (remove-hook 'post-command-hook 'viper-post-command-sentinel) |
316 (add-hook 'post-command-hook 'viper-post-command-sentinel) | |
317 (remove-hook 'pre-command-hook 'viper-pre-command-sentinel) | |
318 (add-hook 'pre-command-hook 'viper-pre-command-sentinel t) | |
18129 | 319 ;; These hooks will be added back if switching to insert/replace mode |
21940 | 320 (remove-hook 'viper-post-command-hooks |
321 'viper-insert-state-post-command-sentinel 'local) | |
322 (remove-hook 'viper-pre-command-hooks | |
323 'viper-insert-state-pre-command-sentinel 'local) | |
19078 | 324 (setq viper-intermediate-command nil) |
18129 | 325 (cond ((eq new-state 'vi-state) |
19078 | 326 (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
|
327 |
19078 | 328 ;; move viper-last-posn-while-in-insert-state |
18129 | 329 ;; 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
|
330 ;; states after each command. In Vi/Emacs state, it does |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
331 ;; nothing. We need to execute it here to make sure that |
18129 | 332 ;; the last posn was recorded when we hit ESC. |
333 ;; It may be left unrecorded if the last thing done in | |
334 ;; insert/repl state was dabbrev-expansion or abbrev | |
335 ;; expansion caused by hitting ESC | |
19078 | 336 (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
|
337 |
18129 | 338 (condition-case conds |
339 (progn | |
19078 | 340 (viper-save-last-insertion |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
341 viper-insert-point |
19078 | 342 viper-last-posn-while-in-insert-state) |
343 (if viper-began-as-replace | |
344 (setq viper-began-as-replace nil) | |
18129 | 345 ;; repeat insert commands if numerical arg > 1 |
346 (save-excursion | |
19078 | 347 (viper-repeat-insert-command)))) |
18129 | 348 (error |
19078 | 349 (viper-message-conditions conds))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
350 |
19078 | 351 (if (> (length viper-last-insertion) 0) |
352 (viper-push-onto-ring viper-last-insertion | |
353 'viper-insertion-ring)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
354 |
26702
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
355 (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
|
356 (or (bolp) (viper-beginning-of-field) (backward-char 1)))) |
18129 | 357 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
358 |
18129 | 359 ;; insert or replace |
360 ((memq new-state '(insert-state replace-state)) | |
19078 | 361 (if (memq viper-current-state '(emacs-state vi-state)) |
362 (viper-move-marker-locally 'viper-insert-point (point))) | |
363 (viper-move-marker-locally | |
364 'viper-last-posn-while-in-insert-state (point)) | |
21940 | 365 (add-hook 'viper-post-command-hooks |
366 'viper-insert-state-post-command-sentinel t 'local) | |
367 (add-hook 'viper-pre-command-hooks | |
368 'viper-insert-state-pre-command-sentinel t 'local)) | |
18129 | 369 ) ; outermost cond |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
370 |
18129 | 371 ;; Nothing needs to be done to switch to emacs mode! Just set some |
19078 | 372 ;; variables, which is already done in viper-change-state-to-emacs! |
373 | |
19462 | 374 ;; ISO accents |
375 ;; always turn off iso-accents-mode in vi-state, or else we won't be able to | |
376 ;; use the keys `,',^ , as they will do accents instead of Vi actions. | |
377 (cond ((eq new-state 'vi-state) (viper-set-iso-accents-mode nil));accents off | |
378 (viper-automatic-iso-accents (viper-set-iso-accents-mode t));accents on | |
379 (t (viper-set-iso-accents-mode nil))) | |
380 ;; Always turn off quail mode in vi state | |
381 (cond ((eq new-state 'vi-state) (viper-set-input-method nil)) ;intl input off | |
382 (viper-special-input-method (viper-set-input-method t)) ;intl input on | |
383 (t (viper-set-input-method nil))) | |
384 | |
19078 | 385 (setq viper-current-state new-state) |
19462 | 386 |
387 (viper-update-syntax-classes) | |
19078 | 388 (viper-normalize-minor-mode-map-alist) |
389 (viper-adjust-keys-for new-state) | |
390 (viper-set-mode-vars-for new-state) | |
391 (viper-refresh-mode-line) | |
18129 | 392 ) |
393 | |
394 | |
19078 | 395 (defun viper-adjust-keys-for (state) |
18129 | 396 "Make necessary adjustments to keymaps before entering STATE." |
397 (cond ((memq state '(insert-state replace-state)) | |
19078 | 398 (if viper-auto-indent |
18129 | 399 (progn |
19078 | 400 (define-key viper-insert-basic-map "\C-m" 'viper-autoindent) |
401 (if viper-want-emacs-keys-in-insert | |
18129 | 402 ;; expert |
19078 | 403 (define-key viper-insert-basic-map "\C-j" nil) |
18129 | 404 ;; novice |
19078 | 405 (define-key viper-insert-basic-map "\C-j" 'viper-autoindent))) |
406 (define-key viper-insert-basic-map "\C-m" nil) | |
407 (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
|
408 |
19078 | 409 (setq viper-insert-diehard-minor-mode |
410 (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
|
411 |
19078 | 412 (if viper-want-ctl-h-help |
19891 | 413 (progn |
414 (define-key viper-insert-basic-map "\C-h" 'help-command) | |
415 (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
|
416 (define-key viper-insert-basic-map |
19891 | 417 "\C-h" 'viper-del-backward-char-in-insert) |
19462 | 418 (define-key viper-replace-map |
19891 | 419 "\C-h" 'viper-del-backward-char-in-replace)) |
420 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't. | |
421 (define-key viper-insert-basic-map | |
422 [backspace] 'viper-del-backward-char-in-insert) | |
423 (define-key viper-replace-map | |
424 [backspace] 'viper-del-backward-char-in-replace) | |
425 ) ; end insert/replace case | |
18129 | 426 (t ; Vi state |
19078 | 427 (setq viper-vi-diehard-minor-mode (not viper-want-emacs-keys-in-vi)) |
428 (if viper-want-ctl-h-help | |
19891 | 429 (define-key viper-vi-basic-map "\C-h" 'help-command) |
430 (define-key viper-vi-basic-map "\C-h" 'viper-backward-char)) | |
431 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't. | |
432 (define-key viper-vi-basic-map [backspace] 'viper-backward-char)) | |
18129 | 433 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
434 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
435 |
18129 | 436 ;; Normalizes minor-mode-map-alist by putting Viper keymaps first. |
437 ;; This ensures that Viper bindings are in effect, regardless of which minor | |
438 ;; modes were turned on by the user or by other packages. | |
19078 | 439 (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
|
440 (setq viper--intercept-key-maps |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
441 (list |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
442 (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
|
443 (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
|
444 (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
|
445 )) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
446 (setq viper--key-maps |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
447 (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
|
448 (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
|
449 (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
|
450 (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
|
451 (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
|
452 (if (keymapp |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
453 (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
|
454 (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
|
455 viper-empty-keymap)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
456 (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
|
457 (cons 'viper-vi-basic-minor-mode viper-vi-basic-map) |
19078 | 458 (cons 'viper-replace-minor-mode viper-replace-map) |
459 ;; 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
|
460 ;; viper-replace-minor-mode |
19078 | 461 (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
|
462 viper-minibuffer-map) |
19078 | 463 (cons 'viper-insert-local-user-minor-mode |
464 viper-insert-local-user-map) | |
465 (cons 'viper-insert-kbd-minor-mode viper-insert-kbd-map) | |
466 (cons 'viper-insert-global-user-minor-mode | |
467 viper-insert-global-user-map) | |
468 (cons 'viper-insert-state-modifier-minor-mode | |
18129 | 469 (if (keymapp |
19203 | 470 (cdr (assoc major-mode |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
471 viper-insert-state-modifier-alist))) |
19203 | 472 (cdr (assoc major-mode |
473 viper-insert-state-modifier-alist)) | |
19078 | 474 viper-empty-keymap)) |
475 (cons 'viper-insert-diehard-minor-mode viper-insert-diehard-map) | |
476 (cons 'viper-insert-basic-minor-mode viper-insert-basic-map) | |
477 (cons 'viper-emacs-local-user-minor-mode | |
478 viper-emacs-local-user-map) | |
479 (cons 'viper-emacs-kbd-minor-mode viper-emacs-kbd-map) | |
480 (cons 'viper-emacs-global-user-minor-mode | |
481 viper-emacs-global-user-map) | |
482 (cons 'viper-emacs-state-modifier-minor-mode | |
18129 | 483 (if (keymapp |
484 (cdr | |
19078 | 485 (assoc major-mode viper-emacs-state-modifier-alist))) |
18129 | 486 (cdr |
19078 | 487 (assoc major-mode viper-emacs-state-modifier-alist)) |
488 viper-empty-keymap)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
489 )) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
490 |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
491 ;; 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
|
492 ;; 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
|
493 ;; 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
|
494 ;; 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
|
495 ;; 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
|
496 ;; 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
|
497 ;; ***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
|
498 ;; 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
|
499 (unless |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
500 (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
|
501 (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
|
502 (viper-append-filter-alist |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
503 (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
|
504 minor-mode-map-alist))) |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
505 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
506 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
507 |
18129 | 508 |
509 ;; Viper mode-changing commands and utilities | |
510 | |
511 ;; Modifies mode-line-buffer-identification. | |
19078 | 512 (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
|
513 (set (make-local-variable 'viper-mode-string) |
19078 | 514 (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id) |
515 ((eq viper-current-state 'vi-state) viper-vi-state-id) | |
516 ((eq viper-current-state 'replace-state) viper-replace-state-id) | |
517 ((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
|
518 |
18129 | 519 ;; Sets Viper mode string in global-mode-string |
520 (force-mode-line-update)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
521 |
18129 | 522 |
523 ;; Switch from Insert state to Vi state. | |
19078 | 524 (defun viper-exit-insert-state () |
18129 | 525 (interactive) |
19078 | 526 (viper-change-state-to-vi)) |
527 | |
528 (defun viper-set-mode-vars-for (state) | |
18129 | 529 "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
|
530 |
18129 | 531 ;; Emacs state |
19078 | 532 (setq viper-vi-minibuffer-minor-mode nil |
533 viper-insert-minibuffer-minor-mode nil | |
534 viper-vi-intercept-minor-mode nil | |
535 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
|
536 |
19078 | 537 viper-vi-local-user-minor-mode nil |
538 viper-vi-kbd-minor-mode nil | |
539 viper-vi-global-user-minor-mode nil | |
540 viper-vi-state-modifier-minor-mode nil | |
541 viper-vi-diehard-minor-mode nil | |
542 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
|
543 |
19078 | 544 viper-replace-minor-mode nil |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
545 |
19078 | 546 viper-insert-local-user-minor-mode nil |
547 viper-insert-kbd-minor-mode nil | |
548 viper-insert-global-user-minor-mode nil | |
549 viper-insert-state-modifier-minor-mode nil | |
550 viper-insert-diehard-minor-mode nil | |
551 viper-insert-basic-minor-mode nil | |
552 viper-emacs-intercept-minor-mode t | |
553 viper-emacs-local-user-minor-mode t | |
554 viper-emacs-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
555 viper-emacs-global-user-minor-mode t | |
556 viper-emacs-state-modifier-minor-mode t | |
18129 | 557 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
558 |
18129 | 559 ;; Vi state |
560 (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
|
561 (setq |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
562 viper-vi-intercept-minor-mode t |
19078 | 563 viper-vi-minibuffer-minor-mode (viper-is-in-minibuffer) |
564 viper-vi-local-user-minor-mode t | |
565 viper-vi-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
566 viper-vi-global-user-minor-mode t | |
567 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
|
568 ;; don't let the diehard keymap block command completion |
18129 | 569 ;; and other things in the minibuffer |
19078 | 570 viper-vi-diehard-minor-mode (not |
571 (or viper-want-emacs-keys-in-vi | |
572 (viper-is-in-minibuffer))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
573 viper-vi-basic-minor-mode t |
19078 | 574 viper-emacs-intercept-minor-mode nil |
575 viper-emacs-local-user-minor-mode nil | |
576 viper-emacs-kbd-minor-mode nil | |
577 viper-emacs-global-user-minor-mode nil | |
578 viper-emacs-state-modifier-minor-mode nil | |
18129 | 579 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
580 |
18129 | 581 ;; Insert and Replace states |
582 (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
|
583 (setq |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
584 viper-insert-intercept-minor-mode t |
19078 | 585 viper-replace-minor-mode (eq state 'replace-state) |
586 viper-insert-minibuffer-minor-mode (viper-is-in-minibuffer) | |
587 viper-insert-local-user-minor-mode t | |
588 viper-insert-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
589 viper-insert-global-user-minor-mode t | |
590 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
|
591 ;; don't let the diehard keymap block command completion |
18129 | 592 ;; and other things in the minibuffer |
19078 | 593 viper-insert-diehard-minor-mode (not |
594 (or | |
595 viper-want-emacs-keys-in-insert | |
596 (viper-is-in-minibuffer))) | |
597 viper-insert-basic-minor-mode t | |
598 viper-emacs-intercept-minor-mode nil | |
599 viper-emacs-local-user-minor-mode nil | |
600 viper-emacs-kbd-minor-mode nil | |
601 viper-emacs-global-user-minor-mode nil | |
602 viper-emacs-state-modifier-minor-mode nil | |
18129 | 603 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
604 |
18129 | 605 ;; minibuffer faces |
19078 | 606 (if (viper-has-face-support-p) |
607 (setq viper-minibuffer-current-face | |
608 (cond ((eq state 'emacs-state) viper-minibuffer-emacs-face) | |
609 ((eq state 'vi-state) viper-minibuffer-vi-face) | |
18129 | 610 ((memq state '(insert-state replace-state)) |
19078 | 611 viper-minibuffer-insert-face)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
612 |
19078 | 613 (if (viper-is-in-minibuffer) |
614 (viper-set-minibuffer-overlay)) | |
18129 | 615 ) |
616 | |
617 ;; This also takes care of the annoying incomplete lines in files. | |
618 ;; Also, this fixes `undo' to work vi-style for complex commands. | |
19078 | 619 (defun viper-change-state-to-vi () |
18129 | 620 "Change Viper state to Vi." |
621 (interactive) | |
19078 | 622 (if (and viper-first-time (not (viper-is-in-minibuffer))) |
18129 | 623 (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
|
624 (if overwrite-mode (overwrite-mode -1)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
625 (or (viper-overlay-p viper-replace-overlay) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
626 (viper-set-replace-overlay (point-min) (point-min))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
627 (viper-hide-replace-overlay) |
18129 | 628 (if abbrev-mode (expand-abbrev)) |
629 (if (and auto-fill-function (> (current-column) fill-column)) | |
630 (funcall auto-fill-function)) | |
631 ;; don't leave whitespace lines around | |
632 (if (and (memq last-command | |
19078 | 633 '(viper-autoindent |
634 viper-open-line viper-Open-line | |
635 viper-replace-state-exit-cmd)) | |
636 (viper-over-whitespace-line)) | |
18129 | 637 (indent-to-left-margin)) |
19078 | 638 (viper-add-newline-at-eob-if-necessary) |
19462 | 639 (viper-adjust-undo) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
640 |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
641 (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
|
642 (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
|
643 (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
|
644 |
19078 | 645 (viper-change-state 'vi-state) |
18129 | 646 |
19462 | 647 ;; Protect against user errors in hooks |
18129 | 648 (condition-case conds |
19078 | 649 (run-hooks 'viper-vi-state-hook) |
18129 | 650 (error |
19078 | 651 (viper-message-conditions conds))))) |
652 | |
653 (defun viper-change-state-to-insert () | |
18129 | 654 "Change Viper state to Insert." |
655 (interactive) | |
19078 | 656 (viper-change-state 'insert-state) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
657 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
658 (or (viper-overlay-p viper-replace-overlay) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
659 (viper-set-replace-overlay (point-min) (point-min))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
660 (viper-hide-replace-overlay) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
661 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
662 (let ((has-saved-cursor-color-in-insert-mode |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
663 (stringp (viper-get-saved-cursor-color-in-insert-mode)))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
664 (or has-saved-cursor-color-in-insert-mode |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
665 (string= (viper-get-cursor-color) viper-insert-state-cursor-color) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
666 (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
|
667 (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
|
668 |
19462 | 669 ;; Protect against user errors in hooks |
18129 | 670 (condition-case conds |
19078 | 671 (run-hooks 'viper-insert-state-hook) |
18129 | 672 (error |
19078 | 673 (viper-message-conditions conds)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
674 |
19078 | 675 (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
|
676 ;; 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
|
677 (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
|
678 (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
|
679 (error |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
680 (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
|
681 (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
|
682 viper-replace-minor-mode nil)) |
18129 | 683 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
684 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
685 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
686 ;; Change to replace state. When the end of replacement region is reached, |
18129 | 687 ;; replace state changes to insert state. |
19078 | 688 (defun viper-change-state-to-replace (&optional non-R-cmd) |
689 (viper-change-state 'replace-state) | |
18129 | 690 ;; Run insert-state-hook |
691 (condition-case conds | |
19078 | 692 (run-hooks 'viper-insert-state-hook 'viper-replace-state-hook) |
18129 | 693 (error |
19078 | 694 (viper-message-conditions conds))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
695 |
18129 | 696 (if non-R-cmd |
19078 | 697 (viper-start-replace) |
18129 | 698 ;; 'R' is implemented using Emacs's overwrite-mode |
19078 | 699 (viper-start-R-mode)) |
18129 | 700 ) |
701 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
702 |
19078 | 703 (defun viper-change-state-to-emacs () |
18129 | 704 "Change Viper state to Emacs." |
705 (interactive) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
706 (or (viper-overlay-p viper-replace-overlay) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
707 (viper-set-replace-overlay (point-min) (point-min))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
708 (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
|
709 |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
710 (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
|
711 (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
|
712 (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
|
713 (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
|
714 (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
|
715 (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
|
716 (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
|
717 |
19078 | 718 (viper-change-state 'emacs-state) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
719 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
720 ;; Protect against user errors in hooks |
18129 | 721 (condition-case conds |
19078 | 722 (run-hooks 'viper-emacs-state-hook) |
18129 | 723 (error |
19078 | 724 (viper-message-conditions conds)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
725 |
18129 | 726 ;; escape to emacs mode termporarily |
19078 | 727 (defun viper-escape-to-emacs (arg &optional events) |
18129 | 728 "Escape to Emacs state from Vi state for one Emacs command. |
729 ARG is used as the prefix value for the executed command. If | |
730 EVENTS is a list of events, which become the beginning of the command." | |
731 (interactive "P") | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
732 (if (viper= last-command-char ?\\) |
18129 | 733 (message "Switched to EMACS state for the next command...")) |
19078 | 734 (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
|
735 |
18129 | 736 ;; escape to Vi mode termporarily |
19078 | 737 (defun viper-escape-to-vi (arg) |
18129 | 738 "Escape from Emacs state to Vi state for one Vi 1-character command. |
739 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
|
740 Vi's prefix argument will be used. Otherwise, the prefix argument passed to |
19078 | 741 `viper-escape-to-vi' is used." |
18129 | 742 (interactive "P") |
743 (message "Switched to VI state for the next command...") | |
19078 | 744 (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
|
745 |
18129 | 746 ;; Escape to STATE mode for one Emacs command. |
19078 | 747 (defun viper-escape-to-state (arg events state) |
18129 | 748 ;;(let (com key prefix-arg) |
749 (let (com key) | |
750 ;; this temporarily turns off Viper's minor mode keymaps | |
19078 | 751 (viper-set-mode-vars-for state) |
752 (viper-normalize-minor-mode-map-alist) | |
753 (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
|
754 |
18129 | 755 ;; protect against keyboard quit and other errors |
756 (condition-case nil | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
757 (let (viper-vi-kbd-minor-mode |
19078 | 758 viper-insert-kbd-minor-mode |
759 viper-emacs-kbd-minor-mode) | |
18129 | 760 (unwind-protect |
761 (progn | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
762 (setq com |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
763 (key-binding (setq key (viper-read-key-sequence nil)))) |
18129 | 764 ;; In case of binding indirection--chase definitions. |
765 ;; Have to do it here because we execute this command under | |
766 ;; different keymaps, so command-execute may not do the | |
767 ;; right thing there | |
768 (while (vectorp com) (setq com (key-binding com)))) | |
769 nil) | |
770 ;; 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
|
771 ;; `state'. Otherwise, if we switch buffers while executing the |
18129 | 772 ;; 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
|
773 ;; `state'. When we return to the orig buffer, the bindings will be |
18129 | 774 ;; screwed up. |
19078 | 775 (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
|
776 |
18129 | 777 ;; this-command, last-command-char, last-command-event |
778 (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
|
779 (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
|
780 ;; 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
|
781 (setq last-command-event |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
782 (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
|
783 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
|
784 ;; 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
|
785 (setq last-command-event |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
786 (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
|
787 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
|
788 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
789 |
18129 | 790 (if (commandp com) |
64485
2273b7101b27
* viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64215
diff
changeset
|
791 ;; 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
|
792 (let ((viper-current-state state)) |
18129 | 793 (setq prefix-arg (or prefix-arg arg)) |
794 (command-execute com))) | |
795 ) | |
796 (quit (ding)) | |
797 (error (beep 1)))) | |
798 ;; set state in the new buffer | |
19078 | 799 (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
|
800 |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
801 ;; 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
|
802 ;; 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
|
803 ;; 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
|
804 ;; 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
|
805 ;; 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
|
806 (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
|
807 (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
|
808 (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
|
809 (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
|
810 (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
|
811 (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
|
812 (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
|
813 (condition-case nil |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
814 (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
|
815 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
|
816 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
|
817 ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
818 (cond ((and viper-special-input-method |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
819 (featurep 'emacs) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
820 (fboundp 'quail-input-method)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
821 ;; (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
|
822 ;; 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
|
823 ;; 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
|
824 ;; types a regular key.) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
825 (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
|
826 ;; 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
|
827 ;; 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
|
828 ;; 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
|
829 (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
|
830 ;; 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
|
831 (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
|
832 ;; 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
|
833 (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
|
834 (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
|
835 (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
|
836 (quail-input-method nil) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
837 |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
838 (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
|
839 (insert ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
840 (insert quail-current-str)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
841 (setq ch (or ch |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
842 (aref quail-current-str |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
843 (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
|
844 )) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
845 ((and viper-special-input-method |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
846 (featurep 'xemacs) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
847 (fboundp 'quail-start-translation)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
848 ;; 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
|
849 ;; quail-input-method |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
850 (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
|
851 (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
|
852 ;; 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
|
853 (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
|
854 ;; 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
|
855 (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
|
856 (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
|
857 (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
|
858 (quail-start-translation nil) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
859 |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
860 (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
|
861 (insert ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
862 (insert quail-current-str)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
863 (setq ch (or ch |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
864 (aref quail-current-str |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
865 (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
|
866 )) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
867 ((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
|
868 (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
|
869 ;; 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
|
870 (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
|
871 ;; 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
|
872 (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
|
873 (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
|
874 (insert ch)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
875 (t |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
876 ;;(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
|
877 (setq ch (aref (read-key-sequence nil) 0)) |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
878 (if (featurep 'xemacs) |
72579
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
879 (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
|
880 ;; 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
|
881 (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
|
882 ;; 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
|
883 (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
|
884 (progn |
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
885 ;;(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
|
886 (setq ch (aref (read-key-sequence nil) 0)) |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
887 (if (featurep 'xemacs) |
72579
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
888 (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
|
889 ) |
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 ) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
892 (setq last-command-event |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
893 (viper-copy-event (if (featurep 'xemacs) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
894 (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
|
895 ) ; let |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
896 (error nil) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
897 ) ; condition-case |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
898 |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
899 (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
|
900 (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
|
901 (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
|
902 ) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
903 |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
904 |
19078 | 905 (defun viper-exec-form-in-vi (form) |
18129 | 906 "Execute FORM in Vi state, regardless of the Ccurrent Vi state." |
907 (let ((buff (current-buffer)) | |
908 result) | |
19078 | 909 (viper-set-mode-vars-for 'vi-state) |
18129 | 910 |
911 (condition-case nil | |
19078 | 912 (let (viper-vi-kbd-minor-mode) ; execute without kbd macros |
74857
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
913 (setq result (eval form))) |
18129 | 914 (error |
915 (signal 'quit nil))) | |
916 | |
917 (if (not (equal buff (current-buffer))) ; cmd switched buffer | |
918 (save-excursion | |
919 (set-buffer buff) | |
19078 | 920 (viper-set-mode-vars-for viper-current-state))) |
921 (viper-set-mode-vars-for viper-current-state) | |
18129 | 922 result)) |
923 | |
19078 | 924 (defun viper-exec-form-in-emacs (form) |
18129 | 925 "Execute FORM in Emacs, temporarily disabling Viper's minor modes. |
19078 | 926 Similar to viper-escape-to-emacs, but accepts forms rather than keystrokes." |
18129 | 927 (let ((buff (current-buffer)) |
928 result) | |
19078 | 929 (viper-set-mode-vars-for 'emacs-state) |
18129 | 930 (setq result (eval form)) |
931 (if (not (equal buff (current-buffer))) ; cmd switched buffer | |
932 (save-excursion | |
933 (set-buffer buff) | |
19078 | 934 (viper-set-mode-vars-for viper-current-state))) |
935 (viper-set-mode-vars-for viper-current-state) | |
18129 | 936 result)) |
937 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
938 ;; 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
|
939 ;; 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
|
940 (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
|
941 (interactive "P") |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
942 (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
|
943 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
944 |
18129 | 945 ;; 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
|
946 ;; bindings. By letting Viper know which files these modes are in, it will |
18129 | 947 ;; arrange to reorganize minor-mode-map-alist so that things will work right. |
19078 | 948 (defun viper-harness-minor-mode (load-file) |
18129 | 949 "Familiarize Viper with a minor mode defined in LOAD_FILE. |
950 Minor modes that have their own keymaps may overshadow Viper keymaps. | |
951 This function is designed to make Viper aware of the packages that define | |
952 such minor modes. | |
953 Usage: | |
19078 | 954 (viper-harness-minor-mode load-file) |
18129 | 955 |
956 LOAD-FILE is a name of the file where the specific minor mode is defined. | |
957 Suffixes such as .el or .elc should be stripped." | |
958 | |
959 (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
|
960 |
19078 | 961 (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
|
962 |
18129 | 963 ;; Change the default for minor-mode-map-alist each time a harnessed minor |
964 ;; 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
|
965 (unless |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
966 (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
|
967 (eval-after-load |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
968 load-file '(setq-default minor-mode-map-alist minor-mode-map-alist))) |
18129 | 969 ) |
970 | |
971 | |
19078 | 972 (defun viper-ESC (arg) |
18129 | 973 "Emulate ESC key in Emacs. |
19078 | 974 Prevents multiple escape keystrokes if viper-no-multiple-ESC is true. |
975 If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state. | |
18129 | 976 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
|
977 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
|
978 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
|
979 a Meta key in this case. When viper-no-multiple-ESC is nil, ESC functions |
18129 | 980 as a Meta key and any number of multiple escapes is allowed." |
981 (interactive "P") | |
982 (let (char) | |
19078 | 983 (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state)) |
984 (setq char (viper-read-char-exclusive)) | |
985 (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
|
986 ((and (eq viper-no-multiple-ESC 'twice) |
19078 | 987 (eq viper-current-state 'vi-state)) |
988 (setq char (viper-read-char-exclusive)) | |
989 (if (= char (string-to-char viper-ESC-key)) | |
18129 | 990 (ding) |
19078 | 991 (viper-escape-to-emacs arg (list ?\e char) ))) |
18129 | 992 (t (ding))) |
993 )) | |
994 | |
19078 | 995 (defun viper-alternate-Meta-key (arg) |
18129 | 996 "Simulate Emacs Meta key." |
997 (interactive "P") | |
998 (sit-for 1) (message "ESC-") | |
19078 | 999 (viper-escape-to-emacs arg '(?\e))) |
1000 | |
1001 (defun viper-toggle-key-action () | |
1002 "Action bound to `viper-toggle-key'." | |
18129 | 1003 (interactive) |
19078 | 1004 (if (and (< viper-expert-level 2) (equal viper-toggle-key "\C-z")) |
1005 (if (viper-window-display-p) | |
1006 (viper-iconify) | |
18129 | 1007 (suspend-emacs)) |
19078 | 1008 (viper-change-state-to-emacs))) |
18129 | 1009 |
1010 | |
1011 ;; Intercept ESC sequences on dumb terminals. | |
1012 ;; Based on the idea contributed by Marcelino Veiga Tuimil <mveiga@dit.upm.es> | |
1013 | |
1014 ;; Check if last key was ESC and if so try to reread it as a function key. | |
1015 ;; But only if there are characters to read during a very short time. | |
1016 ;; Returns the last event, if any. | |
19078 | 1017 (defun viper-envelop-ESC-key () |
18129 | 1018 (let ((event last-input-event) |
1019 (keyseq [nil]) | |
39288
25dc021070bc
2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1020 (inhibit-quit t)) |
19078 | 1021 (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
|
1022 (progn |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1023 ;; 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
|
1024 ;; 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
|
1025 ;; 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
|
1026 ;; 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
|
1027 ;; report it. |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1028 ;;(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
|
1029 (if (viper-fast-keysequence-p) ;; for Emacsen without the above bug |
18129 | 1030 (progn |
64485
2273b7101b27
* viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64215
diff
changeset
|
1031 (let (minor-mode-map-alist emulation-mode-map-alists) |
19078 | 1032 (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
|
1033 (setq keyseq (read-key-sequence nil 'continue-echo)) |
18129 | 1034 ) ; let |
1035 ;; If keyseq translates into something that still has ESC | |
1036 ;; at the beginning, separate ESC from the rest of the seq. | |
1037 ;; In XEmacs we check for events that are keypress meta-key | |
1038 ;; and convert them into [escape key] | |
1039 ;; | |
1040 ;; This is needed for the following reason: | |
1041 ;; If ESC is the first symbol, we interpret it as if the | |
1042 ;; user typed ESC and then quickly some other symbols. | |
1043 ;; If ESC is not the first one, then the key sequence | |
1044 ;; entered was apparently translated into a function key or | |
1045 ;; something (e.g., one may have | |
1046 ;; (define-key function-key-map "\e[192z" [f11]) | |
1047 ;; which would translate the escape-sequence generated by | |
1048 ;; f11 in an xterm window into the symbolic key f11. | |
1049 ;; | |
1050 ;; If `first-key' is not an ESC event, we make it into the | |
1051 ;; 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
|
1052 ;; 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
|
1053 ;; macros. Otherwise, viper-exec-mapped-kbd-macro will think |
19078 | 1054 ;; that the last event was ESC and so it'll execute whatever is |
18129 | 1055 ;; bound to ESC. (Viper macros can't be bound to |
1056 ;; ESC-sequences). | |
1057 (let* ((first-key (elt keyseq 0)) | |
1058 (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
|
1059 (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
|
1060 (not viper-translate-all-ESC-keysequences)) |
18129 | 1061 ;; put keys following ESC on the unread list |
1062 ;; 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
|
1063 (viper-set-unread-command-events (viper-subseq keyseq 1)) |
18129 | 1064 (setq last-input-event event |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
1065 keyseq (if (featurep 'emacs) |
18129 | 1066 "\e" |
1067 (vector (character-to-event ?\e))))) | |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
1068 ((and (featurep 'xemacs) |
18129 | 1069 (key-press-event-p first-key) |
1070 (equal '(meta) key-mod)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1071 (viper-set-unread-command-events |
18129 | 1072 (vconcat (vector |
1073 (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
|
1074 (viper-subseq keyseq 1))) |
18129 | 1075 (setq last-input-event event |
1076 keyseq (vector (character-to-event ?\e)))) | |
1077 ((eventp first-key) | |
19078 | 1078 (setq last-command-event |
1079 (viper-copy-event first-key))) | |
18129 | 1080 )) |
1081 ) ; end progn | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1082 |
18129 | 1083 ;; this is escape event with nothing after it |
1084 ;; put in unread-command-event and then re-read | |
19078 | 1085 (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
|
1086 (setq keyseq (read-key-sequence nil)) |
18129 | 1087 )) |
1088 ;; not an escape event | |
1089 (setq keyseq (vector event))) | |
1090 keyseq)) | |
1091 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1092 |
18129 | 1093 |
1094 ;; Listen to ESC key. | |
1095 ;; If a sequence of keys starting with ESC is issued with very short delays, | |
1096 ;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key. | |
19078 | 1097 (defun viper-intercept-ESC-key () |
18129 | 1098 "Function that implements ESC key in Viper emulation of Vi." |
1099 (interactive) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1100 (let ((cmd (or (key-binding (viper-envelop-ESC-key)) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
1101 '(lambda () (interactive) (error "Viper bell"))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1102 |
18129 | 1103 ;; call the actual function to execute ESC (if no other symbols followed) |
1104 ;; 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
|
1105 ;; with very short delay between characters). |
19078 | 1106 (if (eq cmd 'viper-intercept-ESC-key) |
18129 | 1107 (setq cmd |
19078 | 1108 (cond ((eq viper-current-state 'vi-state) |
1109 'viper-ESC) | |
1110 ((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
|
1111 'viper-exit-insert-state) |
19078 | 1112 ((eq viper-current-state 'replace-state) |
1113 'viper-replace-state-exit-cmd) | |
1114 (t 'viper-change-state-to-vi) | |
18129 | 1115 ))) |
1116 (call-interactively cmd))) | |
1117 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1118 |
18129 | 1119 |
1120 | |
1121 ;; prefix argument for Vi mode | |
1122 | |
1123 ;; In Vi mode, prefix argument is a dotted pair (NUM . COM) where NUM | |
1124 ;; represents the numeric value of the prefix argument and COM represents | |
1125 ;; command prefix such as "c", "d", "m" and "y". | |
1126 | |
1127 ;; Get value part of prefix-argument ARG. | |
19078 | 1128 (defsubst viper-p-val (arg) |
18129 | 1129 (cond ((null arg) 1) |
1130 ((consp arg) | |
1131 (if (or (null (car arg)) (equal (car arg) '(nil))) | |
1132 1 (car arg))) | |
1133 (t arg))) | |
1134 | |
1135 ;; Get raw value part of prefix-argument ARG. | |
19078 | 1136 (defsubst viper-P-val (arg) |
18129 | 1137 (cond ((consp arg) (car arg)) |
1138 (t arg))) | |
1139 | |
1140 ;; Get com part of prefix-argument ARG. | |
19078 | 1141 (defsubst viper-getcom (arg) |
18129 | 1142 (cond ((null arg) nil) |
1143 ((consp arg) (cdr arg)) | |
1144 (t nil))) | |
1145 | |
1146 ;; Get com part of prefix-argument ARG and modify it. | |
19078 | 1147 (defun viper-getCom (arg) |
1148 (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
|
1149 (cond ((viper= com ?c) ?c) |
19078 | 1150 ;; Previously, ?c was being converted to ?C, but this prevented |
1151 ;; multiline replace regions. | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1152 ;;((viper= com ?c) ?C) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1153 ((viper= com ?d) ?D) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1154 ((viper= com ?y) ?Y) |
18129 | 1155 (t com)))) |
1156 | |
1157 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1158 ;; 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
|
1159 ;; Invoked by EVENT-CHAR. COM is the command part obtained so far. |
21940 | 1160 (defun viper-prefix-arg-value (event-char com) |
19078 | 1161 (let ((viper-intermediate-command 'viper-digit-argument) |
1162 value func) | |
18129 | 1163 ;; read while number |
21940 | 1164 (while (and (viper-characterp event-char) |
1165 (>= event-char ?0) (<= event-char ?9)) | |
1166 (setq value (+ (* (if (integerp value) value 0) 10) (- event-char ?0))) | |
1167 (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
|
1168 |
18129 | 1169 (setq prefix-arg value) |
1170 (if com (setq prefix-arg (cons prefix-arg com))) | |
21940 | 1171 (while (eq event-char ?U) |
19078 | 1172 (viper-describe-arg prefix-arg) |
21940 | 1173 (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
|
1174 |
19078 | 1175 (if (or com (and (not (eq viper-current-state 'vi-state)) |
18129 | 1176 ;; make sure it is a Vi command |
21940 | 1177 (viper-characterp event-char) |
1178 (viper-vi-command-p event-char) | |
18129 | 1179 )) |
1180 ;; If appears to be one of the vi commands, | |
1181 ;; then execute it with funcall and clear prefix-arg in order to not | |
1182 ;; confuse subsequent commands | |
1183 (progn | |
1184 ;; 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
|
1185 ;; last. If com is not nil, the viper-digit-argument command was |
19078 | 1186 ;; 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
|
1187 ;; etc., i.e., the user typed, say, d2. In this case, `com' would be |
19078 | 1188 ;; `d', `w', etc. If viper-digit-argument was invoked by |
1189 ;; viper-escape-to-vi (which is indicated by the fact that the | |
21940 | 1190 ;; 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
|
1191 ;; vi command to be executed (e.g., `d', `w', etc). Again, |
19078 | 1192 ;; last-command-char must make emacs believe that this is the command |
1193 ;; we typed. | |
21940 | 1194 (cond ((eq event-char 'return) (setq event-char ?\C-m)) |
1195 ((eq event-char 'delete) (setq event-char ?\C-?)) | |
1196 ((eq event-char 'backspace) (setq event-char ?\C-h)) | |
1197 ((eq event-char 'space) (setq event-char ?\ ))) | |
1198 (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
|
1199 (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
|
1200 `(key-binding (char-to-string ,event-char)))) |
18129 | 1201 (funcall func prefix-arg) |
1202 (setq prefix-arg nil)) | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1203 ;; 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
|
1204 (viper-set-unread-command-events event-char)) |
18129 | 1205 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1206 |
18129 | 1207 |
1208 ;; Vi operator as prefix argument." | |
19078 | 1209 (defun viper-prefix-arg-com (char value com) |
18129 | 1210 (let ((cont t) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1211 cmd-info |
18958 | 1212 cmd-to-exec-at-end) |
18129 | 1213 (while (and cont |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1214 (viper-memq-char char |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1215 (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
|
1216 viper-buffer-search-char))) |
18129 | 1217 (if com |
1218 ;; this means that we already have a command character, so we | |
1219 ;; construct a com list and exit while. however, if char is " | |
1220 ;; it is an error. | |
1221 (progn | |
1222 ;; new com is (CHAR . OLDCOM) | |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
1223 (if (viper-memq-char char '(?# ?\")) (error "Viper bell")) |
18129 | 1224 (setq com (cons char com)) |
1225 (setq cont nil)) | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1226 ;; 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
|
1227 ;; ", 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
|
1228 ;; 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
|
1229 ;; loop. |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1230 (cond ((viper-memq-char char '(?! ?=)) |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1231 (setq com char) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1232 (setq char (read-char)) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1233 (setq cont nil)) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1234 ((viper= char ?#) |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1235 ;; 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
|
1236 (setq com (+ 128 (read-char))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1237 (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
|
1238 ((viper= char ?\") |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1239 (let ((reg (read-char))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1240 (if (viper-valid-register reg) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1241 (setq viper-use-register reg) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
1242 (error "Viper bell")) |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1243 (setq char (read-char)))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1244 (t |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1245 (setq com char) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1246 (setq char (read-char)))))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1247 |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1248 (if (atom com) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1249 ;; `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
|
1250 ;; 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
|
1251 ;; 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
|
1252 (progn |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1253 (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
|
1254 (while (viper= char ?U) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1255 (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
|
1256 (setq char (read-char))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1257 ;; `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
|
1258 ;; 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
|
1259 (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
|
1260 (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
|
1261 (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
|
1262 (viper= char ?!) ; bang command |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1263 (viper= char ?g) ; the gg command (like G0) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
1264 (error "Viper bell")) |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1265 (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
|
1266 (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
|
1267 `(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
|
1268 |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1269 ;; 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
|
1270 (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
|
1271 ;; execute apropriate region command. |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1272 (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
|
1273 (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
|
1274 (if (viper= char ?r) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1275 (viper-region prefix-arg) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1276 (viper-Region prefix-arg)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1277 ;; reset prefix-arg |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1278 (setq prefix-arg nil)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1279 ;; 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
|
1280 (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
|
1281 (setq prefix-arg nil) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1282 (cond |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1283 ;; 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
|
1284 ;; 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
|
1285 ;; 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
|
1286 ;; 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
|
1287 ;; with nC. |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1288 ((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
|
1289 ((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
|
1290 ((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
|
1291 ((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
|
1292 ((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
|
1293 ((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
|
1294 ((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
|
1295 ((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
|
1296 ;; gg acts as G0 |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1297 ((equal (car com) ?g) (viper-goto-line 0)) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
1298 (t (error "Viper bell"))))) |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1299 |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1300 (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
|
1301 (progn |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1302 (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
|
1303 (setq last-command-event |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1304 (viper-copy-event |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
1305 (if (featurep 'xemacs) (character-to-event char) char))) |
81331
c3779fe5830e
2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75346
diff
changeset
|
1306 (condition-case err |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1307 (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
|
1308 (error |
81331
c3779fe5830e
2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75346
diff
changeset
|
1309 (error "%s" (error-message-string err)))))) |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1310 )) |
18129 | 1311 |
19078 | 1312 (defun viper-describe-arg (arg) |
18129 | 1313 (let (val com) |
19078 | 1314 (setq val (viper-P-val arg) |
1315 com (viper-getcom arg)) | |
18129 | 1316 (if (null val) |
1317 (if (null com) | |
1318 (message "Value is nil, and command is nil") | |
1319 (message "Value is nil, and command is `%c'" com)) | |
1320 (if (null com) | |
1321 (message "Value is `%d', and command is nil" val) | |
1322 (message "Value is `%d', and command is `%c'" val com))))) | |
1323 | |
19078 | 1324 (defun viper-digit-argument (arg) |
18129 | 1325 "Begin numeric argument for the next command." |
1326 (interactive "P") | |
19078 | 1327 (viper-leave-region-active) |
1328 (viper-prefix-arg-value | |
18129 | 1329 last-command-char (if (consp arg) (cdr arg) nil))) |
1330 | |
19078 | 1331 (defun viper-command-argument (arg) |
18129 | 1332 "Accept a motion command as an argument." |
1333 (interactive "P") | |
19078 | 1334 (let ((viper-intermediate-command 'viper-command-argument)) |
18129 | 1335 (condition-case nil |
19078 | 1336 (viper-prefix-arg-com |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1337 last-command-char |
18129 | 1338 (cond ((null arg) nil) |
1339 ((consp arg) (car arg)) | |
1340 ((integerp arg) arg) | |
19078 | 1341 (t (error viper-InvalidCommandArgument))) |
18129 | 1342 (cond ((null arg) nil) |
1343 ((consp arg) (cdr arg)) | |
1344 ((integerp arg) nil) | |
19078 | 1345 (t (error viper-InvalidCommandArgument)))) |
1346 (quit (setq viper-use-register nil) | |
18129 | 1347 (signal 'quit nil))) |
19078 | 1348 (viper-deactivate-mark))) |
18129 | 1349 |
1350 | |
1351 ;; repeat last destructive command | |
1352 | |
1353 ;; Append region to text in register REG. | |
1354 ;; START and END are buffer positions indicating what to append. | |
19078 | 1355 (defsubst viper-append-to-register (reg start end) |
18129 | 1356 (set-register reg (concat (if (stringp (get-register reg)) |
1357 (get-register reg) "") | |
1358 (buffer-substring start end)))) | |
1359 | |
19078 | 1360 ;; Saves last inserted text for possible use by viper-repeat command. |
1361 (defun viper-save-last-insertion (beg end) | |
19756 | 1362 (condition-case nil |
1363 (setq viper-last-insertion (buffer-substring beg end)) | |
1364 (error | |
1365 ;; beg or end marker are somehow screwed up | |
1366 (setq viper-last-insertion nil))) | |
19078 | 1367 (setq viper-last-insertion (buffer-substring beg end)) |
1368 (or (< (length viper-d-com) 5) | |
1369 (setcar (nthcdr 4 viper-d-com) viper-last-insertion)) | |
1370 (or (null viper-command-ring) | |
1371 (ring-empty-p viper-command-ring) | |
18129 | 1372 (progn |
19078 | 1373 (setcar (nthcdr 4 (viper-current-ring-item viper-command-ring)) |
1374 viper-last-insertion) | |
18129 | 1375 ;; del most recent elt, if identical to the second most-recent |
19078 | 1376 (viper-cleanup-ring viper-command-ring))) |
18129 | 1377 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1378 |
19078 | 1379 (defsubst viper-yank-last-insertion () |
1380 "Inserts the text saved by the previous viper-save-last-insertion command." | |
18129 | 1381 (condition-case nil |
19078 | 1382 (insert viper-last-insertion) |
18129 | 1383 (error nil))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1384 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1385 |
18129 | 1386 ;; define functions to be executed |
1387 | |
1388 ;; invoked by the `C' command | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1389 (defun viper-exec-change (m-com com) |
19078 | 1390 (or (and (markerp viper-com-point) (marker-position viper-com-point)) |
1391 (set-marker viper-com-point (point) (current-buffer))) | |
18129 | 1392 ;; handle C cmd at the eol and at eob. |
19078 | 1393 (if (or (and (eolp) (= viper-com-point (point))) |
1394 (= viper-com-point (point-max))) | |
18129 | 1395 (progn |
1396 (insert " ")(backward-char 1))) | |
19078 | 1397 (if (= viper-com-point (point)) |
1398 (viper-forward-char-carefully)) | |
1399 (set-mark viper-com-point) | |
1400 (if (eq m-com 'viper-next-line-at-bol) | |
1401 (viper-enlarge-region (mark t) (point))) | |
1402 (if (< (point) (mark t)) | |
1403 (exchange-point-and-mark)) | |
1404 (if (eq (preceding-char) ?\n) | |
1405 (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
|
1406 (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
|
1407 (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
|
1408 (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
|
1409 )) |
19078 | 1410 |
1411 ;; this is invoked by viper-substitute-line | |
1412 (defun viper-exec-Change (m-com com) | |
18129 | 1413 (save-excursion |
19078 | 1414 (set-mark viper-com-point) |
1415 (viper-enlarge-region (mark t) (point)) | |
1416 (if viper-use-register | |
18129 | 1417 (progn |
19078 | 1418 (cond ((viper-valid-register viper-use-register '(letter digit)) |
18129 | 1419 (copy-to-register |
19078 | 1420 viper-use-register (mark t) (point) nil)) |
1421 ((viper-valid-register viper-use-register '(Letter)) | |
1422 (viper-append-to-register | |
1423 (downcase viper-use-register) (mark t) (point))) | |
1424 (t (setq viper-use-register nil) | |
1425 (error viper-InvalidRegister viper-use-register))) | |
1426 (setq viper-use-register nil))) | |
18129 | 1427 (delete-region (mark t) (point))) |
1428 (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
|
1429 (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
|
1430 (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
|
1431 (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
|
1432 )) |
19078 | 1433 |
1434 (defun viper-exec-delete (m-com com) | |
1435 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
1436 (set-marker viper-com-point (point) (current-buffer))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1437 (let (chars-deleted) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1438 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1439 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1440 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1441 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1442 viper-use-register viper-com-point (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1443 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1444 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1445 (downcase viper-use-register) viper-com-point (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1446 (t (setq viper-use-register nil) |
19078 | 1447 (error viper-InvalidRegister viper-use-register))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1448 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1449 (setq last-command |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1450 (if (eq last-command 'd-command) 'kill-region nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1451 (setq chars-deleted (abs (- (point) viper-com-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1452 (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
|
1453 (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
|
1454 (message "Deleted %d characters" chars-deleted))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1455 (kill-region viper-com-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1456 (setq this-command 'd-command) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1457 (if viper-ex-style-motion |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1458 (if (and (eolp) (not (bolp))) (backward-char 1))))) |
18129 | 1459 |
19078 | 1460 (defun viper-exec-Delete (m-com com) |
18129 | 1461 (save-excursion |
19078 | 1462 (set-mark viper-com-point) |
1463 (viper-enlarge-region (mark t) (point)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1464 (let (lines-deleted) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1465 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1466 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1467 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1468 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1469 viper-use-register (mark t) (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1470 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1471 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1472 (downcase viper-use-register) (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1473 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1474 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1475 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1476 (setq last-command |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1477 (if (eq last-command 'D-command) 'kill-region nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1478 (setq lines-deleted (count-lines (point) viper-com-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1479 (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
|
1480 (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
|
1481 (message "Deleted %d lines" lines-deleted))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1482 (kill-region (mark t) (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1483 (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
|
1484 (back-to-indentation))) |
18129 | 1485 |
21940 | 1486 ;; save region |
19078 | 1487 (defun viper-exec-yank (m-com com) |
1488 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
1489 (set-marker viper-com-point (point) (current-buffer))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1490 (let (chars-saved) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1491 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1492 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1493 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1494 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1495 viper-use-register viper-com-point (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1496 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1497 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1498 (downcase viper-use-register) viper-com-point (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1499 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1500 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1501 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1502 (setq last-command nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1503 (copy-region-as-kill viper-com-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1504 (setq chars-saved (abs (- (point) viper-com-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1505 (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
|
1506 (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
|
1507 (message "Saved %d characters" chars-saved))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1508 (goto-char viper-com-point))) |
19078 | 1509 |
21940 | 1510 ;; save lines |
19078 | 1511 (defun viper-exec-Yank (m-com com) |
18129 | 1512 (save-excursion |
19078 | 1513 (set-mark viper-com-point) |
1514 (viper-enlarge-region (mark t) (point)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1515 (let (lines-saved) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1516 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1517 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1518 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1519 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1520 viper-use-register (mark t) (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1521 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1522 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1523 (downcase viper-use-register) (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1524 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1525 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1526 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1527 (setq last-command nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1528 (copy-region-as-kill (mark t) (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1529 (setq lines-saved (count-lines (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1530 (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
|
1531 (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
|
1532 (message "Saved %d lines" lines-saved))))) |
19078 | 1533 (viper-deactivate-mark) |
1534 (goto-char viper-com-point)) | |
1535 | |
1536 (defun viper-exec-bang (m-com com) | |
18129 | 1537 (save-excursion |
19078 | 1538 (set-mark viper-com-point) |
1539 (viper-enlarge-region (mark t) (point)) | |
18958 | 1540 (exchange-point-and-mark) |
18129 | 1541 (shell-command-on-region |
1542 (mark t) (point) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1543 (if (viper= com ?!) |
19078 | 1544 (setq viper-last-shell-com |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1545 (viper-read-string-with-history |
18129 | 1546 "!" |
1547 nil | |
19078 | 1548 'viper-shell-history |
1549 (car viper-shell-history) | |
18129 | 1550 )) |
19078 | 1551 viper-last-shell-com) |
18129 | 1552 t))) |
1553 | |
19078 | 1554 (defun viper-exec-equals (m-com com) |
18129 | 1555 (save-excursion |
19078 | 1556 (set-mark viper-com-point) |
1557 (viper-enlarge-region (mark t) (point)) | |
18129 | 1558 (if (> (mark t) (point)) (exchange-point-and-mark)) |
1559 (indent-region (mark t) (point) nil))) | |
1560 | |
19078 | 1561 (defun viper-exec-shift (m-com com) |
18129 | 1562 (save-excursion |
19078 | 1563 (set-mark viper-com-point) |
1564 (viper-enlarge-region (mark t) (point)) | |
18129 | 1565 (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
|
1566 (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
|
1567 (if (viper= com ?>) |
19078 | 1568 viper-shift-width |
1569 (- viper-shift-width)))) | |
18129 | 1570 ;; return point to where it was before shift |
19078 | 1571 (goto-char viper-com-point)) |
18129 | 1572 |
1573 ;; this is needed because some commands fake com by setting it to ?r, which | |
1574 ;; denotes repeated insert command. | |
19078 | 1575 (defsubst viper-exec-dummy (m-com com) |
18129 | 1576 nil) |
1577 | |
19078 | 1578 (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
|
1579 (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
|
1580 (regexp-quote (buffer-substring (point) viper-com-point))) |
19078 | 1581 (setq viper-s-forward t) |
1582 (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
|
1583 (setq viper-intermediate-command 'viper-exec-buffer-search) |
19078 | 1584 (viper-search viper-s-string viper-s-forward 1)) |
1585 | |
1586 (defvar viper-exec-array (make-vector 128 nil)) | |
18129 | 1587 |
1588 ;; 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
|
1589 ;; without affecting other functions. Buffer search can now be bound |
18129 | 1590 ;; to any character. |
1591 | |
19078 | 1592 (aset viper-exec-array ?c 'viper-exec-change) |
1593 (aset viper-exec-array ?C 'viper-exec-Change) | |
1594 (aset viper-exec-array ?d 'viper-exec-delete) | |
1595 (aset viper-exec-array ?D 'viper-exec-Delete) | |
1596 (aset viper-exec-array ?y 'viper-exec-yank) | |
1597 (aset viper-exec-array ?Y 'viper-exec-Yank) | |
1598 (aset viper-exec-array ?r 'viper-exec-dummy) | |
1599 (aset viper-exec-array ?! 'viper-exec-bang) | |
1600 (aset viper-exec-array ?< 'viper-exec-shift) | |
1601 (aset viper-exec-array ?> 'viper-exec-shift) | |
1602 (aset viper-exec-array ?= 'viper-exec-equals) | |
18129 | 1603 |
1604 | |
1605 | |
1606 ;; 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
|
1607 ;; destructive command on the region specified by the movement command. For |
19078 | 1608 ;; instance, if the user types cw, then the command viper-forward-word will |
1609 ;; call viper-execute-com to execute viper-exec-change, which eventually will | |
1610 ;; call viper-change to invoke the replace mode on the region. | |
18129 | 1611 ;; |
19078 | 1612 ;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS) |
1613 ;; via a call to viper-set-destructive-command, for later use by viper-repeat. | |
1614 (defun viper-execute-com (m-com val com) | |
1615 (let ((reg viper-use-register)) | |
18129 | 1616 ;; this is the special command `#' |
1617 (if (> com 128) | |
19078 | 1618 (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
|
1619 (let ((fn (aref viper-exec-array com))) |
18129 | 1620 (if (null fn) |
19078 | 1621 (error "%c: %s" com viper-InvalidViCommand) |
18129 | 1622 (funcall fn m-com com)))) |
19078 | 1623 (if (viper-dotable-command-p com) |
1624 (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
|
1625 (list m-com val com reg nil nil))) |
18129 | 1626 )) |
1627 | |
1628 | |
19078 | 1629 (defun viper-repeat (arg) |
18129 | 1630 "Re-execute last destructive command. |
19078 | 1631 Use the info in viper-d-com, which has the form |
18129 | 1632 \(com val ch reg inserted-text command-keys\), |
1633 where `com' is the command to be re-executed, `val' is the | |
1634 argument to `com', `ch' is a flag for repeat, and `reg' is optional; | |
1635 if it exists, it is the name of the register for `com'. | |
1636 If the prefix argument, ARG, is non-nil, it is used instead of `val'." | |
1637 (interactive "P") | |
1638 (let ((save-point (point)) ; save point before repeating prev cmd | |
1639 ;; Pass along that we are repeating a destructive command | |
19078 | 1640 ;; This tells viper-set-destructive-command not to update |
1641 ;; viper-command-ring | |
1642 (viper-intermediate-command 'viper-repeat)) | |
1643 (if (eq last-command 'viper-undo) | |
1644 ;; if the last command was viper-undo, then undo-more | |
1645 (viper-undo-more) | |
1646 ;; otherwise execute the command stored in viper-d-com. if arg is | |
1647 ;; non-nil its prefix value is used as new prefix value for the command. | |
1648 (let ((m-com (car viper-d-com)) | |
1649 (val (viper-P-val arg)) | |
1650 (com (nth 2 viper-d-com)) | |
1651 (reg (nth 3 viper-d-com))) | |
1652 (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
|
1653 (if (null m-com) (error "No previous command to repeat")) |
19078 | 1654 (setq viper-use-register reg) |
1655 (if (nth 4 viper-d-com) ; text inserted by command | |
1656 (setq viper-last-insertion (nth 4 viper-d-com) | |
1657 viper-d-char (nth 4 viper-d-com))) | |
18129 | 1658 (funcall m-com (cons val com)) |
19078 | 1659 (cond ((and (< save-point (point)) viper-keep-point-on-repeat) |
18839 | 1660 (goto-char save-point)) ; go back to before repeat. |
19462 | 1661 ((and (< save-point (point)) viper-ex-style-editing) |
18839 | 1662 (or (bolp) (backward-char 1)))) |
18129 | 1663 (if (and (eolp) (not (bolp))) |
1664 (backward-char 1)) | |
1665 )) | |
19462 | 1666 (viper-adjust-undo) ; take care of undo |
18129 | 1667 ;; 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
|
1668 ;; just executed a command from that ring. So, push it on the ring again. |
19078 | 1669 ;; If we are just executing previous command , then don't push viper-d-com |
1670 ;; 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
|
1671 ;; the inserted text may be nil). Besides, in this case, the command |
18129 | 1672 ;; executed by `.' is already on the ring. |
19078 | 1673 (if (eq last-command 'viper-display-current-destructive-command) |
1674 (viper-push-onto-ring viper-d-com 'viper-command-ring)) | |
1675 (viper-deactivate-mark) | |
18129 | 1676 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1677 |
19078 | 1678 (defun viper-repeat-from-history () |
18129 | 1679 "Repeat a destructive command from history. |
19078 | 1680 Doesn't change viper-command-ring in any way, so `.' will work as before |
18129 | 1681 executing this command. |
1682 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
|
1683 the second character is a digit 0 to 9. The digit indicates which |
18129 | 1684 history command to execute. `<char>0' is equivalent to `.', `<char>1' |
1685 invokes the command before that, etc." | |
1686 (interactive) | |
19078 | 1687 (let* ((viper-intermediate-command 'repeating-display-destructive-command) |
1688 (idx (cond (viper-this-kbd-macro | |
18129 | 1689 (string-to-number |
19078 | 1690 (symbol-name (elt viper-this-kbd-macro 1)))) |
18129 | 1691 (t 0))) |
1692 (num idx) | |
19078 | 1693 (viper-d-com viper-d-com)) |
18129 | 1694 |
1695 (or (and (numberp num) (<= 0 num) (<= num 9)) | |
1696 (progn | |
1697 (setq idx 0 | |
1698 num 0) | |
1699 (message | |
19078 | 1700 "`viper-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'"))) |
18129 | 1701 (while (< 0 num) |
19078 | 1702 (setq viper-d-com (viper-special-ring-rotate1 viper-command-ring -1)) |
18129 | 1703 (setq num (1- num))) |
19078 | 1704 (viper-repeat nil) |
18129 | 1705 (while (> idx num) |
19078 | 1706 (viper-special-ring-rotate1 viper-command-ring 1) |
18129 | 1707 (setq num (1+ num))) |
1708 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1709 |
18129 | 1710 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1711 ;; The hash-command. It is invoked interactively by the key sequence #<char>. |
19078 | 1712 ;; The chars that can follow `#' are determined by viper-hash-command-p |
1713 (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
|
1714 (cond ((viper= char ?c) |
19078 | 1715 (downcase-region (min viper-com-point (point)) |
1716 (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
|
1717 ((viper= char ?C) |
19078 | 1718 (upcase-region (min viper-com-point (point)) |
1719 (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
|
1720 ((viper= char ?g) |
19078 | 1721 (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
|
1722 ;; execute the last emacs kbd macro on each line of the region |
19078 | 1723 (viper-global-execute)) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1724 ((viper= char ?q) |
19078 | 1725 (push-mark viper-com-point t) |
1726 (viper-quote-region)) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1727 ((viper= char ?s) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1728 (funcall viper-spell-function viper-com-point (point))) |
19078 | 1729 (t (error "#%c: %s" char viper-InvalidViCommand)))) |
18129 | 1730 |
1731 | |
1732 ;; undoing | |
1733 | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1734 ;; hook used inside undo |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1735 (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
|
1736 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1737 ;; 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
|
1738 (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
|
1739 (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
|
1740 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1741 (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
|
1742 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1743 ;; 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
|
1744 (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
|
1745 (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
|
1746 (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
|
1747 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
|
1748 ;; 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
|
1749 ;; 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
|
1750 ;; its repeated invocation |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1751 (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
|
1752 )) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1753 |
19078 | 1754 (defun viper-undo () |
18129 | 1755 "Undo previous change." |
1756 (interactive) | |
1757 (message "undo!") | |
1758 (let ((modified (buffer-modified-p)) | |
1759 (before-undo-pt (point-marker)) | |
1760 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
|
1761 |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1762 ;; 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
|
1763 (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
|
1764 |
18129 | 1765 (undo-start) |
1766 (undo-more 2) | |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1767 ;;(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
|
1768 ;; 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
|
1769 ;;(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
|
1770 ;; 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
|
1771 |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1772 (if (and undo-beg-posn undo-end-posn) |
18129 | 1773 (progn |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1774 (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
|
1775 (sit-for 0) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1776 (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
|
1777 (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
|
1778 (progn |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1779 (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
|
1780 (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
|
1781 (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
|
1782 (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
|
1783 (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
|
1784 (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
|
1785 (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
|
1786 (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
|
1787 )) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1788 |
18129 | 1789 (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
|
1790 ) |
19078 | 1791 (setq this-command 'viper-undo)) |
18129 | 1792 |
1793 ;; Continue undoing previous changes. | |
19078 | 1794 (defun viper-undo-more () |
18129 | 1795 (message "undo more!") |
1796 (condition-case nil | |
1797 (undo-more 1) | |
1798 (error (beep) | |
1799 (message "No further undo information in this buffer"))) | |
1800 (if (and (eolp) (not (bolp))) (backward-char 1)) | |
19078 | 1801 (setq this-command 'viper-undo)) |
18129 | 1802 |
1803 ;; The following two functions are used to set up undo properly. | |
1804 ;; 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
|
1805 ;; they are undone all at once. |
19078 | 1806 (defun viper-adjust-undo () |
19462 | 1807 (if viper-undo-needs-adjustment |
1808 (let ((inhibit-quit t) | |
1809 tmp tmp2) | |
1810 (setq viper-undo-needs-adjustment nil) | |
1811 (if (listp buffer-undo-list) | |
1812 (if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list)) | |
1813 (progn | |
1814 (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
|
1815 |
19462 | 1816 ;; cut tail from buffer-undo-list temporarily by direct |
1817 ;; manipulation with pointers in buffer-undo-list | |
1818 (setcdr tmp nil) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1819 |
19462 | 1820 (setq buffer-undo-list (delq nil buffer-undo-list)) |
1821 (setq buffer-undo-list | |
1822 (delq viper-buffer-undo-list-mark buffer-undo-list)) | |
1823 ;; restore tail of buffer-undo-list | |
1824 (setq buffer-undo-list (nconc buffer-undo-list tmp2))) | |
1825 (setq buffer-undo-list (delq nil buffer-undo-list))))) | |
1826 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1827 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1828 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1829 (defun viper-set-complex-command-for-undo () |
18129 | 1830 (if (listp buffer-undo-list) |
19078 | 1831 (if (not viper-undo-needs-adjustment) |
18129 | 1832 (let ((inhibit-quit t)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1833 (setq buffer-undo-list |
19078 | 1834 (cons viper-buffer-undo-list-mark buffer-undo-list)) |
1835 (setq viper-undo-needs-adjustment t))))) | |
18129 | 1836 |
1837 | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1838 ;;; 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
|
1839 |
19078 | 1840 (defun viper-display-current-destructive-command () |
1841 (let ((text (nth 4 viper-d-com)) | |
1842 (keys (nth 5 viper-d-com)) | |
18129 | 1843 (max-text-len 30)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1844 |
19078 | 1845 (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
|
1846 |
18129 | 1847 (message " `.' runs %s%s" |
19078 | 1848 (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
|
1849 (viper-abbreviate-string |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1850 (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
|
1851 (replace-in-string ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1852 (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
|
1853 ((stringp text) text) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1854 (t "")) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1855 "\n" "^J") |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1856 text ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1857 ) |
19079 | 1858 max-text-len |
1859 " inserting `" "'" " .......")) | |
18129 | 1860 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1861 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1862 |
19078 | 1863 ;; don't change viper-d-com if it was viper-repeat command invoked with `.' |
18129 | 1864 ;; or in some other way (non-interactively). |
19078 | 1865 (defun viper-set-destructive-command (list) |
1866 (or (eq viper-intermediate-command 'viper-repeat) | |
18129 | 1867 (progn |
19078 | 1868 (setq viper-d-com list) |
1869 (setcar (nthcdr 5 viper-d-com) | |
1870 (viper-array-to-string (if (arrayp viper-this-command-keys) | |
1871 viper-this-command-keys | |
1872 (this-command-keys)))) | |
1873 (viper-push-onto-ring viper-d-com 'viper-command-ring))) | |
1874 (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
|
1875 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1876 |
19078 | 1877 (defun viper-prev-destructive-command (next) |
18129 | 1878 "Find previous destructive command in the history of destructive commands. |
1879 With prefix argument, find next destructive command." | |
1880 (interactive "P") | |
19078 | 1881 (let (cmd viper-intermediate-command) |
1882 (if (eq last-command 'viper-display-current-destructive-command) | |
18129 | 1883 ;; repeated search through command history |
19078 | 1884 (setq viper-intermediate-command |
1885 'repeating-display-destructive-command) | |
18129 | 1886 ;; first search through command history--set temp ring |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82467
diff
changeset
|
1887 (setq viper-temp-command-ring (ring-copy viper-command-ring))) |
18129 | 1888 (setq cmd (if next |
19078 | 1889 (viper-special-ring-rotate1 viper-temp-command-ring 1) |
1890 (viper-special-ring-rotate1 viper-temp-command-ring -1))) | |
18129 | 1891 (if (null cmd) |
1892 () | |
19078 | 1893 (setq viper-d-com cmd)) |
1894 (viper-display-current-destructive-command))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1895 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1896 |
19078 | 1897 (defun viper-next-destructive-command () |
18129 | 1898 "Find next destructive command in the history of destructive commands." |
1899 (interactive) | |
19078 | 1900 (viper-prev-destructive-command 'next)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1901 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1902 |
19078 | 1903 (defun viper-insert-prev-from-insertion-ring (arg) |
18129 | 1904 "Cycle through insertion ring in the direction of older insertions. |
1905 Undoes previous insertion and inserts new. | |
1906 With prefix argument, cycles in the direction of newer elements. | |
1907 In minibuffer, this command executes whatever the invocation key is bound | |
1908 to in the global map, instead of cycling through the insertion ring." | |
1909 (interactive "P") | |
19078 | 1910 (let (viper-intermediate-command) |
1911 (if (eq last-command 'viper-insert-from-insertion-ring) | |
18129 | 1912 (progn ; repeated search through insertion history |
19078 | 1913 (setq viper-intermediate-command 'repeating-insertion-from-ring) |
1914 (if (eq viper-current-state 'replace-state) | |
18129 | 1915 (undo 1) |
19078 | 1916 (if viper-last-inserted-string-from-insertion-ring |
18129 | 1917 (backward-delete-char |
19078 | 1918 (length viper-last-inserted-string-from-insertion-ring)))) |
18129 | 1919 ) |
1920 ;;first search through insertion history | |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82467
diff
changeset
|
1921 (setq viper-temp-insertion-ring (ring-copy viper-insertion-ring))) |
19078 | 1922 (setq this-command 'viper-insert-from-insertion-ring) |
18129 | 1923 ;; so that things will be undone properly |
1924 (setq buffer-undo-list (cons nil buffer-undo-list)) | |
19078 | 1925 (setq viper-last-inserted-string-from-insertion-ring |
1926 (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
|
1927 |
19078 | 1928 ;; this change of viper-intermediate-command must come after |
1929 ;; viper-special-ring-rotate1, so that the ring will rotate, but before the | |
18129 | 1930 ;; insertion. |
19078 | 1931 (setq viper-intermediate-command nil) |
1932 (if viper-last-inserted-string-from-insertion-ring | |
1933 (insert viper-last-inserted-string-from-insertion-ring)) | |
18129 | 1934 )) |
1935 | |
19078 | 1936 (defun viper-insert-next-from-insertion-ring () |
18129 | 1937 "Cycle through insertion ring in the direction of older insertions. |
1938 Undo previous insertion and inserts new." | |
1939 (interactive) | |
19078 | 1940 (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
|
1941 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1942 |
18129 | 1943 |
1944 ;; some region utilities | |
1945 | |
1946 ;; If at the last line of buffer, add \\n before eob, if newline is missing. | |
19078 | 1947 (defun viper-add-newline-at-eob-if-necessary () |
18129 | 1948 (save-excursion |
1949 (end-of-line) | |
1950 ;; make sure all lines end with newline, unless in the minibuffer or | |
1951 ;; 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
|
1952 (save-restriction |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1953 (widen) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1954 (if (and (eobp) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1955 (not (bolp)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1956 require-final-newline |
74857
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1957 ;; add newline only if we actually edited buffer. otherwise it |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1958 ;; might unintentionally modify binary buffers |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1959 (buffer-modified-p) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1960 (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
|
1961 (not buffer-read-only)) |
74857
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1962 ;; text property may be read-only |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1963 (condition-case nil |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1964 (insert "\n") |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1965 (error nil)) |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1966 )) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1967 )) |
18129 | 1968 |
19078 | 1969 (defun viper-yank-defun () |
18129 | 1970 (mark-defun) |
1971 (copy-region-as-kill (point) (mark t))) | |
1972 | |
1973 ;; Enlarge region between BEG and END. | |
19078 | 1974 (defun viper-enlarge-region (beg end) |
18129 | 1975 (or beg (setq beg end)) ; if beg is nil, set to end |
1976 (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
|
1977 |
18129 | 1978 (if (< beg end) |
1979 (progn (goto-char beg) (set-mark end)) | |
1980 (goto-char end) | |
1981 (set-mark beg)) | |
1982 (beginning-of-line) | |
1983 (exchange-point-and-mark) | |
1984 (if (or (not (eobp)) (not (bolp))) (forward-line 1)) | |
1985 (if (not (eobp)) (beginning-of-line)) | |
1986 (if (> beg end) (exchange-point-and-mark))) | |
1987 | |
1988 | |
1989 ;; Quote region by each line with a user supplied string. | |
19078 | 1990 (defun viper-quote-region () |
20343 | 1991 (let ((quote-str viper-quote-string) |
1992 (donot-change-dafault t)) | |
1993 (setq quote-str | |
1994 (viper-read-string-with-history | |
1995 "Quote string: " | |
1996 nil | |
1997 'viper-quote-region-history | |
1998 (cond ((string-match "tex.*-mode" (symbol-name major-mode)) "%%") | |
1999 ((string-match "java.*-mode" (symbol-name major-mode)) "//") | |
2000 ((string-match "perl.*-mode" (symbol-name major-mode)) "#") | |
2001 ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") | |
2002 ((memq major-mode '(c-mode cc-mode c++-mode)) "//") | |
2003 ((memq major-mode '(sh-mode shell-mode)) "#") | |
2004 (t (setq donot-change-dafault nil) | |
2005 quote-str)))) | |
2006 (or donot-change-dafault | |
2007 (setq viper-quote-string quote-str)) | |
2008 (viper-enlarge-region (point) (mark t)) | |
2009 (if (> (point) (mark t)) (exchange-point-and-mark)) | |
2010 (insert quote-str) | |
18129 | 2011 (beginning-of-line) |
20343 | 2012 (forward-line 1) |
2013 (while (and (< (point) (mark t)) (bolp)) | |
2014 (insert quote-str) | |
2015 (beginning-of-line) | |
2016 (forward-line 1)))) | |
18129 | 2017 |
2018 ;; Tells whether BEG is on the same line as END. | |
2019 ;; If one of the args is nil, it'll return nil. | |
19078 | 2020 (defun viper-same-line (beg end) |
18129 | 2021 (let ((selective-display nil) |
2022 (incr 0) | |
2023 temp) | |
2024 (if (and beg end (> beg end)) | |
2025 (setq temp beg | |
2026 beg end | |
2027 end temp)) | |
2028 (if (and beg end) | |
2029 (cond ((or (> beg (point-max)) (> end (point-max))) ; out of range | |
2030 nil) | |
2031 (t | |
2032 ;; This 'if' is needed because Emacs treats the next empty line | |
2033 ;; as part of the previous line. | |
19078 | 2034 (if (= (viper-line-pos 'start) end) |
18129 | 2035 (setq incr 1)) |
2036 (<= (+ incr (count-lines beg end)) 1)))) | |
2037 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2038 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2039 |
18129 | 2040 ;; Check if the string ends with a newline. |
19078 | 2041 (defun viper-end-with-a-newline-p (string) |
18129 | 2042 (or (string= string "") |
19078 | 2043 (= (viper-seq-last-elt string) ?\n))) |
2044 | |
2045 (defun viper-tmp-insert-at-eob (msg) | |
18129 | 2046 (let ((savemax (point-max))) |
2047 (goto-char savemax) | |
2048 (insert msg) | |
2049 (sit-for 2) | |
2050 (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
|
2051 )) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2052 |
18129 | 2053 |
2054 | |
2055 ;;; Minibuffer business | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2056 |
19078 | 2057 (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
|
2058 (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
|
2059 (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
|
2060 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2061 |
19078 | 2062 (defun viper-minibuffer-setup-sentinel () |
2063 (let ((hook (if viper-vi-style-in-minibuffer | |
2064 'viper-change-state-to-insert | |
2065 '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
|
2066 ;; 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
|
2067 ;; 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
|
2068 ;; 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
|
2069 ;; the normal buffers |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2070 (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
|
2071 (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
|
2072 (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
|
2073 (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
|
2074 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
|
2075 viper-command-ring nil) |
18129 | 2076 (funcall hook) |
2077 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2078 |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2079 ;; 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
|
2080 ;; 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
|
2081 ;; 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
|
2082 ;; viper-read-string-with-history |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2083 (defun viper-minibuffer-standard-hook () |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2084 (if (stringp init-message) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2085 (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
|
2086 (if (stringp initial) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2087 (progn |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2088 ;; 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
|
2089 (or unread-command-events |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2090 executing-kbd-macro |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2091 (sit-for 840)) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2092 (if (fboundp 'minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2093 (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
|
2094 (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
|
2095 (insert initial)))) |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2096 |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2097 (defsubst viper-minibuffer-real-start () |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2098 (if (fboundp 'minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2099 (minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2100 (point-min))) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2101 |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2102 (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
|
2103 (when (active-minibuffer-window) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2104 (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
|
2105 (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
|
2106 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2107 |
19756 | 2108 ;; Interpret last event in the local map first; if fails, use exit-minibuffer. |
2109 ;; Run viper-minibuffer-exit-hook before exiting. | |
19078 | 2110 (defun viper-exit-minibuffer () |
19756 | 2111 "Exit minibuffer Viper way." |
18129 | 2112 (interactive) |
2113 (let (command) | |
2114 (setq command (local-key-binding (char-to-string last-command-char))) | |
19756 | 2115 (run-hooks 'viper-minibuffer-exit-hook) |
18129 | 2116 (if command |
2117 (command-execute command) | |
2118 (exit-minibuffer)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2119 |
19756 | 2120 |
2121 (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
|
2122 '("" "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
|
2123 "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
|
2124 "*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
|
2125 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
|
2126 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
|
2127 represents an editable file. However, file completion will stop at the `.' |
19756 | 2128 The smart suffix feature lets you hit RET in such a case, and Viper will |
2129 select the appropriate suffix. | |
2130 | |
2131 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
|
2132 corresponding file exists is selected. If no file exists for any of the |
19756 | 2133 suffixes, the user is asked to confirm. |
2134 | |
2135 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
|
2136 :type '(repeat string) |
20003 | 2137 :group 'viper-misc) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2138 |
19756 | 2139 |
2140 ;; Try to add a suitable suffix to files whose name ends with a `.' | |
2141 ;; Useful when the user hits RET on a non-completed file name. | |
2142 ;; Used as a minibuffer exit hook in read-file-name | |
2143 (defun viper-file-add-suffix () | |
2144 (let ((count 0) | |
2145 (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
|
2146 (file (buffer-substring-no-properties |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2147 (viper-minibuffer-real-start) (point-max))) |
19756 | 2148 found key cmd suff) |
2149 (goto-char (point-max)) | |
2150 (if (and viper-smart-suffix-list (string-match "\\.$" file)) | |
2151 (progn | |
2152 (while (and (not found) (< count len)) | |
2153 (setq suff (nth count viper-smart-suffix-list) | |
2154 count (1+ count)) | |
2155 (if (file-exists-p | |
2156 (format "%s%s" (substitute-in-file-name file) suff)) | |
2157 (progn | |
2158 (setq found t) | |
2159 (insert suff)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2160 |
19756 | 2161 (if found |
2162 () | |
2163 (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
|
2164 (unwind-protect |
19756 | 2165 (while (not (memq cmd |
2166 '(exit-minibuffer viper-exit-minibuffer))) | |
2167 (setq cmd | |
2168 (key-binding (setq key (read-key-sequence nil)))) | |
2169 (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
|
2170 (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
|
2171 (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
|
2172 (insert key) ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2173 )) |
19756 | 2174 ((memq cmd '(exit-minibuffer viper-exit-minibuffer)) |
2175 nil) | |
2176 (t (command-execute cmd))) | |
2177 ))) | |
2178 )))) | |
2179 | |
2180 | |
2181 (defun viper-minibuffer-trim-tail () | |
2182 "Delete junk at the end of the first line of the minibuffer input. | |
2183 Remove this function from `viper-minibuffer-exit-hook', if this causes | |
2184 problems." | |
2185 (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
|
2186 (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
|
2187 (goto-char (viper-minibuffer-real-start)) |
19756 | 2188 (end-of-line) |
2189 (delete-region (point) (point-max))))) | |
2190 | |
18129 | 2191 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2192 ;;; Reading string with history |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2193 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2194 (defun viper-read-string-with-history (prompt &optional initial |
20343 | 2195 history-var default keymap |
2196 init-message) | |
18129 | 2197 ;; Read string, prompting with PROMPT and inserting the INITIAL |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2198 ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the |
20343 | 2199 ;; input is an empty string. |
18129 | 2200 ;; 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
|
2201 ;; minibuffer. |
20343 | 2202 ;; KEYMAP is used, if given, instead of minibuffer-local-map. |
2203 ;; INIT-MESSAGE is the message temporarily displayed after entering the | |
2204 ;; minibuffer. | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2205 (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
|
2206 ;; 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
|
2207 (let ((old |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2208 (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
|
2209 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
|
2210 nil))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2211 (cons |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2212 '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
|
2213 (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
|
2214 (list old) old)))) |
18129 | 2215 (val "") |
2216 (padding "") | |
2217 temp-msg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2218 |
18129 | 2219 (setq keymap (or keymap minibuffer-local-map) |
2220 initial (or initial "") | |
2221 temp-msg (if default | |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2222 (format "(default %s) " default) |
18129 | 2223 "")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2224 |
19078 | 2225 (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
|
2226 (setq val (read-from-minibuffer prompt |
18129 | 2227 (concat temp-msg initial val padding) |
2228 keymap nil history-var)) | |
2229 (setq minibuffer-setup-hook nil | |
19078 | 2230 padding (viper-array-to-string (this-command-keys)) |
18129 | 2231 temp-msg "") |
2232 ;; the following tries to be smart about what to put in history | |
2233 (if (not (string= val (car (eval history-var)))) | |
2234 (set history-var (cons val (eval history-var)))) | |
2235 (if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var))) | |
2236 (string= (nth 0 (eval history-var)) "")) | |
2237 (set history-var (cdr (eval history-var)))) | |
19078 | 2238 ;; 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
|
2239 ;; viper-command-argument, or `! shell-command', this probably means |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2240 ;; that the user typed something then erased. Return "" in this case, not |
18129 | 2241 ;; the default---the default is too confusing in this case. |
2242 (cond ((and (string= val "") | |
2243 (not (string= prompt "!")) ; was a `! shell-command' | |
2244 (not (memq last-command | |
19078 | 2245 '(viper-ex |
2246 viper-command-argument | |
18129 | 2247 t) |
2248 ))) | |
2249 "") | |
2250 ((string= val "") (or default "")) | |
2251 (t val)) | |
2252 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2253 |
18129 | 2254 |
2255 | |
2256 ;; insertion commands | |
2257 | |
2258 ;; Called when state changes from Insert Vi command mode. | |
2259 ;; Repeats the insertion command if Insert state was entered with prefix | |
2260 ;; argument > 1. | |
19078 | 2261 (defun viper-repeat-insert-command () |
2262 (let ((i-com (car viper-d-com)) | |
2263 (val (nth 1 viper-d-com)) | |
2264 (char (nth 2 viper-d-com))) | |
18129 | 2265 (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
|
2266 (progn |
19078 | 2267 (setq viper-d-com (list i-com (1- val) ?r nil nil nil)) |
2268 (viper-repeat nil) | |
2269 (setq viper-d-com (list i-com val char nil nil nil)) | |
18129 | 2270 )))) |
2271 | |
19078 | 2272 (defun viper-insert (arg) |
18129 | 2273 "Insert before point." |
2274 (interactive "P") | |
19078 | 2275 (viper-set-complex-command-for-undo) |
2276 (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
|
2277 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2278 ) |
19078 | 2279 (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
|
2280 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2281 (viper-loop val (viper-yank-last-insertion)) |
2282 (viper-change-state-to-insert)))) | |
2283 | |
2284 (defun viper-append (arg) | |
18129 | 2285 "Append after point." |
2286 (interactive "P") | |
19078 | 2287 (viper-set-complex-command-for-undo) |
2288 (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
|
2289 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2290 ) |
19078 | 2291 (viper-set-destructive-command (list 'viper-append val ?r nil nil nil)) |
18129 | 2292 (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
|
2293 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2294 (viper-loop val (viper-yank-last-insertion)) |
2295 (viper-change-state-to-insert)))) | |
2296 | |
2297 (defun viper-Append (arg) | |
18129 | 2298 "Append at end of line." |
2299 (interactive "P") | |
19078 | 2300 (viper-set-complex-command-for-undo) |
2301 (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
|
2302 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2303 ) |
19078 | 2304 (viper-set-destructive-command (list 'viper-Append val ?r nil nil nil)) |
18129 | 2305 (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
|
2306 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2307 (viper-loop val (viper-yank-last-insertion)) |
2308 (viper-change-state-to-insert)))) | |
2309 | |
2310 (defun viper-Insert (arg) | |
18129 | 2311 "Insert before first non-white." |
2312 (interactive "P") | |
19078 | 2313 (viper-set-complex-command-for-undo) |
2314 (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
|
2315 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2316 ) |
19078 | 2317 (viper-set-destructive-command (list 'viper-Insert val ?r nil nil nil)) |
18129 | 2318 (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
|
2319 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2320 (viper-loop val (viper-yank-last-insertion)) |
2321 (viper-change-state-to-insert)))) | |
2322 | |
2323 (defun viper-open-line (arg) | |
18129 | 2324 "Open line below." |
2325 (interactive "P") | |
19078 | 2326 (viper-set-complex-command-for-undo) |
2327 (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
|
2328 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2329 ) |
19078 | 2330 (viper-set-destructive-command (list 'viper-open-line val ?r nil nil nil)) |
18129 | 2331 (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
|
2332 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2333 (viper-loop val |
18129 | 2334 (end-of-line) |
2335 (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
|
2336 (viper-indent-line col) |
19462 | 2337 (viper-yank-last-insertion)) |
18129 | 2338 (end-of-line) |
2339 (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
|
2340 (viper-indent-line col) |
19078 | 2341 (viper-change-state-to-insert))))) |
2342 | |
2343 (defun viper-Open-line (arg) | |
18129 | 2344 "Open line above." |
2345 (interactive "P") | |
19078 | 2346 (viper-set-complex-command-for-undo) |
2347 (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
|
2348 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2349 ) |
19078 | 2350 (viper-set-destructive-command (list 'viper-Open-line val ?r nil nil nil)) |
18129 | 2351 (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
|
2352 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2353 (viper-loop val |
18129 | 2354 (beginning-of-line) |
2355 (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
|
2356 (viper-indent-line col) |
19462 | 2357 (viper-yank-last-insertion)) |
18129 | 2358 (beginning-of-line) |
2359 (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
|
2360 (viper-indent-line col) |
19078 | 2361 (viper-change-state-to-insert))))) |
2362 | |
2363 (defun viper-open-line-at-point (arg) | |
18129 | 2364 "Open line at point." |
2365 (interactive "P") | |
19078 | 2366 (viper-set-complex-command-for-undo) |
2367 (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
|
2368 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2369 ) |
19078 | 2370 (viper-set-destructive-command |
2371 (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
|
2372 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2373 (viper-loop val |
18129 | 2374 (open-line 1) |
19462 | 2375 (viper-yank-last-insertion)) |
18129 | 2376 (open-line 1) |
19078 | 2377 (viper-change-state-to-insert)))) |
2378 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2379 ;; bound to s |
19078 | 2380 (defun viper-substitute (arg) |
18129 | 2381 "Substitute characters." |
2382 (interactive "P") | |
19078 | 2383 (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
|
2384 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2385 ) |
18129 | 2386 (push-mark nil t) |
2387 (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
|
2388 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2389 (viper-change-subr (mark t) (point)) |
2390 (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
|
2391 ;; com is set to ?r when we repeat this comand with dot |
19078 | 2392 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil)) |
18129 | 2393 )) |
2394 | |
19078 | 2395 ;; Command bound to S |
2396 (defun viper-substitute-line (arg) | |
18129 | 2397 "Substitute lines." |
2398 (interactive "p") | |
19078 | 2399 (viper-set-complex-command-for-undo) |
2400 (viper-line (cons arg ?C))) | |
18129 | 2401 |
2402 ;; Prepare for replace | |
19078 | 2403 (defun viper-start-replace () |
2404 (setq viper-began-as-replace t | |
2405 viper-sitting-in-replace t | |
19462 | 2406 viper-replace-chars-to-delete 0) |
21940 | 2407 (add-hook |
2408 'viper-after-change-functions 'viper-replace-mode-spy-after t 'local) | |
2409 (add-hook | |
2410 'viper-before-change-functions 'viper-replace-mode-spy-before t 'local) | |
18129 | 2411 ;; this will get added repeatedly, but no harm |
19078 | 2412 (add-hook 'after-change-functions 'viper-after-change-sentinel t) |
2413 (add-hook 'before-change-functions 'viper-before-change-sentinel t) | |
21940 | 2414 (viper-move-marker-locally |
2415 'viper-last-posn-in-replace-region (viper-replace-start)) | |
2416 (add-hook | |
2417 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel | |
2418 t 'local) | |
2419 (add-hook | |
2420 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
18129 | 2421 ;; guard against a smartie who switched from R-replace to normal replace |
21940 | 2422 (remove-hook |
2423 '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
|
2424 (if overwrite-mode (overwrite-mode -1)) |
18129 | 2425 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2426 |
18129 | 2427 |
19078 | 2428 (defun viper-replace-mode-spy-before (beg end) |
19462 | 2429 (setq viper-replace-region-chars-deleted (viper-chars-in-region beg end)) |
2430 ) | |
2431 | |
2432 ;; 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
|
2433 ;; 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
|
2434 ;; if this command performs several separate buffer changes. Therefore, if |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2435 ;; 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
|
2436 ;; deleted. |
19078 | 2437 (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
|
2438 (if (memq viper-intermediate-command |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2439 '(dabbrev-expand hippie-expand repeating-insertion-from-ring)) |
19462 | 2440 ;; Take special care of text insertion from insertion ring inside |
2441 ;; replacement overlays. | |
18129 | 2442 (progn |
19078 | 2443 (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
|
2444 (viper-move-marker-locally |
19078 | 2445 '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
|
2446 |
19462 | 2447 (let* ((real-end (min end (viper-replace-end))) |
2448 (column-shift (- (save-excursion (goto-char real-end) | |
2449 (current-column)) | |
2450 (save-excursion (goto-char beg) | |
2451 (current-column)))) | |
2452 (chars-deleted 0)) | |
2453 | |
2454 (if (> length 0) | |
2455 (setq chars-deleted viper-replace-region-chars-deleted)) | |
2456 (setq viper-replace-region-chars-deleted 0) | |
2457 (setq viper-replace-chars-to-delete | |
2458 (+ viper-replace-chars-to-delete | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2459 (- |
19462 | 2460 ;; if column shift is bigger, due to a TAB insertion, take |
2461 ;; column-shift instead of the number of inserted chars | |
2462 (max (viper-chars-in-region beg real-end) | |
2463 ;; This test accounts for Chinese/Japanese/... chars, | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2464 ;; which occupy 2 columns instead of one. If we use |
19462 | 2465 ;; 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
|
2466 ;; one when the user types one Chinese character. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2467 ;; Deleting two would be OK, if they were European chars, |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2468 ;; but it is not OK if they are Chinese chars. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2469 ;; Since it is hard to |
19462 | 2470 ;; figure out which characters are being deleted in any |
2471 ;; given region, we decided to treat Eastern and European | |
2472 ;; characters equally, even though Eastern chars may | |
2473 ;; occupy more columns. | |
2474 (if (memq this-command '(self-insert-command | |
2475 quoted-insert viper-insert-tab)) | |
2476 column-shift | |
2477 0)) | |
2478 ;; the number of deleted chars | |
2479 chars-deleted))) | |
2480 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2481 (viper-move-marker-locally |
19078 | 2482 'viper-last-posn-in-replace-region |
19462 | 2483 (max (if (> end (viper-replace-end)) (viper-replace-end) end) |
19078 | 2484 (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
|
2485 (viper-replace-start)) |
18129 | 2486 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2487 |
18129 | 2488 ))) |
2489 | |
19462 | 2490 |
2491 ;; Delete stuff between viper-last-posn-in-replace-region and the end of | |
2492 ;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within | |
2493 ;; the overlay and current point is before the end of the overlay. | |
2494 ;; Don't delete anything if current point is past the end of the overlay. | |
2495 (defun viper-finish-change () | |
21940 | 2496 (remove-hook |
2497 'viper-after-change-functions 'viper-replace-mode-spy-after 'local) | |
2498 (remove-hook | |
2499 'viper-before-change-functions 'viper-replace-mode-spy-before 'local) | |
2500 (remove-hook | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2501 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) |
21940 | 2502 (remove-hook |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2503 '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
|
2504 (viper-restore-cursor-color 'after-replace-mode) |
19078 | 2505 (setq viper-sitting-in-replace nil) ; just in case we'll need to know it |
18129 | 2506 (save-excursion |
19462 | 2507 (if (and viper-replace-overlay |
2508 (viper-pos-within-region viper-last-posn-in-replace-region | |
2509 (viper-replace-start) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2510 (viper-replace-end)) |
19462 | 2511 (< (point) (viper-replace-end))) |
2512 (delete-region | |
2513 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
|
2514 |
19078 | 2515 (if (eq viper-current-state 'replace-state) |
2516 (viper-downgrade-to-insert)) | |
2517 ;; replace mode ended => nullify viper-last-posn-in-replace-region | |
2518 (viper-move-marker-locally 'viper-last-posn-in-replace-region nil) | |
2519 (viper-hide-replace-overlay) | |
2520 (viper-refresh-mode-line) | |
2521 (viper-put-string-on-kill-ring viper-last-replace-region) | |
18129 | 2522 ) |
2523 | |
2524 ;; Make STRING be the first element of the kill ring. | |
19078 | 2525 (defun viper-put-string-on-kill-ring (string) |
18129 | 2526 (setq kill-ring (cons string kill-ring)) |
2527 (if (> (length kill-ring) kill-ring-max) | |
2528 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)) | |
2529 (setq kill-ring-yank-pointer kill-ring)) | |
2530 | |
19078 | 2531 (defun viper-finish-R-mode () |
21940 | 2532 (remove-hook |
2533 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) | |
2534 (remove-hook | |
2535 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local) | |
19078 | 2536 (viper-downgrade-to-insert)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2537 |
19078 | 2538 (defun viper-start-R-mode () |
18129 | 2539 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number |
2540 (overwrite-mode 1) | |
21940 | 2541 (add-hook |
2542 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local) | |
2543 (add-hook | |
2544 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
18129 | 2545 ;; guard against a smartie who switched from R-replace to normal replace |
21940 | 2546 (remove-hook |
2547 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) | |
18129 | 2548 ) |
2549 | |
2550 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2551 |
19078 | 2552 (defun viper-replace-state-exit-cmd () |
18129 | 2553 "Binding for keys that cause Replace state to switch to Vi or to Insert. |
2554 These keys are ESC, RET, and LineFeed" | |
2555 (interactive) | |
19462 | 2556 (if overwrite-mode ; if in replace mode invoked via 'R' |
19078 | 2557 (viper-finish-R-mode) |
19462 | 2558 (viper-finish-change)) |
18129 | 2559 (let (com) |
19078 | 2560 (if (eq this-command 'viper-intercept-ESC-key) |
2561 (setq com 'viper-exit-insert-state) | |
2562 (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
|
2563 (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
|
2564 |
18129 | 2565 (condition-case conds |
2566 (command-execute com) | |
2567 (error | |
19078 | 2568 (viper-message-conditions conds))) |
18129 | 2569 ) |
19078 | 2570 (viper-hide-replace-overlay)) |
2571 | |
2572 | |
2573 (defun viper-replace-state-carriage-return () | |
2574 "Carriage return in Viper replace state." | |
18129 | 2575 (interactive) |
2576 ;; If Emacs start supporting overlay maps, as it currently supports | |
19078 | 2577 ;; 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
|
2578 ;; just have keymap attached to replace overlay. Then the "if part" of this |
18129 | 2579 ;; statement can be deleted. |
19078 | 2580 (if (or (< (point) (viper-replace-start)) |
2581 (> (point) (viper-replace-end))) | |
2582 (let (viper-replace-minor-mode com) | |
2583 (viper-set-unread-command-events last-input-char) | |
18129 | 2584 (setq com (key-binding (read-key-sequence nil))) |
2585 (condition-case conds | |
2586 (command-execute com) | |
2587 (error | |
19078 | 2588 (viper-message-conditions conds)))) |
2589 (if (not viper-allow-multiline-replace-regions) | |
2590 (viper-replace-state-exit-cmd) | |
2591 (if (viper-same-line (point) (viper-replace-end)) | |
2592 (viper-replace-state-exit-cmd) | |
2593 ;; delete the rest of line | |
2594 (delete-region (point) (viper-line-pos 'end)) | |
2595 (save-excursion | |
2596 (end-of-line) | |
2597 (if (eobp) (error "Last line in buffer"))) | |
2598 ;; skip to the next line | |
2599 (forward-line 1) | |
2600 (back-to-indentation) | |
2601 )))) | |
18129 | 2602 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2603 |
18129 | 2604 ;; This is the function bound to 'R'---unlimited replace. |
2605 ;; 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
|
2606 (defun viper-overwrite (arg) |
18129 | 2607 "Begin overwrite mode." |
2608 (interactive "P") | |
19078 | 2609 (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
|
2610 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2611 (len)) |
19078 | 2612 (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
|
2613 (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
|
2614 (progn |
19078 | 2615 ;; Viper saves inserted text in viper-last-insertion |
2616 (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
|
2617 (delete-char (min len (- (point-max) (point) 1))) |
19078 | 2618 (viper-loop val (viper-yank-last-insertion))) |
2619 (setq last-command 'viper-overwrite) | |
2620 (viper-set-complex-command-for-undo) | |
2621 (viper-set-replace-overlay (point) (viper-line-pos 'end)) | |
2622 (viper-change-state-to-replace) | |
18129 | 2623 ))) |
2624 | |
2625 | |
2626 ;; line commands | |
2627 | |
19078 | 2628 (defun viper-line (arg) |
18129 | 2629 (let ((val (car arg)) |
2630 (com (cdr arg))) | |
19078 | 2631 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 2632 (if (not (eobp)) |
19078 | 2633 (viper-next-line-carefully (1- val))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2634 ;; 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
|
2635 ;; last line of buffer when this line has no \n. |
19078 | 2636 (viper-add-newline-at-eob-if-necessary) |
2637 (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
|
2638 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
18129 | 2639 ) |
2640 | |
19078 | 2641 (defun viper-yank-line (arg) |
18129 | 2642 "Yank ARG lines (in Vi's sense)." |
2643 (interactive "P") | |
19078 | 2644 (let ((val (viper-p-val arg))) |
2645 (viper-line (cons val ?Y)))) | |
18129 | 2646 |
2647 | |
2648 ;; region commands | |
2649 | |
19078 | 2650 (defun viper-region (arg) |
18129 | 2651 "Execute command on a region." |
2652 (interactive "P") | |
19078 | 2653 (let ((val (viper-P-val arg)) |
2654 (com (viper-getcom arg))) | |
2655 (viper-move-marker-locally 'viper-com-point (point)) | |
18129 | 2656 (exchange-point-and-mark) |
19078 | 2657 (viper-execute-com 'viper-region val com))) |
2658 | |
2659 (defun viper-Region (arg) | |
18129 | 2660 "Execute command on a Region." |
2661 (interactive "P") | |
19078 | 2662 (let ((val (viper-P-val arg)) |
2663 (com (viper-getCom arg))) | |
2664 (viper-move-marker-locally 'viper-com-point (point)) | |
18129 | 2665 (exchange-point-and-mark) |
19078 | 2666 (viper-execute-com 'viper-Region val com))) |
2667 | |
2668 (defun viper-replace-char (arg) | |
18129 | 2669 "Replace the following ARG chars by the character read." |
2670 (interactive "P") | |
2671 (if (and (eolp) (bolp)) (error "No character to replace here")) | |
19078 | 2672 (let ((val (viper-p-val arg)) |
2673 (com (viper-getcom arg))) | |
2674 (viper-replace-char-subr com val) | |
18129 | 2675 (if (and (eolp) (not (bolp))) (forward-char 1)) |
19462 | 2676 (setq viper-this-command-keys |
2677 (format "%sr" (if (integerp arg) arg ""))) | |
19078 | 2678 (viper-set-destructive-command |
2679 (list 'viper-replace-char val ?r nil viper-d-char nil)) | |
18129 | 2680 )) |
2681 | |
19078 | 2682 (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
|
2683 (let ((inhibit-quit t) |
25dc021070bc
2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
2684 char) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2685 (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
|
2686 (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
|
2687 (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
|
2688 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2689 (delete-char 1 t) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2690 (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
|
2691 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2692 (if com (insert char)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2693 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2694 (setq viper-d-char char) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2695 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2696 (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
|
2697 (delete-char 1 t) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2698 (insert char)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2699 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2700 (viper-adjust-undo) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2701 (backward-char arg) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2702 )) |
18129 | 2703 |
2704 | |
2705 ;; basic cursor movement. j, k, l, h commands. | |
2706 | |
19078 | 2707 (defun viper-forward-char (arg) |
18129 | 2708 "Move point right ARG characters (left if ARG negative). |
2709 On reaching end of line, stop and signal error." | |
2710 (interactive "P") | |
19078 | 2711 (viper-leave-region-active) |
2712 (let ((val (viper-p-val arg)) | |
2713 (com (viper-getcom arg))) | |
2714 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2715 (if viper-ex-style-motion | |
18129 | 2716 (progn |
2717 ;; the boundary condition check gets weird here because | |
2718 ;; forward-char may be the parameter of a delete, and 'dl' works | |
2719 ;; just like 'x' for the last char on a line, so we have to allow | |
19078 | 2720 ;; the forward motion before the 'viper-execute-com', but, of |
18129 | 2721 ;; course, 'dl' doesn't work on an empty line, so we have to |
19078 | 2722 ;; catch that condition before 'viper-execute-com' |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
2723 (if (and (eolp) (bolp)) (error "Viper bell") (forward-char val)) |
19078 | 2724 (if com (viper-execute-com 'viper-forward-char val com)) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
2725 (if (eolp) (progn (backward-char 1) (error "Viper bell")))) |
18129 | 2726 (forward-char val) |
19078 | 2727 (if com (viper-execute-com 'viper-forward-char val com))))) |
2728 | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2729 |
19078 | 2730 (defun viper-backward-char (arg) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2731 "Move point left ARG characters (right if ARG negative). |
18129 | 2732 On reaching beginning of line, stop and signal error." |
2733 (interactive "P") | |
19078 | 2734 (viper-leave-region-active) |
2735 (let ((val (viper-p-val arg)) | |
2736 (com (viper-getcom arg))) | |
2737 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2738 (if viper-ex-style-motion | |
18129 | 2739 (progn |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
2740 (if (bolp) (error "Viper bell") (backward-char val)) |
19078 | 2741 (if com (viper-execute-com 'viper-backward-char val com))) |
18129 | 2742 (backward-char val) |
19078 | 2743 (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
|
2744 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2745 |
18129 | 2746 ;; 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
|
2747 ;; Returns distance traveled |
19462 | 2748 ;; (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
|
2749 (defun viper-forward-char-carefully (&optional arg) |
18129 | 2750 (setq arg (or arg 1)) |
19462 | 2751 (let ((pt (point))) |
2752 (condition-case nil | |
2753 (forward-char arg) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2754 (error nil)) |
19462 | 2755 (if (< (point) pt) ; arg was negative |
2756 (- (viper-chars-in-region pt (point))) | |
2757 (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
|
2758 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2759 |
19462 | 2760 ;; Like backward-char, but doesn't move at beg of buffer. |
2761 ;; Returns distance traveled | |
2762 ;; (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
|
2763 (defun viper-backward-char-carefully (&optional arg) |
18129 | 2764 (setq arg (or arg 1)) |
19462 | 2765 (let ((pt (point))) |
2766 (condition-case nil | |
2767 (backward-char arg) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2768 (error nil)) |
19462 | 2769 (if (> (point) pt) ; arg was negative |
2770 (viper-chars-in-region pt (point)) | |
2771 (- (viper-chars-in-region pt (point)))))) | |
18129 | 2772 |
19078 | 2773 (defun viper-next-line-carefully (arg) |
18129 | 2774 (condition-case nil |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82467
diff
changeset
|
2775 ;; do not use forward-line! need to keep column |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
2776 (with-no-warnings (next-line arg)) |
18129 | 2777 (error nil))) |
2778 | |
2779 | |
2780 | |
2781 ;;; Word command | |
2782 | |
19078 | 2783 ;; 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
|
2784 ;; word movement. When executed with a destructive command, \n is usually left |
19078 | 2785 ;; 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
|
2786 ;; word and what is a separator. However, \n is always a separator. Also, if |
19078 | 2787 ;; viper-syntax-preference is 'vi, then `_' is part of the word. |
18129 | 2788 |
2789 ;; skip only one \n | |
19078 | 2790 (defun viper-skip-separators (forward) |
18129 | 2791 (if forward |
2792 (progn | |
19078 | 2793 (viper-skip-all-separators-forward 'within-line) |
18129 | 2794 (if (looking-at "\n") |
2795 (progn | |
2796 (forward-char) | |
19078 | 2797 (viper-skip-all-separators-forward 'within-line)))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2798 ;; 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
|
2799 (if (and (eobp) (save-excursion |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2800 (viper-backward-char-carefully) |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2801 (viper-looking-at-separator))) |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2802 (viper-backward-char-carefully)) |
19078 | 2803 (viper-skip-all-separators-backward 'within-line) |
19462 | 2804 (viper-backward-char-carefully) |
18129 | 2805 (if (looking-at "\n") |
19078 | 2806 (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
|
2807 (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
|
2808 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2809 |
19078 | 2810 (defun viper-forward-word-kernel (val) |
18129 | 2811 (while (> val 0) |
19078 | 2812 (cond ((viper-looking-at-alpha) |
2813 (viper-skip-alpha-forward "_") | |
2814 (viper-skip-separators t)) | |
2815 ((viper-looking-at-separator) | |
2816 (viper-skip-separators t)) | |
2817 ((not (viper-looking-at-alphasep)) | |
2818 (viper-skip-nonalphasep-forward) | |
2819 (viper-skip-separators t))) | |
18129 | 2820 (setq val (1- val)))) |
2821 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2822 ;; first skip non-newline separators backward, then skip \n. Then, if TWICE is |
19462 | 2823 ;; non-nil, skip non-\n back again, but don't overshoot the limit LIM. |
2824 (defun viper-separator-skipback-special (twice lim) | |
2825 (let ((prev-char (viper-char-at-pos 'backward)) | |
2826 (saved-point (point))) | |
2827 ;; 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
|
2828 (while (and (not (viper-memq-char prev-char '(nil \n))) |
19462 | 2829 (< lim (point)) |
2830 ;; must be non-newline separator | |
2831 (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
|
2832 (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
|
2833 (viper-memq-char (char-syntax prev-char) '(?\ ?-)))) |
19462 | 2834 (viper-backward-char-carefully) |
2835 (setq prev-char (viper-char-at-pos 'backward))) | |
2836 | |
2837 (if (and (< lim (point)) (eq prev-char ?\n)) | |
2838 (backward-char) | |
2839 ;; If we skipped to the next word and the prefix of this line doesn't | |
2840 ;; consist of separators preceded by a newline, then don't skip backwards | |
2841 ;; at all. | |
2842 (goto-char saved-point)) | |
2843 (setq prev-char (viper-char-at-pos 'backward)) | |
2844 | |
2845 ;; skip again, but make sure we don't overshoot the limit | |
2846 (if twice | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2847 (while (and (not (viper-memq-char prev-char '(nil \n))) |
19462 | 2848 (< lim (point)) |
2849 ;; must be non-newline separator | |
2850 (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
|
2851 (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
|
2852 (viper-memq-char (char-syntax prev-char) '(?\ ?-)))) |
19462 | 2853 (viper-backward-char-carefully) |
2854 (setq prev-char (viper-char-at-pos 'backward)))) | |
2855 | |
2856 (if (= (point) lim) | |
2857 (viper-forward-char-carefully)) | |
2858 )) | |
18129 | 2859 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2860 |
19078 | 2861 (defun viper-forward-word (arg) |
18129 | 2862 "Forward word." |
2863 (interactive "P") | |
19078 | 2864 (viper-leave-region-active) |
2865 (let ((val (viper-p-val arg)) | |
2866 (com (viper-getcom arg))) | |
2867 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2868 (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
|
2869 (if com |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2870 (progn |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2871 (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
|
2872 (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
|
2873 ;; 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
|
2874 ((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
|
2875 (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
|
2876 ((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
|
2877 (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
|
2878 (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
|
2879 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2880 |
18129 | 2881 |
19078 | 2882 (defun viper-forward-Word (arg) |
18129 | 2883 "Forward word delimited by white characters." |
2884 (interactive "P") | |
19078 | 2885 (viper-leave-region-active) |
2886 (let ((val (viper-p-val arg)) | |
2887 (com (viper-getcom arg))) | |
2888 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2889 (viper-loop val | |
2890 (viper-skip-nonseparators 'forward) | |
19462 | 2891 (viper-skip-separators t)) |
18129 | 2892 (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
|
2893 (cond ((viper-char-equal com ?c) |
19462 | 2894 (viper-separator-skipback-special 'twice viper-com-point)) |
18129 | 2895 ;; 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
|
2896 ((viper-char-equal com ?y) |
19462 | 2897 (viper-separator-skipback-special nil viper-com-point)) |
19078 | 2898 ((viper-dotable-command-p com) |
19462 | 2899 (viper-separator-skipback-special nil viper-com-point))) |
19078 | 2900 (viper-execute-com 'viper-forward-Word val com))))) |
18129 | 2901 |
2902 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2903 ;; this is a bit different from Vi, but Vi's end of word |
18129 | 2904 ;; makes no sense whatsoever |
19078 | 2905 (defun viper-end-of-word-kernel () |
2906 (if (viper-end-of-word-p) (forward-char)) | |
2907 (if (viper-looking-at-separator) | |
2908 (viper-skip-all-separators-forward)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2909 |
19078 | 2910 (cond ((viper-looking-at-alpha) (viper-skip-alpha-forward "_")) |
2911 ((not (viper-looking-at-alphasep)) (viper-skip-nonalphasep-forward))) | |
2912 (viper-backward-char-carefully)) | |
2913 | |
2914 (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
|
2915 (or (eobp) |
18129 | 2916 (save-excursion |
19078 | 2917 (cond ((viper-looking-at-alpha) |
18129 | 2918 (forward-char) |
19078 | 2919 (not (viper-looking-at-alpha))) |
2920 ((not (viper-looking-at-alphasep)) | |
18129 | 2921 (forward-char) |
19078 | 2922 (viper-looking-at-alphasep)))))) |
2923 | |
2924 | |
2925 (defun viper-end-of-word (arg &optional careful) | |
18129 | 2926 "Move point to end of current word." |
2927 (interactive "P") | |
19078 | 2928 (viper-leave-region-active) |
2929 (let ((val (viper-p-val arg)) | |
2930 (com (viper-getcom arg))) | |
2931 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2932 (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
|
2933 (if com |
18129 | 2934 (progn |
2935 (forward-char) | |
19078 | 2936 (viper-execute-com 'viper-end-of-word val com))))) |
2937 | |
2938 (defun viper-end-of-Word (arg) | |
18129 | 2939 "Forward to end of word delimited by white character." |
2940 (interactive "P") | |
19078 | 2941 (viper-leave-region-active) |
2942 (let ((val (viper-p-val arg)) | |
2943 (com (viper-getcom arg))) | |
2944 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2945 (viper-loop val | |
2946 (viper-end-of-word-kernel) | |
2947 (viper-skip-nonseparators 'forward) | |
19462 | 2948 (backward-char)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2949 (if com |
18129 | 2950 (progn |
2951 (forward-char) | |
19078 | 2952 (viper-execute-com 'viper-end-of-Word val com))))) |
2953 | |
2954 (defun viper-backward-word-kernel (val) | |
18129 | 2955 (while (> val 0) |
19462 | 2956 (viper-backward-char-carefully) |
19078 | 2957 (cond ((viper-looking-at-alpha) |
2958 (viper-skip-alpha-backward "_")) | |
2959 ((viper-looking-at-separator) | |
18129 | 2960 (forward-char) |
19078 | 2961 (viper-skip-separators nil) |
19462 | 2962 (viper-backward-char-carefully) |
19078 | 2963 (cond ((viper-looking-at-alpha) |
2964 (viper-skip-alpha-backward "_")) | |
2965 ((not (viper-looking-at-alphasep)) | |
2966 (viper-skip-nonalphasep-backward)) | |
19462 | 2967 ((bobp)) ; could still be at separator, but at beg of buffer |
18129 | 2968 (t (forward-char)))) |
19078 | 2969 ((not (viper-looking-at-alphasep)) |
2970 (viper-skip-nonalphasep-backward))) | |
18129 | 2971 (setq val (1- val)))) |
2972 | |
19078 | 2973 (defun viper-backward-word (arg) |
18129 | 2974 "Backward word." |
2975 (interactive "P") | |
19078 | 2976 (viper-leave-region-active) |
2977 (let ((val (viper-p-val arg)) | |
2978 (com (viper-getcom arg))) | |
18129 | 2979 (if com |
2980 (let (i) | |
2981 (if (setq i (save-excursion (backward-char) (looking-at "\n"))) | |
2982 (backward-char)) | |
19078 | 2983 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 2984 (if i (forward-char)))) |
19078 | 2985 (viper-backward-word-kernel val) |
2986 (if com (viper-execute-com 'viper-backward-word val com)))) | |
2987 | |
2988 (defun viper-backward-Word (arg) | |
18129 | 2989 "Backward word delimited by white character." |
2990 (interactive "P") | |
19078 | 2991 (viper-leave-region-active) |
2992 (let ((val (viper-p-val arg)) | |
2993 (com (viper-getcom arg))) | |
18129 | 2994 (if com |
2995 (let (i) | |
2996 (if (setq i (save-excursion (backward-char) (looking-at "\n"))) | |
2997 (backward-char)) | |
19078 | 2998 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 2999 (if i (forward-char)))) |
19078 | 3000 (viper-loop val |
19462 | 3001 (viper-skip-separators nil) ; nil means backward here |
3002 (viper-skip-nonseparators 'backward)) | |
19078 | 3003 (if com (viper-execute-com 'viper-backward-Word val com)))) |
18129 | 3004 |
3005 | |
3006 | |
3007 ;; line commands | |
3008 | |
19078 | 3009 (defun viper-beginning-of-line (arg) |
18129 | 3010 "Go to beginning of line." |
3011 (interactive "P") | |
19078 | 3012 (viper-leave-region-active) |
3013 (let ((val (viper-p-val arg)) | |
3014 (com (viper-getcom arg))) | |
3015 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3016 (beginning-of-line val) |
19078 | 3017 (if com (viper-execute-com 'viper-beginning-of-line val com)))) |
3018 | |
3019 (defun viper-bol-and-skip-white (arg) | |
18129 | 3020 "Beginning of line at first non-white character." |
3021 (interactive "P") | |
19078 | 3022 (viper-leave-region-active) |
3023 (let ((val (viper-p-val arg)) | |
3024 (com (viper-getcom arg))) | |
3025 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3026 (forward-to-indentation (1- val)) |
19078 | 3027 (if com (viper-execute-com 'viper-bol-and-skip-white val com)))) |
3028 | |
3029 (defun viper-goto-eol (arg) | |
18129 | 3030 "Go to end of line." |
3031 (interactive "P") | |
19078 | 3032 (viper-leave-region-active) |
3033 (let ((val (viper-p-val arg)) | |
3034 (com (viper-getcom arg))) | |
3035 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3036 (end-of-line val) |
19078 | 3037 (if com (viper-execute-com 'viper-goto-eol val com)) |
3038 (if viper-ex-style-motion | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3039 (if (and (eolp) (not (bolp)) |
19078 | 3040 ;; a fix for viper-change-to-eol |
3041 (not (equal viper-current-state 'insert-state))) | |
18129 | 3042 (backward-char 1) |
3043 )))) | |
3044 | |
3045 | |
19078 | 3046 (defun viper-goto-col (arg) |
18129 | 3047 "Go to ARG's column." |
3048 (interactive "P") | |
19078 | 3049 (viper-leave-region-active) |
3050 (let ((val (viper-p-val arg)) | |
3051 (com (viper-getcom arg)) | |
18129 | 3052 line-len) |
19462 | 3053 (setq line-len |
3054 (viper-chars-in-region | |
3055 (viper-line-pos 'start) (viper-line-pos 'end))) | |
19078 | 3056 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3057 (beginning-of-line) |
3058 (forward-char (1- (min line-len val))) | |
3059 (while (> (current-column) (1- val)) | |
3060 (backward-char 1)) | |
19078 | 3061 (if com (viper-execute-com 'viper-goto-col val com)) |
18129 | 3062 (save-excursion |
3063 (end-of-line) | |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
3064 (if (> val (current-column)) (error "Viper bell"))) |
18129 | 3065 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3066 |
18129 | 3067 |
19078 | 3068 (defun viper-next-line (arg) |
18129 | 3069 "Go to next line." |
3070 (interactive "P") | |
19078 | 3071 (viper-leave-region-active) |
3072 (let ((val (viper-p-val arg)) | |
3073 (com (viper-getCom arg))) | |
3074 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82467
diff
changeset
|
3075 ;; do not use forward-line! need to keep column |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
3076 (with-no-warnings (next-line val)) |
19078 | 3077 (if viper-ex-style-motion |
18129 | 3078 (if (and (eolp) (not (bolp))) (backward-char 1))) |
3079 (setq this-command 'next-line) | |
19078 | 3080 (if com (viper-execute-com 'viper-next-line val com)))) |
3081 | |
87118
f9a6598fa930
Remove directory part from filenames in function declarations.
Glenn Morris <rgm@gnu.org>
parents:
86983
diff
changeset
|
3082 (declare-function widget-type "wid-edit" (widget)) |
f9a6598fa930
Remove directory part from filenames in function declarations.
Glenn Morris <rgm@gnu.org>
parents:
86983
diff
changeset
|
3083 (declare-function widget-button-press "wid-edit" (pos &optional event)) |
86247
fc93e9674475
* progmodes/python.el (info-lookup-maybe-add-help):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85972
diff
changeset
|
3084 (declare-function viper-set-hooks "viper" ()) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3085 |
19078 | 3086 (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
|
3087 "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
|
3088 If point is on a widget or a button, simulate clicking on that widget/button." |
18129 | 3089 (interactive "P") |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3090 (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
|
3091 (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
|
3092 (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
|
3093 (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
|
3094 (if (and widget |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3095 (if (symbolp widget) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3096 (get widget 'widget-type) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3097 (and (consp widget) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3098 (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
|
3099 (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
|
3100 (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
|
3101 (push-button) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3102 ;; 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
|
3103 (viper-leave-region-active) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3104 (save-excursion |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3105 (end-of-line) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3106 (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
|
3107 (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
|
3108 (com (viper-getCom arg))) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3109 (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
|
3110 (forward-line val) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3111 (back-to-indentation) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3112 (if com (viper-execute-com 'viper-next-line-at-bol val com))))))) |
19078 | 3113 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
3114 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3115 (defun viper-previous-line (arg) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3116 "Go to previous line." |
18129 | 3117 (interactive "P") |
19078 | 3118 (viper-leave-region-active) |
3119 (let ((val (viper-p-val arg)) | |
3120 (com (viper-getCom arg))) | |
3121 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82467
diff
changeset
|
3122 ;; do not use forward-line! need to keep column |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
3123 (with-no-warnings (previous-line val)) |
19078 | 3124 (if viper-ex-style-motion |
18129 | 3125 (if (and (eolp) (not (bolp))) (backward-char 1))) |
3126 (setq this-command 'previous-line) | |
19078 | 3127 (if com (viper-execute-com 'viper-previous-line val com)))) |
3128 | |
3129 | |
3130 (defun viper-previous-line-at-bol (arg) | |
18129 | 3131 "Previous line at beginning of line." |
3132 (interactive "P") | |
19078 | 3133 (viper-leave-region-active) |
18129 | 3134 (save-excursion |
3135 (beginning-of-line) | |
3136 (if (bobp) (error "First line in buffer"))) | |
19078 | 3137 (let ((val (viper-p-val arg)) |
3138 (com (viper-getCom arg))) | |
3139 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3140 (forward-line (- val)) |
3141 (back-to-indentation) | |
19078 | 3142 (if com (viper-execute-com 'viper-previous-line val com)))) |
3143 | |
3144 (defun viper-change-to-eol (arg) | |
18129 | 3145 "Change to end of line." |
3146 (interactive "P") | |
19078 | 3147 (viper-goto-eol (cons arg ?c))) |
3148 | |
3149 (defun viper-kill-line (arg) | |
18129 | 3150 "Delete line." |
3151 (interactive "P") | |
19078 | 3152 (viper-goto-eol (cons arg ?d))) |
3153 | |
3154 (defun viper-erase-line (arg) | |
18129 | 3155 "Erase line." |
3156 (interactive "P") | |
19078 | 3157 (viper-beginning-of-line (cons arg ?d))) |
18129 | 3158 |
3159 | |
3160 ;;; Moving around | |
3161 | |
19078 | 3162 (defun viper-goto-line (arg) |
18129 | 3163 "Go to ARG's line. Without ARG go to end of buffer." |
3164 (interactive "P") | |
19078 | 3165 (let ((val (viper-P-val arg)) |
3166 (com (viper-getCom arg))) | |
3167 (viper-move-marker-locally 'viper-com-point (point)) | |
3168 (viper-deactivate-mark) | |
18129 | 3169 (push-mark nil t) |
3170 (if (null val) | |
3171 (goto-char (point-max)) | |
3172 (goto-char (point-min)) | |
3173 (forward-line (1- val))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3174 |
18129 | 3175 ;; positioning is done twice: before and after command execution |
3176 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3177 (back-to-indentation) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3178 |
19078 | 3179 (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
|
3180 |
18129 | 3181 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3182 (back-to-indentation) | |
3183 )) | |
3184 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3185 ;; Find ARG's occurrence of CHAR on the current line. |
18129 | 3186 ;; If FORWARD then search is forward, otherwise backward. OFFSET is used to |
3187 ;; adjust point after search. | |
19078 | 3188 (defun viper-find-char (arg char forward offset) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
3189 (or (char-or-string-p char) (error "Viper bell")) |
18129 | 3190 (let ((arg (if forward arg (- arg))) |
19078 | 3191 (cmd (if (eq viper-intermediate-command 'viper-repeat) |
3192 (nth 5 viper-d-com) | |
3193 (viper-array-to-string (this-command-keys)))) | |
21940 | 3194 point region-beg region-end) |
18129 | 3195 (save-excursion |
3196 (save-restriction | |
21940 | 3197 (if (> arg 0) ; forward |
3198 (progn | |
3199 (setq region-beg (point)) | |
3200 (if viper-allow-multiline-replace-regions | |
3201 (viper-forward-paragraph 1) | |
3202 (end-of-line)) | |
3203 (setq region-end (point))) | |
3204 (setq region-end (point)) | |
3205 (if viper-allow-multiline-replace-regions | |
3206 (viper-backward-paragraph 1) | |
3207 (beginning-of-line)) | |
3208 (setq region-beg (point))) | |
3209 (if (or (and (< arg 0) | |
3210 (< (- region-end region-beg) | |
3211 (if viper-allow-multiline-replace-regions | |
3212 2 1)) | |
3213 (bolp)) | |
3214 (and (> arg 0) | |
3215 (< (- region-end region-beg) | |
3216 (if viper-allow-multiline-replace-regions | |
3217 3 2)) | |
3218 (eolp))) | |
3219 (error "Command `%s': At %s of %s" | |
3220 cmd | |
3221 (if (> arg 0) "end" "beginning") | |
3222 (if viper-allow-multiline-replace-regions | |
3223 "paragraph" "line"))) | |
3224 (narrow-to-region region-beg region-end) | |
18129 | 3225 ;; if arg > 0, point is forwarded before search. |
3226 (if (> arg 0) (goto-char (1+ (point-min))) | |
3227 (goto-char (point-max))) | |
3228 (if (let ((case-fold-search nil)) | |
3229 (search-forward (char-to-string char) nil 0 arg)) | |
3230 (setq point (point)) | |
3231 (error "Command `%s': `%c' not found" cmd char)))) | |
19462 | 3232 (goto-char point) |
3233 (if (> arg 0) | |
3234 (backward-char (if offset 2 1)) | |
3235 (forward-char (if offset 1 0))))) | |
18129 | 3236 |
19078 | 3237 (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
|
3238 "Find char on the line. |
18129 | 3239 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
|
3240 called from viper-repeat, the char last used is used. This behavior is |
18129 | 3241 controlled by the sign of prefix numeric value." |
3242 (interactive "P") | |
19078 | 3243 (let ((val (viper-p-val arg)) |
3244 (com (viper-getcom arg)) | |
3245 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3246 (if (> val 0) |
3247 ;; this means that the function was called interactively | |
19078 | 3248 (setq viper-f-char (read-char) |
3249 viper-f-forward t | |
3250 viper-f-offset nil) | |
3251 ;; viper-repeat --- set viper-F-char from command-keys | |
3252 (setq viper-F-char (if (stringp cmd-representation) | |
3253 (viper-seq-last-elt cmd-representation) | |
3254 viper-F-char) | |
3255 viper-f-char viper-F-char) | |
18129 | 3256 (setq val (- val))) |
19078 | 3257 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3258 (viper-find-char | |
3259 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t nil) | |
18129 | 3260 (setq val (- val)) |
3261 (if com | |
3262 (progn | |
19078 | 3263 (setq viper-F-char viper-f-char) ; set new viper-F-char |
18129 | 3264 (forward-char) |
19078 | 3265 (viper-execute-com 'viper-find-char-forward val com))))) |
3266 | |
3267 (defun viper-goto-char-forward (arg) | |
18129 | 3268 "Go up to char ARG forward on line." |
3269 (interactive "P") | |
19078 | 3270 (let ((val (viper-p-val arg)) |
3271 (com (viper-getcom arg)) | |
3272 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3273 (if (> val 0) |
3274 ;; this means that the function was called interactively | |
19078 | 3275 (setq viper-f-char (read-char) |
3276 viper-f-forward t | |
3277 viper-f-offset t) | |
3278 ;; viper-repeat --- set viper-F-char from command-keys | |
3279 (setq viper-F-char (if (stringp cmd-representation) | |
3280 (viper-seq-last-elt cmd-representation) | |
3281 viper-F-char) | |
3282 viper-f-char viper-F-char) | |
18129 | 3283 (setq val (- val))) |
19078 | 3284 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3285 (viper-find-char | |
3286 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t t) | |
18129 | 3287 (setq val (- val)) |
3288 (if com | |
3289 (progn | |
19078 | 3290 (setq viper-F-char viper-f-char) ; set new viper-F-char |
18129 | 3291 (forward-char) |
19078 | 3292 (viper-execute-com 'viper-goto-char-forward val com))))) |
3293 | |
3294 (defun viper-find-char-backward (arg) | |
18129 | 3295 "Find char ARG on line backward." |
3296 (interactive "P") | |
19078 | 3297 (let ((val (viper-p-val arg)) |
3298 (com (viper-getcom arg)) | |
3299 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3300 (if (> val 0) |
3301 ;; this means that the function was called interactively | |
19078 | 3302 (setq viper-f-char (read-char) |
3303 viper-f-forward nil | |
3304 viper-f-offset nil) | |
3305 ;; viper-repeat --- set viper-F-char from command-keys | |
3306 (setq viper-F-char (if (stringp cmd-representation) | |
3307 (viper-seq-last-elt cmd-representation) | |
3308 viper-F-char) | |
3309 viper-f-char viper-F-char) | |
18129 | 3310 (setq val (- val))) |
19078 | 3311 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3312 (viper-find-char | |
3313 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil nil) | |
18129 | 3314 (setq val (- val)) |
3315 (if com | |
3316 (progn | |
19078 | 3317 (setq viper-F-char viper-f-char) ; set new viper-F-char |
3318 (viper-execute-com 'viper-find-char-backward val com))))) | |
3319 | |
3320 (defun viper-goto-char-backward (arg) | |
18129 | 3321 "Go up to char ARG backward on line." |
3322 (interactive "P") | |
19078 | 3323 (let ((val (viper-p-val arg)) |
3324 (com (viper-getcom arg)) | |
3325 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3326 (if (> val 0) |
3327 ;; this means that the function was called interactively | |
19078 | 3328 (setq viper-f-char (read-char) |
3329 viper-f-forward nil | |
3330 viper-f-offset t) | |
3331 ;; viper-repeat --- set viper-F-char from command-keys | |
3332 (setq viper-F-char (if (stringp cmd-representation) | |
3333 (viper-seq-last-elt cmd-representation) | |
3334 viper-F-char) | |
3335 viper-f-char viper-F-char) | |
18129 | 3336 (setq val (- val))) |
19078 | 3337 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3338 (viper-find-char | |
3339 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil t) | |
18129 | 3340 (setq val (- val)) |
3341 (if com | |
3342 (progn | |
19078 | 3343 (setq viper-F-char viper-f-char) ; set new viper-F-char |
3344 (viper-execute-com 'viper-goto-char-backward val com))))) | |
3345 | |
3346 (defun viper-repeat-find (arg) | |
18129 | 3347 "Repeat previous find command." |
3348 (interactive "P") | |
19078 | 3349 (let ((val (viper-p-val arg)) |
3350 (com (viper-getcom arg))) | |
3351 (viper-deactivate-mark) | |
3352 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3353 (viper-find-char val viper-f-char viper-f-forward viper-f-offset) | |
18129 | 3354 (if com |
3355 (progn | |
19078 | 3356 (if viper-f-forward (forward-char)) |
3357 (viper-execute-com 'viper-repeat-find val com))))) | |
3358 | |
3359 (defun viper-repeat-find-opposite (arg) | |
18129 | 3360 "Repeat previous find command in the opposite direction." |
3361 (interactive "P") | |
19078 | 3362 (let ((val (viper-p-val arg)) |
3363 (com (viper-getcom arg))) | |
3364 (viper-deactivate-mark) | |
3365 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3366 (viper-find-char val viper-f-char (not viper-f-forward) viper-f-offset) | |
18129 | 3367 (if com |
3368 (progn | |
19078 | 3369 (if viper-f-forward (forward-char)) |
3370 (viper-execute-com 'viper-repeat-find-opposite val com))))) | |
18129 | 3371 |
3372 | |
3373 ;; window scrolling etc. | |
3374 | |
19078 | 3375 (defun viper-window-top (arg) |
18129 | 3376 "Go to home window line." |
3377 (interactive "P") | |
19078 | 3378 (let ((val (viper-p-val arg)) |
3379 (com (viper-getCom arg))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3380 (viper-leave-region-active) |
19078 | 3381 (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
|
3382 (push-mark nil t) |
18129 | 3383 (move-to-window-line (1- val)) |
3384 | |
3385 ;; positioning is done twice: before and after command execution | |
3386 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3387 (back-to-indentation) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3388 |
19078 | 3389 (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
|
3390 |
18129 | 3391 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3392 (back-to-indentation) | |
3393 )) | |
3394 | |
19078 | 3395 (defun viper-window-middle (arg) |
18129 | 3396 "Go to middle window line." |
3397 (interactive "P") | |
19078 | 3398 (let ((val (viper-p-val arg)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3399 (com (viper-getCom arg))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3400 (viper-leave-region-active) |
19078 | 3401 (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
|
3402 (push-mark nil t) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3403 (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
|
3404 |
18129 | 3405 ;; positioning is done twice: before and after command execution |
3406 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3407 (back-to-indentation) | |
3408 | |
19078 | 3409 (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
|
3410 |
18129 | 3411 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3412 (back-to-indentation) | |
3413 )) | |
3414 | |
19078 | 3415 (defun viper-window-bottom (arg) |
18129 | 3416 "Go to last window line." |
3417 (interactive "P") | |
19078 | 3418 (let ((val (viper-p-val arg)) |
3419 (com (viper-getCom arg))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3420 (viper-leave-region-active) |
19078 | 3421 (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
|
3422 (push-mark nil t) |
18129 | 3423 (move-to-window-line (- val)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3424 |
18129 | 3425 ;; positioning is done twice: before and after command execution |
3426 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3427 (back-to-indentation) | |
3428 | |
19078 | 3429 (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
|
3430 |
18129 | 3431 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3432 (back-to-indentation) | |
3433 )) | |
3434 | |
19078 | 3435 (defun viper-line-to-top (arg) |
18129 | 3436 "Put current line on the home line." |
3437 (interactive "p") | |
3438 (recenter (1- arg))) | |
3439 | |
19078 | 3440 (defun viper-line-to-middle (arg) |
18129 | 3441 "Put current line on the middle line." |
3442 (interactive "p") | |
3443 (recenter (+ (1- arg) (/ (1- (window-height)) 2)))) | |
3444 | |
19078 | 3445 (defun viper-line-to-bottom (arg) |
18129 | 3446 "Put current line on the last line." |
3447 (interactive "p") | |
3448 (recenter (- (window-height) (1+ arg)))) | |
3449 | |
19078 | 3450 ;; If point is within viper-search-scroll-threshold of window top or bottom, |
18129 | 3451 ;; 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
|
3452 ;; 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
|
3453 ;; (which is called from viper-search-forward/backward/next). If the value of |
19078 | 3454 ;; viper-search-scroll-threshold is negative - don't scroll. |
3455 (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
|
3456 (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
|
3457 (window-displayed-height) ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3458 ;; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3459 (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
|
3460 )) |
18129 | 3461 (pt (point)) |
3462 at-top-p at-bottom-p | |
3463 min-scroll direction) | |
3464 (save-excursion | |
3465 (move-to-window-line 0) ; top | |
3466 (setq at-top-p | |
3467 (<= (count-lines pt (point)) | |
19078 | 3468 viper-search-scroll-threshold)) |
18129 | 3469 (move-to-window-line -1) ; bottom |
3470 (setq at-bottom-p | |
19078 | 3471 (<= (count-lines pt (point)) viper-search-scroll-threshold)) |
18129 | 3472 ) |
19078 | 3473 (cond (at-top-p (setq min-scroll (1- viper-search-scroll-threshold) |
18129 | 3474 direction 1)) |
19078 | 3475 (at-bottom-p (setq min-scroll (1+ viper-search-scroll-threshold) |
18129 | 3476 direction -1))) |
3477 (if min-scroll | |
3478 (recenter | |
3479 (* (max min-scroll (/ win-height 7)) direction))) | |
3480 )) | |
3481 | |
3482 | |
3483 ;; paren match | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3484 ;; must correct this to only match ( to ) etc. On the other hand |
18129 | 3485 ;; 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
|
3486 ;; catch _all_ imbalances. |
18129 | 3487 |
19078 | 3488 (defun viper-paren-match (arg) |
18129 | 3489 "Go to the matching parenthesis." |
3490 (interactive "P") | |
19078 | 3491 (viper-leave-region-active) |
3492 (let ((com (viper-getcom arg)) | |
3493 (parse-sexp-ignore-comments viper-parse-sexp-ignore-comments) | |
18129 | 3494 anchor-point) |
3495 (if (integerp arg) | |
3496 (if (or (> arg 99) (< arg 1)) | |
3497 (error "Prefix must be between 1 and 99") | |
3498 (goto-char | |
3499 (if (> (point-max) 80000) | |
3500 (* (/ (point-max) 100) arg) | |
3501 (/ (* (point-max) arg) 100))) | |
3502 (back-to-indentation)) | |
3503 (let (beg-lim end-lim) | |
3504 (if (and (eolp) (not (bolp))) (forward-char -1)) | |
3505 (if (not (looking-at "[][(){}]")) | |
3506 (setq anchor-point (point))) | |
3507 (save-excursion | |
3508 (beginning-of-line) | |
3509 (setq beg-lim (point)) | |
3510 (end-of-line) | |
3511 (setq end-lim (point))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3512 (cond ((re-search-forward "[][(){}]" end-lim t) |
18129 | 3513 (backward-char) ) |
3514 ((re-search-backward "[][(){}]" beg-lim t)) | |
3515 (t | |
3516 (error "No matching character on line")))) | |
3517 (cond ((looking-at "[\(\[{]") | |
19078 | 3518 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3519 (forward-sexp 1) |
3520 (if com | |
19078 | 3521 (viper-execute-com 'viper-paren-match nil com) |
18129 | 3522 (backward-char))) |
3523 (anchor-point | |
3524 (if com | |
3525 (progn | |
19078 | 3526 (viper-move-marker-locally 'viper-com-point anchor-point) |
18129 | 3527 (forward-char 1) |
19078 | 3528 (viper-execute-com 'viper-paren-match nil com) |
18129 | 3529 ))) |
3530 ((looking-at "[])}]") | |
3531 (forward-char) | |
19078 | 3532 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3533 (backward-sexp 1) |
19078 | 3534 (if com (viper-execute-com 'viper-paren-match nil com))) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
3535 (t (error "Viper bell")))))) |
18129 | 3536 |
19078 | 3537 (defun viper-toggle-parse-sexp-ignore-comments () |
18129 | 3538 (interactive) |
19078 | 3539 (setq viper-parse-sexp-ignore-comments |
3540 (not viper-parse-sexp-ignore-comments)) | |
18839 | 3541 (princ (format |
3542 "From now on, `%%' will %signore parentheses inside comment fields" | |
19078 | 3543 (if viper-parse-sexp-ignore-comments "" "NOT ")))) |
18129 | 3544 |
3545 | |
21940 | 3546 ;; sentence, paragraph and heading |
18129 | 3547 |
19078 | 3548 (defun viper-forward-sentence (arg) |
18129 | 3549 "Forward sentence." |
3550 (interactive "P") | |
20003 | 3551 (or (eq last-command this-command) |
3552 (push-mark nil t)) | |
19078 | 3553 (let ((val (viper-p-val arg)) |
3554 (com (viper-getcom arg))) | |
3555 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3556 (forward-sentence val) |
19078 | 3557 (if com (viper-execute-com 'viper-forward-sentence nil com)))) |
3558 | |
3559 (defun viper-backward-sentence (arg) | |
18129 | 3560 "Backward sentence." |
3561 (interactive "P") | |
20003 | 3562 (or (eq last-command this-command) |
3563 (push-mark nil t)) | |
19078 | 3564 (let ((val (viper-p-val arg)) |
3565 (com (viper-getcom arg))) | |
3566 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3567 (backward-sentence val) |
19078 | 3568 (if com (viper-execute-com 'viper-backward-sentence nil com)))) |
3569 | |
3570 (defun viper-forward-paragraph (arg) | |
18129 | 3571 "Forward paragraph." |
3572 (interactive "P") | |
20003 | 3573 (or (eq last-command this-command) |
3574 (push-mark nil t)) | |
19078 | 3575 (let ((val (viper-p-val arg)) |
21940 | 3576 ;; if you want d} operate on whole lines, change viper-getcom to |
3577 ;; viper-getCom below | |
3578 (com (viper-getcom arg))) | |
19078 | 3579 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3580 (forward-paragraph val) |
3581 (if com | |
3582 (progn | |
3583 (backward-char 1) | |
19078 | 3584 (viper-execute-com 'viper-forward-paragraph nil com))))) |
3585 | |
3586 (defun viper-backward-paragraph (arg) | |
18129 | 3587 "Backward paragraph." |
3588 (interactive "P") | |
20003 | 3589 (or (eq last-command this-command) |
3590 (push-mark nil t)) | |
19078 | 3591 (let ((val (viper-p-val arg)) |
21940 | 3592 ;; if you want d{ operate on whole lines, change viper-getcom to |
3593 ;; viper-getCom below | |
3594 (com (viper-getcom arg))) | |
19078 | 3595 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3596 (backward-paragraph val) |
3597 (if com | |
3598 (progn | |
3599 (forward-char 1) | |
19078 | 3600 (viper-execute-com 'viper-backward-paragraph nil com) |
18129 | 3601 (backward-char 1))))) |
3602 | |
20003 | 3603 ;; should be mode-specific |
19078 | 3604 (defun viper-prev-heading (arg) |
18129 | 3605 (interactive "P") |
19078 | 3606 (let ((val (viper-p-val arg)) |
3607 (com (viper-getCom arg))) | |
3608 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3609 (re-search-backward viper-heading-start nil t val) | |
18129 | 3610 (goto-char (match-beginning 0)) |
19078 | 3611 (if com (viper-execute-com 'viper-prev-heading nil com)))) |
3612 | |
3613 (defun viper-heading-end (arg) | |
18129 | 3614 (interactive "P") |
19078 | 3615 (let ((val (viper-p-val arg)) |
3616 (com (viper-getCom arg))) | |
3617 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3618 (re-search-forward viper-heading-end nil t val) | |
18129 | 3619 (goto-char (match-beginning 0)) |
19078 | 3620 (if com (viper-execute-com 'viper-heading-end nil com)))) |
3621 | |
3622 (defun viper-next-heading (arg) | |
18129 | 3623 (interactive "P") |
19078 | 3624 (let ((val (viper-p-val arg)) |
3625 (com (viper-getCom arg))) | |
3626 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3627 (end-of-line) |
19078 | 3628 (re-search-forward viper-heading-start nil t val) |
18129 | 3629 (goto-char (match-beginning 0)) |
19078 | 3630 (if com (viper-execute-com 'viper-next-heading nil com)))) |
18129 | 3631 |
3632 | |
3633 ;; scrolling | |
3634 | |
19078 | 3635 (defun viper-scroll-screen (arg) |
18129 | 3636 "Scroll to next screen." |
3637 (interactive "p") | |
3638 (condition-case nil | |
3639 (if (> arg 0) | |
3640 (while (> arg 0) | |
3641 (scroll-up) | |
3642 (setq arg (1- arg))) | |
3643 (while (> 0 arg) | |
3644 (scroll-down) | |
3645 (setq arg (1+ arg)))) | |
3646 (error (beep 1) | |
3647 (if (> arg 0) | |
3648 (progn | |
3649 (message "End of buffer") | |
3650 (goto-char (point-max))) | |
3651 (message "Beginning of buffer") | |
3652 (goto-char (point-min)))) | |
3653 )) | |
3654 | |
19078 | 3655 (defun viper-scroll-screen-back (arg) |
18129 | 3656 "Scroll to previous screen." |
3657 (interactive "p") | |
19078 | 3658 (viper-scroll-screen (- arg))) |
3659 | |
3660 (defun viper-scroll-down (arg) | |
18129 | 3661 "Pull down half screen." |
3662 (interactive "P") | |
3663 (condition-case nil | |
3664 (if (null arg) | |
3665 (scroll-down (/ (window-height) 2)) | |
3666 (scroll-down arg)) | |
3667 (error (beep 1) | |
3668 (message "Beginning of buffer") | |
3669 (goto-char (point-min))))) | |
3670 | |
19078 | 3671 (defun viper-scroll-down-one (arg) |
18129 | 3672 "Scroll up one line." |
3673 (interactive "p") | |
3674 (scroll-down arg)) | |
3675 | |
19078 | 3676 (defun viper-scroll-up (arg) |
18129 | 3677 "Pull up half screen." |
3678 (interactive "P") | |
3679 (condition-case nil | |
3680 (if (null arg) | |
3681 (scroll-up (/ (window-height) 2)) | |
3682 (scroll-up arg)) | |
3683 (error (beep 1) | |
3684 (message "End of buffer") | |
3685 (goto-char (point-max))))) | |
3686 | |
19078 | 3687 (defun viper-scroll-up-one (arg) |
18129 | 3688 "Scroll down one line." |
3689 (interactive "p") | |
3690 (scroll-up arg)) | |
3691 | |
3692 | |
3693 ;; searching | |
3694 | |
19078 | 3695 (defun viper-if-string (prompt) |
3696 (if (memq viper-intermediate-command | |
3697 '(viper-command-argument viper-digit-argument viper-repeat)) | |
3698 (setq viper-this-command-keys (this-command-keys))) | |
3699 (let ((s (viper-read-string-with-history | |
18129 | 3700 prompt |
3701 nil ; no initial | |
19078 | 3702 'viper-search-history |
3703 (car viper-search-history)))) | |
18129 | 3704 (if (not (string= s "")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3705 (setq viper-s-string s)))) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3706 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3707 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3708 (defun viper-toggle-search-style (arg) |
19078 | 3709 "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
|
3710 Without prefix argument, will ask which search style to toggle. With prefix |
19078 | 3711 arg 1,toggles viper-case-fold-search; with arg 2 toggles viper-re-search. |
3712 | |
3713 Although this function is bound to \\[viper-toggle-search-style], the most | |
18129 | 3714 convenient way to use it is to bind `//' to the macro |
19078 | 3715 `1 M-x viper-toggle-search-style' and `///' to |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3716 `2 M-x viper-toggle-search-style'. In this way, hitting `//' quickly will |
18129 | 3717 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
|
3718 search. Macros are more convenient in this case because they don't affect |
18129 | 3719 the Emacs binding of `/'." |
3720 (interactive "P") | |
3721 (let (msg) | |
3722 (cond ((or (eq arg 1) | |
3723 (and (null arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3724 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
19078 | 3725 (if viper-case-fold-search |
18129 | 3726 "case-insensitive" "case-sensitive") |
19078 | 3727 (if viper-case-fold-search |
18129 | 3728 "case-sensitive" |
3729 "case-insensitive"))))) | |
19078 | 3730 (setq viper-case-fold-search (null viper-case-fold-search)) |
3731 (if viper-case-fold-search | |
18129 | 3732 (setq msg "Search becomes case-insensitive") |
3733 (setq msg "Search becomes case-sensitive"))) | |
3734 ((or (eq arg 2) | |
3735 (and (null arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3736 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
19078 | 3737 (if viper-re-search |
18129 | 3738 "regexp-search" "vanilla-search") |
19078 | 3739 (if viper-re-search |
18129 | 3740 "vanilla-search" |
3741 "regexp-search"))))) | |
19078 | 3742 (setq viper-re-search (null viper-re-search)) |
3743 (if viper-re-search | |
18129 | 3744 (setq msg "Search becomes regexp-style") |
3745 (setq msg "Search becomes vanilla-style"))) | |
3746 (t | |
3747 (setq msg "Search style remains unchanged"))) | |
18839 | 3748 (princ msg t))) |
3749 | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3750 (defun viper-set-searchstyle-toggling-macros (unset &optional major-mode) |
18129 | 3751 "Set the macros for toggling the search style in Viper's vi-state. |
3752 The macro that toggles case sensitivity is bound to `//', and the one that | |
3753 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
|
3754 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
|
3755 If MAJOR-MODE is set, set the macros only in that major mode." |
18129 | 3756 (interactive "P") |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3757 (let (scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3758 (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
|
3759 (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
|
3760 (setq scope 't)) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3761 (or noninteractive |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3762 (if (not unset) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3763 (progn |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3764 ;; 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
|
3765 (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
|
3766 "//" 'vi-state |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3767 [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
|
3768 scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3769 ;; 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
|
3770 (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
|
3771 "///" 'vi-state |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3772 [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
|
3773 scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3774 (if (interactive-p) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3775 (message |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3776 "// 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
|
3777 (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
|
3778 (sit-for 2) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3779 (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
|
3780 )) |
63268
b9bfb8457681
(viper-find-char-forward): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62440
diff
changeset
|
3781 |
b9bfb8457681
(viper-find-char-forward): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62440
diff
changeset
|
3782 |
19078 | 3783 (defun viper-set-parsing-style-toggling-macro (unset) |
18839 | 3784 "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses. |
3785 This is used in conjunction with the `%' command. | |
3786 | |
3787 With a prefix argument, unsets the macro." | |
3788 (interactive "P") | |
3789 (or noninteractive | |
3790 (if (not unset) | |
3791 (progn | |
3792 ;; Make %%% toggle parsing comments for matching parentheses | |
19078 | 3793 (viper-record-kbd-macro |
18839 | 3794 "%%%" 'vi-state |
19078 | 3795 [(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 | 3796 't) |
3797 (if (interactive-p) | |
3798 (message | |
3799 "%%%%%% now toggles whether comments should be parsed for matching parentheses"))) | |
19078 | 3800 (viper-unrecord-kbd-macro "%%%" 'vi-state)))) |
3801 | |
3802 | |
3803 (defun viper-set-emacs-state-searchstyle-macros (unset &optional arg-majormode) | |
18129 | 3804 "Set the macros for toggling the search style in Viper's emacs-state. |
3805 The macro that toggles case sensitivity is bound to `//', and the one that | |
3806 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
|
3807 With a prefix argument, this function unsets the macros. |
18129 | 3808 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
|
3809 this sets the macros only in the macros in that major mode. Otherwise, |
18129 | 3810 the macros are set in the current major mode. |
3811 \(When unsetting the macros, the second argument has no effect.\)" | |
3812 (interactive "P") | |
3813 (or noninteractive | |
3814 (if (not unset) | |
3815 (progn | |
3816 ;; toggle case sensitivity in search | |
19078 | 3817 (viper-record-kbd-macro |
18129 | 3818 "//" 'emacs-state |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3819 [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 | 3820 (or arg-majormode major-mode)) |
3821 ;; toggle regexp/vanila search | |
19078 | 3822 (viper-record-kbd-macro |
18129 | 3823 "///" 'emacs-state |
19078 | 3824 [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 | 3825 (or arg-majormode major-mode)) |
3826 (if (interactive-p) | |
3827 (message | |
3828 "// and /// now toggle case-sensitivity and regexp search."))) | |
19078 | 3829 (viper-unrecord-kbd-macro "//" 'emacs-state) |
18129 | 3830 (sit-for 2) |
19078 | 3831 (viper-unrecord-kbd-macro "///" 'emacs-state)))) |
3832 | |
3833 | |
3834 (defun viper-search-forward (arg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3835 "Search a string forward. |
18129 | 3836 ARG is used to find the ARG's occurrence of the string. |
3837 Null string will repeat previous search." | |
3838 (interactive "P") | |
19078 | 3839 (let ((val (viper-P-val arg)) |
3840 (com (viper-getcom arg)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3841 (old-str viper-s-string) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3842 debug-on-error) |
19078 | 3843 (setq viper-s-forward t) |
3844 (viper-if-string "/") | |
18129 | 3845 ;; this is not used at present, but may be used later |
19078 | 3846 (if (or (not (equal old-str viper-s-string)) |
3847 (not (markerp viper-local-search-start-marker)) | |
3848 (not (marker-buffer viper-local-search-start-marker))) | |
3849 (setq viper-local-search-start-marker (point-marker))) | |
3850 (viper-search viper-s-string t val) | |
18129 | 3851 (if com |
3852 (progn | |
19078 | 3853 (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
|
3854 (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
|
3855 )) |
19078 | 3856 |
3857 (defun viper-search-backward (arg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3858 "Search a string backward. |
18129 | 3859 ARG is used to find the ARG's occurrence of the string. |
3860 Null string will repeat previous search." | |
3861 (interactive "P") | |
19078 | 3862 (let ((val (viper-P-val arg)) |
3863 (com (viper-getcom arg)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3864 (old-str viper-s-string) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3865 debug-on-error) |
19078 | 3866 (setq viper-s-forward nil) |
3867 (viper-if-string "?") | |
18129 | 3868 ;; this is not used at present, but may be used later |
19078 | 3869 (if (or (not (equal old-str viper-s-string)) |
3870 (not (markerp viper-local-search-start-marker)) | |
3871 (not (marker-buffer viper-local-search-start-marker))) | |
3872 (setq viper-local-search-start-marker (point-marker))) | |
3873 (viper-search viper-s-string nil val) | |
18129 | 3874 (if com |
3875 (progn | |
19078 | 3876 (viper-move-marker-locally 'viper-com-point (mark t)) |
3877 (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
|
3878 |
18129 | 3879 |
3880 ;; Search for COUNT's occurrence of STRING. | |
3881 ;; Search is forward if FORWARD is non-nil, otherwise backward. | |
3882 ;; INIT-POINT is the position where search is to start. | |
3883 ;; Arguments: | |
3884 ;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND) | |
19078 | 3885 (defun viper-search (string forward arg |
3886 &optional no-offset init-point fail-if-not-found) | |
18129 | 3887 (if (not (equal string "")) |
19078 | 3888 (let ((val (viper-p-val arg)) |
3889 (com (viper-getcom arg)) | |
18129 | 3890 (offset (not no-offset)) |
19078 | 3891 (case-fold-search viper-case-fold-search) |
18129 | 3892 (start-point (or init-point (point)))) |
19078 | 3893 (viper-deactivate-mark) |
18129 | 3894 (if forward |
3895 (condition-case nil | |
3896 (progn | |
19078 | 3897 (if offset (viper-forward-char-carefully)) |
3898 (if viper-re-search | |
18129 | 3899 (progn |
3900 (re-search-forward string nil nil val) | |
3901 (re-search-backward string)) | |
3902 (search-forward string nil nil val) | |
3903 (search-backward string)) | |
3904 (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
|
3905 (push-mark start-point t))) |
18129 | 3906 (search-failed |
19078 | 3907 (if (and (not fail-if-not-found) viper-search-wrap-around-t) |
18129 | 3908 (progn |
3909 (message "Search wrapped around BOTTOM of buffer") | |
3910 (goto-char (point-min)) | |
19078 | 3911 (viper-search string forward (cons 1 com) t start-point 'fail) |
18129 | 3912 ;; don't wait in macros |
19078 | 3913 (or executing-kbd-macro |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3914 (memq viper-intermediate-command |
19078 | 3915 '(viper-repeat |
3916 viper-digit-argument | |
3917 viper-command-argument)) | |
3918 (sit-for 2)) | |
18129 | 3919 ;; delete the wrap-around message |
3920 (message "") | |
3921 ) | |
3922 (goto-char start-point) | |
3923 (error "`%s': %s not found" | |
3924 string | |
19078 | 3925 (if viper-re-search "Pattern" "String")) |
18129 | 3926 ))) |
3927 ;; backward | |
3928 (condition-case nil | |
3929 (progn | |
19078 | 3930 (if viper-re-search |
18129 | 3931 (re-search-backward string nil nil val) |
3932 (search-backward string nil nil val)) | |
3933 (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
|
3934 (push-mark start-point t))) |
18129 | 3935 (search-failed |
19078 | 3936 (if (and (not fail-if-not-found) viper-search-wrap-around-t) |
18129 | 3937 (progn |
3938 (message "Search wrapped around TOP of buffer") | |
3939 (goto-char (point-max)) | |
19078 | 3940 (viper-search string forward (cons 1 com) t start-point 'fail) |
18129 | 3941 ;; don't wait in macros |
19078 | 3942 (or executing-kbd-macro |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3943 (memq viper-intermediate-command |
19078 | 3944 '(viper-repeat |
3945 viper-digit-argument | |
3946 viper-command-argument)) | |
3947 (sit-for 2)) | |
18129 | 3948 ;; delete the wrap-around message |
3949 (message "") | |
3950 ) | |
3951 (goto-char start-point) | |
3952 (error "`%s': %s not found" | |
3953 string | |
19078 | 3954 (if viper-re-search "Pattern" "String")) |
18129 | 3955 )))) |
3956 ;; pull up or down if at top/bottom of window | |
19078 | 3957 (viper-adjust-window) |
18129 | 3958 ;; highlight the result of search |
3959 ;; don't wait and don't highlight in macros | |
3960 (or executing-kbd-macro | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3961 (memq viper-intermediate-command |
19078 | 3962 '(viper-repeat viper-digit-argument viper-command-argument)) |
3963 (viper-flash-search-pattern)) | |
18129 | 3964 ))) |
3965 | |
19078 | 3966 (defun viper-search-next (arg) |
18129 | 3967 "Repeat previous search." |
3968 (interactive "P") | |
19078 | 3969 (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
|
3970 (com (viper-getcom arg)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3971 debug-on-error) |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
3972 (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
|
3973 (error viper-NoPrevSearch)) |
19078 | 3974 (viper-search viper-s-string viper-s-forward arg) |
18129 | 3975 (if com |
3976 (progn | |
19078 | 3977 (viper-move-marker-locally 'viper-com-point (mark t)) |
3978 (viper-execute-com 'viper-search-next val com))))) | |
3979 | |
3980 (defun viper-search-Next (arg) | |
18129 | 3981 "Repeat previous search in the reverse direction." |
3982 (interactive "P") | |
19078 | 3983 (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
|
3984 (com (viper-getcom arg)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3985 debug-on-error) |
19078 | 3986 (if (null viper-s-string) (error viper-NoPrevSearch)) |
3987 (viper-search viper-s-string (not viper-s-forward) arg) | |
18129 | 3988 (if com |
3989 (progn | |
19078 | 3990 (viper-move-marker-locally 'viper-com-point (mark t)) |
3991 (viper-execute-com 'viper-search-Next val com))))) | |
18129 | 3992 |
3993 | |
3994 ;; Search contents of buffer defined by one of Viper's motion commands. | |
3995 ;; Repeatable via `n' and `N'. | |
19078 | 3996 (defun viper-buffer-search-enable (&optional c) |
3997 (cond (c (setq viper-buffer-search-char c)) | |
3998 ((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
|
3999 ;; ?g acts as a default value for viper-buffer-search-char |
19078 | 4000 (setq viper-buffer-search-char ?g))) |
4001 (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
|
4002 (cond ((viper-characterp viper-buffer-search-char) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4003 (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
|
4004 (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
|
4005 viper-buffer-search-char))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4006 'viper-command-argument) |
19078 | 4007 (aset viper-exec-array viper-buffer-search-char 'viper-exec-buffer-search) |
4008 (setq viper-prefix-commands | |
4009 (cons viper-buffer-search-char viper-prefix-commands))) | |
18129 | 4010 |
4011 ;; This is a Viper wraper for isearch-forward. | |
19078 | 4012 (defun viper-isearch-forward (arg) |
18129 | 4013 "Do incremental search forward." |
4014 (interactive "P") | |
4015 ;; emacs bug workaround | |
4016 (if (listp arg) (setq arg (car arg))) | |
19078 | 4017 (viper-exec-form-in-emacs (list 'isearch-forward arg))) |
18129 | 4018 |
4019 ;; This is a Viper wraper for isearch-backward." | |
19078 | 4020 (defun viper-isearch-backward (arg) |
18129 | 4021 "Do incremental search backward." |
4022 (interactive "P") | |
4023 ;; emacs bug workaround | |
4024 (if (listp arg) (setq arg (car arg))) | |
19078 | 4025 (viper-exec-form-in-emacs (list 'isearch-backward arg))) |
18129 | 4026 |
4027 | |
4028 ;; visiting and killing files, buffers | |
4029 | |
19078 | 4030 (defun viper-switch-to-buffer () |
18129 | 4031 "Switch to buffer in the current window." |
4032 (interactive) | |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4033 (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
|
4034 buffer) |
18129 | 4035 (setq buffer |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4036 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4037 "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
|
4038 (switch-to-buffer buffer))) |
18129 | 4039 |
19078 | 4040 (defun viper-switch-to-buffer-other-window () |
18129 | 4041 "Switch to buffer in another window." |
4042 (interactive) | |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4043 (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
|
4044 buffer) |
18129 | 4045 (setq buffer |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4046 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4047 "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
|
4048 (switch-to-buffer-other-window buffer))) |
18129 | 4049 |
19078 | 4050 (defun viper-kill-buffer () |
18129 | 4051 "Kill a buffer." |
4052 (interactive) | |
4053 (let (buffer buffer-name) | |
4054 (setq buffer-name | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4055 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4056 (format "Kill buffer \(%s\): " |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4057 (buffer-name (current-buffer))))) |
18129 | 4058 (setq buffer |
4059 (if (null buffer-name) | |
4060 (current-buffer) | |
4061 (get-buffer buffer-name))) | |
4062 (if (null buffer) (error "`%s': No such buffer" buffer-name)) | |
4063 (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
|
4064 (y-or-n-p |
18129 | 4065 (format |
4066 "Buffer `%s' is modified, are you sure you want to kill it? " | |
4067 buffer-name))) | |
4068 (kill-buffer buffer) | |
4069 (error "Buffer not killed")))) | |
4070 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4071 |
18129 | 4072 |
4073 ;; yank and pop | |
4074 | |
19078 | 4075 (defsubst viper-yank (text) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4076 "Yank TEXT silently. This works correctly with Emacs's yank-pop command." |
18129 | 4077 (insert text) |
4078 (setq this-command 'yank)) | |
4079 | |
19078 | 4080 (defun viper-put-back (arg) |
18129 | 4081 "Put back after point/below line." |
4082 (interactive "P") | |
19078 | 4083 (let ((val (viper-p-val arg)) |
4084 (text (if viper-use-register | |
4085 (cond ((viper-valid-register viper-use-register '(digit)) | |
4086 (current-kill | |
4087 (- viper-use-register ?1) 'do-not-rotate)) | |
4088 ((viper-valid-register viper-use-register) | |
4089 (get-register (downcase viper-use-register))) | |
4090 (t (error viper-InvalidRegister viper-use-register))) | |
21940 | 4091 (current-kill 0))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4092 sv-point chars-inserted lines-inserted) |
18129 | 4093 (if (null text) |
19078 | 4094 (if viper-use-register |
4095 (let ((reg viper-use-register)) | |
4096 (setq viper-use-register nil) | |
4097 (error viper-EmptyRegister reg)) | |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
4098 (error "Viper bell"))) |
19078 | 4099 (setq viper-use-register nil) |
4100 (if (viper-end-with-a-newline-p text) | |
18129 | 4101 (progn |
4102 (end-of-line) | |
4103 (if (eobp) | |
4104 (insert "\n") | |
4105 (forward-line 1)) | |
4106 (beginning-of-line)) | |
19078 | 4107 (if (not (eolp)) (viper-forward-char-carefully))) |
4108 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
4109 (viper-set-destructive-command | |
4110 (list 'viper-put-back val nil viper-use-register nil nil)) | |
21940 | 4111 (setq sv-point (point)) |
4112 (viper-loop val (viper-yank text)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4113 (setq chars-inserted (abs (- (point) sv-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4114 lines-inserted (abs (count-lines (point) sv-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4115 (if (or (> chars-inserted viper-change-notification-threshold) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4116 (> 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
|
4117 (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
|
4118 (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
|
4119 chars-inserted lines-inserted)))) |
18129 | 4120 ;; 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
|
4121 ;; newline; it leaves the cursor at the beginning when the text contains |
18129 | 4122 ;; a newline |
19078 | 4123 (if (viper-same-line (point) (mark)) |
4124 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
18129 | 4125 (exchange-point-and-mark) |
4126 (if (bolp) | |
4127 (back-to-indentation))) | |
19078 | 4128 (viper-deactivate-mark)) |
4129 | |
4130 (defun viper-Put-back (arg) | |
18129 | 4131 "Put back at point/above line." |
4132 (interactive "P") | |
19078 | 4133 (let ((val (viper-p-val arg)) |
4134 (text (if viper-use-register | |
4135 (cond ((viper-valid-register viper-use-register '(digit)) | |
4136 (current-kill | |
4137 (- viper-use-register ?1) 'do-not-rotate)) | |
4138 ((viper-valid-register viper-use-register) | |
4139 (get-register (downcase viper-use-register))) | |
4140 (t (error viper-InvalidRegister viper-use-register))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4141 (current-kill 0))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4142 sv-point chars-inserted lines-inserted) |
18129 | 4143 (if (null text) |
19078 | 4144 (if viper-use-register |
4145 (let ((reg viper-use-register)) | |
4146 (setq viper-use-register nil) | |
4147 (error viper-EmptyRegister reg)) | |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
4148 (error "Viper bell"))) |
19078 | 4149 (setq viper-use-register nil) |
4150 (if (viper-end-with-a-newline-p text) (beginning-of-line)) | |
4151 (viper-set-destructive-command | |
4152 (list 'viper-Put-back val nil viper-use-register nil nil)) | |
4153 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4154 (setq sv-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4155 (viper-loop val (viper-yank text)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4156 (setq chars-inserted (abs (- (point) sv-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4157 lines-inserted (abs (count-lines (point) sv-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4158 (if (or (> chars-inserted viper-change-notification-threshold) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4159 (> 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
|
4160 (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
|
4161 (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
|
4162 chars-inserted lines-inserted)))) |
18129 | 4163 ;; 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
|
4164 ;; newline; it leaves the cursor at the beginning when the text contains |
18129 | 4165 ;; a newline |
19078 | 4166 (if (viper-same-line (point) (mark)) |
4167 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
18129 | 4168 (exchange-point-and-mark) |
4169 (if (bolp) | |
4170 (back-to-indentation))) | |
19078 | 4171 (viper-deactivate-mark)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4172 |
18129 | 4173 |
4174 ;; Copy region to kill-ring. | |
4175 ;; If BEG and END do not belong to the same buffer, copy empty region. | |
19078 | 4176 (defun viper-copy-region-as-kill (beg end) |
18129 | 4177 (condition-case nil |
4178 (copy-region-as-kill beg end) | |
4179 (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
|
4180 |
18129 | 4181 |
19078 | 4182 (defun viper-delete-char (arg) |
19462 | 4183 "Delete next character." |
18129 | 4184 (interactive "P") |
19462 | 4185 (let ((val (viper-p-val arg)) |
4186 end-del-pos) | |
19078 | 4187 (viper-set-destructive-command |
4188 (list 'viper-delete-char val nil nil nil nil)) | |
19462 | 4189 (if (and viper-ex-style-editing |
4190 (> val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
4191 (setq val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
19078 | 4192 (if (and viper-ex-style-motion (eolp)) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
4193 (if (bolp) (error "Viper bell") (setq val 0))) ; not bol---simply back 1 ch |
19462 | 4194 (save-excursion |
4195 (viper-forward-char-carefully val) | |
4196 (setq end-del-pos (point))) | |
19078 | 4197 (if viper-use-register |
18129 | 4198 (progn |
19078 | 4199 (cond ((viper-valid-register viper-use-register '((Letter))) |
4200 (viper-append-to-register | |
19462 | 4201 (downcase viper-use-register) (point) end-del-pos)) |
19078 | 4202 ((viper-valid-register viper-use-register) |
18129 | 4203 (copy-to-register |
19462 | 4204 viper-use-register (point) end-del-pos nil)) |
19078 | 4205 (t (error viper-InvalidRegister viper-use-register))) |
4206 (setq viper-use-register nil))) | |
19462 | 4207 |
4208 (delete-char val t) | |
19078 | 4209 (if viper-ex-style-motion |
19462 | 4210 (if (and (eolp) (not (bolp))) (backward-char 1))) |
4211 )) | |
18129 | 4212 |
19078 | 4213 (defun viper-delete-backward-char (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4214 "Delete previous character. On reaching beginning of line, stop and beep." |
18129 | 4215 (interactive "P") |
19462 | 4216 (let ((val (viper-p-val arg)) |
4217 end-del-pos) | |
19078 | 4218 (viper-set-destructive-command |
4219 (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
|
4220 (if (and |
19462 | 4221 viper-ex-style-editing |
4222 (> val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
4223 (setq val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
4224 (save-excursion | |
4225 (viper-backward-char-carefully val) | |
4226 (setq end-del-pos (point))) | |
19078 | 4227 (if viper-use-register |
18129 | 4228 (progn |
19078 | 4229 (cond ((viper-valid-register viper-use-register '(Letter)) |
4230 (viper-append-to-register | |
19462 | 4231 (downcase viper-use-register) end-del-pos (point))) |
19078 | 4232 ((viper-valid-register viper-use-register) |
18129 | 4233 (copy-to-register |
19462 | 4234 viper-use-register end-del-pos (point) nil)) |
19078 | 4235 (t (error viper-InvalidRegister viper-use-register))) |
4236 (setq viper-use-register nil))) | |
19462 | 4237 (if (and (bolp) viper-ex-style-editing) |
4238 (ding)) | |
4239 (delete-backward-char val t))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4240 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4241 |
19078 | 4242 (defun viper-del-backward-char-in-insert () |
18129 | 4243 "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
|
4244 (interactive) |
19462 | 4245 (if (and viper-ex-style-editing (bolp)) |
18129 | 4246 (beep 1) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4247 ;; 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
|
4248 (delete-backward-char 1 nil))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4249 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4250 |
19078 | 4251 (defun viper-del-backward-char-in-replace () |
18129 | 4252 "Delete one character in replace mode. |
19078 | 4253 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
|
4254 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
|
4255 to Vi. The variable `viper-ex-style-editing', if t, doesn't let the |
18129 | 4256 cursor move past the beginning of line." |
4257 (interactive) | |
19078 | 4258 (cond (viper-delete-backwards-in-replace |
18129 | 4259 (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
|
4260 ;; 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
|
4261 (delete-backward-char 1 nil)) |
19462 | 4262 (viper-ex-style-editing |
18129 | 4263 (beep 1)) |
4264 ((bobp) | |
4265 (beep 1)) | |
4266 (t | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4267 ;; 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
|
4268 (delete-backward-char 1 nil)))) |
19462 | 4269 (viper-ex-style-editing |
18129 | 4270 (if (bolp) |
4271 (beep 1) | |
4272 (backward-char 1))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4273 (t |
18129 | 4274 (backward-char 1)))) |
4275 | |
4276 | |
4277 | |
4278 ;; join lines. | |
4279 | |
19078 | 4280 (defun viper-join-lines (arg) |
18129 | 4281 "Join this line to next, if ARG is nil. Otherwise, join ARG lines." |
4282 (interactive "*P") | |
19078 | 4283 (let ((val (viper-P-val arg))) |
4284 (viper-set-destructive-command | |
4285 (list 'viper-join-lines val nil nil nil nil)) | |
4286 (viper-loop (if (null val) 1 (1- val)) | |
18129 | 4287 (end-of-line) |
4288 (if (not (eobp)) | |
4289 (progn | |
4290 (forward-line 1) | |
4291 (delete-region (point) (1- (point))) | |
18839 | 4292 (fixup-whitespace) |
4293 ;; fixup-whitespace sometimes does not leave space | |
4294 ;; between objects, so we insert it as in Vi | |
4295 (or (looking-at " ") | |
4296 (insert " ") | |
4297 (backward-char 1)) | |
19462 | 4298 ))))) |
18129 | 4299 |
4300 | |
4301 ;; Replace state | |
4302 | |
19078 | 4303 (defun viper-change (beg end) |
18129 | 4304 (if (markerp beg) (setq beg (marker-position beg))) |
4305 (if (markerp end) (setq end (marker-position end))) | |
4306 ;; beg is sometimes (mark t), which may be nil | |
4307 (or beg (setq beg end)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4308 |
19078 | 4309 (viper-set-complex-command-for-undo) |
4310 (if viper-use-register | |
18129 | 4311 (progn |
19078 | 4312 (copy-to-register viper-use-register beg end nil) |
4313 (setq viper-use-register nil))) | |
4314 (viper-set-replace-overlay beg end) | |
18129 | 4315 (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
|
4316 |
19078 | 4317 (if (= (viper-replace-start) (point-max)) |
18129 | 4318 (error "End of buffer")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4319 |
19078 | 4320 (setq viper-last-replace-region |
4321 (buffer-substring (viper-replace-start) | |
4322 (viper-replace-end))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4323 |
18129 | 4324 ;; protect against error while inserting "@" and other disasters |
4325 ;; (e.g., read-only buff) | |
4326 (condition-case conds | |
19078 | 4327 (if (or viper-allow-multiline-replace-regions |
4328 (viper-same-line (viper-replace-start) | |
19203 | 4329 (viper-replace-end))) |
18129 | 4330 (progn |
4331 ;; tabs cause problems in replace, so untabify | |
19078 | 4332 (goto-char (viper-replace-end)) |
18129 | 4333 (insert-before-markers "@") ; put placeholder after the TAB |
19078 | 4334 (untabify (viper-replace-start) (point)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4335 ;; del @, don't put on kill ring |
18129 | 4336 (delete-backward-char 1) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4337 |
19078 | 4338 (viper-set-replace-overlay-glyphs |
4339 viper-replace-region-start-delimiter | |
4340 viper-replace-region-end-delimiter) | |
18129 | 4341 ;; 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
|
4342 ;; has to be shifted because of insert. We can't simply insert |
18129 | 4343 ;; "$" before-markers because then overlay-start will shift the |
4344 ;; 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
|
4345 ;; character. This fixes the bug with `s' and `cl' commands. |
19078 | 4346 (viper-move-replace-overlay (viper-replace-start) (point)) |
4347 (goto-char (viper-replace-start)) | |
4348 (viper-change-state-to-replace t)) | |
4349 (kill-region (viper-replace-start) | |
4350 (viper-replace-end)) | |
4351 (viper-hide-replace-overlay) | |
4352 (viper-change-state-to-insert)) | |
18129 | 4353 (error ;; make sure that the overlay doesn't stay. |
4354 ;; go back to the original point | |
19078 | 4355 (goto-char (viper-replace-start)) |
4356 (viper-hide-replace-overlay) | |
4357 (viper-message-conditions conds)))) | |
4358 | |
4359 | |
4360 (defun viper-change-subr (beg end) | |
18129 | 4361 ;; beg is sometimes (mark t), which may be nil |
4362 (or beg (setq beg end)) | |
19078 | 4363 (if viper-use-register |
18129 | 4364 (progn |
19078 | 4365 (copy-to-register viper-use-register beg end nil) |
4366 (setq viper-use-register nil))) | |
18129 | 4367 (kill-region beg end) |
19078 | 4368 (setq this-command 'viper-change) |
4369 (viper-yank-last-insertion)) | |
4370 | |
4371 (defun viper-toggle-case (arg) | |
18129 | 4372 "Toggle character case." |
4373 (interactive "P") | |
19078 | 4374 (let ((val (viper-p-val arg)) (c)) |
4375 (viper-set-destructive-command | |
4376 (list 'viper-toggle-case val nil nil nil nil)) | |
18129 | 4377 (while (> val 0) |
4378 (setq c (following-char)) | |
4379 (delete-char 1 nil) | |
4380 (if (eq c (upcase c)) | |
4381 (insert-char (downcase c) 1) | |
4382 (insert-char (upcase c) 1)) | |
4383 (if (eolp) (backward-char 1)) | |
4384 (setq val (1- val))))) | |
4385 | |
4386 | |
4387 ;; query replace | |
4388 | |
19078 | 4389 (defun viper-query-replace () |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4390 "Query replace. |
18129 | 4391 If a null string is suplied as the string to be replaced, |
4392 the query replace mode will toggle between string replace | |
4393 and regexp replace." | |
4394 (interactive) | |
4395 (let (str) | |
19078 | 4396 (setq str (viper-read-string-with-history |
4397 (if viper-re-query-replace "Query replace regexp: " | |
18129 | 4398 "Query replace: ") |
4399 nil ; no initial | |
19078 | 4400 'viper-replace1-history |
4401 (car viper-replace1-history) ; default | |
18129 | 4402 )) |
4403 (if (string= str "") | |
4404 (progn | |
19078 | 4405 (setq viper-re-query-replace (not viper-re-query-replace)) |
18129 | 4406 (message "Query replace mode changed to %s" |
19078 | 4407 (if viper-re-query-replace "regexp replace" |
18129 | 4408 "string replace"))) |
19078 | 4409 (if viper-re-query-replace |
18129 | 4410 (query-replace-regexp |
4411 str | |
19078 | 4412 (viper-read-string-with-history |
18129 | 4413 (format "Query replace regexp `%s' with: " str) |
4414 nil ; no initial | |
19078 | 4415 'viper-replace1-history |
4416 (car viper-replace1-history) ; default | |
18129 | 4417 )) |
4418 (query-replace | |
4419 str | |
19078 | 4420 (viper-read-string-with-history |
18129 | 4421 (format "Query replace `%s' with: " str) |
4422 nil ; no initial | |
19078 | 4423 'viper-replace1-history |
4424 (car viper-replace1-history) ; default | |
18129 | 4425 )))))) |
4426 | |
4427 | |
4428 ;; marking | |
4429 | |
19078 | 4430 (defun viper-mark-beginning-of-buffer () |
18129 | 4431 "Mark beginning of buffer." |
4432 (interactive) | |
4433 (push-mark (point)) | |
4434 (goto-char (point-min)) | |
4435 (exchange-point-and-mark) | |
4436 (message "Mark set at the beginning of buffer")) | |
4437 | |
19078 | 4438 (defun viper-mark-end-of-buffer () |
18129 | 4439 "Mark end of buffer." |
4440 (interactive) | |
4441 (push-mark (point)) | |
4442 (goto-char (point-max)) | |
4443 (exchange-point-and-mark) | |
4444 (message "Mark set at the end of buffer")) | |
4445 | |
19078 | 4446 (defun viper-mark-point () |
18129 | 4447 "Set mark at point of buffer." |
4448 (interactive) | |
4449 (let ((char (read-char))) | |
4450 (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
|
4451 (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
|
4452 ((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
|
4453 ((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
|
4454 ((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
|
4455 ((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
|
4456 ((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
|
4457 ((viper= char ?D) (mark-defun)) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
4458 (t (error "Viper bell")) |
18129 | 4459 ))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4460 |
18129 | 4461 ;; Algorithm: If first invocation of this command save mark on ring, goto |
4462 ;; mark, M0, and pop the most recent elt from the mark ring into mark, | |
4463 ;; making it into the new mark, M1. | |
4464 ;; Push this mark back and set mark to the original point position, p1. | |
4465 ;; So, if you hit '' or `` then you can return to p1. | |
4466 ;; | |
4467 ;; 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
|
4468 ;; jump there. This forgets the position, p1, and puts M1 back into mark. |
18129 | 4469 ;; Then we save the current pos, which is M0, jump to M1 and pop M2 from |
4470 ;; the ring into mark. Push M2 back on the ring and set mark to M0. | |
4471 ;; etc. | |
19078 | 4472 (defun viper-cycle-through-mark-ring () |
18129 | 4473 "Visit previous locations on the mark ring. |
4474 One can use `` and '' to temporarily jump 1 step back." | |
4475 (let* ((sv-pt (point))) | |
4476 ;; if repeated `m,' command, pop the previously saved mark. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4477 ;; 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
|
4478 ;; user types `` or '' and is discarded |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4479 ;; from the mark ring by the next `m,' command. |
18129 | 4480 ;; In any case, go to the previous or previously saved mark. |
4481 ;; 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
|
4482 ;; point to be the mark. Current pt as mark is discarded by the next |
18129 | 4483 ;; m, command. |
19078 | 4484 (if (eq last-command 'viper-cycle-through-mark-ring) |
18129 | 4485 () |
4486 ;; save current mark if the first iteration | |
19078 | 4487 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
18129 | 4488 (if (mark t) |
4489 (push-mark (mark t) t)) ) | |
4490 (pop-mark) | |
4491 (set-mark-command 1) | |
4492 ;; don't duplicate mark on the ring | |
19078 | 4493 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
18129 | 4494 (push-mark sv-pt t) |
19078 | 4495 (viper-deactivate-mark) |
4496 (setq this-command 'viper-cycle-through-mark-ring) | |
18129 | 4497 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4498 |
18129 | 4499 |
19078 | 4500 (defun viper-goto-mark (arg) |
18129 | 4501 "Go to mark." |
4502 (interactive "P") | |
4503 (let ((char (read-char)) | |
19078 | 4504 (com (viper-getcom arg))) |
4505 (viper-goto-mark-subr char com nil))) | |
4506 | |
4507 (defun viper-goto-mark-and-skip-white (arg) | |
18129 | 4508 "Go to mark and skip to first non-white character on line." |
4509 (interactive "P") | |
4510 (let ((char (read-char)) | |
19078 | 4511 (com (viper-getCom arg))) |
4512 (viper-goto-mark-subr char com t))) | |
4513 | |
4514 (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
|
4515 (if (eobp) |
18129 | 4516 (if (bobp) |
4517 (error "Empty buffer") | |
4518 (backward-char 1))) | |
19078 | 4519 (cond ((viper-valid-register char '(letter)) |
18129 | 4520 (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
|
4521 (reg (viper-int-to-char (1+ (- char ?a)))) |
18129 | 4522 (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
|
4523 ;; 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
|
4524 ;; 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
|
4525 (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
|
4526 (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
|
4527 (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
|
4528 (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
|
4529 (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
|
4530 (save-excursion |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4531 (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
|
4532 (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
|
4533 (<= (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
|
4534 (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
|
4535 (set-register reg text-marker)))) |
19078 | 4536 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4537 (if (not (viper-valid-marker text-marker)) | |
4538 (error viper-EmptyTextmarker char)) | |
4539 (if (and (viper-same-line (point) viper-last-jump) | |
4540 (= (point) viper-last-jump-ignore)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4541 (push-mark viper-last-jump t) |
18129 | 4542 (push-mark nil t)) ; no msg |
19078 | 4543 (viper-register-to-point reg) |
4544 (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
|
4545 (cond (skip-white |
18129 | 4546 (back-to-indentation) |
19078 | 4547 (setq viper-last-jump-ignore (point)))) |
18129 | 4548 (if com |
4549 (if (equal buff (current-buffer)) | |
19078 | 4550 (viper-execute-com (if skip-white |
4551 'viper-goto-mark-and-skip-white | |
4552 'viper-goto-mark) | |
18129 | 4553 nil com) |
4554 (switch-to-buffer buff) | |
19078 | 4555 (goto-char viper-com-point) |
4556 (viper-change-state-to-vi) | |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
4557 (error "Viper bell"))))) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4558 ((and (not skip-white) (viper= char ?`)) |
19078 | 4559 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4560 (if (and (viper-same-line (point) viper-last-jump) | |
4561 (= (point) viper-last-jump-ignore)) | |
4562 (goto-char viper-last-jump)) | |
18129 | 4563 (if (null (mark t)) (error "Mark is not set in this buffer")) |
4564 (if (= (point) (mark t)) (pop-mark)) | |
4565 (exchange-point-and-mark) | |
19078 | 4566 (setq viper-last-jump (point-marker) |
4567 viper-last-jump-ignore 0) | |
4568 (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
|
4569 ((and skip-white (viper= char ?')) |
19078 | 4570 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4571 (if (and (viper-same-line (point) viper-last-jump) | |
4572 (= (point) viper-last-jump-ignore)) | |
4573 (goto-char viper-last-jump)) | |
18129 | 4574 (if (= (point) (mark t)) (pop-mark)) |
4575 (exchange-point-and-mark) | |
19078 | 4576 (setq viper-last-jump (point)) |
18129 | 4577 (back-to-indentation) |
19078 | 4578 (setq viper-last-jump-ignore (point)) |
4579 (if com (viper-execute-com 'viper-goto-mark-and-skip-white nil com))) | |
4580 (t (error viper-InvalidTextmarker char)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4581 |
19078 | 4582 (defun viper-insert-tab () |
18129 | 4583 (interactive) |
4584 (insert-tab)) | |
4585 | |
19078 | 4586 (defun viper-exchange-point-and-mark () |
18129 | 4587 (interactive) |
4588 (exchange-point-and-mark) | |
4589 (back-to-indentation)) | |
4590 | |
4591 ;; Input Mode Indentation | |
4592 | |
4593 ;; Returns t, if the string before point matches the regexp STR. | |
19078 | 4594 (defsubst viper-looking-back (str) |
18129 | 4595 (and (save-excursion (re-search-backward str nil t)) |
4596 (= (point) (match-end 0)))) | |
4597 | |
4598 | |
19078 | 4599 (defun viper-forward-indent () |
18129 | 4600 "Indent forward -- `C-t' in Vi." |
4601 (interactive) | |
19078 | 4602 (setq viper-cted t) |
4603 (indent-to (+ (current-column) viper-shift-width))) | |
4604 | |
4605 (defun viper-backward-indent () | |
18129 | 4606 "Backtab, C-d in VI" |
4607 (interactive) | |
19078 | 4608 (if viper-cted |
18129 | 4609 (let ((p (point)) (c (current-column)) bol (indent t)) |
19078 | 4610 (if (viper-looking-back "[0^]") |
18129 | 4611 (progn |
4612 (if (eq ?^ (preceding-char)) | |
19078 | 4613 (setq viper-preserve-indent t)) |
18129 | 4614 (delete-backward-char 1) |
4615 (setq p (point)) | |
4616 (setq indent nil))) | |
4617 (save-excursion | |
4618 (beginning-of-line) | |
4619 (setq bol (point))) | |
4620 (if (re-search-backward "[^ \t]" bol 1) (forward-char)) | |
4621 (delete-region (point) p) | |
4622 (if indent | |
19078 | 4623 (indent-to (- c viper-shift-width))) |
4624 (if (or (bolp) (viper-looking-back "[^ \t]")) | |
4625 (setq viper-cted nil))))) | |
4626 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4627 ;; 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
|
4628 (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
|
4629 (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
|
4630 (progn |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4631 (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
|
4632 (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
|
4633 (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
|
4634 text-mode |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4635 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
|
4636 (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
|
4637 (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
|
4638 |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4639 |
19078 | 4640 (defun viper-autoindent () |
18129 | 4641 "Auto Indentation, Vi-style." |
4642 (interactive) | |
4643 (let ((col (current-indentation))) | |
4644 (if abbrev-mode (expand-abbrev)) | |
19078 | 4645 (if viper-preserve-indent |
4646 (setq viper-preserve-indent nil) | |
4647 (setq viper-current-indent col)) | |
18129 | 4648 ;; don't leave whitespace lines around |
4649 (if (memq last-command | |
19078 | 4650 '(viper-autoindent |
4651 viper-open-line viper-Open-line | |
4652 viper-replace-state-exit-cmd)) | |
18129 | 4653 (indent-to-left-margin)) |
4654 ;; use \n instead of newline, or else <Return> will move the insert point | |
4655 ;;(newline 1) | |
4656 (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
|
4657 (viper-indent-line viper-current-indent) |
18129 | 4658 )) |
4659 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4660 |
18129 | 4661 ;; Viewing registers |
4662 | |
19078 | 4663 (defun viper-ket-function (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4664 "Function called by \], the ket. View registers and call \]\]." |
18129 | 4665 (interactive "P") |
4666 (let ((reg (read-char))) | |
19078 | 4667 (cond ((viper-valid-register reg '(letter Letter)) |
18129 | 4668 (view-register (downcase reg))) |
19078 | 4669 ((viper-valid-register reg '(digit)) |
18129 | 4670 (let ((text (current-kill (- reg ?1) 'do-not-rotate))) |
20003 | 4671 (with-output-to-temp-buffer " *viper-info*" |
4672 (princ (format "Register %c contains the string:\n" reg)) | |
4673 (princ text)) | |
4674 )) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4675 ((viper= ?\] reg) |
19078 | 4676 (viper-next-heading arg)) |
18129 | 4677 (t (error |
19078 | 4678 viper-InvalidRegister reg))))) |
4679 | |
4680 (defun viper-brac-function (arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4681 "Function called by \[, the brac. View textmarkers and call \[\[" |
18129 | 4682 (interactive "P") |
4683 (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
|
4684 (cond ((viper= ?\[ reg) |
19078 | 4685 (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
|
4686 ((viper= ?\] reg) |
19078 | 4687 (viper-heading-end arg)) |
4688 ((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
|
4689 (let* ((val (get-register (viper-int-to-char (1+ (- reg ?a))))) |
20003 | 4690 (buf (if (not (markerp val)) |
19078 | 4691 (error viper-EmptyTextmarker reg) |
18129 | 4692 (marker-buffer val))) |
4693 (pos (marker-position val)) | |
4694 line-no text (s pos) (e pos)) | |
20003 | 4695 (with-output-to-temp-buffer " *viper-info*" |
18129 | 4696 (if (and buf pos) |
4697 (progn | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4698 (save-excursion |
18129 | 4699 (set-buffer buf) |
4700 (setq line-no (1+ (count-lines (point-min) val))) | |
4701 (goto-char pos) | |
4702 (beginning-of-line) | |
4703 (if (re-search-backward "[^ \t]" nil t) | |
4704 (progn | |
4705 (beginning-of-line) | |
4706 (setq s (point)))) | |
4707 (goto-char pos) | |
4708 (forward-line 1) | |
4709 (if (re-search-forward "[^ \t]" nil t) | |
4710 (progn | |
4711 (end-of-line) | |
4712 (setq e (point)))) | |
4713 (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
|
4714 (setq text (format "%s<%c>%s" |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4715 (substring text 0 (- pos s)) |
18129 | 4716 reg (substring text (- pos s))))) |
20003 | 4717 (princ |
18129 | 4718 (format |
4719 "Textmarker `%c' is in buffer `%s' at line %d.\n" | |
4720 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
|
4721 (princ (format "Here is some text around %c:\n\n %s" |
18129 | 4722 reg text))) |
20003 | 4723 (princ (format viper-EmptyTextmarker reg)))) |
4724 )) | |
19078 | 4725 (t (error viper-InvalidTextmarker reg))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4726 |
18129 | 4727 |
4728 | |
19078 | 4729 (defun viper-delete-backward-word (arg) |
18129 | 4730 "Delete previous word." |
4731 (interactive "p") | |
4732 (save-excursion | |
4733 (push-mark nil t) | |
4734 (backward-word arg) | |
4735 (delete-region (point) (mark t)) | |
4736 (pop-mark))) | |
4737 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4738 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4739 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4740 ;; 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
|
4741 ;; 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
|
4742 ;; 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
|
4743 (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
|
4744 (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
|
4745 (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
|
4746 (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
|
4747 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4748 |
18129 | 4749 |
18839 | 4750 (defun viper-set-expert-level (&optional dont-change-unless) |
18129 | 4751 "Sets the expert level for a Viper user. |
4752 Can be called interactively to change (temporarily or permanently) the | |
4753 current expert level. | |
4754 | |
18289 | 4755 The optional argument DONT-CHANGE-UNLESS, if not nil, says that |
18129 | 4756 the level should not be changed, unless its current value is |
4757 meaningless (i.e., not one of 1,2,3,4,5). | |
4758 | |
4759 User level determines the setting of Viper variables that are most | |
4760 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
|
4761 |
18129 | 4762 (interactive) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4763 |
18839 | 4764 (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
|
4765 |
18129 | 4766 (save-window-excursion |
4767 (delete-other-windows) | |
18839 | 4768 ;; if 0 < viper-expert-level < viper-max-expert-level |
18129 | 4769 ;; & dont-change-unless = t -- use it; else ask |
19078 | 4770 (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
|
4771 |
19078 | 4772 (setq viper-always t |
4773 viper-ex-style-motion t | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4774 viper-ex-style-editing t |
19078 | 4775 viper-want-ctl-h-help nil) |
18129 | 4776 |
18839 | 4777 (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
|
4778 (global-set-key ; in emacs-state |
19078 | 4779 viper-toggle-key |
4780 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs)) | |
4781 (setq viper-no-multiple-ESC t | |
4782 viper-re-search t | |
4783 viper-vi-style-in-minibuffer t | |
4784 viper-search-wrap-around-t t | |
4785 viper-electric-mode nil | |
4786 viper-want-emacs-keys-in-vi nil | |
4787 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
|
4788 |
18839 | 4789 ((and (> viper-expert-level 1) (< viper-expert-level 5)) |
18129 | 4790 ;; intermediate to guru |
19078 | 4791 (setq viper-no-multiple-ESC (if (viper-window-display-p) |
4792 t 'twice) | |
4793 viper-electric-mode t | |
4794 viper-want-emacs-keys-in-vi t | |
4795 viper-want-emacs-keys-in-insert (> viper-expert-level 2)) | |
4796 | |
4797 (if (eq viper-expert-level 4) ; respect user's ex-style motion | |
4798 ; and viper-no-multiple-ESC | |
18129 | 4799 (progn |
18839 | 4800 (setq-default |
19462 | 4801 viper-ex-style-editing |
4802 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4803 viper-ex-style-motion |
4804 (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
|
4805 (setq viper-ex-style-motion |
19078 | 4806 (viper-standard-value 'viper-ex-style-motion) |
19462 | 4807 viper-ex-style-editing |
4808 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4809 viper-re-search |
4810 (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
|
4811 viper-no-multiple-ESC |
19078 | 4812 (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
|
4813 |
18129 | 4814 ;; A wizard!! |
4815 ;; Ideally, if 5 is selected, a buffer should pop up to let the | |
4816 ;; user toggle the values of variables. | |
19462 | 4817 (t (setq-default viper-ex-style-editing |
4818 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4819 viper-ex-style-motion |
4820 (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
|
4821 (setq viper-want-ctl-h-help |
19078 | 4822 (viper-standard-value 'viper-want-ctl-h-help) |
18289 | 4823 viper-always |
18839 | 4824 (viper-standard-value 'viper-always) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4825 viper-no-multiple-ESC |
19078 | 4826 (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
|
4827 viper-ex-style-motion |
19078 | 4828 (viper-standard-value 'viper-ex-style-motion) |
19462 | 4829 viper-ex-style-editing |
4830 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4831 viper-re-search |
4832 (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
|
4833 viper-electric-mode |
19078 | 4834 (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
|
4835 viper-want-emacs-keys-in-vi |
19078 | 4836 (viper-standard-value 'viper-want-emacs-keys-in-vi) |
4837 viper-want-emacs-keys-in-insert | |
4838 (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
|
4839 |
19078 | 4840 (viper-set-mode-vars-for viper-current-state) |
18289 | 4841 (if (or viper-always |
18839 | 4842 (and (> viper-expert-level 0) (> 5 viper-expert-level))) |
19078 | 4843 (viper-set-hooks))) |
18129 | 4844 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4845 |
18129 | 4846 ;; Ask user expert level. |
19078 | 4847 (defun viper-ask-level (dont-change-unless) |
4848 (let ((ask-buffer " *viper-ask-level*") | |
18129 | 4849 level-changed repeated) |
4850 (save-window-excursion | |
4851 (switch-to-buffer ask-buffer) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4852 |
18839 | 4853 (while (or (> viper-expert-level viper-max-expert-level) |
4854 (< viper-expert-level 1) | |
18129 | 4855 (null dont-change-unless)) |
4856 (erase-buffer) | |
4857 (if repeated | |
4858 (progn | |
4859 (message "Invalid user level") | |
4860 (beep 1)) | |
4861 (setq repeated t)) | |
4862 (setq dont-change-unless t | |
4863 level-changed t) | |
4864 (insert " | |
4865 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
|
4866 \(and the VI Plan for Emacs Rescue). |
18839 | 4867 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
|
4868 |
18129 | 4869 1 -- BEGINNER: Almost all Emacs features are suppressed. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4870 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
|
4871 command history in the minibuffer are thrown in as a bonus. |
19078 | 4872 To use Emacs productively, you must reach level 3 or higher. |
18129 | 4873 2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state, |
19078 | 4874 so most Emacs commands can be used when Viper is in Vi state. |
4875 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
|
4876 3 -- GRAND MASTER: Like 2, but most Emacs commands are available also |
19078 | 4877 in Viper's insert state. |
4878 4 -- GURU: Like 3, but user settings are respected for viper-no-multiple-ESC, | |
19462 | 4879 viper-ex-style-motion, viper-ex-style-editing, and |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4880 viper-re-search variables. Adjust these settings to your taste. |
18289 | 4881 5 -- WIZARD: Like 4, but user settings are also respected for viper-always, |
19078 | 4882 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
|
4883 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
|
4884 |
18129 | 4885 Please, specify your level now: ") |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4886 |
19078 | 4887 (setq viper-expert-level (- (viper-read-char-exclusive) ?0)) |
18129 | 4888 ) ; end while |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4889 |
18129 | 4890 ;; tell the user if level was changed |
4891 (and level-changed | |
4892 (progn | |
4893 (insert | |
4894 (format "\n\n\n\n\n\t\tYou have selected user level %d" | |
18839 | 4895 viper-expert-level)) |
18129 | 4896 (if (y-or-n-p "Do you wish to make this change permanent? ") |
18839 | 4897 ;; save the setting for viper-expert-level |
19078 | 4898 (viper-save-setting |
18839 | 4899 'viper-expert-level |
4900 (format "Saving user level %d ..." viper-expert-level) | |
19078 | 4901 viper-custom-file-name)) |
18129 | 4902 )) |
4903 (bury-buffer) ; remove ask-buffer from screen | |
4904 (message "") | |
4905 ))) | |
4906 | |
4907 | |
19078 | 4908 (defun viper-nil () |
18129 | 4909 (interactive) |
4910 (beep 1)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4911 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4912 |
18129 | 4913 ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer |
19078 | 4914 (defun viper-register-to-point (char &optional enforce-buffer) |
18129 | 4915 "Like jump-to-register, but switches to another buffer in another window." |
4916 (interactive "cViper register to point: ") | |
4917 (let ((val (get-register char))) | |
4918 (cond | |
4919 ((and (fboundp 'frame-configuration-p) | |
4920 (frame-configuration-p val)) | |
4921 (set-frame-configuration val)) | |
4922 ((window-configuration-p val) | |
4923 (set-window-configuration val)) | |
19078 | 4924 ((viper-valid-marker val) |
18129 | 4925 (if (and enforce-buffer |
4926 (not (equal (current-buffer) (marker-buffer val)))) | |
19078 | 4927 (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
|
4928 (viper-int-to-char (1- (+ char ?a))))) |
18129 | 4929 (pop-to-buffer (marker-buffer val)) |
4930 (goto-char val)) | |
4931 ((and (consp val) (eq (car val) 'file)) | |
4932 (find-file (cdr val))) | |
4933 (t | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4934 (error viper-EmptyTextmarker (viper-int-to-char (1- (+ char ?a)))))))) |
19078 | 4935 |
4936 | |
4937 (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
|
4938 "Save then kill current buffer." |
18129 | 4939 (interactive) |
18839 | 4940 (if (< viper-expert-level 2) |
18129 | 4941 (save-buffers-kill-emacs) |
4942 (save-buffer) | |
4943 (kill-buffer (current-buffer)))) | |
4944 | |
4945 | |
4946 | |
4947 ;;; Bug Report | |
4948 | |
19078 | 4949 (defun viper-submit-report () |
18129 | 4950 "Submit bug report on Viper." |
4951 (interactive) | |
4952 (let ((reporter-prompt-for-summary-p t) | |
19078 | 4953 (viper-device-type (viper-device-type)) |
18129 | 4954 color-display-p frame-parameters |
4955 minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face | |
4956 varlist salutation window-config) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4957 |
18129 | 4958 ;; If mode info is needed, add variable to `let' and then set it below, |
4959 ;; 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
|
4960 (setq color-display-p (if (viper-window-display-p) |
19078 | 4961 (viper-color-display-p) |
18129 | 4962 'non-x) |
19078 | 4963 minibuffer-vi-face (if (viper-has-face-support-p) |
4964 (viper-get-face viper-minibuffer-vi-face) | |
18129 | 4965 'non-x) |
19078 | 4966 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
|
4967 (viper-get-face |
19078 | 4968 viper-minibuffer-insert-face) |
18129 | 4969 'non-x) |
19078 | 4970 minibuffer-emacs-face (if (viper-has-face-support-p) |
4971 (viper-get-face | |
4972 viper-minibuffer-emacs-face) | |
18129 | 4973 'non-x) |
4974 frame-parameters (if (fboundp 'frame-parameters) | |
4975 (frame-parameters (selected-frame)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4976 |
19078 | 4977 (setq varlist (list 'viper-vi-minibuffer-minor-mode |
4978 'viper-insert-minibuffer-minor-mode | |
4979 'viper-vi-intercept-minor-mode | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4980 'viper-vi-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4981 'viper-vi-kbd-minor-mode |
19078 | 4982 'viper-vi-global-user-minor-mode |
4983 '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
|
4984 'viper-vi-diehard-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4985 'viper-vi-basic-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4986 'viper-replace-minor-mode |
19078 | 4987 'viper-insert-intercept-minor-mode |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4988 'viper-insert-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4989 'viper-insert-kbd-minor-mode |
19078 | 4990 'viper-insert-global-user-minor-mode |
4991 '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
|
4992 'viper-insert-diehard-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4993 'viper-insert-basic-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4994 'viper-emacs-intercept-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4995 'viper-emacs-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4996 'viper-emacs-kbd-minor-mode |
19078 | 4997 'viper-emacs-global-user-minor-mode |
4998 'viper-emacs-state-modifier-minor-mode | |
4999 'viper-automatic-iso-accents | |
19462 | 5000 'viper-special-input-method |
19078 | 5001 'viper-want-emacs-keys-in-insert |
5002 'viper-want-emacs-keys-in-vi | |
5003 'viper-keep-point-on-undo | |
5004 'viper-no-multiple-ESC | |
5005 'viper-electric-mode | |
5006 'viper-ESC-key | |
5007 'viper-want-ctl-h-help | |
19462 | 5008 'viper-ex-style-editing |
19078 | 5009 'viper-delete-backwards-in-replace |
5010 'viper-vi-style-in-minibuffer | |
5011 'viper-vi-state-hook | |
5012 'viper-insert-state-hook | |
5013 'viper-replace-state-hook | |
5014 'viper-emacs-state-hook | |
18129 | 5015 'ex-cycle-other-window |
5016 'ex-cycle-through-non-files | |
18839 | 5017 'viper-expert-level |
18129 | 5018 'major-mode |
19078 | 5019 'viper-device-type |
18129 | 5020 'color-display-p |
5021 'frame-parameters | |
5022 'minibuffer-vi-face | |
5023 'minibuffer-insert-face | |
5024 'minibuffer-emacs-face | |
5025 )) | |
5026 (setq salutation " | |
5027 Congratulations! You may have unearthed a bug in Viper! | |
5028 Please mail a concise, accurate summary of the problem to the address above. | |
5029 | |
5030 -------------------------------------------------------------------") | |
5031 (setq window-config (current-window-configuration)) | |
19078 | 5032 (with-output-to-temp-buffer " *viper-info*" |
5033 (switch-to-buffer " *viper-info*") | |
18129 | 5034 (delete-other-windows) |
5035 (princ " | |
5036 PLEASE FOLLOW THESE PROCEDURES | |
5037 ------------------------------ | |
5038 | |
5039 Before reporting a bug, please verify that it is related to Viper, and is | |
5040 not cause by other packages you are using. | |
5041 | |
5042 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
|
5043 problem. These warnings are normal and unavoidable. |
18129 | 5044 |
5045 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
|
5046 those advertised in the manual. Such `customization' is likely to crash |
18129 | 5047 Viper, as it would any other improperly customized Emacs package. |
5048 | |
5049 If you are reporting an error message received while executing one of the | |
5050 Viper commands, type: | |
5051 | |
5052 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
|
5053 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5054 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
|
5055 back trace of the execution that leads to the error. Please include this |
18129 | 5056 trace in your bug report. |
5057 | |
5058 If you believe that one of Viper's commands goes into an infinite loop | |
5059 \(e.g., Emacs freezes\), type: | |
5060 | |
5061 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
|
5062 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5063 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
|
5064 the current command. Include the resulting back trace in the bug report. |
18129 | 5065 |
5066 Mail anyway (y or n)? ") | |
5067 (if (y-or-n-p "Mail anyway? ") | |
5068 () | |
5069 (set-window-configuration window-config) | |
5070 (error "Bug report aborted"))) | |
5071 | |
5072 (require 'reporter) | |
5073 (set-window-configuration window-config) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5074 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
5075 (reporter-submit-bug-report "kifer@cs.stonybrook.edu" |
19078 | 5076 (viper-version) |
18129 | 5077 varlist |
5078 nil 'delete-other-windows | |
5079 salutation) | |
5080 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5081 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5082 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
5083 |
18129 | 5084 |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
5085 ;; 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
|
5086 ;;; viper-cmd.el ends here |