annotate lisp/emulation/viper-cmd.el @ 39925:8944218cbc96

*** empty log message ***
author Pavel Janík <Pavel@Janik.cz>
date Sun, 14 Oct 2001 16:14:53 +0000
parents 50f67a72ea1b
children 3ce98f3e0608
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3 ;; Copyright (C) 1997 Free Software Foundation, Inc.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
6
19905
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
7 ;; 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
8
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
9 ;; 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
10 ;; it under the terms of the GNU General Public License as published by
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
12 ;; any later version.
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
13
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
14 ;; 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
15 ;; 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
16 ;; 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
17 ;; 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
18
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
19 ;; 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
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
22 ;; Boston, MA 02111-1307, USA.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
23
38414
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33842
diff changeset
24 ;;; Commentary:
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33842
diff changeset
25
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33842
diff changeset
26 ;;; Code:
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
27
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
28 (provide 'viper-cmd)
18172
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
29 (require 'advice)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
30
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
31 ;; Compiler pacifier
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
32 (defvar viper-minibuffer-current-face)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
33 (defvar viper-minibuffer-insert-face)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
34 (defvar viper-minibuffer-vi-face)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
35 (defvar viper-minibuffer-emacs-face)
18289
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
36 (defvar viper-always)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
37 (defvar viper-mode-string)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
38 (defvar viper-custom-file-name)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
39 (defvar iso-accents-mode)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
40 (defvar quail-mode)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
41 (defvar quail-current-str)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
42 (defvar zmacs-region-stays)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
43 (defvar mark-even-if-inactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
44
18172
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
45 ;; loading happens only in non-interactive compilation
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
46 ;; in order to spare non-viperized emacs from being viperized
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
47 (if noninteractive
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
48 (eval-when-compile
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
49 (let ((load-path (cons (expand-file-name ".") load-path)))
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
50 (or (featurep 'viper-util)
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
51 (load "viper-util.el" nil nil 'nosuffix))
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
52 (or (featurep 'viper-keym)
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
53 (load "viper-keym.el" nil nil 'nosuffix))
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
54 (or (featurep 'viper-mous)
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
55 (load "viper-mous.el" nil nil 'nosuffix))
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
56 (or (featurep 'viper-macs)
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
57 (load "viper-macs.el" nil nil 'nosuffix))
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
58 (or (featurep 'viper-ex)
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
59 (load "viper-ex.el" nil nil 'nosuffix))
e145ccc61a22 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18151
diff changeset
60 )))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
61 ;; end pacifier
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
62
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
63
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
64 (require 'viper-util)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
65 (require 'viper-keym)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
66 (require 'viper-mous)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
67 (require 'viper-macs)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
68 (require 'viper-ex)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
69
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
70
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
71
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
72 ;; Generic predicates
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
73
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
74 ;; These test functions are shamelessly lifted from vip 4.4.2 by Aamod Sane
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
75
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
76 ;; generate test functions
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
77 ;; given symbol foo, foo-p is the test function, foos is the set of
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
78 ;; Viper command keys
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
79 ;; (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
80 ;; (defun foo-p (com) (consp (memq com foos)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
81
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
82 (defmacro viper-test-com-defun (name)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
83 (let* ((snm (symbol-name name))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
84 (nm-p (intern (concat snm "-p")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
85 (nms (intern (concat snm "s"))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
86 `(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
87 (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
88 ))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
89
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
90 ;; Variables for defining VI commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
91
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
92 ;; Modifying commands that can be prefixes to movement commands
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
93 (defconst viper-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
94 ;; define viper-prefix-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
95 (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
96
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
97 ;; Commands that are pairs eg. dd. r and R here are a hack
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
98 (defconst viper-charpair-commands '(?c ?d ?y ?! ?= ?< ?> ?r ?R))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
99 ;; define viper-charpair-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
100 (viper-test-com-defun viper-charpair-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
101
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
102 (defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?H ?j ?k ?l
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
103 ?H ?M ?L ?n ?t ?T ?w ?W ?$ ?%
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
104 ?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?`
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
105 ?\; ?, ?0 ?? ?/ ?\ ?\C-m
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
106 space return
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
107 delete backspace
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
108 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
109 "Movement commands")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
110 ;; define viper-movement-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
111 (viper-test-com-defun viper-movement-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
112
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
113 ;; Vi digit commands
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
114 (defconst viper-digit-commands '(?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
115
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
116 ;; define viper-digit-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
117 (viper-test-com-defun viper-digit-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
118
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
119 ;; Commands that can be repeated by . (dotted)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
120 (defconst viper-dotable-commands '(?c ?d ?C ?s ?S ?D ?> ?<))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
121 ;; define viper-dotable-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
122 (viper-test-com-defun viper-dotable-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
123
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
124 ;; Commands that can follow a #
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
125 (defconst viper-hash-commands '(?c ?C ?g ?q ?s))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
126 ;; define viper-hash-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
127 (viper-test-com-defun viper-hash-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
128
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
129 ;; Commands that may have registers as prefix
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
130 (defconst viper-regsuffix-commands '(?d ?y ?Y ?D ?p ?P ?x ?X))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
131 ;; define viper-regsuffix-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
132 (viper-test-com-defun viper-regsuffix-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
133
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
134 (defconst viper-vi-commands (append viper-movement-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
135 viper-digit-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
136 viper-dotable-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
137 viper-charpair-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
138 viper-hash-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
139 viper-prefix-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
140 viper-regsuffix-commands)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
141 "The list of all commands in Vi-state.")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
142 ;; define viper-vi-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
143 (viper-test-com-defun viper-vi-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
144
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
145 ;; Where viper saves mark. This mark is resurrected by m^
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
146 (defvar viper-saved-mark nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
147
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
148
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
149
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
150 ;;; CODE
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
151
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
152 ;; sentinels
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
153
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
154 ;; Runs viper-after-change-functions inside after-change-functions
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
155 (defun viper-after-change-sentinel (beg end len)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
156 (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
157
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
158 ;; Runs viper-before-change-functions inside before-change-functions
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
159 (defun viper-before-change-sentinel (beg end)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
160 (run-hook-with-args 'viper-before-change-functions beg end))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
161
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
162 (defsubst viper-post-command-sentinel ()
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
163 (run-hooks 'viper-post-command-hooks)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
164 (if (eq viper-current-state 'vi-state)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
165 (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
166
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
167 (defsubst viper-pre-command-sentinel ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
168 (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
169
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
170 ;; Needed so that Viper will be able to figure the last inserted
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
171 ;; chunk of text with reasonable accuracy.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
172 (defsubst viper-insert-state-post-command-sentinel ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
173 (if (and (memq viper-current-state '(insert-state replace-state))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
174 viper-insert-point
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
175 (>= (point) viper-insert-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
176 (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
177 (or (viper-overlay-p viper-replace-overlay)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
178 (progn
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
179 (viper-set-replace-overlay (point-min) (point-min))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
180 (viper-hide-replace-overlay)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
181 (if (eq viper-current-state 'insert-state)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
182 (let ((has-saved-cursor-color-in-insert-mode
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
183 (stringp (viper-get-saved-cursor-color-in-insert-mode))))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
184 (or has-saved-cursor-color-in-insert-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
185 (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
186 ;; save current color, if not already saved
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
187 (viper-save-cursor-color 'before-insert-mode))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
188 ;; set insert mode cursor color
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
189 (viper-change-cursor-color viper-insert-state-cursor-color)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
190
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
191 (if (and (memq this-command '(dabbrev-expand hippie-expand))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
192 (integerp viper-pre-command-point)
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
193 (markerp viper-insert-point)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
194 (marker-position viper-insert-point)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
195 (> viper-insert-point viper-pre-command-point))
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
196 (viper-move-marker-locally viper-insert-point viper-pre-command-point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
197 )
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
198
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
199 (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
200 (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
201 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
202 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
203 viper-delete-backward-char
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
204 viper-join-lines
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
205 viper-delete-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
206 (memq (viper-event-key last-command-event)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
207 '(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
208 (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
209
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
210 (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
211 (or (viper-preserve-cursor-color)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
212 (viper-restore-cursor-color 'after-insert-mode))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
213 (if (and (memq this-command '(dabbrev-expand hippie-expand))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
214 (markerp viper-insert-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
215 (marker-position viper-insert-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
216 (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
217
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
218 (defsubst viper-R-state-post-command-sentinel ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
219 ;; Restoring cursor color is needed despite
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
220 ;; viper-replace-state-pre-command-sentinel: When you jump to another buffer
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
221 ;; in another frame, the pre-command hook won't change cursor color to
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
222 ;; default in that other frame. So, if the second frame cursor was red and
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
223 ;; 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
224 ;; will remain red. Restoring the default, below, prevents this.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
225 (if (and (<= (viper-replace-start) (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
226 (<= (point) (viper-replace-end)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
227 (viper-change-cursor-color viper-replace-overlay-cursor-color)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
228 (viper-restore-cursor-color 'after-replace-mode)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
229 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
230
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
231 ;; to speed up, don't change cursor color before self-insert
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
232 ;; and common move commands
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
233 (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
234 (or (viper-preserve-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)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
236
26702
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
237
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
238 ;; 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
239 ;; 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
240 (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
241 (setq viper-replace-chars-to-delete
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
242 (max 0
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
243 (min viper-replace-chars-to-delete
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
244 ;; 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
245 (viper-chars-in-region
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
246 (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
247 ;; 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
248 ;; 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
249 (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
250 ))))
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
251
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
252
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
253 (defun viper-replace-state-post-command-sentinel ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
254 ;; Restoring cursor color is needed despite
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
255 ;; viper-replace-state-pre-command-sentinel: When one jumps to another buffer
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
256 ;; in another frame, the pre-command hook won't change cursor color to
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
257 ;; default in that other frame. So, if the second frame cursor was red and
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
258 ;; 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
259 ;; will remain red. Restoring the default, below, fixes this problem.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
260 ;;
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
261 ;; 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
262 ;; viper-delete-backward-char, etc., since they either don't change
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
263 ;; cursor color or, if they terminate replace mode, the color will be changed
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
264 ;; 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
265 (or (viper-preserve-cursor-color)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
266 (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
267 (cond
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
268 ((eq viper-current-state 'replace-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
269 ;; delete characters to compensate for inserted chars.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
270 (let ((replace-boundary (viper-replace-end)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
271 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
272 (goto-char viper-last-posn-in-replace-region)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
273 (viper-trim-replace-chars-to-delete-if-necessary)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
274 (delete-char viper-replace-chars-to-delete)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
275 (setq viper-replace-chars-to-delete 0)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
276 ;; terminate replace mode if reached replace limit
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
277 (if (= viper-last-posn-in-replace-region (viper-replace-end))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
278 (viper-finish-change)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
279
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
280 (if (viper-pos-within-region
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
281 (point) (viper-replace-start) replace-boundary)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
282 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
283 ;; the state may have changed in viper-finish-change above
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
284 (if (eq viper-current-state 'replace-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
285 (viper-change-cursor-color viper-replace-overlay-cursor-color))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
286 (setq viper-last-posn-in-replace-region (point-marker))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
287 ))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
288 ;; terminate replace mode if changed Viper states.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
289 (t (viper-finish-change))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
290
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
291
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
292 ;; changing mode
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
293
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
294 ;; Change state to NEW-STATE---either emacs-state, vi-state, or insert-state.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
295 (defun viper-change-state (new-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
296 ;; Keep viper-post/pre-command-hooks fresh.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
297 ;; We remove then add viper-post/pre-command-sentinel since it is very
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
298 ;; desirable that viper-pre-command-sentinel is the last hook and
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
299 ;; viper-post-command-sentinel is the first hook.
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
300
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
301 (make-local-hook 'viper-after-change-functions)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
302 (make-local-hook 'viper-before-change-functions)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
303 (make-local-hook 'viper-post-command-hooks)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
304 (make-local-hook 'viper-pre-command-hooks)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
305
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
306 (remove-hook 'post-command-hook 'viper-post-command-sentinel)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
307 (add-hook 'post-command-hook 'viper-post-command-sentinel)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
308 (remove-hook 'pre-command-hook 'viper-pre-command-sentinel)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
309 (add-hook 'pre-command-hook 'viper-pre-command-sentinel t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
310 ;; These hooks will be added back if switching to insert/replace mode
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
311 (remove-hook 'viper-post-command-hooks
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
312 'viper-insert-state-post-command-sentinel 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
313 (remove-hook 'viper-pre-command-hooks
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
314 'viper-insert-state-pre-command-sentinel 'local)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
315 (setq viper-intermediate-command nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
316 (cond ((eq new-state 'vi-state)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
317 (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
318
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
319 ;; move viper-last-posn-while-in-insert-state
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
320 ;; 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
321 ;; states after each command. In Vi/Emacs state, it does
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
322 ;; nothing. We need to execute it here to make sure that
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
323 ;; the last posn was recorded when we hit ESC.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
324 ;; It may be left unrecorded if the last thing done in
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
325 ;; insert/repl state was dabbrev-expansion or abbrev
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
326 ;; expansion caused by hitting ESC
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
327 (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
328
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
329 (condition-case conds
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
330 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
331 (viper-save-last-insertion
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
332 viper-insert-point
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
333 viper-last-posn-while-in-insert-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
334 (if viper-began-as-replace
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
335 (setq viper-began-as-replace nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
336 ;; repeat insert commands if numerical arg > 1
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
337 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
338 (viper-repeat-insert-command))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
339 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
340 (viper-message-conditions conds)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
341
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
342 (if (> (length viper-last-insertion) 0)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
343 (viper-push-onto-ring viper-last-insertion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
344 'viper-insertion-ring))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
345
26702
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
346 (if viper-ESC-moves-cursor-back
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
347 (or (bolp) (backward-char 1))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
348 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
349
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
350 ;; insert or replace
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
351 ((memq new-state '(insert-state replace-state))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
352 (if (memq viper-current-state '(emacs-state vi-state))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
353 (viper-move-marker-locally 'viper-insert-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
354 (viper-move-marker-locally
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
355 'viper-last-posn-while-in-insert-state (point))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
356 (add-hook 'viper-post-command-hooks
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
357 'viper-insert-state-post-command-sentinel t 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
358 (add-hook 'viper-pre-command-hooks
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
359 'viper-insert-state-pre-command-sentinel t 'local))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
360 ) ; outermost cond
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
361
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
362 ;; Nothing needs to be done to switch to emacs mode! Just set some
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
363 ;; variables, which is already done in viper-change-state-to-emacs!
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
364
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
365 ;; ISO accents
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
366 ;; always turn off iso-accents-mode in vi-state, or else we won't be able to
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
367 ;; use the keys `,',^ , as they will do accents instead of Vi actions.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
368 (cond ((eq new-state 'vi-state) (viper-set-iso-accents-mode nil));accents off
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
369 (viper-automatic-iso-accents (viper-set-iso-accents-mode t));accents on
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
370 (t (viper-set-iso-accents-mode nil)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
371 ;; Always turn off quail mode in vi state
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
372 (cond ((eq new-state 'vi-state) (viper-set-input-method nil)) ;intl input off
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
373 (viper-special-input-method (viper-set-input-method t)) ;intl input on
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
374 (t (viper-set-input-method nil)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
375
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
376 (setq viper-current-state new-state)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
377
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
378 (viper-update-syntax-classes)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
379 (viper-normalize-minor-mode-map-alist)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
380 (viper-adjust-keys-for new-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
381 (viper-set-mode-vars-for new-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
382 (viper-refresh-mode-line)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
383 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
384
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
385
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
386
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
387 (defun viper-adjust-keys-for (state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
388 "Make necessary adjustments to keymaps before entering STATE."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
389 (cond ((memq state '(insert-state replace-state))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
390 (if viper-auto-indent
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
391 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
392 (define-key viper-insert-basic-map "\C-m" 'viper-autoindent)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
393 (if viper-want-emacs-keys-in-insert
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
394 ;; expert
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
395 (define-key viper-insert-basic-map "\C-j" nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
396 ;; novice
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
397 (define-key viper-insert-basic-map "\C-j" 'viper-autoindent)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
398 (define-key viper-insert-basic-map "\C-m" nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
399 (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
400
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
401 (setq viper-insert-diehard-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
402 (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
403
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
404 (if viper-want-ctl-h-help
19891
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
405 (progn
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
406 (define-key viper-insert-basic-map "\C-h" 'help-command)
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
407 (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
408 (define-key viper-insert-basic-map
19891
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
409 "\C-h" 'viper-del-backward-char-in-insert)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
410 (define-key viper-replace-map
19891
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
411 "\C-h" 'viper-del-backward-char-in-replace))
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
412 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't.
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
413 (define-key viper-insert-basic-map
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
414 [backspace] 'viper-del-backward-char-in-insert)
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
415 (define-key viper-replace-map
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
416 [backspace] 'viper-del-backward-char-in-replace)
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
417 ) ; end insert/replace case
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
418 (t ; Vi state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
419 (setq viper-vi-diehard-minor-mode (not viper-want-emacs-keys-in-vi))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
420 (if viper-want-ctl-h-help
19891
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
421 (define-key viper-vi-basic-map "\C-h" 'help-command)
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
422 (define-key viper-vi-basic-map "\C-h" 'viper-backward-char))
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
423 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't.
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
424 (define-key viper-vi-basic-map [backspace] 'viper-backward-char))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
425 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
426
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
427
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
428 ;; Normalizes minor-mode-map-alist by putting Viper keymaps first.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
429 ;; This ensures that Viper bindings are in effect, regardless of which minor
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
430 ;; modes were turned on by the user or by other packages.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
431 (defun 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
432 (setq minor-mode-map-alist
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
433 (viper-append-filter-alist
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
434 (list (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
435 (cons 'viper-vi-minibuffer-minor-mode viper-minibuffer-map)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
436 (cons 'viper-vi-local-user-minor-mode viper-vi-local-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
437 (cons 'viper-vi-kbd-minor-mode viper-vi-kbd-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
438 (cons 'viper-vi-global-user-minor-mode viper-vi-global-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
439 (cons 'viper-vi-state-modifier-minor-mode
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
440 (if (keymapp
19203
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
441 (cdr (assoc major-mode
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
442 viper-vi-state-modifier-alist)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
443 (cdr (assoc major-mode viper-vi-state-modifier-alist))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
444 viper-empty-keymap))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
445 (cons 'viper-vi-diehard-minor-mode viper-vi-diehard-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
446 (cons 'viper-vi-basic-minor-mode viper-vi-basic-map)
19203
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
447 (cons 'viper-insert-intercept-minor-mode
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
448 viper-insert-intercept-map)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
449 (cons 'viper-replace-minor-mode viper-replace-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
450 ;; 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
451 ;; viper-replace-minor-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
452 (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
453 viper-minibuffer-map)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
454 (cons 'viper-insert-local-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
455 viper-insert-local-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
456 (cons 'viper-insert-kbd-minor-mode viper-insert-kbd-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
457 (cons 'viper-insert-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
458 viper-insert-global-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
459 (cons 'viper-insert-state-modifier-minor-mode
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
460 (if (keymapp
19203
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
461 (cdr (assoc major-mode
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
462 viper-insert-state-modifier-alist)))
19203
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
463 (cdr (assoc major-mode
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
464 viper-insert-state-modifier-alist))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
465 viper-empty-keymap))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
466 (cons 'viper-insert-diehard-minor-mode viper-insert-diehard-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
467 (cons 'viper-insert-basic-minor-mode viper-insert-basic-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
468 (cons 'viper-emacs-intercept-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
469 viper-emacs-intercept-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
470 (cons 'viper-emacs-local-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
471 viper-emacs-local-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
472 (cons 'viper-emacs-kbd-minor-mode viper-emacs-kbd-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
473 (cons 'viper-emacs-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
474 viper-emacs-global-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
475 (cons 'viper-emacs-state-modifier-minor-mode
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
476 (if (keymapp
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
477 (cdr
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
478 (assoc major-mode viper-emacs-state-modifier-alist)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
479 (cdr
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
480 (assoc major-mode viper-emacs-state-modifier-alist))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
481 viper-empty-keymap))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
482 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
483 minor-mode-map-alist)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
484
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
485
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
486
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
487 ;; Viper mode-changing commands and utilities
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
488
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
489 ;; Modifies mode-line-buffer-identification.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
490 (defun viper-refresh-mode-line ()
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
491 (setq viper-mode-string
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
492 (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
493 ((eq viper-current-state 'vi-state) viper-vi-state-id)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
494 ((eq viper-current-state 'replace-state) viper-replace-state-id)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
495 ((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
496
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
497 ;; Sets Viper mode string in global-mode-string
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
498 (force-mode-line-update))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
499
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
500
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
501 ;; Switch from Insert state to Vi state.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
502 (defun viper-exit-insert-state ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
503 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
504 (viper-change-state-to-vi))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
505
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
506 (defun viper-set-mode-vars-for (state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
507 "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
508
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
509 ;; Emacs state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
510 (setq viper-vi-minibuffer-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
511 viper-insert-minibuffer-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
512 viper-vi-intercept-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
513 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
514
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
515 viper-vi-local-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
516 viper-vi-kbd-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
517 viper-vi-global-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
518 viper-vi-state-modifier-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
519 viper-vi-diehard-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
520 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
521
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
522 viper-replace-minor-mode nil
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
523
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
524 viper-insert-local-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
525 viper-insert-kbd-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
526 viper-insert-global-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
527 viper-insert-state-modifier-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
528 viper-insert-diehard-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
529 viper-insert-basic-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
530 viper-emacs-intercept-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
531 viper-emacs-local-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
532 viper-emacs-kbd-minor-mode (not (viper-is-in-minibuffer))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
533 viper-emacs-global-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
534 viper-emacs-state-modifier-minor-mode t
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
535 )
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
536
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
537 ;; Vi state
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
538 (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
539 (setq
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
540 viper-vi-intercept-minor-mode t
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
541 viper-vi-minibuffer-minor-mode (viper-is-in-minibuffer)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
542 viper-vi-local-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
543 viper-vi-kbd-minor-mode (not (viper-is-in-minibuffer))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
544 viper-vi-global-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
545 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
546 ;; don't let the diehard keymap block command completion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
547 ;; and other things in the minibuffer
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
548 viper-vi-diehard-minor-mode (not
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
549 (or viper-want-emacs-keys-in-vi
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
550 (viper-is-in-minibuffer)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
551 viper-vi-basic-minor-mode t
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
552 viper-emacs-intercept-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
553 viper-emacs-local-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
554 viper-emacs-kbd-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
555 viper-emacs-global-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
556 viper-emacs-state-modifier-minor-mode nil
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
557 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
558
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
559 ;; Insert and Replace states
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
560 (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
561 (setq
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
562 viper-insert-intercept-minor-mode t
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
563 viper-replace-minor-mode (eq state 'replace-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
564 viper-insert-minibuffer-minor-mode (viper-is-in-minibuffer)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
565 viper-insert-local-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
566 viper-insert-kbd-minor-mode (not (viper-is-in-minibuffer))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
567 viper-insert-global-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
568 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
569 ;; don't let the diehard keymap block command completion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
570 ;; and other things in the minibuffer
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
571 viper-insert-diehard-minor-mode (not
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
572 (or
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
573 viper-want-emacs-keys-in-insert
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
574 (viper-is-in-minibuffer)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
575 viper-insert-basic-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
576 viper-emacs-intercept-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
577 viper-emacs-local-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
578 viper-emacs-kbd-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
579 viper-emacs-global-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
580 viper-emacs-state-modifier-minor-mode nil
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
581 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
582
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
583 ;; minibuffer faces
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
584 (if (viper-has-face-support-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
585 (setq viper-minibuffer-current-face
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
586 (cond ((eq state 'emacs-state) viper-minibuffer-emacs-face)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
587 ((eq state 'vi-state) viper-minibuffer-vi-face)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
588 ((memq state '(insert-state replace-state))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
589 viper-minibuffer-insert-face))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
590
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
591 (if (viper-is-in-minibuffer)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
592 (viper-set-minibuffer-overlay))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
593 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
594
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
595 ;; This also takes care of the annoying incomplete lines in files.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
596 ;; Also, this fixes `undo' to work vi-style for complex commands.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
597 (defun viper-change-state-to-vi ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
598 "Change Viper state to Vi."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
599 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
600 (if (and viper-first-time (not (viper-is-in-minibuffer)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
601 (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
602 (if overwrite-mode (overwrite-mode -1))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
603 (or (viper-overlay-p viper-replace-overlay)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
604 (viper-set-replace-overlay (point-min) (point-min)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
605 (viper-hide-replace-overlay)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
606 (if abbrev-mode (expand-abbrev))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
607 (if (and auto-fill-function (> (current-column) fill-column))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
608 (funcall auto-fill-function))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
609 ;; don't leave whitespace lines around
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
610 (if (and (memq last-command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
611 '(viper-autoindent
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
612 viper-open-line viper-Open-line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
613 viper-replace-state-exit-cmd))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
614 (viper-over-whitespace-line))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
615 (indent-to-left-margin))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
616 (viper-add-newline-at-eob-if-necessary)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
617 (viper-adjust-undo)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
618 (viper-change-state 'vi-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
619
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
620 (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
621
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
622 ;; Protect against user errors in hooks
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
623 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
624 (run-hooks 'viper-vi-state-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
625 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
626 (viper-message-conditions conds)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
627
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
628 (defun viper-change-state-to-insert ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
629 "Change Viper state to Insert."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
630 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
631 (viper-change-state 'insert-state)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
632
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
633 (or (viper-overlay-p viper-replace-overlay)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
634 (viper-set-replace-overlay (point-min) (point-min)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
635 (viper-hide-replace-overlay)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
636
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
637 (let ((has-saved-cursor-color-in-insert-mode
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
638 (stringp (viper-get-saved-cursor-color-in-insert-mode))))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
639 (or has-saved-cursor-color-in-insert-mode
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
640 (string= (viper-get-cursor-color) viper-insert-state-cursor-color)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
641 (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
642 (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
643
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
644 ;; Protect against user errors in hooks
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
645 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
646 (run-hooks 'viper-insert-state-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
647 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
648 (viper-message-conditions conds))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
649
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
650 (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
651 ;; 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
652 (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
653 (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
654 (error
f6a67d77484a * ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 33019
diff changeset
655 (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
656 (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
657 viper-replace-minor-mode nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
658
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
659
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
660
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
661 ;; Change to replace state. When the end of replacement region is reached,
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
662 ;; replace state changes to insert state.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
663 (defun viper-change-state-to-replace (&optional non-R-cmd)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
664 (viper-change-state 'replace-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
665 ;; Run insert-state-hook
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
666 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
667 (run-hooks 'viper-insert-state-hook 'viper-replace-state-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
668 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
669 (viper-message-conditions conds)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
670
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
671 (if non-R-cmd
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
672 (viper-start-replace)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
673 ;; 'R' is implemented using Emacs's overwrite-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
674 (viper-start-R-mode))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
675 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
676
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
677
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
678 (defun viper-change-state-to-emacs ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
679 "Change Viper state to Emacs."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
680 (interactive)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
681 (or (viper-overlay-p viper-replace-overlay)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
682 (viper-set-replace-overlay (point-min) (point-min)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
683 (viper-hide-replace-overlay)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
684 (viper-change-state 'emacs-state)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
685
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
686 ;; Protect agains user errors in hooks
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
687 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
688 (run-hooks 'viper-emacs-state-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
689 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
690 (viper-message-conditions conds))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
691
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
692 ;; escape to emacs mode termporarily
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
693 (defun viper-escape-to-emacs (arg &optional events)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
694 "Escape to Emacs state from Vi state for one Emacs command.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
695 ARG is used as the prefix value for the executed command. If
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
696 EVENTS is a list of events, which become the beginning of the command."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
697 (interactive "P")
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
698 (if (viper= last-command-char ?\\)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
699 (message "Switched to EMACS state for the next command..."))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
700 (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
701
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
702 ;; escape to Vi mode termporarily
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
703 (defun viper-escape-to-vi (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
704 "Escape from Emacs state to Vi state for one Vi 1-character command.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
705 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
706 Vi's prefix argument will be used. Otherwise, the prefix argument passed to
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
707 `viper-escape-to-vi' is used."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
708 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
709 (message "Switched to VI state for the next command...")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
710 (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
711
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
712 ;; Escape to STATE mode for one Emacs command.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
713 (defun viper-escape-to-state (arg events state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
714 ;;(let (com key prefix-arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
715 (let (com key)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
716 ;; this temporarily turns off Viper's minor mode keymaps
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
717 (viper-set-mode-vars-for state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
718 (viper-normalize-minor-mode-map-alist)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
719 (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
720
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
721 ;; protect against keyboard quit and other errors
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
722 (condition-case nil
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
723 (let (viper-vi-kbd-minor-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
724 viper-insert-kbd-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
725 viper-emacs-kbd-minor-mode)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
726 (unwind-protect
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
727 (progn
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
728 (setq com
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
729 (key-binding (setq key (viper-read-key-sequence nil))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
730 ;; In case of binding indirection--chase definitions.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
731 ;; Have to do it here because we execute this command under
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
732 ;; different keymaps, so command-execute may not do the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
733 ;; right thing there
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
734 (while (vectorp com) (setq com (key-binding com))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
735 nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
736 ;; 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
737 ;; `state'. Otherwise, if we switch buffers while executing the
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
738 ;; 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
739 ;; `state'. When we return to the orig buffer, the bindings will be
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
740 ;; screwed up.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
741 (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
742
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
743 ;; this-command, last-command-char, last-command-event
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
744 (setq this-command com)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
745 (if viper-xemacs-p ; XEmacs represents key sequences as vectors
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
746 (setq last-command-event
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
747 (viper-copy-event (viper-seq-last-elt key))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
748 last-command-char (event-to-character last-command-event))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
749 ;; Emacs represents them as sequences (str or vec)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
750 (setq last-command-event
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
751 (viper-copy-event (viper-seq-last-elt key))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
752 last-command-char last-command-event))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
753
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
754 (if (commandp com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
755 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
756 (setq prefix-arg (or prefix-arg arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
757 (command-execute com)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
758 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
759 (quit (ding))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
760 (error (beep 1))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
761 ;; set state in the new buffer
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
762 (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
763
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
764 ;; 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
765 ;; 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
766 ;; 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
767 ;; 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
768 ;; 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
769 (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
770 (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
771 (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
772 (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
773 (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
774 (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
775 (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
776 (condition-case nil
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
777 (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
778 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
779 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
780 ch)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
781 (cond ((and viper-special-input-method
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
782 viper-emacs-p
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
783 (fboundp 'quail-input-method))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
784 ;; (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
785 ;; 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
786 ;; 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
787 ;; types a regular key.)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
788 (let (unread-command-events)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
789 ;; The next 2 cmds are intended to prevent the input method
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
790 ;; from swallowing ^M, ^Q and other special characters
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
791 (setq ch (read-char))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
792 (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
793 (quail-input-method nil)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
794
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
795 (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
796 (insert ch)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
797 (insert quail-current-str))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
798 (setq ch (or ch
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
799 (aref quail-current-str
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
800 (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
801 ))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
802 ((and viper-special-input-method
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
803 viper-xemacs-p
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
804 (fboundp 'quail-start-translation))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
805 ;; 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
806 ;; quail-input-method
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
807 (let (unread-command-events)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
808 (setq ch (read-char))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
809 (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
810 (quail-start-translation nil)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
811
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
812 (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
813 (insert ch)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
814 (insert quail-current-str))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
815 (setq ch (or ch
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
816 (aref quail-current-str
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
817 (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
818 ))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
819 ((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
820 (setq ch (aref (read-key-sequence nil) 0))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
821 (insert ch))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
822 (t
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
823 (setq ch (read-char))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
824 (insert ch))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
825 )
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
826 (setq last-command-event
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
827 (viper-copy-event (if viper-xemacs-p
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
828 (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
829 ) ; let
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
830 (error)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
831 ) ; condition-case
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
832
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
833 (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
834 (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
835 (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
836 )
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
837
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
838
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
839 (defun viper-exec-form-in-vi (form)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
840 "Execute FORM in Vi state, regardless of the Ccurrent Vi state."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
841 (let ((buff (current-buffer))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
842 result)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
843 (viper-set-mode-vars-for 'vi-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
844
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
845 (condition-case nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
846 (let (viper-vi-kbd-minor-mode) ; execute without kbd macros
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
847 (setq result (eval form))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
848 )
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
849 (error
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
850 (signal 'quit nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
851
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
852 (if (not (equal buff (current-buffer))) ; cmd switched buffer
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
853 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
854 (set-buffer buff)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
855 (viper-set-mode-vars-for viper-current-state)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
856 (viper-set-mode-vars-for viper-current-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
857 result))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
858
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
859 (defun viper-exec-form-in-emacs (form)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
860 "Execute FORM in Emacs, temporarily disabling Viper's minor modes.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
861 Similar to viper-escape-to-emacs, but accepts forms rather than keystrokes."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
862 (let ((buff (current-buffer))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
863 result)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
864 (viper-set-mode-vars-for 'emacs-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
865 (setq result (eval form))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
866 (if (not (equal buff (current-buffer))) ; cmd switched buffer
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
867 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
868 (set-buffer buff)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
869 (viper-set-mode-vars-for viper-current-state)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
870 (viper-set-mode-vars-for viper-current-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
871 result))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
872
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
873 ;; 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
874 ;; 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
875 (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
876 (interactive "P")
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
877 (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
878
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
879
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
880 ;; 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
881 ;; bindings. By letting Viper know which files these modes are in, it will
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
882 ;; arrange to reorganize minor-mode-map-alist so that things will work right.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
883 (defun viper-harness-minor-mode (load-file)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
884 "Familiarize Viper with a minor mode defined in LOAD_FILE.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
885 Minor modes that have their own keymaps may overshadow Viper keymaps.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
886 This function is designed to make Viper aware of the packages that define
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
887 such minor modes.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
888 Usage:
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
889 (viper-harness-minor-mode load-file)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
890
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
891 LOAD-FILE is a name of the file where the specific minor mode is defined.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
892 Suffixes such as .el or .elc should be stripped."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
893
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
894 (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
895
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
896 (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
897
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
898 ;; Change the default for minor-mode-map-alist each time a harnessed minor
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
899 ;; mode adds its own keymap to the a-list.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
900 (eval-after-load
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
901 load-file '(setq-default minor-mode-map-alist minor-mode-map-alist))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
902 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
903
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
904
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
905 (defun viper-ESC (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
906 "Emulate ESC key in Emacs.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
907 Prevents multiple escape keystrokes if viper-no-multiple-ESC is true.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
908 If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
909 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
910 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
911 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
912 a Meta key in this case. When viper-no-multiple-ESC is nil, ESC functions
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
913 as a Meta key and any number of multiple escapes is allowed."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
914 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
915 (let (char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
916 (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
917 (setq char (viper-read-char-exclusive))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
918 (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
919 ((and (eq viper-no-multiple-ESC 'twice)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
920 (eq viper-current-state 'vi-state))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
921 (setq char (viper-read-char-exclusive))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
922 (if (= char (string-to-char viper-ESC-key))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
923 (ding)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
924 (viper-escape-to-emacs arg (list ?\e char) )))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
925 (t (ding)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
926 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
927
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
928 (defun viper-alternate-Meta-key (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
929 "Simulate Emacs Meta key."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
930 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
931 (sit-for 1) (message "ESC-")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
932 (viper-escape-to-emacs arg '(?\e)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
933
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
934 (defun viper-toggle-key-action ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
935 "Action bound to `viper-toggle-key'."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
936 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
937 (if (and (< viper-expert-level 2) (equal viper-toggle-key "\C-z"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
938 (if (viper-window-display-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
939 (viper-iconify)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
940 (suspend-emacs))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
941 (viper-change-state-to-emacs)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
942
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
943
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
944 ;; Intercept ESC sequences on dumb terminals.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
945 ;; Based on the idea contributed by Marcelino Veiga Tuimil <mveiga@dit.upm.es>
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
946
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
947 ;; Check if last key was ESC and if so try to reread it as a function key.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
948 ;; But only if there are characters to read during a very short time.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
949 ;; Returns the last event, if any.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
950 (defun viper-envelop-ESC-key ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
951 (let ((event last-input-event)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
952 (keyseq [nil])
39288
25dc021070bc 2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39215
diff changeset
953 (inhibit-quit t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
954 (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
955 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
956 (if (viper-fast-keysequence-p)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
957 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
958 (let (minor-mode-map-alist)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
959 (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
960 (setq keyseq (read-key-sequence nil 'continue-echo))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
961 ) ; let
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
962 ;; If keyseq translates into something that still has ESC
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
963 ;; at the beginning, separate ESC from the rest of the seq.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
964 ;; In XEmacs we check for events that are keypress meta-key
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
965 ;; and convert them into [escape key]
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
966 ;;
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
967 ;; This is needed for the following reason:
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
968 ;; If ESC is the first symbol, we interpret it as if the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
969 ;; user typed ESC and then quickly some other symbols.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
970 ;; If ESC is not the first one, then the key sequence
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
971 ;; entered was apparently translated into a function key or
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
972 ;; something (e.g., one may have
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
973 ;; (define-key function-key-map "\e[192z" [f11])
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
974 ;; which would translate the escape-sequence generated by
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
975 ;; f11 in an xterm window into the symbolic key f11.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
976 ;;
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
977 ;; If `first-key' is not an ESC event, we make it into the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
978 ;; 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
979 ;; 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
980 ;; macros. Otherwise, viper-exec-mapped-kbd-macro will think
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
981 ;; that the last event was ESC and so it'll execute whatever is
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
982 ;; bound to ESC. (Viper macros can't be bound to
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
983 ;; ESC-sequences).
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
984 (let* ((first-key (elt keyseq 0))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
985 (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
986 (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
987 (not viper-translate-all-ESC-keysequences))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
988 ;; put keys following ESC on the unread list
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
989 ;; and return ESC as the key-sequence
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
990 (viper-set-unread-command-events (subseq keyseq 1))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
991 (setq last-input-event event
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
992 keyseq (if viper-emacs-p
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
993 "\e"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
994 (vector (character-to-event ?\e)))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
995 ((and viper-xemacs-p
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
996 (key-press-event-p first-key)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
997 (equal '(meta) key-mod))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
998 (viper-set-unread-command-events
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
999 (vconcat (vector
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1000 (character-to-event (event-key first-key)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1001 (subseq keyseq 1)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1002 (setq last-input-event event
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1003 keyseq (vector (character-to-event ?\e))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1004 ((eventp first-key)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1005 (setq last-command-event
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1006 (viper-copy-event first-key)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1007 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1008 ) ; end progn
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1009
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1010 ;; this is escape event with nothing after it
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1011 ;; put in unread-command-event and then re-read
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1012 (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
1013 (setq keyseq (read-key-sequence nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1014 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1015 ;; not an escape event
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1016 (setq keyseq (vector event)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1017 keyseq))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1018
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1019
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1020
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1021 ;; Listen to ESC key.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1022 ;; If a sequence of keys starting with ESC is issued with very short delays,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1023 ;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1024 (defun viper-intercept-ESC-key ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1025 "Function that implements ESC key in Viper emulation of Vi."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1026 (interactive)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1027 (let ((cmd (or (key-binding (viper-envelop-ESC-key))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1028 '(lambda () (interactive) (error "")))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1029
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1030 ;; call the actual function to execute ESC (if no other symbols followed)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1031 ;; or the key bound to the ESC sequence (if the sequence was issued
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1032 ;; with very short delay between characters.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1033 (if (eq cmd 'viper-intercept-ESC-key)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1034 (setq cmd
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1035 (cond ((eq viper-current-state 'vi-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1036 'viper-ESC)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1037 ((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
1038 'viper-exit-insert-state)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1039 ((eq viper-current-state 'replace-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1040 'viper-replace-state-exit-cmd)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1041 (t 'viper-change-state-to-vi)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1042 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1043 (call-interactively cmd)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1044
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1045
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1046
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1047
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1048 ;; prefix argument for Vi mode
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1049
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1050 ;; In Vi mode, prefix argument is a dotted pair (NUM . COM) where NUM
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1051 ;; represents the numeric value of the prefix argument and COM represents
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1052 ;; command prefix such as "c", "d", "m" and "y".
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1053
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1054 ;; Get value part of prefix-argument ARG.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1055 (defsubst viper-p-val (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1056 (cond ((null arg) 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1057 ((consp arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1058 (if (or (null (car arg)) (equal (car arg) '(nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1059 1 (car arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1060 (t arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1061
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1062 ;; Get raw value part of prefix-argument ARG.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1063 (defsubst viper-P-val (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1064 (cond ((consp arg) (car arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1065 (t arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1066
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1067 ;; Get com part of prefix-argument ARG.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1068 (defsubst viper-getcom (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1069 (cond ((null arg) nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1070 ((consp arg) (cdr arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1071 (t nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1072
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1073 ;; Get com part of prefix-argument ARG and modify it.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1074 (defun viper-getCom (arg)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1075 (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
1076 (cond ((viper= com ?c) ?c)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1077 ;; Previously, ?c was being converted to ?C, but this prevented
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1078 ;; multiline replace regions.
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1079 ;;((viper= com ?c) ?C)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1080 ((viper= com ?d) ?D)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1081 ((viper= com ?y) ?Y)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1082 (t com))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1083
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1084
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1085 ;; 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
1086 ;; Invoked by EVENT-CHAR. COM is the command part obtained so far.
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1087 (defun viper-prefix-arg-value (event-char com)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1088 (let ((viper-intermediate-command 'viper-digit-argument)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1089 value func)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1090 ;; read while number
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1091 (while (and (viper-characterp event-char)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1092 (>= event-char ?0) (<= event-char ?9))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1093 (setq value (+ (* (if (integerp value) value 0) 10) (- event-char ?0)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1094 (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
1095
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1096 (setq prefix-arg value)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1097 (if com (setq prefix-arg (cons prefix-arg com)))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1098 (while (eq event-char ?U)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1099 (viper-describe-arg prefix-arg)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1100 (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
1101
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1102 (if (or com (and (not (eq viper-current-state 'vi-state))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1103 ;; make sure it is a Vi command
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1104 (viper-characterp event-char)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1105 (viper-vi-command-p event-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1106 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1107 ;; If appears to be one of the vi commands,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1108 ;; then execute it with funcall and clear prefix-arg in order to not
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1109 ;; confuse subsequent commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1110 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1111 ;; 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
1112 ;; last. If com is not nil, the viper-digit-argument command was
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1113 ;; 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
1114 ;; etc., i.e., the user typed, say, d2. In this case, `com' would be
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1115 ;; `d', `w', etc. If viper-digit-argument was invoked by
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1116 ;; viper-escape-to-vi (which is indicated by the fact that the
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1117 ;; 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
1118 ;; vi command to be executed (e.g., `d', `w', etc). Again,
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1119 ;; last-command-char must make emacs believe that this is the command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1120 ;; we typed.
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1121 (cond ((eq event-char 'return) (setq event-char ?\C-m))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1122 ((eq event-char 'delete) (setq event-char ?\C-?))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1123 ((eq event-char 'backspace) (setq event-char ?\C-h))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1124 ((eq event-char 'space) (setq event-char ?\ )))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1125 (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
1126 (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
1127 `(key-binding (char-to-string ,event-char))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1128 (funcall func prefix-arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1129 (setq prefix-arg nil))
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1130 ;; 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
1131 (viper-set-unread-command-events event-char))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1132 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1133
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1134
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1135 ;; Vi operator as prefix argument."
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1136 (defun viper-prefix-arg-com (char value com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1137 (let ((cont t)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1138 cmd-info
18958
506ec0258d63 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18855
diff changeset
1139 cmd-to-exec-at-end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1140 (while (and cont
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1141 (viper-memq-char char
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1142 (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
1143 viper-buffer-search-char)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1144 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1145 ;; this means that we already have a command character, so we
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1146 ;; construct a com list and exit while. however, if char is "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1147 ;; it is an error.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1148 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1149 ;; new com is (CHAR . OLDCOM)
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1150 (if (viper-memq-char char '(?# ?\")) (error ""))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1151 (setq com (cons char com))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1152 (setq cont nil))
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1153 ;; 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
1154 ;; ", 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
1155 ;; 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
1156 ;; loop.
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1157 (cond ((viper-memq-char char '(?! ?=))
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1158 (setq com char)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1159 (setq char (read-char))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1160 (setq cont nil))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1161 ((viper= char ?#)
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1162 ;; 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
1163 (setq com (+ 128 (read-char)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1164 (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
1165 ((viper= char ?\")
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1166 (let ((reg (read-char)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1167 (if (viper-valid-register reg)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1168 (setq viper-use-register reg)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1169 (error ""))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1170 (setq char (read-char))))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1171 (t
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1172 (setq com char)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1173 (setq char (read-char))))))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1174
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1175 (if (atom com)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1176 ;; `com' is a single char, so we construct the command argument
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1177 ;; and if `char' is `?', we describe the arg; otherwise
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1178 ;; we prepare the command that will be executed at the end.
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1179 (progn
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1180 (setq cmd-info (cons value com))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1181 (while (viper= char ?U)
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1182 (viper-describe-arg cmd-info)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1183 (setq char (read-char)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1184 ;; `char' is a movement cmd, a digit arg cmd, or a register cmd---so we
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1185 ;; execute it at the very end
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1186 (or (viper-movement-command-p char)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1187 (viper-digit-command-p char)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1188 (viper-regsuffix-command-p char)
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1189 (viper= char ?!) ; bang command
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1190 (error ""))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1191 (setq cmd-to-exec-at-end
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1192 (viper-exec-form-in-vi
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1193 `(key-binding (char-to-string ,char)))))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1194
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1195 ;; as com is non-nil, this means that we have a command to execute
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1196 (if (viper-memq-char (car com) '(?r ?R))
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1197 ;; execute apropriate region command.
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1198 (let ((char (car com)) (com (cdr com)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1199 (setq prefix-arg (cons value com))
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
1200 (if (viper= char ?r)
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
1201 (viper-region prefix-arg)
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1202 (viper-Region prefix-arg))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1203 ;; reset prefix-arg
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1204 (setq prefix-arg nil))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1205 ;; otherwise, reset prefix arg and call appropriate command
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1206 (setq value (if (null value) 1 value))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1207 (setq prefix-arg nil)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1208 (cond
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1209 ;; If we change ?C to ?c here, then cc will enter replacement mode
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1210 ;; rather than deleting lines. However, it will affect 1 less line than
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1211 ;; normal. We decided to not use replacement mode here and follow Vi,
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1212 ;; since replacement mode on n full lines can be achieved with nC.
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1213 ((equal com '(?c . ?c)) (viper-line (cons value ?C)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1214 ((equal com '(?d . ?d)) (viper-line (cons value ?D)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1215 ((equal com '(?d . ?y)) (viper-yank-defun))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1216 ((equal com '(?y . ?y)) (viper-line (cons value ?Y)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1217 ((equal com '(?< . ?<)) (viper-line (cons value ?<)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1218 ((equal com '(?> . ?>)) (viper-line (cons value ?>)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1219 ((equal com '(?! . ?!)) (viper-line (cons value ?!)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1220 ((equal com '(?= . ?=)) (viper-line (cons value ?=)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1221 (t (error "")))))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1222
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1223 (if cmd-to-exec-at-end
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1224 (progn
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1225 (setq last-command-char char)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1226 (setq last-command-event
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1227 (viper-copy-event
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1228 (if viper-xemacs-p (character-to-event char) char)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1229 (condition-case nil
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1230 (funcall cmd-to-exec-at-end cmd-info)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1231 (error
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1232 (error "")))))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1233 ))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1234
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1235 (defun viper-describe-arg (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1236 (let (val com)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1237 (setq val (viper-P-val arg)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1238 com (viper-getcom arg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1239 (if (null val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1240 (if (null com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1241 (message "Value is nil, and command is nil")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1242 (message "Value is nil, and command is `%c'" com))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1243 (if (null com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1244 (message "Value is `%d', and command is nil" val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1245 (message "Value is `%d', and command is `%c'" val com)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1246
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1247 (defun viper-digit-argument (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1248 "Begin numeric argument for the next command."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1249 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1250 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1251 (viper-prefix-arg-value
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1252 last-command-char (if (consp arg) (cdr arg) nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1253
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1254 (defun viper-command-argument (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1255 "Accept a motion command as an argument."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1256 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1257 (let ((viper-intermediate-command 'viper-command-argument))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1258 (condition-case nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1259 (viper-prefix-arg-com
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1260 last-command-char
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1261 (cond ((null arg) nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1262 ((consp arg) (car arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1263 ((integerp arg) arg)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1264 (t (error viper-InvalidCommandArgument)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1265 (cond ((null arg) nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1266 ((consp arg) (cdr arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1267 ((integerp arg) nil)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1268 (t (error viper-InvalidCommandArgument))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1269 (quit (setq viper-use-register nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1270 (signal 'quit nil)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1271 (viper-deactivate-mark)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1272
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1273
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1274 ;; repeat last destructive command
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1275
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1276 ;; Append region to text in register REG.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1277 ;; START and END are buffer positions indicating what to append.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1278 (defsubst viper-append-to-register (reg start end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1279 (set-register reg (concat (if (stringp (get-register reg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1280 (get-register reg) "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1281 (buffer-substring start end))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1282
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1283 ;; Saves last inserted text for possible use by viper-repeat command.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1284 (defun viper-save-last-insertion (beg end)
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1285 (condition-case nil
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1286 (setq viper-last-insertion (buffer-substring beg end))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1287 (error
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1288 ;; beg or end marker are somehow screwed up
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1289 (setq viper-last-insertion nil)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1290 (setq viper-last-insertion (buffer-substring beg end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1291 (or (< (length viper-d-com) 5)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1292 (setcar (nthcdr 4 viper-d-com) viper-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1293 (or (null viper-command-ring)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1294 (ring-empty-p viper-command-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1295 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1296 (setcar (nthcdr 4 (viper-current-ring-item viper-command-ring))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1297 viper-last-insertion)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1298 ;; del most recent elt, if identical to the second most-recent
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1299 (viper-cleanup-ring viper-command-ring)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1300 )
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1301
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1302 (defsubst viper-yank-last-insertion ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1303 "Inserts the text saved by the previous viper-save-last-insertion command."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1304 (condition-case nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1305 (insert viper-last-insertion)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1306 (error nil)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1307
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1308
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1309 ;; define functions to be executed
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1310
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1311 ;; invoked by the `C' command
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1312 (defun viper-exec-change (m-com com)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1313 (or (and (markerp viper-com-point) (marker-position viper-com-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1314 (set-marker viper-com-point (point) (current-buffer)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1315 ;; handle C cmd at the eol and at eob.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1316 (if (or (and (eolp) (= viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1317 (= viper-com-point (point-max)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1318 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1319 (insert " ")(backward-char 1)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1320 (if (= viper-com-point (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1321 (viper-forward-char-carefully))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1322 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1323 (if (eq m-com 'viper-next-line-at-bol)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1324 (viper-enlarge-region (mark t) (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1325 (if (< (point) (mark t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1326 (exchange-point-and-mark))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1327 (if (eq (preceding-char) ?\n)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1328 (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
1329 (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
1330 (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
1331 (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
1332 ))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1333
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1334 ;; this is invoked by viper-substitute-line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1335 (defun viper-exec-Change (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1336 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1337 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1338 (viper-enlarge-region (mark t) (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1339 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1340 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1341 (cond ((viper-valid-register viper-use-register '(letter digit))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1342 (copy-to-register
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1343 viper-use-register (mark t) (point) nil))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1344 ((viper-valid-register viper-use-register '(Letter))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1345 (viper-append-to-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1346 (downcase viper-use-register) (mark t) (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1347 (t (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1348 (error viper-InvalidRegister viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1349 (setq viper-use-register nil)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1350 (delete-region (mark t) (point)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1351 (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
1352 (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
1353 (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
1354 (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
1355 ))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1356
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1357 (defun viper-exec-delete (m-com com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1358 (or (and (markerp viper-com-point) (marker-position viper-com-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1359 (set-marker viper-com-point (point) (current-buffer)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1360 (let (chars-deleted)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1361 (if viper-use-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1362 (progn
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1363 (cond ((viper-valid-register viper-use-register '(letter digit))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1364 (copy-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1365 viper-use-register viper-com-point (point) nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1366 ((viper-valid-register viper-use-register '(Letter))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1367 (viper-append-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1368 (downcase viper-use-register) viper-com-point (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1369 (t (setq viper-use-register nil)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1370 (error viper-InvalidRegister viper-use-register)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1371 (setq viper-use-register nil)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1372 (setq last-command
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1373 (if (eq last-command 'd-command) 'kill-region nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1374 (setq chars-deleted (abs (- (point) viper-com-point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1375 (if (> chars-deleted viper-change-notification-threshold)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1376 (message "Deleted %d characters" chars-deleted))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1377 (kill-region viper-com-point (point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1378 (setq this-command 'd-command)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1379 (if viper-ex-style-motion
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1380 (if (and (eolp) (not (bolp))) (backward-char 1)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1381
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1382 (defun viper-exec-Delete (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1383 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1384 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1385 (viper-enlarge-region (mark t) (point))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1386 (let (lines-deleted)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1387 (if viper-use-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1388 (progn
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1389 (cond ((viper-valid-register viper-use-register '(letter digit))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1390 (copy-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1391 viper-use-register (mark t) (point) nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1392 ((viper-valid-register viper-use-register '(Letter))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1393 (viper-append-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1394 (downcase viper-use-register) (mark t) (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1395 (t (setq viper-use-register nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1396 (error viper-InvalidRegister viper-use-register)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1397 (setq viper-use-register nil)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1398 (setq last-command
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1399 (if (eq last-command 'D-command) 'kill-region nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1400 (setq lines-deleted (count-lines (point) viper-com-point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1401 (if (> lines-deleted viper-change-notification-threshold)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1402 (message "Deleted %d lines" lines-deleted))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1403 (kill-region (mark t) (point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1404 (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
1405 (back-to-indentation)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1406
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1407 ;; save region
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1408 (defun viper-exec-yank (m-com com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1409 (or (and (markerp viper-com-point) (marker-position viper-com-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1410 (set-marker viper-com-point (point) (current-buffer)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1411 (let (chars-saved)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1412 (if viper-use-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1413 (progn
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1414 (cond ((viper-valid-register viper-use-register '(letter digit))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1415 (copy-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1416 viper-use-register viper-com-point (point) nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1417 ((viper-valid-register viper-use-register '(Letter))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1418 (viper-append-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1419 (downcase viper-use-register) viper-com-point (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1420 (t (setq viper-use-register nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1421 (error viper-InvalidRegister viper-use-register)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1422 (setq viper-use-register nil)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1423 (setq last-command nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1424 (copy-region-as-kill viper-com-point (point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1425 (setq chars-saved (abs (- (point) viper-com-point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1426 (if (> chars-saved viper-change-notification-threshold)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1427 (message "Saved %d characters" chars-saved))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1428 (goto-char viper-com-point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1429
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1430 ;; save lines
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1431 (defun viper-exec-Yank (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1432 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1433 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1434 (viper-enlarge-region (mark t) (point))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1435 (let (lines-saved)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1436 (if viper-use-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1437 (progn
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1438 (cond ((viper-valid-register viper-use-register '(letter digit))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1439 (copy-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1440 viper-use-register (mark t) (point) nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1441 ((viper-valid-register viper-use-register '(Letter))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1442 (viper-append-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1443 (downcase viper-use-register) (mark t) (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1444 (t (setq viper-use-register nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1445 (error viper-InvalidRegister viper-use-register)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1446 (setq viper-use-register nil)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1447 (setq last-command nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1448 (copy-region-as-kill (mark t) (point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1449 (setq lines-saved (count-lines (mark t) (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1450 (if (> lines-saved viper-change-notification-threshold)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1451 (message "Saved %d lines" lines-saved))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1452 (viper-deactivate-mark)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1453 (goto-char viper-com-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1454
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1455 (defun viper-exec-bang (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1456 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1457 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1458 (viper-enlarge-region (mark t) (point))
18958
506ec0258d63 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18855
diff changeset
1459 (exchange-point-and-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1460 (shell-command-on-region
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1461 (mark t) (point)
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1462 (if (viper= com ?!)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1463 (setq viper-last-shell-com
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1464 (viper-read-string-with-history
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1465 "!"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1466 nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1467 'viper-shell-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1468 (car viper-shell-history)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1469 ))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1470 viper-last-shell-com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1471 t)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1472
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1473 (defun viper-exec-equals (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1474 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1475 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1476 (viper-enlarge-region (mark t) (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1477 (if (> (mark t) (point)) (exchange-point-and-mark))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1478 (indent-region (mark t) (point) nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1479
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1480 (defun viper-exec-shift (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1481 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1482 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1483 (viper-enlarge-region (mark t) (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1484 (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
1485 (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
1486 (if (viper= com ?>)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1487 viper-shift-width
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1488 (- viper-shift-width))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1489 ;; return point to where it was before shift
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1490 (goto-char viper-com-point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1491
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1492 ;; this is needed because some commands fake com by setting it to ?r, which
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1493 ;; denotes repeated insert command.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1494 (defsubst viper-exec-dummy (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1495 nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1496
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1497 (defun viper-exec-buffer-search (m-com com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1498 (setq viper-s-string (buffer-substring (point) viper-com-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1499 (setq viper-s-forward t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1500 (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
1501 (setq viper-intermediate-command 'viper-exec-buffer-search)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1502 (viper-search viper-s-string viper-s-forward 1))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1503
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1504 (defvar viper-exec-array (make-vector 128 nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1505
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1506 ;; 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
1507 ;; without affecting other functions. Buffer search can now be bound
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1508 ;; to any character.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1509
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1510 (aset viper-exec-array ?c 'viper-exec-change)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1511 (aset viper-exec-array ?C 'viper-exec-Change)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1512 (aset viper-exec-array ?d 'viper-exec-delete)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1513 (aset viper-exec-array ?D 'viper-exec-Delete)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1514 (aset viper-exec-array ?y 'viper-exec-yank)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1515 (aset viper-exec-array ?Y 'viper-exec-Yank)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1516 (aset viper-exec-array ?r 'viper-exec-dummy)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1517 (aset viper-exec-array ?! 'viper-exec-bang)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1518 (aset viper-exec-array ?< 'viper-exec-shift)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1519 (aset viper-exec-array ?> 'viper-exec-shift)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1520 (aset viper-exec-array ?= 'viper-exec-equals)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1521
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1522
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1523
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1524 ;; 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
1525 ;; destructive command on the region specified by the movement command. For
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1526 ;; instance, if the user types cw, then the command viper-forward-word will
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1527 ;; call viper-execute-com to execute viper-exec-change, which eventually will
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1528 ;; call viper-change to invoke the replace mode on the region.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1529 ;;
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1530 ;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1531 ;; via a call to viper-set-destructive-command, for later use by viper-repeat.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1532 (defun viper-execute-com (m-com val com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1533 (let ((reg viper-use-register))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1534 ;; this is the special command `#'
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1535 (if (> com 128)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1536 (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
1537 (let ((fn (aref viper-exec-array com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1538 (if (null fn)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1539 (error "%c: %s" com viper-InvalidViCommand)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1540 (funcall fn m-com com))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1541 (if (viper-dotable-command-p com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1542 (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
1543 (list m-com val com reg nil nil)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1544 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1545
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1546
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1547 (defun viper-repeat (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1548 "Re-execute last destructive command.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1549 Use the info in viper-d-com, which has the form
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1550 \(com val ch reg inserted-text command-keys\),
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1551 where `com' is the command to be re-executed, `val' is the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1552 argument to `com', `ch' is a flag for repeat, and `reg' is optional;
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1553 if it exists, it is the name of the register for `com'.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1554 If the prefix argument, ARG, is non-nil, it is used instead of `val'."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1555 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1556 (let ((save-point (point)) ; save point before repeating prev cmd
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1557 ;; Pass along that we are repeating a destructive command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1558 ;; This tells viper-set-destructive-command not to update
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1559 ;; viper-command-ring
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1560 (viper-intermediate-command 'viper-repeat))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1561 (if (eq last-command 'viper-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1562 ;; if the last command was viper-undo, then undo-more
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1563 (viper-undo-more)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1564 ;; otherwise execute the command stored in viper-d-com. if arg is
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1565 ;; non-nil its prefix value is used as new prefix value for the command.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1566 (let ((m-com (car viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1567 (val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1568 (com (nth 2 viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1569 (reg (nth 3 viper-d-com)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1570 (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
1571 (if (null m-com) (error "No previous command to repeat"))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1572 (setq viper-use-register reg)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1573 (if (nth 4 viper-d-com) ; text inserted by command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1574 (setq viper-last-insertion (nth 4 viper-d-com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1575 viper-d-char (nth 4 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1576 (funcall m-com (cons val com))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1577 (cond ((and (< save-point (point)) viper-keep-point-on-repeat)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
1578 (goto-char save-point)) ; go back to before repeat.
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1579 ((and (< save-point (point)) viper-ex-style-editing)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
1580 (or (bolp) (backward-char 1))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1581 (if (and (eolp) (not (bolp)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1582 (backward-char 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1583 ))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1584 (viper-adjust-undo) ; take care of undo
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1585 ;; 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
1586 ;; just executed a command from that ring. So, push it on the ring again.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1587 ;; If we are just executing previous command , then don't push viper-d-com
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1588 ;; 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
1589 ;; the inserted text may be nil). Besides, in this case, the command
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1590 ;; executed by `.' is already on the ring.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1591 (if (eq last-command 'viper-display-current-destructive-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1592 (viper-push-onto-ring viper-d-com 'viper-command-ring))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1593 (viper-deactivate-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1594 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1595
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1596 (defun viper-repeat-from-history ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1597 "Repeat a destructive command from history.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1598 Doesn't change viper-command-ring in any way, so `.' will work as before
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1599 executing this command.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1600 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
1601 the second character is a digit 0 to 9. The digit indicates which
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1602 history command to execute. `<char>0' is equivalent to `.', `<char>1'
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1603 invokes the command before that, etc."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1604 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1605 (let* ((viper-intermediate-command 'repeating-display-destructive-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1606 (idx (cond (viper-this-kbd-macro
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1607 (string-to-number
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1608 (symbol-name (elt viper-this-kbd-macro 1))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1609 (t 0)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1610 (num idx)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1611 (viper-d-com viper-d-com))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1612
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1613 (or (and (numberp num) (<= 0 num) (<= num 9))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1614 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1615 (setq idx 0
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1616 num 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1617 (message
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1618 "`viper-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'")))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1619 (while (< 0 num)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1620 (setq viper-d-com (viper-special-ring-rotate1 viper-command-ring -1))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1621 (setq num (1- num)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1622 (viper-repeat nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1623 (while (> idx num)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1624 (viper-special-ring-rotate1 viper-command-ring 1)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1625 (setq num (1+ num)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1626 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1627
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1628
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1629 ;; The hash-command. It is invoked interactively by the key sequence #<char>.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1630 ;; The chars that can follow `#' are determined by viper-hash-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1631 (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
1632 (cond ((viper= char ?c)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1633 (downcase-region (min viper-com-point (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1634 (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
1635 ((viper= char ?C)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1636 (upcase-region (min viper-com-point (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1637 (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
1638 ((viper= char ?g)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1639 (push-mark viper-com-point t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1640 (viper-global-execute))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1641 ((viper= char ?q)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1642 (push-mark viper-com-point t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1643 (viper-quote-region))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1644 ((viper= char ?s)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1645 (funcall viper-spell-function viper-com-point (point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1646 (t (error "#%c: %s" char viper-InvalidViCommand))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1647
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1648
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1649 ;; undoing
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1650
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1651 (defun viper-undo ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1652 "Undo previous change."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1653 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1654 (message "undo!")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1655 (let ((modified (buffer-modified-p))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1656 (before-undo-pt (point-marker))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1657 (after-change-functions after-change-functions)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1658 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
1659
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1660 ;; no need to remove this hook, since this var has scope inside a let.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1661 (add-hook 'after-change-functions
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1662 '(lambda (beg end len)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1663 (setq undo-beg-posn beg
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1664 undo-end-posn (or end beg))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1665
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1666 (undo-start)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1667 (undo-more 2)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1668 (setq undo-beg-posn (or undo-beg-posn before-undo-pt)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1669 undo-end-posn (or undo-end-posn undo-beg-posn))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1670
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1671 (goto-char undo-beg-posn)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1672 (sit-for 0)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1673 (if (and viper-keep-point-on-undo
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1674 (pos-visible-in-window-p before-undo-pt))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1675 (progn
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1676 (push-mark (point-marker) t)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1677 (viper-sit-for-short 300)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1678 (goto-char undo-end-posn)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1679 (viper-sit-for-short 300)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1680 (if (and (> (viper-chars-in-region undo-beg-posn before-undo-pt) 1)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1681 (> (viper-chars-in-region undo-end-posn before-undo-pt) 1))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1682 (goto-char before-undo-pt)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1683 (goto-char undo-beg-posn)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1684 (push-mark before-undo-pt t))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1685 (if (and (eolp) (not (bolp))) (backward-char 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1686 (if (not modified) (set-buffer-modified-p t)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1687 (setq this-command 'viper-undo))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1688
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1689 ;; Continue undoing previous changes.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1690 (defun viper-undo-more ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1691 (message "undo more!")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1692 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1693 (undo-more 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1694 (error (beep)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1695 (message "No further undo information in this buffer")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1696 (if (and (eolp) (not (bolp))) (backward-char 1))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1697 (setq this-command 'viper-undo))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1698
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1699 ;; The following two functions are used to set up undo properly.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1700 ;; 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
1701 ;; they are undone all at once.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1702 (defun viper-adjust-undo ()
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1703 (if viper-undo-needs-adjustment
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1704 (let ((inhibit-quit t)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1705 tmp tmp2)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1706 (setq viper-undo-needs-adjustment nil)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1707 (if (listp buffer-undo-list)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1708 (if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1709 (progn
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1710 (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
1711
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1712 ;; cut tail from buffer-undo-list temporarily by direct
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1713 ;; manipulation with pointers in buffer-undo-list
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1714 (setcdr tmp nil)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1715
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1716 (setq buffer-undo-list (delq nil buffer-undo-list))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1717 (setq buffer-undo-list
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1718 (delq viper-buffer-undo-list-mark buffer-undo-list))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1719 ;; restore tail of buffer-undo-list
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1720 (setq buffer-undo-list (nconc buffer-undo-list tmp2)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1721 (setq buffer-undo-list (delq nil buffer-undo-list)))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1722 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1723
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1724
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1725 (defun viper-set-complex-command-for-undo ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1726 (if (listp buffer-undo-list)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1727 (if (not viper-undo-needs-adjustment)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1728 (let ((inhibit-quit t))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1729 (setq buffer-undo-list
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1730 (cons viper-buffer-undo-list-mark buffer-undo-list))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1731 (setq viper-undo-needs-adjustment t)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1732
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1733
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1734
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1735
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1736 (defun viper-display-current-destructive-command ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1737 (let ((text (nth 4 viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1738 (keys (nth 5 viper-d-com))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1739 (max-text-len 30))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1740
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1741 (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
1742
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1743 (message " `.' runs %s%s"
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1744 (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
1745 (viper-abbreviate-string
19079
dfbef8117c6a new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19078
diff changeset
1746 (if viper-xemacs-p
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1747 (replace-in-string
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1748 (cond ((characterp text) (char-to-string text))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1749 ((stringp text) text)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1750 (t ""))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1751 "\n" "^J")
19079
dfbef8117c6a new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19078
diff changeset
1752 text)
dfbef8117c6a new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19078
diff changeset
1753 max-text-len
dfbef8117c6a new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19078
diff changeset
1754 " inserting `" "'" " ......."))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1755 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1756
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1757
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1758 ;; don't change viper-d-com if it was viper-repeat command invoked with `.'
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1759 ;; or in some other way (non-interactively).
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1760 (defun viper-set-destructive-command (list)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1761 (or (eq viper-intermediate-command 'viper-repeat)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1762 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1763 (setq viper-d-com list)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1764 (setcar (nthcdr 5 viper-d-com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1765 (viper-array-to-string (if (arrayp viper-this-command-keys)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1766 viper-this-command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1767 (this-command-keys))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1768 (viper-push-onto-ring viper-d-com 'viper-command-ring)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1769 (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
1770
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1771
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1772 (defun viper-prev-destructive-command (next)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1773 "Find previous destructive command in the history of destructive commands.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1774 With prefix argument, find next destructive command."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1775 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1776 (let (cmd viper-intermediate-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1777 (if (eq last-command 'viper-display-current-destructive-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1778 ;; repeated search through command history
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1779 (setq viper-intermediate-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1780 'repeating-display-destructive-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1781 ;; first search through command history--set temp ring
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1782 (setq viper-temp-command-ring (copy-list viper-command-ring)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1783 (setq cmd (if next
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1784 (viper-special-ring-rotate1 viper-temp-command-ring 1)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1785 (viper-special-ring-rotate1 viper-temp-command-ring -1)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1786 (if (null cmd)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1787 ()
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1788 (setq viper-d-com cmd))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1789 (viper-display-current-destructive-command)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1790
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1791
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1792 (defun viper-next-destructive-command ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1793 "Find next destructive command in the history of destructive commands."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1794 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1795 (viper-prev-destructive-command 'next))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1796
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1797
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1798 (defun viper-insert-prev-from-insertion-ring (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1799 "Cycle through insertion ring in the direction of older insertions.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1800 Undoes previous insertion and inserts new.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1801 With prefix argument, cycles in the direction of newer elements.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1802 In minibuffer, this command executes whatever the invocation key is bound
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1803 to in the global map, instead of cycling through the insertion ring."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1804 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1805 (let (viper-intermediate-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1806 (if (eq last-command 'viper-insert-from-insertion-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1807 (progn ; repeated search through insertion history
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1808 (setq viper-intermediate-command 'repeating-insertion-from-ring)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1809 (if (eq viper-current-state 'replace-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1810 (undo 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1811 (if viper-last-inserted-string-from-insertion-ring
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1812 (backward-delete-char
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1813 (length viper-last-inserted-string-from-insertion-ring))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1814 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1815 ;;first search through insertion history
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1816 (setq viper-temp-insertion-ring (copy-list viper-insertion-ring)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1817 (setq this-command 'viper-insert-from-insertion-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1818 ;; so that things will be undone properly
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1819 (setq buffer-undo-list (cons nil buffer-undo-list))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1820 (setq viper-last-inserted-string-from-insertion-ring
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1821 (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
1822
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1823 ;; this change of viper-intermediate-command must come after
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1824 ;; viper-special-ring-rotate1, so that the ring will rotate, but before the
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1825 ;; insertion.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1826 (setq viper-intermediate-command nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1827 (if viper-last-inserted-string-from-insertion-ring
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1828 (insert viper-last-inserted-string-from-insertion-ring))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1829 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1830
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1831 (defun viper-insert-next-from-insertion-ring ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1832 "Cycle through insertion ring in the direction of older insertions.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1833 Undo previous insertion and inserts new."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1834 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1835 (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
1836
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1837
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1838
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1839 ;; some region utilities
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1840
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1841 ;; If at the last line of buffer, add \\n before eob, if newline is missing.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1842 (defun viper-add-newline-at-eob-if-necessary ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1843 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1844 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1845 ;; make sure all lines end with newline, unless in the minibuffer or
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1846 ;; when requested otherwise (require-final-newline is nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1847 (if (and (eobp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1848 (not (bolp))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1849 require-final-newline
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1850 (not (viper-is-in-minibuffer))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1851 (not buffer-read-only))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1852 (insert "\n"))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1853
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1854 (defun viper-yank-defun ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1855 (mark-defun)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1856 (copy-region-as-kill (point) (mark t)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1857
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1858 ;; Enlarge region between BEG and END.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1859 (defun viper-enlarge-region (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1860 (or beg (setq beg end)) ; if beg is nil, set to end
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1861 (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
1862
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1863 (if (< beg end)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1864 (progn (goto-char beg) (set-mark end))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1865 (goto-char end)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1866 (set-mark beg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1867 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1868 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1869 (if (or (not (eobp)) (not (bolp))) (forward-line 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1870 (if (not (eobp)) (beginning-of-line))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1871 (if (> beg end) (exchange-point-and-mark)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1872
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1873
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1874 ;; Quote region by each line with a user supplied string.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1875 (defun viper-quote-region ()
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1876 (let ((quote-str viper-quote-string)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1877 (donot-change-dafault t))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1878 (setq quote-str
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1879 (viper-read-string-with-history
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1880 "Quote string: "
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1881 nil
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1882 'viper-quote-region-history
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1883 (cond ((string-match "tex.*-mode" (symbol-name major-mode)) "%%")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1884 ((string-match "java.*-mode" (symbol-name major-mode)) "//")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1885 ((string-match "perl.*-mode" (symbol-name major-mode)) "#")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1886 ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1887 ((memq major-mode '(c-mode cc-mode c++-mode)) "//")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1888 ((memq major-mode '(sh-mode shell-mode)) "#")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1889 (t (setq donot-change-dafault nil)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1890 quote-str))))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1891 (or donot-change-dafault
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1892 (setq viper-quote-string quote-str))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1893 (viper-enlarge-region (point) (mark t))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1894 (if (> (point) (mark t)) (exchange-point-and-mark))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1895 (insert quote-str)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1896 (beginning-of-line)
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1897 (forward-line 1)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1898 (while (and (< (point) (mark t)) (bolp))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1899 (insert quote-str)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1900 (beginning-of-line)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1901 (forward-line 1))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1902
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1903 ;; Tells whether BEG is on the same line as END.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1904 ;; If one of the args is nil, it'll return nil.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1905 (defun viper-same-line (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1906 (let ((selective-display nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1907 (incr 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1908 temp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1909 (if (and beg end (> beg end))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1910 (setq temp beg
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1911 beg end
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1912 end temp))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1913 (if (and beg end)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1914 (cond ((or (> beg (point-max)) (> end (point-max))) ; out of range
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1915 nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1916 (t
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1917 ;; This 'if' is needed because Emacs treats the next empty line
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1918 ;; as part of the previous line.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1919 (if (= (viper-line-pos 'start) end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1920 (setq incr 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1921 (<= (+ incr (count-lines beg end)) 1))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1922 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1923
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1924
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1925 ;; Check if the string ends with a newline.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1926 (defun viper-end-with-a-newline-p (string)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1927 (or (string= string "")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1928 (= (viper-seq-last-elt string) ?\n)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1929
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1930 (defun viper-tmp-insert-at-eob (msg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1931 (let ((savemax (point-max)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1932 (goto-char savemax)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1933 (insert msg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1934 (sit-for 2)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1935 (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
1936 ))
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1937
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1938
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1939
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1940 ;;; Minibuffer business
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1941
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1942 (defsubst viper-set-minibuffer-style ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1943 (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1944
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1945
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1946 (defun viper-minibuffer-setup-sentinel ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1947 (let ((hook (if viper-vi-style-in-minibuffer
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1948 'viper-change-state-to-insert
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1949 'viper-change-state-to-emacs)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1950 (funcall hook)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1951 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1952
26743
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1953 ;; 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
1954 ;; A dirty feature, but it is the simplest way to have it do the right thing.
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1955 ;; 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
1956 ;; viper-read-string-with-history
26743
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1957 (defun viper-minibuffer-standard-hook ()
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1958 (if (stringp init-message)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1959 (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
1960 (if (stringp initial)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1961 (progn
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1962 ;; 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
1963 (or unread-command-events
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1964 executing-kbd-macro
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1965 (sit-for 840))
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1966 (if (fboundp 'minibuffer-prompt-end)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1967 (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
1968 (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
1969 (insert initial))))
26743
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1970
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1971 (defsubst viper-minibuffer-real-start ()
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1972 (if (fboundp 'minibuffer-prompt-end)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1973 (minibuffer-prompt-end)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1974 (point-min)))
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
1975
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1976
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1977 ;; Interpret last event in the local map first; if fails, use exit-minibuffer.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1978 ;; Run viper-minibuffer-exit-hook before exiting.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1979 (defun viper-exit-minibuffer ()
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1980 "Exit minibuffer Viper way."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1981 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1982 (let (command)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1983 (setq command (local-key-binding (char-to-string last-command-char)))
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1984 (run-hooks 'viper-minibuffer-exit-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1985 (if command
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1986 (command-execute command)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1987 (exit-minibuffer))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1988
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1989
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1990 (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
1991 '("" "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
1992 "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
1993 "*List of suffixes that Viper tries to append to filenames ending with a `.'.
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1994 This is useful when you the current directory contains files with the same
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1995 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
1996 represents an editable file. However, file completion will stop at the `.'
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1997 The smart suffix feature lets you hit RET in such a case, and Viper will
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1998 select the appropriate suffix.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1999
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2000 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
2001 corresponding file exists is selected. If no file exists for any of the
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2002 suffixes, the user is asked to confirm.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2003
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2004 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
2005 :type '(repeat string)
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
2006 :group 'viper-misc)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2007
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2008
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2009 ;; Try to add a suitable suffix to files whose name ends with a `.'
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2010 ;; Useful when the user hits RET on a non-completed file name.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2011 ;; Used as a minibuffer exit hook in read-file-name
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2012 (defun viper-file-add-suffix ()
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2013 (let ((count 0)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2014 (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
2015 (file (buffer-substring-no-properties
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2016 (viper-minibuffer-real-start) (point-max)))
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2017 found key cmd suff)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2018 (goto-char (point-max))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2019 (if (and viper-smart-suffix-list (string-match "\\.$" file))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2020 (progn
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2021 (while (and (not found) (< count len))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2022 (setq suff (nth count viper-smart-suffix-list)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2023 count (1+ count))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2024 (if (file-exists-p
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2025 (format "%s%s" (substitute-in-file-name file) suff))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2026 (progn
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2027 (setq found t)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2028 (insert suff))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2029
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2030 (if found
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2031 ()
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2032 (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
2033 (unwind-protect
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2034 (while (not (memq cmd
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2035 '(exit-minibuffer viper-exit-minibuffer)))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2036 (setq cmd
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2037 (key-binding (setq key (read-key-sequence nil))))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2038 (cond ((eq cmd 'self-insert-command)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2039 (if viper-xemacs-p
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2040 (insert (events-to-keys key))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2041 (insert key)))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2042 ((memq cmd '(exit-minibuffer viper-exit-minibuffer))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2043 nil)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2044 (t (command-execute cmd)))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2045 )))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2046 ))))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2047
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2048
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2049 (defun viper-minibuffer-trim-tail ()
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2050 "Delete junk at the end of the first line of the minibuffer input.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2051 Remove this function from `viper-minibuffer-exit-hook', if this causes
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2052 problems."
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2053 (if (viper-is-in-minibuffer)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2054 (progn
26743
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2055 (goto-char (viper-minibuffer-real-start))
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2056 (end-of-line)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2057 (delete-region (point) (point-max)))))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2058
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2059
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2060 ;;; Reading string with history
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2061
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2062 (defun viper-read-string-with-history (prompt &optional initial
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2063 history-var default keymap
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2064 init-message)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2065 ;; Read string, prompting with PROMPT and inserting the INITIAL
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2066 ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2067 ;; input is an empty string.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2068 ;; 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
2069 ;; minibuffer.
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2070 ;; KEYMAP is used, if given, instead of minibuffer-local-map.
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2071 ;; INIT-MESSAGE is the message temporarily displayed after entering the
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2072 ;; minibuffer.
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2073 (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
2074 ;; 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
2075 (let ((old
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2076 (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
2077 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
2078 nil)))
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2079 (cons
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2080 '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
2081 (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
2082 (list old) old))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2083 (val "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2084 (padding "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2085 temp-msg)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2086
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2087 (setq keymap (or keymap minibuffer-local-map)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2088 initial (or initial "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2089 temp-msg (if default
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2090 (format "(default: %s) " default)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2091 ""))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2092
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2093 (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
2094 (setq val (read-from-minibuffer prompt
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2095 (concat temp-msg initial val padding)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2096 keymap nil history-var))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2097 (setq minibuffer-setup-hook nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2098 padding (viper-array-to-string (this-command-keys))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2099 temp-msg "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2100 ;; the following tries to be smart about what to put in history
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2101 (if (not (string= val (car (eval history-var))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2102 (set history-var (cons val (eval history-var))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2103 (if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2104 (string= (nth 0 (eval history-var)) ""))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2105 (set history-var (cdr (eval history-var))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2106 ;; 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
2107 ;; viper-command-argument, or `! shell-command', this probably means
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2108 ;; that the user typed something then erased. Return "" in this case, not
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2109 ;; the default---the default is too confusing in this case.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2110 (cond ((and (string= val "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2111 (not (string= prompt "!")) ; was a `! shell-command'
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2112 (not (memq last-command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2113 '(viper-ex
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2114 viper-command-argument
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2115 t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2116 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2117 "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2118 ((string= val "") (or default ""))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2119 (t val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2120 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2121
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2122
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2123
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2124 ;; insertion commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2125
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2126 ;; Called when state changes from Insert Vi command mode.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2127 ;; Repeats the insertion command if Insert state was entered with prefix
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2128 ;; argument > 1.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2129 (defun viper-repeat-insert-command ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2130 (let ((i-com (car viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2131 (val (nth 1 viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2132 (char (nth 2 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2133 (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
2134 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2135 (setq viper-d-com (list i-com (1- val) ?r nil nil nil))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2136 (viper-repeat nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2137 (setq viper-d-com (list i-com val char nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2138 ))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2139
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2140 (defun viper-insert (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2141 "Insert before point."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2142 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2143 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2144 (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
2145 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2146 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2147 (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
2148 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2149 (viper-loop val (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2150 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2151
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2152 (defun viper-append (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2153 "Append after point."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2154 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2155 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2156 (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
2157 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2158 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2159 (viper-set-destructive-command (list 'viper-append val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2160 (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
2161 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2162 (viper-loop val (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2163 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2164
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2165 (defun viper-Append (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2166 "Append at end of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2167 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2168 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2169 (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
2170 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2171 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2172 (viper-set-destructive-command (list 'viper-Append val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2173 (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
2174 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2175 (viper-loop val (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2176 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2177
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2178 (defun viper-Insert (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2179 "Insert before first non-white."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2180 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2181 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2182 (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
2183 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2184 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2185 (viper-set-destructive-command (list 'viper-Insert val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2186 (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
2187 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2188 (viper-loop val (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2189 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2190
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2191 (defun viper-open-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2192 "Open line below."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2193 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2194 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2195 (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
2196 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2197 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2198 (viper-set-destructive-command (list 'viper-open-line val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2199 (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
2200 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2201 (viper-loop val
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2202 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2203 (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
2204 (viper-indent-line col)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2205 (viper-yank-last-insertion))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2206 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2207 (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
2208 (viper-indent-line col)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2209 (viper-change-state-to-insert)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2210
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2211 (defun viper-Open-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2212 "Open line above."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2213 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2214 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2215 (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
2216 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2217 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2218 (viper-set-destructive-command (list 'viper-Open-line val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2219 (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
2220 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2221 (viper-loop val
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2222 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2223 (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
2224 (viper-indent-line col)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2225 (viper-yank-last-insertion))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2226 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2227 (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
2228 (viper-indent-line col)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2229 (viper-change-state-to-insert)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2230
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2231 (defun viper-open-line-at-point (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2232 "Open line at point."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2233 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2234 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2235 (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
2236 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2237 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2238 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2239 (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
2240 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2241 (viper-loop val
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2242 (open-line 1)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2243 (viper-yank-last-insertion))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2244 (open-line 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2245 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2246
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2247 ;; bound to s
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2248 (defun viper-substitute (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2249 "Substitute characters."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2250 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2251 (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
2252 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2253 )
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2254 (push-mark nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2255 (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
2256 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2257 (viper-change-subr (mark t) (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2258 (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
2259 ;; com is set to ?r when we repeat this comand with dot
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2260 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2261 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2262
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2263 ;; Command bound to S
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2264 (defun viper-substitute-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2265 "Substitute lines."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2266 (interactive "p")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2267 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2268 (viper-line (cons arg ?C)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2269
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2270 ;; Prepare for replace
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2271 (defun viper-start-replace ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2272 (setq viper-began-as-replace t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2273 viper-sitting-in-replace t
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2274 viper-replace-chars-to-delete 0)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2275 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2276 'viper-after-change-functions 'viper-replace-mode-spy-after t 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2277 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2278 'viper-before-change-functions 'viper-replace-mode-spy-before t 'local)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2279 ;; this will get added repeatedly, but no harm
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2280 (add-hook 'after-change-functions 'viper-after-change-sentinel t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2281 (add-hook 'before-change-functions 'viper-before-change-sentinel t)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2282 (viper-move-marker-locally
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2283 'viper-last-posn-in-replace-region (viper-replace-start))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2284 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2285 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2286 t 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2287 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2288 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2289 ;; guard against a smartie who switched from R-replace to normal replace
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2290 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2291 '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
2292 (if overwrite-mode (overwrite-mode -1))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2293 )
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2294
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2295
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2296 (defun viper-replace-mode-spy-before (beg end)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2297 (setq viper-replace-region-chars-deleted (viper-chars-in-region beg end))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2298 )
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2299
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2300 ;; 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
2301 ;; 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
2302 ;; if this command performs several separate buffer changes. Therefore, if
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2303 ;; 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
2304 ;; deleted.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2305 (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
2306 (if (memq viper-intermediate-command
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2307 '(dabbrev-expand hippie-expand repeating-insertion-from-ring))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2308 ;; Take special care of text insertion from insertion ring inside
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2309 ;; replacement overlays.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2310 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2311 (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
2312 (viper-move-marker-locally
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2313 '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
2314
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2315 (let* ((real-end (min end (viper-replace-end)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2316 (column-shift (- (save-excursion (goto-char real-end)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2317 (current-column))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2318 (save-excursion (goto-char beg)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2319 (current-column))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2320 (chars-deleted 0))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2321
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2322 (if (> length 0)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2323 (setq chars-deleted viper-replace-region-chars-deleted))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2324 (setq viper-replace-region-chars-deleted 0)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2325 (setq viper-replace-chars-to-delete
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2326 (+ viper-replace-chars-to-delete
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2327 (-
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2328 ;; if column shift is bigger, due to a TAB insertion, take
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2329 ;; column-shift instead of the number of inserted chars
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2330 (max (viper-chars-in-region beg real-end)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2331 ;; This test accounts for Chinese/Japanese/... chars,
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2332 ;; which occupy 2 columns instead of one. If we use
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2333 ;; 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
2334 ;; one when the user types one Chinese character.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2335 ;; Deleting two would be OK, if they were European chars,
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2336 ;; but it is not OK if they are Chinese chars.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2337 ;; Since it is hard to
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2338 ;; figure out which characters are being deleted in any
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2339 ;; given region, we decided to treat Eastern and European
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2340 ;; characters equally, even though Eastern chars may
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2341 ;; occupy more columns.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2342 (if (memq this-command '(self-insert-command
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2343 quoted-insert viper-insert-tab))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2344 column-shift
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2345 0))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2346 ;; the number of deleted chars
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2347 chars-deleted)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2348
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2349 (viper-move-marker-locally
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2350 'viper-last-posn-in-replace-region
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2351 (max (if (> end (viper-replace-end)) (viper-replace-end) end)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2352 (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
2353 (viper-replace-start))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2354 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2355
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2356 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2357
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2358
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2359 ;; Delete stuff between viper-last-posn-in-replace-region and the end of
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2360 ;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2361 ;; the overlay and current point is before the end of the overlay.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2362 ;; Don't delete anything if current point is past the end of the overlay.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2363 (defun viper-finish-change ()
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2364 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2365 'viper-after-change-functions 'viper-replace-mode-spy-after 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2366 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2367 'viper-before-change-functions 'viper-replace-mode-spy-before 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2368 (remove-hook
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2369 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2370 (remove-hook
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2371 '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
2372 (viper-restore-cursor-color 'after-replace-mode)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2373 (setq viper-sitting-in-replace nil) ; just in case we'll need to know it
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2374 (save-excursion
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2375 (if (and viper-replace-overlay
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2376 (viper-pos-within-region viper-last-posn-in-replace-region
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2377 (viper-replace-start)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2378 (viper-replace-end))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2379 (< (point) (viper-replace-end)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2380 (delete-region
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2381 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
2382
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2383 (if (eq viper-current-state 'replace-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2384 (viper-downgrade-to-insert))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2385 ;; replace mode ended => nullify viper-last-posn-in-replace-region
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2386 (viper-move-marker-locally 'viper-last-posn-in-replace-region nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2387 (viper-hide-replace-overlay)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2388 (viper-refresh-mode-line)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2389 (viper-put-string-on-kill-ring viper-last-replace-region)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2390 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2391
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2392 ;; Make STRING be the first element of the kill ring.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2393 (defun viper-put-string-on-kill-ring (string)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2394 (setq kill-ring (cons string kill-ring))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2395 (if (> (length kill-ring) kill-ring-max)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2396 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2397 (setq kill-ring-yank-pointer kill-ring))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2398
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2399 (defun viper-finish-R-mode ()
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2400 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2401 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2402 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2403 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2404 (viper-downgrade-to-insert))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2405
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2406 (defun viper-start-R-mode ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2407 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2408 (overwrite-mode 1)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2409 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2410 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2411 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2412 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2413 ;; guard against a smartie who switched from R-replace to normal replace
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2414 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2415 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2416 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2417
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2418
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2419
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2420 (defun viper-replace-state-exit-cmd ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2421 "Binding for keys that cause Replace state to switch to Vi or to Insert.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2422 These keys are ESC, RET, and LineFeed"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2423 (interactive)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2424 (if overwrite-mode ; if in replace mode invoked via 'R'
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2425 (viper-finish-R-mode)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2426 (viper-finish-change))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2427 (let (com)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2428 (if (eq this-command 'viper-intercept-ESC-key)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2429 (setq com 'viper-exit-insert-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2430 (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
2431 (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
2432
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2433 (condition-case conds
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2434 (command-execute com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2435 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2436 (viper-message-conditions conds)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2437 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2438 (viper-hide-replace-overlay))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2439
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2440
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2441 (defun viper-replace-state-carriage-return ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2442 "Carriage return in Viper replace state."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2443 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2444 ;; If Emacs start supporting overlay maps, as it currently supports
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2445 ;; 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
2446 ;; just have keymap attached to replace overlay. Then the "if part" of this
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2447 ;; statement can be deleted.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2448 (if (or (< (point) (viper-replace-start))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2449 (> (point) (viper-replace-end)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2450 (let (viper-replace-minor-mode com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2451 (viper-set-unread-command-events last-input-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2452 (setq com (key-binding (read-key-sequence nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2453 (condition-case conds
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2454 (command-execute com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2455 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2456 (viper-message-conditions conds))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2457 (if (not viper-allow-multiline-replace-regions)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2458 (viper-replace-state-exit-cmd)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2459 (if (viper-same-line (point) (viper-replace-end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2460 (viper-replace-state-exit-cmd)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2461 ;; delete the rest of line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2462 (delete-region (point) (viper-line-pos 'end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2463 (save-excursion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2464 (end-of-line)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2465 (if (eobp) (error "Last line in buffer")))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2466 ;; skip to the next line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2467 (forward-line 1)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2468 (back-to-indentation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2469 ))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2470
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2471
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2472 ;; This is the function bound to 'R'---unlimited replace.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2473 ;; 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
2474 (defun viper-overwrite (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2475 "Begin overwrite mode."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2476 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2477 (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
2478 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2479 (len))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2480 (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
2481 (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
2482 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2483 ;; Viper saves inserted text in viper-last-insertion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2484 (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
2485 (delete-char (min len (- (point-max) (point) 1)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2486 (viper-loop val (viper-yank-last-insertion)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2487 (setq last-command 'viper-overwrite)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2488 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2489 (viper-set-replace-overlay (point) (viper-line-pos 'end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2490 (viper-change-state-to-replace)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2491 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2492
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2493
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2494 ;; line commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2495
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2496 (defun viper-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2497 (let ((val (car arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2498 (com (cdr arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2499 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2500 (if (not (eobp))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2501 (viper-next-line-carefully (1- val)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2502 ;; 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
2503 ;; last line of buffer when this line has no \n.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2504 (viper-add-newline-at-eob-if-necessary)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2505 (viper-execute-com 'viper-line val com))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2506 (if (and (eobp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2507 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2508
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2509 (defun viper-yank-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2510 "Yank ARG lines (in Vi's sense)."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2511 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2512 (let ((val (viper-p-val arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2513 (viper-line (cons val ?Y))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2514
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2515
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2516 ;; region commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2517
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2518 (defun viper-region (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2519 "Execute command on a region."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2520 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2521 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2522 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2523 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2524 (exchange-point-and-mark)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2525 (viper-execute-com 'viper-region val com)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2526
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2527 (defun viper-Region (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2528 "Execute command on a Region."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2529 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2530 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2531 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2532 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2533 (exchange-point-and-mark)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2534 (viper-execute-com 'viper-Region val com)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2535
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2536 (defun viper-replace-char (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2537 "Replace the following ARG chars by the character read."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2538 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2539 (if (and (eolp) (bolp)) (error "No character to replace here"))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2540 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2541 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2542 (viper-replace-char-subr com val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2543 (if (and (eolp) (not (bolp))) (forward-char 1))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2544 (setq viper-this-command-keys
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2545 (format "%sr" (if (integerp arg) arg "")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2546 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2547 (list 'viper-replace-char val ?r nil viper-d-char nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2548 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2549
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2550 (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
2551 (let ((inhibit-quit t)
25dc021070bc 2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39215
diff changeset
2552 char)
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2553 (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
2554 (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
2555 (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
2556
39901
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2557 ;; Is this needed?
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2558 (if (eq char ?\C-m) (setq char ?\n))
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2559
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2560 (delete-char 1 t)
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2561
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2562 (setq char (if com viper-d-char (viper-char-at-pos 'backward)))
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2563 (if com (insert char))
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2564
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2565 (setq viper-d-char char)
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2566
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2567 (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
2568 (delete-char 1 t)
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2569 (insert char))
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2570
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2571 (viper-adjust-undo)
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2572 (backward-char arg)
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2573 ))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2574
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2575
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2576 ;; basic cursor movement. j, k, l, h commands.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2577
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2578 (defun viper-forward-char (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2579 "Move point right ARG characters (left if ARG negative).
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2580 On reaching end of line, stop and signal error."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2581 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2582 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2583 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2584 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2585 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2586 (if viper-ex-style-motion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2587 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2588 ;; the boundary condition check gets weird here because
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2589 ;; forward-char may be the parameter of a delete, and 'dl' works
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2590 ;; just like 'x' for the last char on a line, so we have to allow
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2591 ;; the forward motion before the 'viper-execute-com', but, of
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2592 ;; course, 'dl' doesn't work on an empty line, so we have to
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2593 ;; catch that condition before 'viper-execute-com'
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2594 (if (and (eolp) (bolp)) (error "") (forward-char val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2595 (if com (viper-execute-com 'viper-forward-char val com))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2596 (if (eolp) (progn (backward-char 1) (error ""))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2597 (forward-char val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2598 (if com (viper-execute-com 'viper-forward-char val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2599
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2600
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2601 (defun viper-backward-char (arg)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2602 "Move point left ARG characters (right if ARG negative).
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2603 On reaching beginning of line, stop and signal error."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2604 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2605 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2606 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2607 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2608 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2609 (if viper-ex-style-motion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2610 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2611 (if (bolp) (error "") (backward-char val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2612 (if com (viper-execute-com 'viper-backward-char val com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2613 (backward-char val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2614 (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
2615
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2616
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2617 ;; 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
2618 ;; Returns distance traveled
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2619 ;; (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
2620 (defun viper-forward-char-carefully (&optional arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2621 (setq arg (or arg 1))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2622 (let ((pt (point)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2623 (condition-case nil
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2624 (forward-char arg)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2625 (error))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2626 (if (< (point) pt) ; arg was negative
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2627 (- (viper-chars-in-region pt (point)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2628 (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
2629
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2630
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2631 ;; Like backward-char, but doesn't move at beg of buffer.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2632 ;; Returns distance traveled
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2633 ;; (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
2634 (defun viper-backward-char-carefully (&optional arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2635 (setq arg (or arg 1))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2636 (let ((pt (point)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2637 (condition-case nil
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2638 (backward-char arg)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2639 (error))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2640 (if (> (point) pt) ; arg was negative
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2641 (viper-chars-in-region pt (point))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2642 (- (viper-chars-in-region pt (point))))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2643
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2644 (defun viper-next-line-carefully (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2645 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2646 (next-line arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2647 (error nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2648
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2649
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2650
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2651 ;;; Word command
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2652
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2653 ;; 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
2654 ;; word movement. When executed with a destructive command, \n is usually left
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2655 ;; 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
2656 ;; word and what is a separator. However, \n is always a separator. Also, if
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2657 ;; viper-syntax-preference is 'vi, then `_' is part of the word.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2658
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2659 ;; skip only one \n
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2660 (defun viper-skip-separators (forward)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2661 (if forward
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2662 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2663 (viper-skip-all-separators-forward 'within-line)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2664 (if (looking-at "\n")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2665 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2666 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2667 (viper-skip-all-separators-forward 'within-line))))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2668 ;; 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
2669 (if (and (eobp) (save-excursion
3649674ebf29 (viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
2670 (viper-backward-char-carefully)
3649674ebf29 (viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
2671 (viper-looking-at-separator)))
3649674ebf29 (viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
2672 (viper-backward-char-carefully))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2673 (viper-skip-all-separators-backward 'within-line)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2674 (viper-backward-char-carefully)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2675 (if (looking-at "\n")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2676 (viper-skip-all-separators-backward 'within-line)
22283
3649674ebf29 (viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
2677 (or (bobp) (forward-char)))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2678
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2679
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2680 (defun viper-forward-word-kernel (val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2681 (while (> val 0)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2682 (cond ((viper-looking-at-alpha)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2683 (viper-skip-alpha-forward "_")
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2684 (viper-skip-separators t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2685 ((viper-looking-at-separator)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2686 (viper-skip-separators t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2687 ((not (viper-looking-at-alphasep))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2688 (viper-skip-nonalphasep-forward)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2689 (viper-skip-separators t)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2690 (setq val (1- val))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2691
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2692 ;; first skip non-newline separators backward, then skip \n. Then, if TWICE is
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2693 ;; non-nil, skip non-\n back again, but don't overshoot the limit LIM.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2694 (defun viper-separator-skipback-special (twice lim)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2695 (let ((prev-char (viper-char-at-pos 'backward))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2696 (saved-point (point)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2697 ;; 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
2698 (while (and (not (viper-memq-char prev-char '(nil \n)))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2699 (< lim (point))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2700 ;; must be non-newline separator
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2701 (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
2702 (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
2703 (viper-memq-char (char-syntax prev-char) '(?\ ?-))))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2704 (viper-backward-char-carefully)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2705 (setq prev-char (viper-char-at-pos 'backward)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2706
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2707 (if (and (< lim (point)) (eq prev-char ?\n))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2708 (backward-char)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2709 ;; If we skipped to the next word and the prefix of this line doesn't
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2710 ;; consist of separators preceded by a newline, then don't skip backwards
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2711 ;; at all.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2712 (goto-char saved-point))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2713 (setq prev-char (viper-char-at-pos 'backward))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2714
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2715 ;; skip again, but make sure we don't overshoot the limit
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2716 (if twice
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
2717 (while (and (not (viper-memq-char prev-char '(nil \n)))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2718 (< lim (point))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2719 ;; must be non-newline separator
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2720 (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
2721 (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
2722 (viper-memq-char (char-syntax prev-char) '(?\ ?-))))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2723 (viper-backward-char-carefully)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2724 (setq prev-char (viper-char-at-pos 'backward))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2725
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2726 (if (= (point) lim)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2727 (viper-forward-char-carefully))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2728 ))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2729
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2730
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2731 (defun viper-forward-word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2732 "Forward word."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2733 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2734 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2735 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2736 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2737 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2738 (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
2739 (if com
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2740 (progn
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2741 (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
2742 (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
2743 ;; 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
2744 ((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
2745 (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
2746 ((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
2747 (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
2748 (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
2749 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2750
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2751
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2752 (defun viper-forward-Word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2753 "Forward word delimited by white characters."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2754 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2755 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2756 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2757 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2758 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2759 (viper-loop val
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2760 (viper-skip-nonseparators 'forward)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2761 (viper-skip-separators t))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2762 (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
2763 (cond ((viper-char-equal com ?c)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2764 (viper-separator-skipback-special 'twice viper-com-point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2765 ;; 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
2766 ((viper-char-equal com ?y)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2767 (viper-separator-skipback-special nil viper-com-point))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2768 ((viper-dotable-command-p com)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2769 (viper-separator-skipback-special nil viper-com-point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2770 (viper-execute-com 'viper-forward-Word val com)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2771
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2772
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2773 ;; this is a bit different from Vi, but Vi's end of word
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2774 ;; makes no sense whatsoever
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2775 (defun viper-end-of-word-kernel ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2776 (if (viper-end-of-word-p) (forward-char))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2777 (if (viper-looking-at-separator)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2778 (viper-skip-all-separators-forward))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2779
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2780 (cond ((viper-looking-at-alpha) (viper-skip-alpha-forward "_"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2781 ((not (viper-looking-at-alphasep)) (viper-skip-nonalphasep-forward)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2782 (viper-backward-char-carefully))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2783
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2784 (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
2785 (or (eobp)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2786 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2787 (cond ((viper-looking-at-alpha)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2788 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2789 (not (viper-looking-at-alpha)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2790 ((not (viper-looking-at-alphasep))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2791 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2792 (viper-looking-at-alphasep))))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2793
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2794
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2795 (defun viper-end-of-word (arg &optional careful)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2796 "Move point to end of current word."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2797 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2798 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2799 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2800 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2801 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2802 (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
2803 (if com
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2804 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2805 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2806 (viper-execute-com 'viper-end-of-word val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2807
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2808 (defun viper-end-of-Word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2809 "Forward to end of word delimited by white character."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2810 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2811 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2812 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2813 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2814 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2815 (viper-loop val
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2816 (viper-end-of-word-kernel)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2817 (viper-skip-nonseparators 'forward)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2818 (backward-char))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2819 (if com
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2820 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2821 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2822 (viper-execute-com 'viper-end-of-Word val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2823
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2824 (defun viper-backward-word-kernel (val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2825 (while (> val 0)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2826 (viper-backward-char-carefully)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2827 (cond ((viper-looking-at-alpha)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2828 (viper-skip-alpha-backward "_"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2829 ((viper-looking-at-separator)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2830 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2831 (viper-skip-separators nil)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2832 (viper-backward-char-carefully)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2833 (cond ((viper-looking-at-alpha)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2834 (viper-skip-alpha-backward "_"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2835 ((not (viper-looking-at-alphasep))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2836 (viper-skip-nonalphasep-backward))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2837 ((bobp)) ; could still be at separator, but at beg of buffer
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2838 (t (forward-char))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2839 ((not (viper-looking-at-alphasep))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2840 (viper-skip-nonalphasep-backward)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2841 (setq val (1- val))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2842
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2843 (defun viper-backward-word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2844 "Backward word."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2845 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2846 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2847 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2848 (com (viper-getcom arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2849 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2850 (let (i)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2851 (if (setq i (save-excursion (backward-char) (looking-at "\n")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2852 (backward-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2853 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2854 (if i (forward-char))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2855 (viper-backward-word-kernel val)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2856 (if com (viper-execute-com 'viper-backward-word val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2857
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2858 (defun viper-backward-Word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2859 "Backward word delimited by white character."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2860 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2861 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2862 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2863 (com (viper-getcom arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2864 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2865 (let (i)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2866 (if (setq i (save-excursion (backward-char) (looking-at "\n")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2867 (backward-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2868 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2869 (if i (forward-char))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2870 (viper-loop val
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2871 (viper-skip-separators nil) ; nil means backward here
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2872 (viper-skip-nonseparators 'backward))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2873 (if com (viper-execute-com 'viper-backward-Word val com))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2874
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2875
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2876
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2877 ;; line commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2878
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2879 (defun viper-beginning-of-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2880 "Go to beginning of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2881 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2882 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2883 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2884 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2885 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2886 (beginning-of-line val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2887 (if com (viper-execute-com 'viper-beginning-of-line val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2888
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2889 (defun viper-bol-and-skip-white (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2890 "Beginning of line at first non-white character."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2891 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2892 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2893 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2894 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2895 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2896 (forward-to-indentation (1- val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2897 (if com (viper-execute-com 'viper-bol-and-skip-white val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2898
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2899 (defun viper-goto-eol (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2900 "Go to end of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2901 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2902 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2903 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2904 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2905 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2906 (end-of-line val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2907 (if com (viper-execute-com 'viper-goto-eol val com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2908 (if viper-ex-style-motion
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2909 (if (and (eolp) (not (bolp))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2910 ;; a fix for viper-change-to-eol
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2911 (not (equal viper-current-state 'insert-state)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2912 (backward-char 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2913 ))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2914
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2915
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2916 (defun viper-goto-col (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2917 "Go to ARG's column."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2918 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2919 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2920 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2921 (com (viper-getcom arg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2922 line-len)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2923 (setq line-len
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2924 (viper-chars-in-region
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2925 (viper-line-pos 'start) (viper-line-pos 'end)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2926 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2927 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2928 (forward-char (1- (min line-len val)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2929 (while (> (current-column) (1- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2930 (backward-char 1))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2931 (if com (viper-execute-com 'viper-goto-col val com))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2932 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2933 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2934 (if (> val (current-column)) (error "")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2935 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2936
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2937
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2938 (defun viper-next-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2939 "Go to next line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2940 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2941 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2942 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2943 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2944 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2945 (next-line val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2946 (if viper-ex-style-motion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2947 (if (and (eolp) (not (bolp))) (backward-char 1)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2948 (setq this-command 'next-line)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2949 (if com (viper-execute-com 'viper-next-line val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2950
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2951 (defun viper-next-line-at-bol (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2952 "Next line at beginning of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2953 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2954 (viper-leave-region-active)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2955 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2956 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2957 (if (eobp) (error "Last line in buffer")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2958 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2959 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2960 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2961 (forward-line val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2962 (back-to-indentation)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2963 (if com (viper-execute-com 'viper-next-line-at-bol val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2964
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2965
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2966 (defun viper-previous-line (arg)
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2967 "Go to previous line."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2968 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2969 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2970 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2971 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2972 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2973 (previous-line val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2974 (if viper-ex-style-motion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2975 (if (and (eolp) (not (bolp))) (backward-char 1)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2976 (setq this-command 'previous-line)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2977 (if com (viper-execute-com 'viper-previous-line val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2978
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2979
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2980 (defun viper-previous-line-at-bol (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2981 "Previous line at beginning of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2982 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2983 (viper-leave-region-active)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2984 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2985 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2986 (if (bobp) (error "First line in buffer")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2987 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2988 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2989 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2990 (forward-line (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2991 (back-to-indentation)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2992 (if com (viper-execute-com 'viper-previous-line val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2993
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2994 (defun viper-change-to-eol (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2995 "Change to end of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2996 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2997 (viper-goto-eol (cons arg ?c)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2998
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2999 (defun viper-kill-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3000 "Delete line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3001 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3002 (viper-goto-eol (cons arg ?d)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3003
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3004 (defun viper-erase-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3005 "Erase line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3006 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3007 (viper-beginning-of-line (cons arg ?d)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3008
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3009
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3010 ;;; Moving around
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3011
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3012 (defun viper-goto-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3013 "Go to ARG's line. Without ARG go to end of buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3014 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3015 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3016 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3017 (viper-move-marker-locally 'viper-com-point (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3018 (viper-deactivate-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3019 (push-mark nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3020 (if (null val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3021 (goto-char (point-max))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3022 (goto-char (point-min))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3023 (forward-line (1- val)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3024
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3025 ;; positioning is done twice: before and after command execution
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3026 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3027 (back-to-indentation)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3028
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3029 (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
3030
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3031 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3032 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3033 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3034
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3035 ;; Find ARG's occurrence of CHAR on the current line.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3036 ;; If FORWARD then search is forward, otherwise backward. OFFSET is used to
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3037 ;; adjust point after search.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3038 (defun viper-find-char (arg char forward offset)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3039 (or (char-or-string-p char) (error ""))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3040 (let ((arg (if forward arg (- arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3041 (cmd (if (eq viper-intermediate-command 'viper-repeat)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3042 (nth 5 viper-d-com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3043 (viper-array-to-string (this-command-keys))))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3044 point region-beg region-end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3045 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3046 (save-restriction
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3047 (if (> arg 0) ; forward
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3048 (progn
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3049 (setq region-beg (point))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3050 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3051 (viper-forward-paragraph 1)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3052 (end-of-line))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3053 (setq region-end (point)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3054 (setq region-end (point))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3055 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3056 (viper-backward-paragraph 1)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3057 (beginning-of-line))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3058 (setq region-beg (point)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3059 (if (or (and (< arg 0)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3060 (< (- region-end region-beg)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3061 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3062 2 1))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3063 (bolp))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3064 (and (> arg 0)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3065 (< (- region-end region-beg)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3066 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3067 3 2))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3068 (eolp)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3069 (error "Command `%s': At %s of %s"
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3070 cmd
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3071 (if (> arg 0) "end" "beginning")
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3072 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3073 "paragraph" "line")))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3074 (narrow-to-region region-beg region-end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3075 ;; if arg > 0, point is forwarded before search.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3076 (if (> arg 0) (goto-char (1+ (point-min)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3077 (goto-char (point-max)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3078 (if (let ((case-fold-search nil))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3079 (search-forward (char-to-string char) nil 0 arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3080 (setq point (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3081 (error "Command `%s': `%c' not found" cmd char))))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3082 (goto-char point)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3083 (if (> arg 0)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3084 (backward-char (if offset 2 1))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3085 (forward-char (if offset 1 0)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3086
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3087 (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
3088 "Find char on the line.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3089 If called interactively read the char to find from the terminal, and if
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3090 called from viper-repeat, the char last used is used. This behaviour is
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3091 controlled by the sign of prefix numeric value."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3092 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3093 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3094 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3095 (cmd-representation (nth 5 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3096 (if (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3097 ;; this means that the function was called interactively
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3098 (setq viper-f-char (read-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3099 viper-f-forward t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3100 viper-f-offset nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3101 ;; viper-repeat --- set viper-F-char from command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3102 (setq viper-F-char (if (stringp cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3103 (viper-seq-last-elt cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3104 viper-F-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3105 viper-f-char viper-F-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3106 (setq val (- val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3107 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3108 (viper-find-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3109 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3110 (setq val (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3111 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3112 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3113 (setq viper-F-char viper-f-char) ; set new viper-F-char
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3114 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3115 (viper-execute-com 'viper-find-char-forward val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3116
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3117 (defun viper-goto-char-forward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3118 "Go up to char ARG forward on line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3119 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3120 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3121 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3122 (cmd-representation (nth 5 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3123 (if (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3124 ;; this means that the function was called interactively
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3125 (setq viper-f-char (read-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3126 viper-f-forward t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3127 viper-f-offset t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3128 ;; viper-repeat --- set viper-F-char from command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3129 (setq viper-F-char (if (stringp cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3130 (viper-seq-last-elt cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3131 viper-F-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3132 viper-f-char viper-F-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3133 (setq val (- val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3134 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3135 (viper-find-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3136 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3137 (setq val (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3138 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3139 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3140 (setq viper-F-char viper-f-char) ; set new viper-F-char
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3141 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3142 (viper-execute-com 'viper-goto-char-forward val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3143
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3144 (defun viper-find-char-backward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3145 "Find char ARG on line backward."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3146 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3147 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3148 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3149 (cmd-representation (nth 5 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3150 (if (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3151 ;; this means that the function was called interactively
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3152 (setq viper-f-char (read-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3153 viper-f-forward nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3154 viper-f-offset nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3155 ;; viper-repeat --- set viper-F-char from command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3156 (setq viper-F-char (if (stringp cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3157 (viper-seq-last-elt cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3158 viper-F-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3159 viper-f-char viper-F-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3160 (setq val (- val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3161 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3162 (viper-find-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3163 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3164 (setq val (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3165 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3166 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3167 (setq viper-F-char viper-f-char) ; set new viper-F-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3168 (viper-execute-com 'viper-find-char-backward val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3169
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3170 (defun viper-goto-char-backward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3171 "Go up to char ARG backward on line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3172 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3173 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3174 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3175 (cmd-representation (nth 5 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3176 (if (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3177 ;; this means that the function was called interactively
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3178 (setq viper-f-char (read-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3179 viper-f-forward nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3180 viper-f-offset t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3181 ;; viper-repeat --- set viper-F-char from command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3182 (setq viper-F-char (if (stringp cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3183 (viper-seq-last-elt cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3184 viper-F-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3185 viper-f-char viper-F-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3186 (setq val (- val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3187 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3188 (viper-find-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3189 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3190 (setq val (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3191 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3192 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3193 (setq viper-F-char viper-f-char) ; set new viper-F-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3194 (viper-execute-com 'viper-goto-char-backward val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3195
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3196 (defun viper-repeat-find (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3197 "Repeat previous find command."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3198 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3199 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3200 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3201 (viper-deactivate-mark)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3202 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3203 (viper-find-char val viper-f-char viper-f-forward viper-f-offset)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3204 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3205 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3206 (if viper-f-forward (forward-char))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3207 (viper-execute-com 'viper-repeat-find val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3208
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3209 (defun viper-repeat-find-opposite (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3210 "Repeat previous find command in the opposite direction."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3211 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3212 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3213 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3214 (viper-deactivate-mark)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3215 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3216 (viper-find-char val viper-f-char (not viper-f-forward) viper-f-offset)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3217 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3218 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3219 (if viper-f-forward (forward-char))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3220 (viper-execute-com 'viper-repeat-find-opposite val com)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3221
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3222
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3223 ;; window scrolling etc.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3224
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3225 (defun viper-window-top (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3226 "Go to home window line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3227 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3228 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3229 (com (viper-getCom arg)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3230 (viper-leave-region-active)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3231 (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
3232 (push-mark nil t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3233 (move-to-window-line (1- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3234
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3235 ;; positioning is done twice: before and after command execution
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3236 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3237 (back-to-indentation)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3238
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3239 (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
3240
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3241 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3242 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3243 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3244
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3245 (defun viper-window-middle (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3246 "Go to middle window line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3247 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3248 (let ((val (viper-p-val arg))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3249 (com (viper-getCom arg)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3250 (viper-leave-region-active)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3251 (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
3252 (push-mark nil t)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3253 (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
3254
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3255 ;; positioning is done twice: before and after command execution
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3256 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3257 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3258
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3259 (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
3260
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3261 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3262 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3263 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3264
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3265 (defun viper-window-bottom (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3266 "Go to last window line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3267 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3268 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3269 (com (viper-getCom arg)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3270 (viper-leave-region-active)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3271 (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
3272 (push-mark nil t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3273 (move-to-window-line (- val))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3274
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3275 ;; positioning is done twice: before and after command execution
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3276 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3277 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3278
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3279 (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
3280
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3281 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3282 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3283 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3284
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3285 (defun viper-line-to-top (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3286 "Put current line on the home line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3287 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3288 (recenter (1- arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3289
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3290 (defun viper-line-to-middle (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3291 "Put current line on the middle line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3292 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3293 (recenter (+ (1- arg) (/ (1- (window-height)) 2))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3294
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3295 (defun viper-line-to-bottom (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3296 "Put current line on the last line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3297 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3298 (recenter (- (window-height) (1+ arg))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3299
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3300 ;; If point is within viper-search-scroll-threshold of window top or bottom,
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3301 ;; 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
3302 ;; 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
3303 ;; (which is called from viper-search-forward/backward/next). If the value of
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3304 ;; viper-search-scroll-threshold is negative - don't scroll.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3305 (defun viper-adjust-window ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3306 (let ((win-height (if viper-emacs-p
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3307 (1- (window-height)) ; adjust for modeline
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3308 (window-displayed-height)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3309 (pt (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3310 at-top-p at-bottom-p
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3311 min-scroll direction)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3312 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3313 (move-to-window-line 0) ; top
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3314 (setq at-top-p
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3315 (<= (count-lines pt (point))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3316 viper-search-scroll-threshold))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3317 (move-to-window-line -1) ; bottom
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3318 (setq at-bottom-p
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3319 (<= (count-lines pt (point)) viper-search-scroll-threshold))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3320 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3321 (cond (at-top-p (setq min-scroll (1- viper-search-scroll-threshold)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3322 direction 1))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3323 (at-bottom-p (setq min-scroll (1+ viper-search-scroll-threshold)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3324 direction -1)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3325 (if min-scroll
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3326 (recenter
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3327 (* (max min-scroll (/ win-height 7)) direction)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3328 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3329
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3330
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3331 ;; paren match
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3332 ;; must correct this to only match ( to ) etc. On the other hand
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3333 ;; 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
3334 ;; catch _all_ imbalances.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3335
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3336 (defun viper-paren-match (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3337 "Go to the matching parenthesis."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3338 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3339 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3340 (let ((com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3341 (parse-sexp-ignore-comments viper-parse-sexp-ignore-comments)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3342 anchor-point)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3343 (if (integerp arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3344 (if (or (> arg 99) (< arg 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3345 (error "Prefix must be between 1 and 99")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3346 (goto-char
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3347 (if (> (point-max) 80000)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3348 (* (/ (point-max) 100) arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3349 (/ (* (point-max) arg) 100)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3350 (back-to-indentation))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3351 (let (beg-lim end-lim)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3352 (if (and (eolp) (not (bolp))) (forward-char -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3353 (if (not (looking-at "[][(){}]"))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3354 (setq anchor-point (point)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3355 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3356 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3357 (setq beg-lim (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3358 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3359 (setq end-lim (point)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3360 (cond ((re-search-forward "[][(){}]" end-lim t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3361 (backward-char) )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3362 ((re-search-backward "[][(){}]" beg-lim t))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3363 (t
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3364 (error "No matching character on line"))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3365 (cond ((looking-at "[\(\[{]")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3366 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3367 (forward-sexp 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3368 (if com
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3369 (viper-execute-com 'viper-paren-match nil com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3370 (backward-char)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3371 (anchor-point
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3372 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3373 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3374 (viper-move-marker-locally 'viper-com-point anchor-point)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3375 (forward-char 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3376 (viper-execute-com 'viper-paren-match nil com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3377 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3378 ((looking-at "[])}]")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3379 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3380 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3381 (backward-sexp 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3382 (if com (viper-execute-com 'viper-paren-match nil com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3383 (t (error ""))))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3384
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3385 (defun viper-toggle-parse-sexp-ignore-comments ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3386 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3387 (setq viper-parse-sexp-ignore-comments
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3388 (not viper-parse-sexp-ignore-comments))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3389 (princ (format
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3390 "From now on, `%%' will %signore parentheses inside comment fields"
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3391 (if viper-parse-sexp-ignore-comments "" "NOT "))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3392
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3393
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3394 ;; sentence, paragraph and heading
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3395
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3396 (defun viper-forward-sentence (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3397 "Forward sentence."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3398 (interactive "P")
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3399 (or (eq last-command this-command)
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3400 (push-mark nil t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3401 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3402 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3403 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3404 (forward-sentence val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3405 (if com (viper-execute-com 'viper-forward-sentence nil com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3406
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3407 (defun viper-backward-sentence (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3408 "Backward sentence."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3409 (interactive "P")
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3410 (or (eq last-command this-command)
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3411 (push-mark nil t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3412 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3413 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3414 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3415 (backward-sentence val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3416 (if com (viper-execute-com 'viper-backward-sentence nil com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3417
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3418 (defun viper-forward-paragraph (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3419 "Forward paragraph."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3420 (interactive "P")
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3421 (or (eq last-command this-command)
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3422 (push-mark nil t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3423 (let ((val (viper-p-val arg))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3424 ;; if you want d} operate on whole lines, change viper-getcom to
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3425 ;; viper-getCom below
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3426 (com (viper-getcom arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3427 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3428 (forward-paragraph val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3429 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3430 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3431 (backward-char 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3432 (viper-execute-com 'viper-forward-paragraph nil com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3433
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3434 (defun viper-backward-paragraph (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3435 "Backward paragraph."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3436 (interactive "P")
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3437 (or (eq last-command this-command)
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3438 (push-mark nil t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3439 (let ((val (viper-p-val arg))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3440 ;; if you want d{ operate on whole lines, change viper-getcom to
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3441 ;; viper-getCom below
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3442 (com (viper-getcom arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3443 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3444 (backward-paragraph val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3445 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3446 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3447 (forward-char 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3448 (viper-execute-com 'viper-backward-paragraph nil com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3449 (backward-char 1)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3450
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3451 ;; should be mode-specific
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3452 (defun viper-prev-heading (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3453 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3454 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3455 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3456 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3457 (re-search-backward viper-heading-start nil t val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3458 (goto-char (match-beginning 0))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3459 (if com (viper-execute-com 'viper-prev-heading nil com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3460
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3461 (defun viper-heading-end (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3462 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3463 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3464 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3465 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3466 (re-search-forward viper-heading-end nil t val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3467 (goto-char (match-beginning 0))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3468 (if com (viper-execute-com 'viper-heading-end nil com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3469
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3470 (defun viper-next-heading (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3471 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3472 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3473 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3474 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3475 (end-of-line)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3476 (re-search-forward viper-heading-start nil t val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3477 (goto-char (match-beginning 0))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3478 (if com (viper-execute-com 'viper-next-heading nil com))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3479
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3480
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3481 ;; scrolling
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3482
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3483 (defun viper-scroll-screen (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3484 "Scroll to next screen."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3485 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3486 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3487 (if (> arg 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3488 (while (> arg 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3489 (scroll-up)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3490 (setq arg (1- arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3491 (while (> 0 arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3492 (scroll-down)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3493 (setq arg (1+ arg))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3494 (error (beep 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3495 (if (> arg 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3496 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3497 (message "End of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3498 (goto-char (point-max)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3499 (message "Beginning of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3500 (goto-char (point-min))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3501 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3502
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3503 (defun viper-scroll-screen-back (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3504 "Scroll to previous screen."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3505 (interactive "p")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3506 (viper-scroll-screen (- arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3507
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3508 (defun viper-scroll-down (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3509 "Pull down half screen."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3510 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3511 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3512 (if (null arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3513 (scroll-down (/ (window-height) 2))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3514 (scroll-down arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3515 (error (beep 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3516 (message "Beginning of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3517 (goto-char (point-min)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3518
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3519 (defun viper-scroll-down-one (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3520 "Scroll up one line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3521 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3522 (scroll-down arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3523
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3524 (defun viper-scroll-up (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3525 "Pull up half screen."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3526 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3527 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3528 (if (null arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3529 (scroll-up (/ (window-height) 2))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3530 (scroll-up arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3531 (error (beep 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3532 (message "End of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3533 (goto-char (point-max)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3534
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3535 (defun viper-scroll-up-one (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3536 "Scroll down one line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3537 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3538 (scroll-up arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3539
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3540
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3541 ;; searching
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3542
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3543 (defun viper-if-string (prompt)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3544 (if (memq viper-intermediate-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3545 '(viper-command-argument viper-digit-argument viper-repeat))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3546 (setq viper-this-command-keys (this-command-keys)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3547 (let ((s (viper-read-string-with-history
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3548 prompt
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3549 nil ; no initial
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3550 'viper-search-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3551 (car viper-search-history))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3552 (if (not (string= s ""))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3553 (setq viper-s-string s))))
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3554
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3555
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3556 (defun viper-toggle-search-style (arg)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3557 "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
3558 Without prefix argument, will ask which search style to toggle. With prefix
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3559 arg 1,toggles viper-case-fold-search; with arg 2 toggles viper-re-search.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3560
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3561 Although this function is bound to \\[viper-toggle-search-style], the most
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3562 convenient way to use it is to bind `//' to the macro
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3563 `1 M-x viper-toggle-search-style' and `///' to
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3564 `2 M-x viper-toggle-search-style'. In this way, hitting `//' quickly will
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3565 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
3566 search. Macros are more convenient in this case because they don't affect
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3567 the Emacs binding of `/'."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3568 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3569 (let (msg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3570 (cond ((or (eq arg 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3571 (and (null arg)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3572 (y-or-n-p (format "Search style: '%s'. Want '%s'? "
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3573 (if viper-case-fold-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3574 "case-insensitive" "case-sensitive")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3575 (if viper-case-fold-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3576 "case-sensitive"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3577 "case-insensitive")))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3578 (setq viper-case-fold-search (null viper-case-fold-search))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3579 (if viper-case-fold-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3580 (setq msg "Search becomes case-insensitive")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3581 (setq msg "Search becomes case-sensitive")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3582 ((or (eq arg 2)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3583 (and (null arg)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3584 (y-or-n-p (format "Search style: '%s'. Want '%s'? "
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3585 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3586 "regexp-search" "vanilla-search")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3587 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3588 "vanilla-search"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3589 "regexp-search")))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3590 (setq viper-re-search (null viper-re-search))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3591 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3592 (setq msg "Search becomes regexp-style")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3593 (setq msg "Search becomes vanilla-style")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3594 (t
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3595 (setq msg "Search style remains unchanged")))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3596 (princ msg t)))
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3597
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3598 (defun viper-set-searchstyle-toggling-macros (unset)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3599 "Set the macros for toggling the search style in Viper's vi-state.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3600 The macro that toggles case sensitivity is bound to `//', and the one that
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3601 toggles regexp search is bound to `///'.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3602 With a prefix argument, this function unsets the macros. "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3603 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3604 (or noninteractive
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3605 (if (not unset)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3606 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3607 ;; toggle case sensitivity in search
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3608 (viper-record-kbd-macro
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3609 "//" 'vi-state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3610 [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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3611 't)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3612 ;; toggle regexp/vanila search
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3613 (viper-record-kbd-macro
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3614 "///" 'vi-state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3615 [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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3616 't)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3617 (if (interactive-p)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3618 (message
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3619 "// and /// now toggle case-sensitivity and regexp search")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3620 (viper-unrecord-kbd-macro "//" 'vi-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3621 (sit-for 2)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3622 (viper-unrecord-kbd-macro "///" 'vi-state))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3623
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3624
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3625 (defun viper-set-parsing-style-toggling-macro (unset)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3626 "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses.
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3627 This is used in conjunction with the `%' command.
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3628
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3629 With a prefix argument, unsets the macro."
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3630 (interactive "P")
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3631 (or noninteractive
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3632 (if (not unset)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3633 (progn
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3634 ;; Make %%% toggle parsing comments for matching parentheses
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3635 (viper-record-kbd-macro
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3636 "%%%" 'vi-state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3637 [(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
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3638 't)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3639 (if (interactive-p)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3640 (message
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3641 "%%%%%% now toggles whether comments should be parsed for matching parentheses")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3642 (viper-unrecord-kbd-macro "%%%" 'vi-state))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3643
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3644
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3645 (defun viper-set-emacs-state-searchstyle-macros (unset &optional arg-majormode)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3646 "Set the macros for toggling the search style in Viper's emacs-state.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3647 The macro that toggles case sensitivity is bound to `//', and the one that
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3648 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
3649 With a prefix argument, this function unsets the macros.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3650 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
3651 this sets the macros only in the macros in that major mode. Otherwise,
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3652 the macros are set in the current major mode.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3653 \(When unsetting the macros, the second argument has no effect.\)"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3654 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3655 (or noninteractive
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3656 (if (not unset)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3657 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3658 ;; toggle case sensitivity in search
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3659 (viper-record-kbd-macro
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3660 "//" 'emacs-state
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3661 [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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3662 (or arg-majormode major-mode))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3663 ;; toggle regexp/vanila search
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3664 (viper-record-kbd-macro
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3665 "///" 'emacs-state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3666 [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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3667 (or arg-majormode major-mode))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3668 (if (interactive-p)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3669 (message
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3670 "// and /// now toggle case-sensitivity and regexp search.")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3671 (viper-unrecord-kbd-macro "//" 'emacs-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3672 (sit-for 2)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3673 (viper-unrecord-kbd-macro "///" 'emacs-state))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3674
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3675
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3676 (defun viper-search-forward (arg)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3677 "Search a string forward.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3678 ARG is used to find the ARG's occurrence of the string.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3679 Null string will repeat previous search."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3680 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3681 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3682 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3683 (old-str viper-s-string))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3684 (setq viper-s-forward t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3685 (viper-if-string "/")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3686 ;; this is not used at present, but may be used later
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3687 (if (or (not (equal old-str viper-s-string))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3688 (not (markerp viper-local-search-start-marker))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3689 (not (marker-buffer viper-local-search-start-marker)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3690 (setq viper-local-search-start-marker (point-marker)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3691 (viper-search viper-s-string t val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3692 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3693 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3694 (viper-move-marker-locally 'viper-com-point (mark t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3695 (viper-execute-com 'viper-search-next val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3696
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3697 (defun viper-search-backward (arg)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3698 "Search a string backward.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3699 ARG is used to find the ARG's occurrence of the string.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3700 Null string will repeat previous search."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3701 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3702 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3703 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3704 (old-str viper-s-string))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3705 (setq viper-s-forward nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3706 (viper-if-string "?")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3707 ;; this is not used at present, but may be used later
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3708 (if (or (not (equal old-str viper-s-string))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3709 (not (markerp viper-local-search-start-marker))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3710 (not (marker-buffer viper-local-search-start-marker)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3711 (setq viper-local-search-start-marker (point-marker)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3712 (viper-search viper-s-string nil val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3713 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3714 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3715 (viper-move-marker-locally 'viper-com-point (mark t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3716 (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
3717
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3718
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3719 ;; Search for COUNT's occurrence of STRING.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3720 ;; Search is forward if FORWARD is non-nil, otherwise backward.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3721 ;; INIT-POINT is the position where search is to start.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3722 ;; Arguments:
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3723 ;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3724 (defun viper-search (string forward arg
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3725 &optional no-offset init-point fail-if-not-found)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3726 (if (not (equal string ""))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3727 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3728 (com (viper-getcom arg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3729 (offset (not no-offset))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3730 (case-fold-search viper-case-fold-search)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3731 (start-point (or init-point (point))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3732 (viper-deactivate-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3733 (if forward
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3734 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3735 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3736 (if offset (viper-forward-char-carefully))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3737 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3738 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3739 (re-search-forward string nil nil val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3740 (re-search-backward string))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3741 (search-forward string nil nil val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3742 (search-backward string))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3743 (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
3744 (push-mark start-point t)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3745 (search-failed
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3746 (if (and (not fail-if-not-found) viper-search-wrap-around-t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3747 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3748 (message "Search wrapped around BOTTOM of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3749 (goto-char (point-min))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3750 (viper-search string forward (cons 1 com) t start-point 'fail)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3751 ;; don't wait in macros
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3752 (or executing-kbd-macro
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3753 (memq viper-intermediate-command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3754 '(viper-repeat
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3755 viper-digit-argument
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3756 viper-command-argument))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3757 (sit-for 2))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3758 ;; delete the wrap-around message
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3759 (message "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3760 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3761 (goto-char start-point)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3762 (error "`%s': %s not found"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3763 string
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3764 (if viper-re-search "Pattern" "String"))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3765 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3766 ;; backward
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3767 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3768 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3769 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3770 (re-search-backward string nil nil val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3771 (search-backward string nil nil val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3772 (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
3773 (push-mark start-point t)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3774 (search-failed
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3775 (if (and (not fail-if-not-found) viper-search-wrap-around-t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3776 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3777 (message "Search wrapped around TOP of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3778 (goto-char (point-max))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3779 (viper-search string forward (cons 1 com) t start-point 'fail)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3780 ;; don't wait in macros
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3781 (or executing-kbd-macro
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3782 (memq viper-intermediate-command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3783 '(viper-repeat
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3784 viper-digit-argument
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3785 viper-command-argument))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3786 (sit-for 2))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3787 ;; delete the wrap-around message
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3788 (message "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3789 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3790 (goto-char start-point)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3791 (error "`%s': %s not found"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3792 string
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3793 (if viper-re-search "Pattern" "String"))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3794 ))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3795 ;; pull up or down if at top/bottom of window
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3796 (viper-adjust-window)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3797 ;; highlight the result of search
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3798 ;; don't wait and don't highlight in macros
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3799 (or executing-kbd-macro
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3800 (memq viper-intermediate-command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3801 '(viper-repeat viper-digit-argument viper-command-argument))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3802 (viper-flash-search-pattern))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3803 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3804
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3805 (defun viper-search-next (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3806 "Repeat previous search."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3807 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3808 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3809 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3810 (if (null viper-s-string) (error viper-NoPrevSearch))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3811 (viper-search viper-s-string viper-s-forward arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3812 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3813 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3814 (viper-move-marker-locally 'viper-com-point (mark t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3815 (viper-execute-com 'viper-search-next val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3816
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3817 (defun viper-search-Next (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3818 "Repeat previous search in the reverse direction."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3819 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3820 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3821 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3822 (if (null viper-s-string) (error viper-NoPrevSearch))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3823 (viper-search viper-s-string (not viper-s-forward) arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3824 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3825 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3826 (viper-move-marker-locally 'viper-com-point (mark t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3827 (viper-execute-com 'viper-search-Next val com)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3828
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3829
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3830 ;; Search contents of buffer defined by one of Viper's motion commands.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3831 ;; Repeatable via `n' and `N'.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3832 (defun viper-buffer-search-enable (&optional c)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3833 (cond (c (setq viper-buffer-search-char c))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3834 ((null viper-buffer-search-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3835 (setq viper-buffer-search-char ?g)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3836 (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
3837 (cond ((viper-characterp viper-buffer-search-char)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3838 (char-to-string viper-buffer-search-char))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3839 (t (error "viper-buffer-search-char: wrong value type, %s"
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3840 viper-buffer-search-char)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3841 'viper-command-argument)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3842 (aset viper-exec-array viper-buffer-search-char 'viper-exec-buffer-search)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3843 (setq viper-prefix-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3844 (cons viper-buffer-search-char viper-prefix-commands)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3845
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3846 ;; This is a Viper wraper for isearch-forward.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3847 (defun viper-isearch-forward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3848 "Do incremental search forward."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3849 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3850 ;; emacs bug workaround
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3851 (if (listp arg) (setq arg (car arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3852 (viper-exec-form-in-emacs (list 'isearch-forward arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3853
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3854 ;; This is a Viper wraper for isearch-backward."
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3855 (defun viper-isearch-backward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3856 "Do incremental search backward."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3857 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3858 ;; emacs bug workaround
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3859 (if (listp arg) (setq arg (car arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3860 (viper-exec-form-in-emacs (list 'isearch-backward arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3861
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3862
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3863 ;; visiting and killing files, buffers
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3864
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3865 (defun viper-switch-to-buffer ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3866 "Switch to buffer in the current window."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3867 (interactive)
22283
3649674ebf29 (viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
3868 (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
3869 buffer)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3870 (setq buffer
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3871 (funcall viper-read-buffer-function
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3872 "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
3873 (switch-to-buffer buffer)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3874
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3875 (defun viper-switch-to-buffer-other-window ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3876 "Switch to buffer in another window."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3877 (interactive)
22283
3649674ebf29 (viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
3878 (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
3879 buffer)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3880 (setq buffer
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3881 (funcall viper-read-buffer-function
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3882 "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
3883 (switch-to-buffer-other-window buffer)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3884
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3885 (defun viper-kill-buffer ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3886 "Kill a buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3887 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3888 (let (buffer buffer-name)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3889 (setq buffer-name
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3890 (funcall viper-read-buffer-function
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3891 (format "Kill buffer \(%s\): "
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3892 (buffer-name (current-buffer)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3893 (setq buffer
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3894 (if (null buffer-name)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3895 (current-buffer)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3896 (get-buffer buffer-name)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3897 (if (null buffer) (error "`%s': No such buffer" buffer-name))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3898 (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
3899 (y-or-n-p
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3900 (format
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3901 "Buffer `%s' is modified, are you sure you want to kill it? "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3902 buffer-name)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3903 (kill-buffer buffer)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3904 (error "Buffer not killed"))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3905
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3906
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3907
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3908 ;; yank and pop
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3909
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3910 (defsubst viper-yank (text)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3911 "Yank TEXT silently. This works correctly with Emacs's yank-pop command."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3912 (insert text)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3913 (setq this-command 'yank))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3914
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3915 (defun viper-put-back (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3916 "Put back after point/below line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3917 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3918 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3919 (text (if viper-use-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3920 (cond ((viper-valid-register viper-use-register '(digit))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3921 (current-kill
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3922 (- viper-use-register ?1) 'do-not-rotate))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3923 ((viper-valid-register viper-use-register)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3924 (get-register (downcase viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3925 (t (error viper-InvalidRegister viper-use-register)))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3926 (current-kill 0)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3927 sv-point chars-inserted lines-inserted)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3928 (if (null text)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3929 (if viper-use-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3930 (let ((reg viper-use-register))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3931 (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3932 (error viper-EmptyRegister reg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3933 (error "")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3934 (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3935 (if (viper-end-with-a-newline-p text)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3936 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3937 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3938 (if (eobp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3939 (insert "\n")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3940 (forward-line 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3941 (beginning-of-line))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3942 (if (not (eolp)) (viper-forward-char-carefully)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3943 (set-marker (viper-mark-marker) (point) (current-buffer))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3944 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3945 (list 'viper-put-back val nil viper-use-register nil nil))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3946 (setq sv-point (point))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3947 (viper-loop val (viper-yank text))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3948 (setq chars-inserted (abs (- (point) sv-point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3949 lines-inserted (abs (count-lines (point) sv-point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3950 (if (or (> chars-inserted viper-change-notification-threshold)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3951 (> lines-inserted viper-change-notification-threshold))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3952 (message "Inserted %d character(s), %d line(s)"
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3953 chars-inserted lines-inserted)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3954 ;; 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
3955 ;; newline; it leaves the cursor at the beginning when the text contains
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3956 ;; a newline
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3957 (if (viper-same-line (point) (mark))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3958 (or (= (point) (mark)) (viper-backward-char-carefully))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3959 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3960 (if (bolp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3961 (back-to-indentation)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3962 (viper-deactivate-mark))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3963
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3964 (defun viper-Put-back (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3965 "Put back at point/above line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3966 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3967 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3968 (text (if viper-use-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3969 (cond ((viper-valid-register viper-use-register '(digit))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3970 (current-kill
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3971 (- viper-use-register ?1) 'do-not-rotate))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3972 ((viper-valid-register viper-use-register)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3973 (get-register (downcase viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3974 (t (error viper-InvalidRegister viper-use-register)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3975 (current-kill 0)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3976 sv-point chars-inserted lines-inserted)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3977 (if (null text)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3978 (if viper-use-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3979 (let ((reg viper-use-register))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3980 (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3981 (error viper-EmptyRegister reg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3982 (error "")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3983 (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3984 (if (viper-end-with-a-newline-p text) (beginning-of-line))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3985 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3986 (list 'viper-Put-back val nil viper-use-register nil nil))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3987 (set-marker (viper-mark-marker) (point) (current-buffer))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3988 (setq sv-point (point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3989 (viper-loop val (viper-yank text))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3990 (setq chars-inserted (abs (- (point) sv-point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3991 lines-inserted (abs (count-lines (point) sv-point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3992 (if (or (> chars-inserted viper-change-notification-threshold)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3993 (> lines-inserted viper-change-notification-threshold))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3994 (message "Inserted %d character(s), %d line(s)"
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3995 chars-inserted lines-inserted)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3996 ;; 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
3997 ;; newline; it leaves the cursor at the beginning when the text contains
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3998 ;; a newline
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3999 (if (viper-same-line (point) (mark))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4000 (or (= (point) (mark)) (viper-backward-char-carefully))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4001 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4002 (if (bolp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4003 (back-to-indentation)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4004 (viper-deactivate-mark))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4005
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4006
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4007 ;; Copy region to kill-ring.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4008 ;; If BEG and END do not belong to the same buffer, copy empty region.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4009 (defun viper-copy-region-as-kill (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4010 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4011 (copy-region-as-kill beg end)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4012 (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
4013
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4014
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4015 (defun viper-delete-char (arg)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4016 "Delete next character."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4017 (interactive "P")
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4018 (let ((val (viper-p-val arg))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4019 end-del-pos)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4020 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4021 (list 'viper-delete-char val nil nil nil nil))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4022 (if (and viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4023 (> val (viper-chars-in-region (point) (viper-line-pos 'end))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4024 (setq val (viper-chars-in-region (point) (viper-line-pos 'end))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4025 (if (and viper-ex-style-motion (eolp))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4026 (if (bolp) (error "") (setq val 0))) ; not bol---simply back 1 ch
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4027 (save-excursion
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4028 (viper-forward-char-carefully val)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4029 (setq end-del-pos (point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4030 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4031 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4032 (cond ((viper-valid-register viper-use-register '((Letter)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4033 (viper-append-to-register
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4034 (downcase viper-use-register) (point) end-del-pos))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4035 ((viper-valid-register viper-use-register)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4036 (copy-to-register
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4037 viper-use-register (point) end-del-pos nil))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4038 (t (error viper-InvalidRegister viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4039 (setq viper-use-register nil)))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4040
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4041 (delete-char val t)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4042 (if viper-ex-style-motion
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4043 (if (and (eolp) (not (bolp))) (backward-char 1)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4044 ))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4045
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4046 (defun viper-delete-backward-char (arg)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4047 "Delete previous character. On reaching beginning of line, stop and beep."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4048 (interactive "P")
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4049 (let ((val (viper-p-val arg))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4050 end-del-pos)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4051 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4052 (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
4053 (if (and
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4054 viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4055 (> val (viper-chars-in-region (viper-line-pos 'start) (point))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4056 (setq val (viper-chars-in-region (viper-line-pos 'start) (point))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4057 (save-excursion
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4058 (viper-backward-char-carefully val)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4059 (setq end-del-pos (point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4060 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4061 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4062 (cond ((viper-valid-register viper-use-register '(Letter))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4063 (viper-append-to-register
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4064 (downcase viper-use-register) end-del-pos (point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4065 ((viper-valid-register viper-use-register)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4066 (copy-to-register
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4067 viper-use-register end-del-pos (point) nil))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4068 (t (error viper-InvalidRegister viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4069 (setq viper-use-register nil)))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4070 (if (and (bolp) viper-ex-style-editing)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4071 (ding))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4072 (delete-backward-char val t)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4073
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
4074
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4075 (defun viper-del-backward-char-in-insert ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4076 "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
4077 (interactive)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4078 (if (and viper-ex-style-editing (bolp))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4079 (beep 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4080 (delete-backward-char 1 t)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4081
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
4082
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4083 (defun viper-del-backward-char-in-replace ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4084 "Delete one character in replace mode.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4085 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
4086 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
4087 to Vi. The variable `viper-ex-style-editing', if t, doesn't let the
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4088 cursor move past the beginning of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4089 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4090 (cond (viper-delete-backwards-in-replace
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4091 (cond ((not (bolp))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4092 (delete-backward-char 1 t))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4093 (viper-ex-style-editing
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4094 (beep 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4095 ((bobp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4096 (beep 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4097 (t
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4098 (delete-backward-char 1 t))))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4099 (viper-ex-style-editing
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4100 (if (bolp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4101 (beep 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4102 (backward-char 1)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4103 (t
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4104 (backward-char 1))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4105
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4106
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4107
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4108 ;; join lines.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4109
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4110 (defun viper-join-lines (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4111 "Join this line to next, if ARG is nil. Otherwise, join ARG lines."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4112 (interactive "*P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4113 (let ((val (viper-P-val arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4114 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4115 (list 'viper-join-lines val nil nil nil nil))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4116 (viper-loop (if (null val) 1 (1- val))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4117 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4118 (if (not (eobp))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4119 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4120 (forward-line 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4121 (delete-region (point) (1- (point)))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4122 (fixup-whitespace)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4123 ;; fixup-whitespace sometimes does not leave space
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4124 ;; between objects, so we insert it as in Vi
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4125 (or (looking-at " ")
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4126 (insert " ")
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4127 (backward-char 1))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4128 )))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4130
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4131 ;; Replace state
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4132
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4133 (defun viper-change (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4134 (if (markerp beg) (setq beg (marker-position beg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4135 (if (markerp end) (setq end (marker-position end)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4136 ;; beg is sometimes (mark t), which may be nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4137 (or beg (setq beg end))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4138
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4139 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4140 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4141 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4142 (copy-to-register viper-use-register beg end nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4143 (setq viper-use-register nil)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4144 (viper-set-replace-overlay beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4145 (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
4146
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4147 (if (= (viper-replace-start) (point-max))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4148 (error "End of buffer"))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4149
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4150 (setq viper-last-replace-region
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4151 (buffer-substring (viper-replace-start)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4152 (viper-replace-end)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4153
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4154 ;; protect against error while inserting "@" and other disasters
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4155 ;; (e.g., read-only buff)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4156 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4157 (if (or viper-allow-multiline-replace-regions
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4158 (viper-same-line (viper-replace-start)
19203
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
4159 (viper-replace-end)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4160 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4161 ;; tabs cause problems in replace, so untabify
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4162 (goto-char (viper-replace-end))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4163 (insert-before-markers "@") ; put placeholder after the TAB
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4164 (untabify (viper-replace-start) (point))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4165 ;; del @, don't put on kill ring
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4166 (delete-backward-char 1)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4167
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4168 (viper-set-replace-overlay-glyphs
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4169 viper-replace-region-start-delimiter
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4170 viper-replace-region-end-delimiter)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4171 ;; 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
4172 ;; has to be shifted because of insert. We can't simply insert
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4173 ;; "$" before-markers because then overlay-start will shift the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4174 ;; 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
4175 ;; character. This fixes the bug with `s' and `cl' commands.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4176 (viper-move-replace-overlay (viper-replace-start) (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4177 (goto-char (viper-replace-start))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4178 (viper-change-state-to-replace t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4179 (kill-region (viper-replace-start)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4180 (viper-replace-end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4181 (viper-hide-replace-overlay)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4182 (viper-change-state-to-insert))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4183 (error ;; make sure that the overlay doesn't stay.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4184 ;; go back to the original point
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4185 (goto-char (viper-replace-start))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4186 (viper-hide-replace-overlay)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4187 (viper-message-conditions conds))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4188
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4189
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4190 (defun viper-change-subr (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4191 ;; beg is sometimes (mark t), which may be nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4192 (or beg (setq beg end))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4193 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4194 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4195 (copy-to-register viper-use-register beg end nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4196 (setq viper-use-register nil)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4197 (kill-region beg end)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4198 (setq this-command 'viper-change)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4199 (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4200
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4201 (defun viper-toggle-case (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4202 "Toggle character case."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4203 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4204 (let ((val (viper-p-val arg)) (c))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4205 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4206 (list 'viper-toggle-case val nil nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4207 (while (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4208 (setq c (following-char))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4209 (delete-char 1 nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4210 (if (eq c (upcase c))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4211 (insert-char (downcase c) 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4212 (insert-char (upcase c) 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4213 (if (eolp) (backward-char 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4214 (setq val (1- val)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4215
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4216
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4217 ;; query replace
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4218
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4219 (defun viper-query-replace ()
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4220 "Query replace.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4221 If a null string is suplied as the string to be replaced,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4222 the query replace mode will toggle between string replace
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4223 and regexp replace."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4224 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4225 (let (str)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4226 (setq str (viper-read-string-with-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4227 (if viper-re-query-replace "Query replace regexp: "
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4228 "Query replace: ")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4229 nil ; no initial
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4230 'viper-replace1-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4231 (car viper-replace1-history) ; default
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4232 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4233 (if (string= str "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4234 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4235 (setq viper-re-query-replace (not viper-re-query-replace))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4236 (message "Query replace mode changed to %s"
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4237 (if viper-re-query-replace "regexp replace"
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4238 "string replace")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4239 (if viper-re-query-replace
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4240 (query-replace-regexp
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4241 str
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4242 (viper-read-string-with-history
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4243 (format "Query replace regexp `%s' with: " str)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4244 nil ; no initial
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4245 'viper-replace1-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4246 (car viper-replace1-history) ; default
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4247 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4248 (query-replace
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4249 str
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4250 (viper-read-string-with-history
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4251 (format "Query replace `%s' with: " str)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4252 nil ; no initial
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4253 'viper-replace1-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4254 (car viper-replace1-history) ; default
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4255 ))))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4256
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4257
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4258 ;; marking
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4259
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4260 (defun viper-mark-beginning-of-buffer ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4261 "Mark beginning of buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4262 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4263 (push-mark (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4264 (goto-char (point-min))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4265 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4266 (message "Mark set at the beginning of buffer"))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4267
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4268 (defun viper-mark-end-of-buffer ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4269 "Mark end of buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4270 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4271 (push-mark (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4272 (goto-char (point-max))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4273 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4274 (message "Mark set at the end of buffer"))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4275
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4276 (defun viper-mark-point ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4277 "Set mark at point of buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4278 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4279 (let ((char (read-char)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4280 (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
4281 (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
4282 ((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
4283 ((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
4284 ((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
4285 ((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
4286 ((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
4287 ((viper= char ?D) (mark-defun))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4288 (t (error ""))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4289 )))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4290
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4291 ;; Algorithm: If first invocation of this command save mark on ring, goto
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4292 ;; mark, M0, and pop the most recent elt from the mark ring into mark,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4293 ;; making it into the new mark, M1.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4294 ;; Push this mark back and set mark to the original point position, p1.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4295 ;; So, if you hit '' or `` then you can return to p1.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4296 ;;
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4297 ;; 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
4298 ;; jump there. This forgets the position, p1, and puts M1 back into mark.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4299 ;; Then we save the current pos, which is M0, jump to M1 and pop M2 from
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4300 ;; the ring into mark. Push M2 back on the ring and set mark to M0.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4301 ;; etc.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4302 (defun viper-cycle-through-mark-ring ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4303 "Visit previous locations on the mark ring.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4304 One can use `` and '' to temporarily jump 1 step back."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4305 (let* ((sv-pt (point)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4306 ;; if repeated `m,' command, pop the previously saved mark.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4307 ;; 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
4308 ;; user types `` or '' and is discarded
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4309 ;; from the mark ring by the next `m,' command.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4310 ;; In any case, go to the previous or previously saved mark.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4311 ;; 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
4312 ;; point to be the mark. Current pt as mark is discarded by the next
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4313 ;; m, command.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4314 (if (eq last-command 'viper-cycle-through-mark-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4315 ()
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4316 ;; save current mark if the first iteration
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4317 (setq mark-ring (delete (viper-mark-marker) mark-ring))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4318 (if (mark t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4319 (push-mark (mark t) t)) )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4320 (pop-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4321 (set-mark-command 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4322 ;; don't duplicate mark on the ring
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4323 (setq mark-ring (delete (viper-mark-marker) mark-ring))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4324 (push-mark sv-pt t)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4325 (viper-deactivate-mark)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4326 (setq this-command 'viper-cycle-through-mark-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4327 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4328
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4329
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4330 (defun viper-goto-mark (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4331 "Go to mark."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4332 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4333 (let ((char (read-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4334 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4335 (viper-goto-mark-subr char com nil)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4336
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4337 (defun viper-goto-mark-and-skip-white (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4338 "Go to mark and skip to first non-white character on line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4339 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4340 (let ((char (read-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4341 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4342 (viper-goto-mark-subr char com t)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4343
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4344 (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
4345 (if (eobp)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4346 (if (bobp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4347 (error "Empty buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4348 (backward-char 1)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4349 (cond ((viper-valid-register char '(letter))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4350 (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
4351 (reg (viper-int-to-char (1+ (- char ?a))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4352 (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
4353 ;; 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
4354 ;; 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
4355 (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
4356 (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
4357 (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
4358 (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
4359 (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
4360 (save-excursion
42f9a58e0fc4 * viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26743
diff changeset
4361 (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
4362 (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
4363 (<= (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
4364 (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
4365 (set-register reg text-marker))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4366 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4367 (if (not (viper-valid-marker text-marker))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4368 (error viper-EmptyTextmarker char))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4369 (if (and (viper-same-line (point) viper-last-jump)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4370 (= (point) viper-last-jump-ignore))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4371 (push-mark viper-last-jump t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4372 (push-mark nil t)) ; no msg
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4373 (viper-register-to-point reg)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4374 (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
4375 (cond (skip-white
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4376 (back-to-indentation)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4377 (setq viper-last-jump-ignore (point))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4378 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4379 (if (equal buff (current-buffer))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4380 (viper-execute-com (if skip-white
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4381 'viper-goto-mark-and-skip-white
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4382 'viper-goto-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4383 nil com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4384 (switch-to-buffer buff)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4385 (goto-char viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4386 (viper-change-state-to-vi)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4387 (error "")))))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
4388 ((and (not skip-white) (viper= char ?`))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4389 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4390 (if (and (viper-same-line (point) viper-last-jump)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4391 (= (point) viper-last-jump-ignore))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4392 (goto-char viper-last-jump))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4393 (if (null (mark t)) (error "Mark is not set in this buffer"))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4394 (if (= (point) (mark t)) (pop-mark))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4395 (exchange-point-and-mark)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4396 (setq viper-last-jump (point-marker)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4397 viper-last-jump-ignore 0)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4398 (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
4399 ((and skip-white (viper= char ?'))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4400 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4401 (if (and (viper-same-line (point) viper-last-jump)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4402 (= (point) viper-last-jump-ignore))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4403 (goto-char viper-last-jump))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4404 (if (= (point) (mark t)) (pop-mark))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4405 (exchange-point-and-mark)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4406 (setq viper-last-jump (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4407 (back-to-indentation)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4408 (setq viper-last-jump-ignore (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4409 (if com (viper-execute-com 'viper-goto-mark-and-skip-white nil com)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4410 (t (error viper-InvalidTextmarker char))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4411
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4412 (defun viper-insert-tab ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4413 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4414 (insert-tab))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4415
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4416 (defun viper-exchange-point-and-mark ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4417 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4418 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4419 (back-to-indentation))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4420
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4421 ;; Input Mode Indentation
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4422
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4423 ;; Returns t, if the string before point matches the regexp STR.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4424 (defsubst viper-looking-back (str)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4425 (and (save-excursion (re-search-backward str nil t))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4426 (= (point) (match-end 0))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4427
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4428
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4429 (defun viper-forward-indent ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4430 "Indent forward -- `C-t' in Vi."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4431 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4432 (setq viper-cted t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4433 (indent-to (+ (current-column) viper-shift-width)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4434
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4435 (defun viper-backward-indent ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4436 "Backtab, C-d in VI"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4437 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4438 (if viper-cted
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4439 (let ((p (point)) (c (current-column)) bol (indent t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4440 (if (viper-looking-back "[0^]")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4441 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4442 (if (eq ?^ (preceding-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4443 (setq viper-preserve-indent t))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4444 (delete-backward-char 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4445 (setq p (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4446 (setq indent nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4447 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4448 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4449 (setq bol (point)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4450 (if (re-search-backward "[^ \t]" bol 1) (forward-char))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4451 (delete-region (point) p)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4452 (if indent
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4453 (indent-to (- c viper-shift-width)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4454 (if (or (bolp) (viper-looking-back "[^ \t]"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4455 (setq viper-cted nil)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4456
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
4457 ;; 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
4458 (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
4459 (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
4460 (progn
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
4461 (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
4462 (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
4463 (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
4464 text-mode
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
4465 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
4466 (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
4467 (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
4468
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
4469
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4470 (defun viper-autoindent ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4471 "Auto Indentation, Vi-style."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4472 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4473 (let ((col (current-indentation)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4474 (if abbrev-mode (expand-abbrev))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4475 (if viper-preserve-indent
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4476 (setq viper-preserve-indent nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4477 (setq viper-current-indent col))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4478 ;; don't leave whitespace lines around
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4479 (if (memq last-command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4480 '(viper-autoindent
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4481 viper-open-line viper-Open-line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4482 viper-replace-state-exit-cmd))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4483 (indent-to-left-margin))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4484 ;; use \n instead of newline, or else <Return> will move the insert point
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4485 ;;(newline 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4486 (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
4487 (viper-indent-line viper-current-indent)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4488 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4489
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4490
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4491 ;; Viewing registers
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4492
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4493 (defun viper-ket-function (arg)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4494 "Function called by \], the ket. View registers and call \]\]."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4495 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4496 (let ((reg (read-char)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4497 (cond ((viper-valid-register reg '(letter Letter))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4498 (view-register (downcase reg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4499 ((viper-valid-register reg '(digit))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4500 (let ((text (current-kill (- reg ?1) 'do-not-rotate)))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4501 (with-output-to-temp-buffer " *viper-info*"
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4502 (princ (format "Register %c contains the string:\n" reg))
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4503 (princ text))
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4504 ))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
4505 ((viper= ?\] reg)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4506 (viper-next-heading arg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4507 (t (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4508 viper-InvalidRegister reg)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4509
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4510 (defun viper-brac-function (arg)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4511 "Function called by \[, the brac. View textmarkers and call \[\["
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4512 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4513 (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
4514 (cond ((viper= ?\[ reg)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4515 (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
4516 ((viper= ?\] reg)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4517 (viper-heading-end arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4518 ((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
4519 (let* ((val (get-register (viper-int-to-char (1+ (- reg ?a)))))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4520 (buf (if (not (markerp val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4521 (error viper-EmptyTextmarker reg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4522 (marker-buffer val)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4523 (pos (marker-position val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4524 line-no text (s pos) (e pos))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4525 (with-output-to-temp-buffer " *viper-info*"
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4526 (if (and buf pos)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4527 (progn
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4528 (save-excursion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4529 (set-buffer buf)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4530 (setq line-no (1+ (count-lines (point-min) val)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4531 (goto-char pos)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4532 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4533 (if (re-search-backward "[^ \t]" nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4534 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4535 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4536 (setq s (point))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4537 (goto-char pos)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4538 (forward-line 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4539 (if (re-search-forward "[^ \t]" nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4540 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4541 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4542 (setq e (point))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4543 (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
4544 (setq text (format "%s<%c>%s"
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4545 (substring text 0 (- pos s))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4546 reg (substring text (- pos s)))))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4547 (princ
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4548 (format
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4549 "Textmarker `%c' is in buffer `%s' at line %d.\n"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4550 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
4551 (princ (format "Here is some text around %c:\n\n %s"
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4552 reg text)))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4553 (princ (format viper-EmptyTextmarker reg))))
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4554 ))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4555 (t (error viper-InvalidTextmarker reg)))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4556
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4557
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4558
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4559 ;; commands in insertion mode
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4560
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4561 (defun viper-delete-backward-word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4562 "Delete previous word."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4563 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4564 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4565 (push-mark nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4566 (backward-word arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4567 (delete-region (point) (mark t))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4568 (pop-mark)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4569
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4570
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4571 (defun viper-set-expert-level (&optional dont-change-unless)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4572 "Sets the expert level for a Viper user.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4573 Can be called interactively to change (temporarily or permanently) the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4574 current expert level.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4575
18289
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
4576 The optional argument DONT-CHANGE-UNLESS, if not nil, says that
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4577 the level should not be changed, unless its current value is
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4578 meaningless (i.e., not one of 1,2,3,4,5).
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4579
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4580 User level determines the setting of Viper variables that are most
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4581 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
4582
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4583 (interactive)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4584
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4585 (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
4586
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4587 (save-window-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4588 (delete-other-windows)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4589 ;; if 0 < viper-expert-level < viper-max-expert-level
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4590 ;; & dont-change-unless = t -- use it; else ask
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4591 (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
4592
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4593 (setq viper-always t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4594 viper-ex-style-motion t
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4595 viper-ex-style-editing t
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4596 viper-want-ctl-h-help nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4597
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4598 (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
4599 (global-set-key ; in emacs-state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4600 viper-toggle-key
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4601 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4602 (setq viper-no-multiple-ESC t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4603 viper-re-search t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4604 viper-vi-style-in-minibuffer t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4605 viper-search-wrap-around-t t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4606 viper-electric-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4607 viper-want-emacs-keys-in-vi nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4608 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
4609
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4610 ((and (> viper-expert-level 1) (< viper-expert-level 5))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4611 ;; intermediate to guru
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4612 (setq viper-no-multiple-ESC (if (viper-window-display-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4613 t 'twice)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4614 viper-electric-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4615 viper-want-emacs-keys-in-vi t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4616 viper-want-emacs-keys-in-insert (> viper-expert-level 2))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4617
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4618 (if (eq viper-expert-level 4) ; respect user's ex-style motion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4619 ; and viper-no-multiple-ESC
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4620 (progn
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4621 (setq-default
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4622 viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4623 (viper-standard-value 'viper-ex-style-editing)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4624 viper-ex-style-motion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4625 (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
4626 (setq viper-ex-style-motion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4627 (viper-standard-value 'viper-ex-style-motion)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4628 viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4629 (viper-standard-value 'viper-ex-style-editing)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4630 viper-re-search
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4631 (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
4632 viper-no-multiple-ESC
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4633 (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
4634
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4635 ;; A wizard!!
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4636 ;; Ideally, if 5 is selected, a buffer should pop up to let the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4637 ;; user toggle the values of variables.
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4638 (t (setq-default viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4639 (viper-standard-value 'viper-ex-style-editing)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4640 viper-ex-style-motion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4641 (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
4642 (setq viper-want-ctl-h-help
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4643 (viper-standard-value 'viper-want-ctl-h-help)
18289
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
4644 viper-always
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4645 (viper-standard-value 'viper-always)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4646 viper-no-multiple-ESC
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4647 (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
4648 viper-ex-style-motion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4649 (viper-standard-value 'viper-ex-style-motion)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4650 viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4651 (viper-standard-value 'viper-ex-style-editing)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4652 viper-re-search
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4653 (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
4654 viper-electric-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4655 (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
4656 viper-want-emacs-keys-in-vi
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4657 (viper-standard-value 'viper-want-emacs-keys-in-vi)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4658 viper-want-emacs-keys-in-insert
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4659 (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
4660
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4661 (viper-set-mode-vars-for viper-current-state)
18289
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
4662 (if (or viper-always
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4663 (and (> viper-expert-level 0) (> 5 viper-expert-level)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4664 (viper-set-hooks)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4665
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
4666
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4667 ;; Ask user expert level.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4668 (defun viper-ask-level (dont-change-unless)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4669 (let ((ask-buffer " *viper-ask-level*")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4670 level-changed repeated)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4671 (save-window-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4672 (switch-to-buffer ask-buffer)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4673
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4674 (while (or (> viper-expert-level viper-max-expert-level)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4675 (< viper-expert-level 1)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4676 (null dont-change-unless))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4677 (erase-buffer)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4678 (if repeated
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4679 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4680 (message "Invalid user level")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4681 (beep 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4682 (setq repeated t))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4683 (setq dont-change-unless t
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4684 level-changed t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4685 (insert "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4686 Please specify your level of familiarity with the venomous VI PERil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4687 (and the VI Plan for Emacs Rescue).
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4688 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
4689
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4690 1 -- BEGINNER: Almost all Emacs features are suppressed.
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4691 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
4692 command history in the minibuffer are thrown in as a bonus.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4693 To use Emacs productively, you must reach level 3 or higher.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4694 2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state,
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4695 so most Emacs commands can be used when Viper is in Vi state.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4696 Good progress---you are well on the way to level 3!
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4697 3 -- GRAND MASTER: Like 3, but most Emacs commands are available also
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4698 in Viper's insert state.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4699 4 -- GURU: Like 3, but user settings are respected for viper-no-multiple-ESC,
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4700 viper-ex-style-motion, viper-ex-style-editing, and
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4701 viper-re-search variables. Adjust these settings to your taste.
18289
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
4702 5 -- WIZARD: Like 4, but user settings are also respected for viper-always,
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4703 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
4704 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
4705
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4706 Please, specify your level now: ")
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4707
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4708 (setq viper-expert-level (- (viper-read-char-exclusive) ?0))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4709 ) ; end while
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4710
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4711 ;; tell the user if level was changed
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4712 (and level-changed
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4713 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4714 (insert
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4715 (format "\n\n\n\n\n\t\tYou have selected user level %d"
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4716 viper-expert-level))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4717 (if (y-or-n-p "Do you wish to make this change permanent? ")
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4718 ;; save the setting for viper-expert-level
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4719 (viper-save-setting
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4720 'viper-expert-level
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4721 (format "Saving user level %d ..." viper-expert-level)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4722 viper-custom-file-name))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4723 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4724 (bury-buffer) ; remove ask-buffer from screen
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4725 (message "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4726 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4727
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4728
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4729 (defun viper-nil ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4730 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4731 (beep 1))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4732
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4733
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4734 ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4735 (defun viper-register-to-point (char &optional enforce-buffer)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4736 "Like jump-to-register, but switches to another buffer in another window."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4737 (interactive "cViper register to point: ")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4738 (let ((val (get-register char)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4739 (cond
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4740 ((and (fboundp 'frame-configuration-p)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4741 (frame-configuration-p val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4742 (set-frame-configuration val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4743 ((window-configuration-p val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4744 (set-window-configuration val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4745 ((viper-valid-marker val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4746 (if (and enforce-buffer
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4747 (not (equal (current-buffer) (marker-buffer val))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4748 (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
4749 (viper-int-to-char (1- (+ char ?a)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4750 (pop-to-buffer (marker-buffer val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4751 (goto-char val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4752 ((and (consp val) (eq (car val) 'file))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4753 (find-file (cdr val)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4754 (t
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
4755 (error viper-EmptyTextmarker (viper-int-to-char (1- (+ char ?a))))))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4756
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4757
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4758 (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
4759 "Save then kill current buffer."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4760 (interactive)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4761 (if (< viper-expert-level 2)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4762 (save-buffers-kill-emacs)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4763 (save-buffer)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4764 (kill-buffer (current-buffer))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4765
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4766
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4767
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4768 ;;; Bug Report
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4769
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4770 (defun viper-submit-report ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4771 "Submit bug report on Viper."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4772 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4773 (let ((reporter-prompt-for-summary-p t)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4774 (viper-device-type (viper-device-type))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4775 color-display-p frame-parameters
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4776 minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4777 varlist salutation window-config)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4778
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4779 ;; If mode info is needed, add variable to `let' and then set it below,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4780 ;; 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
4781 (setq color-display-p (if (viper-window-display-p)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4782 (viper-color-display-p)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4783 'non-x)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4784 minibuffer-vi-face (if (viper-has-face-support-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4785 (viper-get-face viper-minibuffer-vi-face)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4786 'non-x)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4787 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
4788 (viper-get-face
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4789 viper-minibuffer-insert-face)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4790 'non-x)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4791 minibuffer-emacs-face (if (viper-has-face-support-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4792 (viper-get-face
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4793 viper-minibuffer-emacs-face)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4794 'non-x)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4795 frame-parameters (if (fboundp 'frame-parameters)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4796 (frame-parameters (selected-frame))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4797
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4798 (setq varlist (list 'viper-vi-minibuffer-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4799 'viper-insert-minibuffer-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4800 'viper-vi-intercept-minor-mode
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4801 'viper-vi-local-user-minor-mode
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4802 'viper-vi-kbd-minor-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4803 'viper-vi-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4804 '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
4805 'viper-vi-diehard-minor-mode
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4806 'viper-vi-basic-minor-mode
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4807 'viper-replace-minor-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4808 'viper-insert-intercept-minor-mode
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4809 'viper-insert-local-user-minor-mode
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4810 'viper-insert-kbd-minor-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4811 'viper-insert-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4812 '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
4813 'viper-insert-diehard-minor-mode
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4814 'viper-insert-basic-minor-mode
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4815 'viper-emacs-intercept-minor-mode
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4816 'viper-emacs-local-user-minor-mode
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4817 'viper-emacs-kbd-minor-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4818 'viper-emacs-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4819 'viper-emacs-state-modifier-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4820 'viper-automatic-iso-accents
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4821 'viper-special-input-method
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4822 'viper-want-emacs-keys-in-insert
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4823 'viper-want-emacs-keys-in-vi
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4824 'viper-keep-point-on-undo
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4825 'viper-no-multiple-ESC
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4826 'viper-electric-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4827 'viper-ESC-key
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4828 'viper-want-ctl-h-help
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4829 'viper-ex-style-editing
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4830 'viper-delete-backwards-in-replace
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4831 'viper-vi-style-in-minibuffer
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4832 'viper-vi-state-hook
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4833 'viper-insert-state-hook
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4834 'viper-replace-state-hook
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4835 'viper-emacs-state-hook
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4836 'ex-cycle-other-window
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4837 'ex-cycle-through-non-files
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4838 'viper-expert-level
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4839 'major-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4840 'viper-device-type
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4841 'color-display-p
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4842 'frame-parameters
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4843 'minibuffer-vi-face
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4844 'minibuffer-insert-face
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4845 'minibuffer-emacs-face
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4846 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4847 (setq salutation "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4848 Congratulations! You may have unearthed a bug in Viper!
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4849 Please mail a concise, accurate summary of the problem to the address above.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4850
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4851 -------------------------------------------------------------------")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4852 (setq window-config (current-window-configuration))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4853 (with-output-to-temp-buffer " *viper-info*"
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4854 (switch-to-buffer " *viper-info*")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4855 (delete-other-windows)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4856 (princ "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4857 PLEASE FOLLOW THESE PROCEDURES
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4858 ------------------------------
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4859
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4860 Before reporting a bug, please verify that it is related to Viper, and is
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4861 not cause by other packages you are using.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4862
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4863 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
4864 problem. These warnings are normal and unavoidable.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4865
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4866 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
4867 those advertised in the manual. Such `customization' is likely to crash
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4868 Viper, as it would any other improperly customized Emacs package.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4869
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4870 If you are reporting an error message received while executing one of the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4871 Viper commands, type:
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4872
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4873 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
4874
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4875 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
4876 back trace of the execution that leads to the error. Please include this
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4877 trace in your bug report.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4878
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4879 If you believe that one of Viper's commands goes into an infinite loop
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4880 \(e.g., Emacs freezes\), type:
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4881
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4882 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
4883
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4884 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
4885 the current command. Include the resulting back trace in the bug report.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4886
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4887 Mail anyway (y or n)? ")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4888 (if (y-or-n-p "Mail anyway? ")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4889 ()
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4890 (set-window-configuration window-config)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4891 (error "Bug report aborted")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4892
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4893 (require 'reporter)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4894 (set-window-configuration window-config)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4895
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4896 (reporter-submit-bug-report "kifer@cs.sunysb.edu"
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4897 (viper-version)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4898 varlist
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4899 nil 'delete-other-windows
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4900 salutation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4901 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4902
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4903
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4904
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4905 ;; Smoothes out the difference between Emacs' unread-command-events
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4906 ;; and XEmacs unread-command-event. Arg is a character, an event, a list of
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4907 ;; events or a sequence of keys.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4908 ;;
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4909 ;; Due to the way unread-command-events in Emacs (not XEmacs), a non-event
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4910 ;; symbol in unread-command-events list may cause Emacs to turn this symbol
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4911 ;; into an event. Below, we delete nil from event lists, since nil is the most
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4912 ;; common symbol that might appear in this wrong context.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4913 (defun viper-set-unread-command-events (arg)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4914 (if viper-emacs-p
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4915 (setq
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4916 unread-command-events
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4917 (let ((new-events
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4918 (cond ((eventp arg) (list arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4919 ((listp arg) arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4920 ((sequencep arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4921 (listify-key-sequence arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4922 (t (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4923 "viper-set-unread-command-events: Invalid argument, %S"
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4924 arg)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4925 (if (not (eventp nil))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4926 (setq new-events (delq nil new-events)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4927 (append new-events unread-command-events)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4928 ;; XEmacs
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4929 (setq
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4930 unread-command-events
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4931 (append
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4932 (cond ((viper-characterp arg) (list (character-to-event arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4933 ((eventp arg) (list arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4934 ((stringp arg) (mapcar 'character-to-event arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4935 ((vectorp arg) (append arg nil)) ; turn into list
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4936 ((listp arg) (viper-eventify-list-xemacs arg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4937 (t (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4938 "viper-set-unread-command-events: Invalid argument, %S" arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4939 unread-command-events))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4940
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4941 ;; list is assumed to be a list of events of characters
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4942 (defun viper-eventify-list-xemacs (lis)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4943 (mapcar
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4944 (lambda (elt)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4945 (cond ((viper-characterp elt) (character-to-event elt))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4946 ((eventp elt) elt)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4947 (t (error
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4948 "viper-eventify-list-xemacs: can't convert to event, %S"
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
4949 elt))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4950 lis))
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
4951
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
4952
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4953
38414
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33842
diff changeset
4954 ;;; viper-cmd.el ends here