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