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