;;; viper-cmd.el --- Vi command support for Viper
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
-;; Keywords: emulations
-;; Author: Michael Kifer <kifer@cs.sunysb.edu>
+;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; This file is part of GNU Emacs.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
-;; Code
+;;; Commentary:
+
+;;; Code:
(provide 'viper-cmd)
+(require 'advice)
;; Compiler pacifier
-(defvar vip-minibuffer-current-face)
-(defvar vip-minibuffer-insert-face)
-(defvar vip-minibuffer-vi-face)
-(defvar vip-minibuffer-emacs-face)
-(defvar vip-mode-string )
+(defvar viper-minibuffer-current-face)
+(defvar viper-minibuffer-insert-face)
+(defvar viper-minibuffer-vi-face)
+(defvar viper-minibuffer-emacs-face)
+(defvar viper-always)
+(defvar viper-mode-string)
+(defvar viper-custom-file-name)
+(defvar viper--key-maps)
+(defvar viper--intercept-key-maps)
(defvar iso-accents-mode)
+(defvar quail-mode)
+(defvar quail-current-str)
(defvar zmacs-region-stays)
(defvar mark-even-if-inactive)
-
-(eval-when-compile
- (let ((load-path (cons (expand-file-name ".") load-path)))
- (or (featurep 'viper-util)
- (load "viper-util.el" nil nil 'nosuffix))
- (or (featurep 'viper-keym)
- (load "viper-keym.el" nil nil 'nosuffix))
- (or (featurep 'viper-mous)
- (load "viper-mous.el" nil nil 'nosuffix))
- (or (featurep 'viper-macs)
- (load "viper-macs.el" nil nil 'nosuffix))
- (or (featurep 'viper-ex)
- (load "viper-ex.el" nil nil 'nosuffix))
- ))
+(defvar init-message)
+(defvar initial)
+(defvar undo-beg-posn)
+(defvar undo-end-posn)
+
+;; loading happens only in non-interactive compilation
+;; in order to spare non-viperized emacs from being viperized
+(if noninteractive
+ (eval-when-compile
+ (let ((load-path (cons (expand-file-name ".") load-path)))
+ (or (featurep 'viper-util)
+ (load "viper-util.el" nil nil 'nosuffix))
+ (or (featurep 'viper-keym)
+ (load "viper-keym.el" nil nil 'nosuffix))
+ (or (featurep 'viper-mous)
+ (load "viper-mous.el" nil nil 'nosuffix))
+ (or (featurep 'viper-macs)
+ (load "viper-macs.el" nil nil 'nosuffix))
+ (or (featurep 'viper-ex)
+ (load "viper-ex.el" nil nil 'nosuffix))
+ )))
;; end pacifier
;; generate test functions
;; given symbol foo, foo-p is the test function, foos is the set of
;; Viper command keys
-;; (macroexpand '(vip-test-com-defun foo))
-;; (defun foo-p (com) (consp (memq (if (< com 0) (- com) com) foos)))
+;; (macroexpand '(viper-test-com-defun foo))
+;; (defun foo-p (com) (consp (memq com foos)))
-(defmacro vip-test-com-defun (name)
+(defmacro viper-test-com-defun (name)
(let* ((snm (symbol-name name))
(nm-p (intern (concat snm "-p")))
(nms (intern (concat snm "s"))))
- (` (defun (, nm-p) (com)
- (consp (memq (if (< com 0) (- com) com) (, nms)))))))
-
+ `(defun ,nm-p (com)
+ (consp (viper-memq-char com ,nms)
+ ))))
+
;; Variables for defining VI commands
;; Modifying commands that can be prefixes to movement commands
-(defconst vip-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\"))
-;; define vip-prefix-command-p
-(vip-test-com-defun vip-prefix-command)
-
+(defvar viper-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\"))
+;; define viper-prefix-command-p
+(viper-test-com-defun viper-prefix-command)
+
;; Commands that are pairs eg. dd. r and R here are a hack
-(defconst vip-charpair-commands '(?c ?d ?y ?! ?= ?< ?> ?r ?R))
-;; define vip-charpair-command-p
-(vip-test-com-defun vip-charpair-command)
+(defconst viper-charpair-commands '(?c ?d ?y ?! ?= ?< ?> ?r ?R))
+;; define viper-charpair-command-p
+(viper-test-com-defun viper-charpair-command)
-(defconst vip-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?H ?j ?k ?l
+(defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?H ?j ?k ?l
?H ?M ?L ?n ?t ?T ?w ?W ?$ ?%
?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?`
- ?; ?, ?0 ?? ?/
+ ?\; ?, ?0 ?? ?/ ?\ ?\C-m
+ space return
+ delete backspace
)
"Movement commands")
-;; define vip-movement-command-p
-(vip-test-com-defun vip-movement-command)
+;; define viper-movement-command-p
+(viper-test-com-defun viper-movement-command)
+
+;; Vi digit commands
+(defconst viper-digit-commands '(?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
-(defconst vip-digit-commands '(?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9)
- "Digit commands")
-;; define vip-digit-command-p
-(vip-test-com-defun vip-digit-command)
+;; define viper-digit-command-p
+(viper-test-com-defun viper-digit-command)
;; Commands that can be repeated by . (dotted)
-(defconst vip-dotable-commands '(?c ?d ?C ?s ?S ?D ?> ?<))
-;; define vip-dotable-command-p
-(vip-test-com-defun vip-dotable-command)
+(defconst viper-dotable-commands '(?c ?d ?C ?s ?S ?D ?> ?<))
+;; define viper-dotable-command-p
+(viper-test-com-defun viper-dotable-command)
;; Commands that can follow a #
-(defconst vip-hash-commands '(?c ?C ?g ?q ?s))
-;; define vip-hash-command-p
-(vip-test-com-defun vip-hash-command)
+(defconst viper-hash-commands '(?c ?C ?g ?q ?s))
+;; define viper-hash-command-p
+(viper-test-com-defun viper-hash-command)
;; Commands that may have registers as prefix
-(defconst vip-regsuffix-commands '(?d ?y ?Y ?D ?p ?P ?x ?X))
-;; define vip-regsuffix-command-p
-(vip-test-com-defun vip-regsuffix-command)
-
-(defconst vip-vi-commands (append vip-movement-commands
- vip-digit-commands
- vip-dotable-commands
- vip-charpair-commands
- vip-hash-commands
- vip-prefix-commands
- vip-regsuffix-commands)
+(defconst viper-regsuffix-commands '(?d ?y ?Y ?D ?p ?P ?x ?X))
+;; define viper-regsuffix-command-p
+(viper-test-com-defun viper-regsuffix-command)
+
+(defconst viper-vi-commands (append viper-movement-commands
+ viper-digit-commands
+ viper-dotable-commands
+ viper-charpair-commands
+ viper-hash-commands
+ viper-prefix-commands
+ viper-regsuffix-commands)
"The list of all commands in Vi-state.")
-;; define vip-vi-command-p
-(vip-test-com-defun vip-vi-command)
+;; define viper-vi-command-p
+(viper-test-com-defun viper-vi-command)
+
+;; Where viper saves mark. This mark is resurrected by m^
+(defvar viper-saved-mark nil)
+
+;; Contains user settings for vars affected by viper-set-expert-level function.
+;; Not a user option.
+(defvar viper-saved-user-settings nil)
+
\f
;;; CODE
;; sentinels
-;; Runs vip-after-change-functions inside after-change-functions
-(defun vip-after-change-sentinel (beg end len)
- (let ((list vip-after-change-functions))
- (while list
- (funcall (car list) beg end len)
- (setq list (cdr list)))))
-
-;; Runs vip-before-change-functions inside before-change-functions
-(defun vip-before-change-sentinel (beg end)
- (let ((list vip-before-change-functions))
- (while list
- (funcall (car list) beg end)
- (setq list (cdr list)))))
-
-(defsubst vip-post-command-sentinel ()
- (run-hooks 'vip-post-command-hooks))
-
-(defsubst vip-pre-command-sentinel ()
- (run-hooks 'vip-pre-command-hooks))
-
+;; Runs viper-after-change-functions inside after-change-functions
+(defun viper-after-change-sentinel (beg end len)
+ (run-hook-with-args 'viper-after-change-functions beg end len))
+
+;; Runs viper-before-change-functions inside before-change-functions
+(defun viper-before-change-sentinel (beg end)
+ (run-hook-with-args 'viper-before-change-functions beg end))
+
+(defsubst viper-post-command-sentinel ()
+ (run-hooks 'viper-post-command-hooks)
+ (if (eq viper-current-state 'vi-state)
+ (viper-restore-cursor-color 'after-insert-mode)))
+
+(defsubst viper-pre-command-sentinel ()
+ (run-hooks 'viper-pre-command-hooks))
+
;; Needed so that Viper will be able to figure the last inserted
;; chunk of text with reasonable accuracy.
-(defsubst vip-insert-state-post-command-sentinel ()
- (if (and (memq vip-current-state '(insert-state replace-state))
- vip-insert-point
- (>= (point) vip-insert-point))
- (setq vip-last-posn-while-in-insert-state (point-marker)))
- (if (eq vip-current-state 'insert-state)
+(defsubst viper-insert-state-post-command-sentinel ()
+ (if (and (memq viper-current-state '(insert-state replace-state))
+ viper-insert-point
+ (>= (point) viper-insert-point))
+ (setq viper-last-posn-while-in-insert-state (point-marker)))
+ (or (viper-overlay-p viper-replace-overlay)
(progn
- (or (stringp vip-saved-cursor-color)
- (string= (vip-get-cursor-color) vip-insert-state-cursor-color)
- (setq vip-saved-cursor-color (vip-get-cursor-color)))
- (if (stringp vip-saved-cursor-color)
- (vip-change-cursor-color vip-insert-state-cursor-color))
- ))
- (if (and (eq this-command 'dabbrev-expand)
- (integerp vip-pre-command-point)
- (> vip-insert-point vip-pre-command-point))
- (move-marker vip-insert-point vip-pre-command-point))
+ (viper-set-replace-overlay (point-min) (point-min))
+ (viper-hide-replace-overlay)))
+ (if (eq viper-current-state 'insert-state)
+ (let ((has-saved-cursor-color-in-insert-mode
+ (stringp (viper-get-saved-cursor-color-in-insert-mode))))
+ (or has-saved-cursor-color-in-insert-mode
+ (string= (viper-get-cursor-color) viper-insert-state-cursor-color)
+ ;; save current color, if not already saved
+ (viper-save-cursor-color 'before-insert-mode))
+ ;; set insert mode cursor color
+ (viper-change-cursor-color viper-insert-state-cursor-color)))
+ (if (and viper-emacs-state-cursor-color (eq viper-current-state 'emacs-state))
+ (let ((has-saved-cursor-color-in-emacs-mode
+ (stringp (viper-get-saved-cursor-color-in-emacs-mode))))
+ (or has-saved-cursor-color-in-emacs-mode
+ (string= (viper-get-cursor-color) viper-emacs-state-cursor-color)
+ ;; save current color, if not already saved
+ (viper-save-cursor-color 'before-emacs-mode))
+ ;; set emacs mode cursor color
+ (viper-change-cursor-color viper-emacs-state-cursor-color)))
+
+ (if (and (memq this-command '(dabbrev-expand hippie-expand))
+ (integerp viper-pre-command-point)
+ (markerp viper-insert-point)
+ (marker-position viper-insert-point)
+ (> viper-insert-point viper-pre-command-point))
+ (viper-move-marker-locally viper-insert-point viper-pre-command-point))
)
-
-(defsubst vip-insert-state-pre-command-sentinel ()
- (or (memq this-command '(self-insert-command))
- (memq (vip-event-key last-command-event)
+
+(defsubst viper-preserve-cursor-color ()
+ (or (memq this-command '(self-insert-command
+ viper-del-backward-char-in-insert
+ viper-del-backward-char-in-replace
+ viper-delete-backward-char
+ viper-join-lines
+ viper-delete-char))
+ (memq (viper-event-key last-command-event)
'(up down left right (meta f) (meta b)
- (control n) (control p) (control f) (control b)))
- (vip-restore-cursor-color-after-insert))
- (if (and (eq this-command 'dabbrev-expand)
- (markerp vip-insert-point)
- (marker-position vip-insert-point))
- (setq vip-pre-command-point (marker-position vip-insert-point))))
-
-(defsubst vip-R-state-post-command-sentinel ()
+ (control n) (control p) (control f) (control b)))))
+
+(defsubst viper-insert-state-pre-command-sentinel ()
+ (or (viper-preserve-cursor-color)
+ (viper-restore-cursor-color 'after-insert-mode))
+ (if (and (memq this-command '(dabbrev-expand hippie-expand))
+ (markerp viper-insert-point)
+ (marker-position viper-insert-point))
+ (setq viper-pre-command-point (marker-position viper-insert-point))))
+
+(defsubst viper-R-state-post-command-sentinel ()
;; Restoring cursor color is needed despite
- ;; vip-replace-state-pre-command-sentinel: When you jump to another buffer in
- ;; another frame, the pre-command hook won't change cursor color to default
- ;; in that other frame. So, if the second frame cursor was red and we set
- ;; the point outside the replacement region, then the cursor color will
- ;; remain red. Restoring the default, below, prevents this.
- (if (and (<= (vip-replace-start) (point))
- (<= (point) (vip-replace-end)))
- (vip-change-cursor-color vip-replace-overlay-cursor-color)
- (vip-restore-cursor-color-after-replace)
+ ;; viper-replace-state-pre-command-sentinel: When you jump to another buffer
+ ;; in another frame, the pre-command hook won't change cursor color to
+ ;; default in that other frame. So, if the second frame cursor was red and
+ ;; we set the point outside the replacement region, then the cursor color
+ ;; will remain red. Restoring the default, below, prevents this.
+ (if (and (<= (viper-replace-start) (point))
+ (<= (point) (viper-replace-end)))
+ (viper-change-cursor-color viper-replace-overlay-cursor-color)
+ (viper-restore-cursor-color 'after-replace-mode)
))
;; to speed up, don't change cursor color before self-insert
;; and common move commands
-(defsubst vip-replace-state-pre-command-sentinel ()
- (or (memq this-command '(self-insert-command))
- (memq (vip-event-key last-command-event)
- '(up down left right (meta f) (meta b)
- (control n) (control p) (control f) (control b)))
- (vip-restore-cursor-color-after-replace)))
-
-(defun vip-replace-state-post-command-sentinel ()
+(defsubst viper-replace-state-pre-command-sentinel ()
+ (or (viper-preserve-cursor-color)
+ (viper-restore-cursor-color 'after-replace-mode)))
+
+
+;; Make sure we don't delete more than needed.
+;; This is executed at viper-last-posn-in-replace-region
+(defsubst viper-trim-replace-chars-to-delete-if-necessary ()
+ (setq viper-replace-chars-to-delete
+ (max 0
+ (min viper-replace-chars-to-delete
+ ;; Don't delete more than to the end of repl overlay
+ (viper-chars-in-region
+ (viper-replace-end) viper-last-posn-in-replace-region)
+ ;; point is viper-last-posn-in-replace-region now
+ ;; So, this limits deletion to the end of line
+ (viper-chars-in-region (point) (viper-line-pos 'end))
+ ))))
+
+
+(defun viper-replace-state-post-command-sentinel ()
;; Restoring cursor color is needed despite
- ;; vip-replace-state-pre-command-sentinel: When one jumps to another buffer
+ ;; viper-replace-state-pre-command-sentinel: When one jumps to another buffer
;; in another frame, the pre-command hook won't change cursor color to
;; default in that other frame. So, if the second frame cursor was red and
;; we set the point outside the replacement region, then the cursor color
- ;; will remain red. Restoring the default, below, fixes this problem.
+ ;; will remain red. Restoring the default, below, fixes this problem.
;;
- ;; We optimize for self-insert-command's here, since they either don't change
+ ;; We optimize for some commands, like self-insert-command,
+ ;; viper-delete-backward-char, etc., since they either don't change
;; cursor color or, if they terminate replace mode, the color will be changed
- ;; in vip-finish-change
- (or (memq this-command '(self-insert-command))
- (vip-restore-cursor-color-after-replace))
- (cond
- ((eq vip-current-state 'replace-state)
+ ;; in viper-finish-change
+ (or (viper-preserve-cursor-color)
+ (viper-restore-cursor-color 'after-replace-mode))
+ (cond
+ ((eq viper-current-state 'replace-state)
;; delete characters to compensate for inserted chars.
- (let ((replace-boundary (vip-replace-end)))
+ (let ((replace-boundary (viper-replace-end)))
(save-excursion
- (goto-char vip-last-posn-in-replace-region)
- (delete-char vip-replace-chars-to-delete)
- (setq vip-replace-chars-to-delete 0
- vip-replace-chars-deleted 0)
+ (goto-char viper-last-posn-in-replace-region)
+ (viper-trim-replace-chars-to-delete-if-necessary)
+ (delete-char viper-replace-chars-to-delete)
+ (setq viper-replace-chars-to-delete 0)
;; terminate replace mode if reached replace limit
- (if (= vip-last-posn-in-replace-region
- (vip-replace-end))
- (vip-finish-change vip-last-posn-in-replace-region)))
-
- (if (and (<= (vip-replace-start) (point))
- (<= (point) replace-boundary))
+ (if (= viper-last-posn-in-replace-region (viper-replace-end))
+ (viper-finish-change)))
+
+ (if (viper-pos-within-region
+ (point) (viper-replace-start) replace-boundary)
(progn
- ;; the state may have changed in vip-finish-change above
- (if (eq vip-current-state 'replace-state)
- (vip-change-cursor-color vip-replace-overlay-cursor-color))
- (setq vip-last-posn-in-replace-region (point-marker))))
+ ;; the state may have changed in viper-finish-change above
+ (if (eq viper-current-state 'replace-state)
+ (viper-change-cursor-color viper-replace-overlay-cursor-color))
+ (setq viper-last-posn-in-replace-region (point-marker))))
))
-
- (t ;; terminate replace mode if changed Viper states.
- (vip-finish-change vip-last-posn-in-replace-region))))
+ ;; terminate replace mode if changed Viper states.
+ (t (viper-finish-change))))
;; changing mode
;; Change state to NEW-STATE---either emacs-state, vi-state, or insert-state.
-(defun vip-change-state (new-state)
- ;; Keep vip-post/pre-command-hooks fresh.
- ;; We remove then add vip-post/pre-command-sentinel since it is very
- ;; desirable that vip-pre-command-sentinel is the last hook and
- ;; vip-post-command-sentinel is the first hook.
- (remove-hook 'post-command-hook 'vip-post-command-sentinel)
- (add-hook 'post-command-hook 'vip-post-command-sentinel)
- (remove-hook 'pre-command-hook 'vip-pre-command-sentinel)
- (add-hook 'pre-command-hook 'vip-pre-command-sentinel t)
+(defun viper-change-state (new-state)
+ ;; Keep viper-post/pre-command-hooks fresh.
+ ;; We remove then add viper-post/pre-command-sentinel since it is very
+ ;; desirable that viper-pre-command-sentinel is the last hook and
+ ;; viper-post-command-sentinel is the first hook.
+
+ (viper-cond-compile-for-xemacs-or-emacs
+ ;; xemacs
+ (progn
+ (make-local-hook 'viper-after-change-functions)
+ (make-local-hook 'viper-before-change-functions)
+ (make-local-hook 'viper-post-command-hooks)
+ (make-local-hook 'viper-pre-command-hooks))
+ nil ; emacs
+ )
+
+ (remove-hook 'post-command-hook 'viper-post-command-sentinel)
+ (add-hook 'post-command-hook 'viper-post-command-sentinel)
+ (remove-hook 'pre-command-hook 'viper-pre-command-sentinel)
+ (add-hook 'pre-command-hook 'viper-pre-command-sentinel t)
;; These hooks will be added back if switching to insert/replace mode
- (vip-remove-hook 'vip-post-command-hooks
- 'vip-insert-state-post-command-sentinel)
- (vip-remove-hook 'vip-pre-command-hooks
- 'vip-insert-state-pre-command-sentinel)
+ (remove-hook 'viper-post-command-hooks
+ 'viper-insert-state-post-command-sentinel 'local)
+ (remove-hook 'viper-pre-command-hooks
+ 'viper-insert-state-pre-command-sentinel 'local)
+ (setq viper-intermediate-command nil)
(cond ((eq new-state 'vi-state)
- (cond ((member vip-current-state '(insert-state replace-state))
-
- ;; move vip-last-posn-while-in-insert-state
+ (cond ((member viper-current-state '(insert-state replace-state))
+
+ ;; move viper-last-posn-while-in-insert-state
;; This is a normal hook that is executed in insert/replace
- ;; states after each command. In Vi/Emacs state, it does
- ;; nothing. We need to execute it here to make sure that
+ ;; states after each command. In Vi/Emacs state, it does
+ ;; nothing. We need to execute it here to make sure that
;; the last posn was recorded when we hit ESC.
;; It may be left unrecorded if the last thing done in
;; insert/repl state was dabbrev-expansion or abbrev
;; expansion caused by hitting ESC
- (vip-insert-state-post-command-sentinel)
-
+ (viper-insert-state-post-command-sentinel)
+
(condition-case conds
(progn
- (vip-save-last-insertion
- vip-insert-point
- vip-last-posn-while-in-insert-state)
- (if vip-began-as-replace
- (setq vip-began-as-replace nil)
+ (viper-save-last-insertion
+ viper-insert-point
+ viper-last-posn-while-in-insert-state)
+ (if viper-began-as-replace
+ (setq viper-began-as-replace nil)
;; repeat insert commands if numerical arg > 1
(save-excursion
- (vip-repeat-insert-command))))
+ (viper-repeat-insert-command))))
(error
- (vip-message-conditions conds)))
-
- (if (> (length vip-last-insertion) 0)
- (vip-push-onto-ring vip-last-insertion
- 'vip-insertion-ring))
-
- (if vip-ex-style-editing-in-insert
- (or (bolp) (backward-char 1))))
+ (viper-message-conditions conds)))
+
+ (if (> (length viper-last-insertion) 0)
+ (viper-push-onto-ring viper-last-insertion
+ 'viper-insertion-ring))
+
+ (if viper-ESC-moves-cursor-back
+ (or (bolp) (viper-beginning-of-field) (backward-char 1))))
))
-
+
;; insert or replace
((memq new-state '(insert-state replace-state))
- (if (memq vip-current-state '(emacs-state vi-state))
- (vip-move-marker-locally 'vip-insert-point (point)))
- (vip-move-marker-locally 'vip-last-posn-while-in-insert-state (point))
- (vip-add-hook 'vip-post-command-hooks
- 'vip-insert-state-post-command-sentinel t)
- (vip-add-hook 'vip-pre-command-hooks
- 'vip-insert-state-pre-command-sentinel t))
+ (if (memq viper-current-state '(emacs-state vi-state))
+ (viper-move-marker-locally 'viper-insert-point (point)))
+ (viper-move-marker-locally
+ 'viper-last-posn-while-in-insert-state (point))
+ (add-hook 'viper-post-command-hooks
+ 'viper-insert-state-post-command-sentinel t 'local)
+ (add-hook 'viper-pre-command-hooks
+ 'viper-insert-state-pre-command-sentinel t 'local))
) ; outermost cond
-
- ;; Nothing needs to be done to switch to emacs mode! Just set some
- ;; variables, which is already done in vip-change-state-to-emacs!
- (setq vip-current-state new-state)
- (vip-normalize-minor-mode-map-alist)
- (vip-adjust-keys-for new-state)
- (vip-set-mode-vars-for new-state)
- (vip-refresh-mode-line)
+ ;; Nothing needs to be done to switch to emacs mode! Just set some
+ ;; variables, which is already done in viper-change-state-to-emacs!
+
+ ;; ISO accents
+ ;; always turn off iso-accents-mode in vi-state, or else we won't be able to
+ ;; use the keys `,',^ , as they will do accents instead of Vi actions.
+ (cond ((eq new-state 'vi-state) (viper-set-iso-accents-mode nil));accents off
+ (viper-automatic-iso-accents (viper-set-iso-accents-mode t));accents on
+ (t (viper-set-iso-accents-mode nil)))
+ ;; Always turn off quail mode in vi state
+ (cond ((eq new-state 'vi-state) (viper-set-input-method nil)) ;intl input off
+ (viper-special-input-method (viper-set-input-method t)) ;intl input on
+ (t (viper-set-input-method nil)))
+
+ (setq viper-current-state new-state)
+
+ (viper-update-syntax-classes)
+ (viper-normalize-minor-mode-map-alist)
+ (viper-adjust-keys-for new-state)
+ (viper-set-mode-vars-for new-state)
+ (viper-refresh-mode-line)
)
-
-(defun vip-adjust-keys-for (state)
+(defun viper-adjust-keys-for (state)
"Make necessary adjustments to keymaps before entering STATE."
(cond ((memq state '(insert-state replace-state))
- (if vip-auto-indent
+ (if viper-auto-indent
(progn
- (define-key vip-insert-basic-map "\C-m" 'vip-autoindent)
- (if vip-want-emacs-keys-in-insert
+ (define-key viper-insert-basic-map "\C-m" 'viper-autoindent)
+ (if viper-want-emacs-keys-in-insert
;; expert
- (define-key vip-insert-basic-map "\C-j" nil)
+ (define-key viper-insert-basic-map "\C-j" nil)
;; novice
- (define-key vip-insert-basic-map "\C-j" 'vip-autoindent)))
- (define-key vip-insert-basic-map "\C-m" nil)
- (define-key vip-insert-basic-map "\C-j" nil))
-
- (setq vip-insert-diehard-minor-mode
- (not vip-want-emacs-keys-in-insert))
-
- (if vip-want-ctl-h-help
- (progn
- (define-key vip-insert-basic-map [(control h)] 'help-command)
- (define-key vip-replace-map [(control h)] 'help-command))
- (define-key vip-insert-basic-map
- [(control h)] 'vip-del-backward-char-in-insert)
- (define-key vip-replace-map
- [(control h)] 'vip-del-backward-char-in-replace)))
-
+ (define-key viper-insert-basic-map "\C-j" 'viper-autoindent)))
+ (define-key viper-insert-basic-map "\C-m" nil)
+ (define-key viper-insert-basic-map "\C-j" nil))
+
+ (setq viper-insert-diehard-minor-mode
+ (not viper-want-emacs-keys-in-insert))
+
+ (if viper-want-ctl-h-help
+ (progn
+ (define-key viper-insert-basic-map "\C-h" 'help-command)
+ (define-key viper-replace-map "\C-h" 'help-command))
+ (define-key viper-insert-basic-map
+ "\C-h" 'viper-del-backward-char-in-insert)
+ (define-key viper-replace-map
+ "\C-h" 'viper-del-backward-char-in-replace))
+ ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't.
+ (define-key viper-insert-basic-map
+ [backspace] 'viper-del-backward-char-in-insert)
+ (define-key viper-replace-map
+ [backspace] 'viper-del-backward-char-in-replace)
+ ) ; end insert/replace case
(t ; Vi state
- (setq vip-vi-diehard-minor-mode (not vip-want-emacs-keys-in-vi))
- (if vip-want-ctl-h-help
- (define-key vip-vi-basic-map [(control h)] 'help-command)
- (define-key vip-vi-basic-map [(control h)] 'vip-backward-char)))
+ (setq viper-vi-diehard-minor-mode (not viper-want-emacs-keys-in-vi))
+ (if viper-want-ctl-h-help
+ (define-key viper-vi-basic-map "\C-h" 'help-command)
+ (define-key viper-vi-basic-map "\C-h" 'viper-backward-char))
+ ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't.
+ (define-key viper-vi-basic-map [backspace] 'viper-backward-char))
))
-
-
+
+
;; Normalizes minor-mode-map-alist by putting Viper keymaps first.
;; This ensures that Viper bindings are in effect, regardless of which minor
;; modes were turned on by the user or by other packages.
-(defun vip-normalize-minor-mode-map-alist ()
- (setq minor-mode-map-alist
- (vip-append-filter-alist
- (list
- (cons 'vip-vi-intercept-minor-mode vip-vi-intercept-map)
- (cons 'vip-vi-minibuffer-minor-mode vip-minibuffer-map)
- (cons 'vip-vi-local-user-minor-mode vip-vi-local-user-map)
- (cons 'vip-vi-kbd-minor-mode vip-vi-kbd-map)
- (cons 'vip-vi-global-user-minor-mode vip-vi-global-user-map)
- (cons 'vip-vi-state-modifier-minor-mode
+(defun viper-normalize-minor-mode-map-alist ()
+ (setq viper--intercept-key-maps
+ (list
+ (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map)
+ (cons 'viper-insert-intercept-minor-mode viper-insert-intercept-map)
+ (cons 'viper-emacs-intercept-minor-mode viper-emacs-intercept-map)
+ ))
+ (setq viper--key-maps
+ (list (cons 'viper-vi-minibuffer-minor-mode viper-minibuffer-map)
+ (cons 'viper-vi-local-user-minor-mode viper-vi-local-user-map)
+ (cons 'viper-vi-kbd-minor-mode viper-vi-kbd-map)
+ (cons 'viper-vi-global-user-minor-mode viper-vi-global-user-map)
+ (cons 'viper-vi-state-modifier-minor-mode
+ (if (keymapp
+ (cdr (assoc major-mode viper-vi-state-modifier-alist)))
+ (cdr (assoc major-mode viper-vi-state-modifier-alist))
+ viper-empty-keymap))
+ (cons 'viper-vi-diehard-minor-mode viper-vi-diehard-map)
+ (cons 'viper-vi-basic-minor-mode viper-vi-basic-map)
+ (cons 'viper-replace-minor-mode viper-replace-map)
+ ;; viper-insert-minibuffer-minor-mode must come after
+ ;; viper-replace-minor-mode
+ (cons 'viper-insert-minibuffer-minor-mode
+ viper-minibuffer-map)
+ (cons 'viper-insert-local-user-minor-mode
+ viper-insert-local-user-map)
+ (cons 'viper-insert-kbd-minor-mode viper-insert-kbd-map)
+ (cons 'viper-insert-global-user-minor-mode
+ viper-insert-global-user-map)
+ (cons 'viper-insert-state-modifier-minor-mode
(if (keymapp
- (cdr (assoc major-mode vip-vi-state-modifier-alist)))
- (cdr (assoc major-mode vip-vi-state-modifier-alist))
- vip-empty-keymap))
- (cons 'vip-vi-diehard-minor-mode vip-vi-diehard-map)
- (cons 'vip-vi-basic-minor-mode vip-vi-basic-map)
- (cons 'vip-insert-intercept-minor-mode vip-insert-intercept-map)
- (cons 'vip-replace-minor-mode vip-replace-map)
- ;; vip-insert-minibuffer-minor-mode must come after
- ;; vip-replace-minor-mode
- (cons 'vip-insert-minibuffer-minor-mode
- vip-minibuffer-map)
- (cons 'vip-insert-local-user-minor-mode
- vip-insert-local-user-map)
- (cons 'vip-insert-kbd-minor-mode vip-insert-kbd-map)
- (cons 'vip-insert-global-user-minor-mode
- vip-insert-global-user-map)
- (cons 'vip-insert-state-modifier-minor-mode
+ (cdr (assoc major-mode
+ viper-insert-state-modifier-alist)))
+ (cdr (assoc major-mode
+ viper-insert-state-modifier-alist))
+ viper-empty-keymap))
+ (cons 'viper-insert-diehard-minor-mode viper-insert-diehard-map)
+ (cons 'viper-insert-basic-minor-mode viper-insert-basic-map)
+ (cons 'viper-emacs-local-user-minor-mode
+ viper-emacs-local-user-map)
+ (cons 'viper-emacs-kbd-minor-mode viper-emacs-kbd-map)
+ (cons 'viper-emacs-global-user-minor-mode
+ viper-emacs-global-user-map)
+ (cons 'viper-emacs-state-modifier-minor-mode
(if (keymapp
(cdr
- (assoc major-mode vip-insert-state-modifier-alist)))
+ (assoc major-mode viper-emacs-state-modifier-alist)))
(cdr
- (assoc major-mode vip-insert-state-modifier-alist))
- vip-empty-keymap))
- (cons 'vip-insert-diehard-minor-mode vip-insert-diehard-map)
- (cons 'vip-insert-basic-minor-mode vip-insert-basic-map)
- (cons 'vip-emacs-intercept-minor-mode
- vip-emacs-intercept-map)
- (cons 'vip-emacs-local-user-minor-mode
- vip-emacs-local-user-map)
- (cons 'vip-emacs-kbd-minor-mode vip-emacs-kbd-map)
- (cons 'vip-emacs-global-user-minor-mode
- vip-emacs-global-user-map)
- (cons 'vip-emacs-state-modifier-minor-mode
- (if (keymapp
- (cdr
- (assoc major-mode vip-emacs-state-modifier-alist)))
- (cdr
- (assoc major-mode vip-emacs-state-modifier-alist))
- vip-empty-keymap))
- )
- minor-mode-map-alist)))
-
-
+ (assoc major-mode viper-emacs-state-modifier-alist))
+ viper-empty-keymap))
+ ))
+
+ ;; This var is not local in Emacs, so we make it local. It must be local
+ ;; because although the stack of minor modes can be the same for all buffers,
+ ;; the associated *keymaps* can be different. In Viper,
+ ;; viper-vi-local-user-map, viper-insert-local-user-map, and others can have
+ ;; different keymaps for different buffers. Also, the keymaps associated
+ ;; with viper-vi/insert-state-modifier-minor-mode can be different.
+ ;; ***This is needed only in case emulation-mode-map-alists is not defined.
+ ;; In emacs with emulation-mode-map-alists, nothing needs to be done
+ (unless
+ (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
+ (set (make-local-variable 'minor-mode-map-alist)
+ (viper-append-filter-alist
+ (append viper--intercept-key-maps viper--key-maps)
+ minor-mode-map-alist)))
+ )
\f
;; Viper mode-changing commands and utilities
;; Modifies mode-line-buffer-identification.
-(defun vip-refresh-mode-line ()
- (setq vip-mode-string
- (cond ((eq vip-current-state 'emacs-state) vip-emacs-state-id)
- ((eq vip-current-state 'vi-state) vip-vi-state-id)
- ((eq vip-current-state 'replace-state) vip-replace-state-id)
- ((eq vip-current-state 'insert-state) vip-insert-state-id)))
-
+(defun viper-refresh-mode-line ()
+ (set (make-local-variable 'viper-mode-string)
+ (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id)
+ ((eq viper-current-state 'vi-state) viper-vi-state-id)
+ ((eq viper-current-state 'replace-state) viper-replace-state-id)
+ ((eq viper-current-state 'insert-state) viper-insert-state-id)))
+
;; Sets Viper mode string in global-mode-string
(force-mode-line-update))
-
-;;;###autoload
-(defun viper-mode ()
- "Turn on Viper emulation of Vi."
- (interactive)
- (if (not noninteractive)
- (progn
- (if vip-first-time ; This check is important. Without it, startup and
- (progn ; expert-level msgs mix up when viper-mode recurses
- (setq vip-first-time nil)
- (if (not vip-inhibit-startup-message)
- (save-window-excursion
- (setq vip-inhibit-startup-message t)
- (delete-other-windows)
- (switch-to-buffer "Viper Startup Message")
- (erase-buffer)
- (insert
- (substitute-command-keys
- "Viper Is a Package for Emacs Rebels.
-It is also a VI Plan for Emacs Rescue and a venomous VI PERil.
-
-Technically speaking, Viper is a Vi emulation package for GNU Emacs 19 and
-XEmacs 19. It supports virtually all of Vi and Ex functionality, extending
-and improving upon much of it.
-
- 1. Viper supports Vi at several levels. Level 1 is the closest to Vi,
- level 5 provides the most flexibility to depart from many Vi conventions.
-
- You will be asked to specify your user level in a following screen.
-
- If you select user level 1 then the keys ^X, ^C, ^Z, and ^G will behave
- as in VI, to smooth transition to Viper for the beginners. However, to
- use Emacs productively, you are advised to reach user level 3 or higher.
-
- If your user level is 2 or higher, ^X and ^C will invoke Emacs
- functions,as usual in Emacs; ^Z will toggle vi/emacs modes, and
- ^G will be the usual Emacs's keyboard-quit (something like ^C in VI).
-
- 2. Vi exit functions (e.g., :wq, ZZ) work on INDIVIDUAL files -- they
- do not cause Emacs to quit, except at user level 1 (a novice).
- 3. ^X^C EXITS EMACS.
- 4. Viper supports multiple undo: `u' will undo. Typing `.' will repeat
- undo. Another `u' changes direction.
-
- 6. Emacs Meta functions are invoked by typing `C-\\' or `\\ ESC'.
- On a window system, the best way is to use the Meta-key.
- 7. Try \\[keyboard-quit] and \\[abort-recursive-edit] repeatedly,if
- something funny happens. This would abort the current editing command.
-
-You can get more information on Viper by:
-
- a. Typing `:help' in Vi state
- b. Printing Viper manual, found in ./etc/viper.dvi
- c. Printing ViperCard, the Quick Reference, found in ./etc/viperCard.dvi
-
-This startup message appears whenever you load Viper, unless you type `y' now."
- ))
- (goto-char (point-min))
- (if (y-or-n-p "Inhibit Viper startup message? ")
- (vip-save-setting
- 'vip-inhibit-startup-message
- "Viper startup message inhibited"
- vip-custom-file-name t))
- ;;(kill-buffer (current-buffer))
- (message
- "The last message is in buffer `Viper Startup Message'")
- (sit-for 4)
- ))
- (vip-set-expert-level 'dont-change-unless)))
- (vip-change-state-to-vi))))
-
-;;;###autoload
-(defalias 'vip-mode 'viper-mode)
;; Switch from Insert state to Vi state.
-(defun vip-exit-insert-state ()
+(defun viper-exit-insert-state ()
(interactive)
- (vip-change-state-to-vi))
+ (viper-change-state-to-vi))
-(defun vip-set-mode-vars-for (state)
+(defun viper-set-mode-vars-for (state)
"Sets Viper minor mode variables to put Viper's state STATE in effect."
-
+
;; Emacs state
- (setq vip-vi-minibuffer-minor-mode nil
- vip-insert-minibuffer-minor-mode nil
- vip-vi-intercept-minor-mode nil
- vip-insert-intercept-minor-mode nil
-
- vip-vi-local-user-minor-mode nil
- vip-vi-kbd-minor-mode nil
- vip-vi-global-user-minor-mode nil
- vip-vi-state-modifier-minor-mode nil
- vip-vi-diehard-minor-mode nil
- vip-vi-basic-minor-mode nil
-
- vip-replace-minor-mode nil
-
- vip-insert-local-user-minor-mode nil
- vip-insert-kbd-minor-mode nil
- vip-insert-global-user-minor-mode nil
- vip-insert-state-modifier-minor-mode nil
- vip-insert-diehard-minor-mode nil
- vip-insert-basic-minor-mode nil
- vip-emacs-intercept-minor-mode t
- vip-emacs-local-user-minor-mode t
- vip-emacs-kbd-minor-mode (not (vip-is-in-minibuffer))
- vip-emacs-global-user-minor-mode t
- vip-emacs-state-modifier-minor-mode t
+ (setq viper-vi-minibuffer-minor-mode nil
+ viper-insert-minibuffer-minor-mode nil
+ viper-vi-intercept-minor-mode nil
+ viper-insert-intercept-minor-mode nil
+
+ viper-vi-local-user-minor-mode nil
+ viper-vi-kbd-minor-mode nil
+ viper-vi-global-user-minor-mode nil
+ viper-vi-state-modifier-minor-mode nil
+ viper-vi-diehard-minor-mode nil
+ viper-vi-basic-minor-mode nil
+
+ viper-replace-minor-mode nil
+
+ viper-insert-local-user-minor-mode nil
+ viper-insert-kbd-minor-mode nil
+ viper-insert-global-user-minor-mode nil
+ viper-insert-state-modifier-minor-mode nil
+ viper-insert-diehard-minor-mode nil
+ viper-insert-basic-minor-mode nil
+ viper-emacs-intercept-minor-mode t
+ viper-emacs-local-user-minor-mode t
+ viper-emacs-kbd-minor-mode (not (viper-is-in-minibuffer))
+ viper-emacs-global-user-minor-mode t
+ viper-emacs-state-modifier-minor-mode t
)
-
+
;; Vi state
(if (eq state 'vi-state) ; adjust for vi-state
- (setq
- vip-vi-intercept-minor-mode t
- vip-vi-minibuffer-minor-mode (vip-is-in-minibuffer)
- vip-vi-local-user-minor-mode t
- vip-vi-kbd-minor-mode (not (vip-is-in-minibuffer))
- vip-vi-global-user-minor-mode t
- vip-vi-state-modifier-minor-mode t
- ;; don't let the diehard keymap block command completion
+ (setq
+ viper-vi-intercept-minor-mode t
+ viper-vi-minibuffer-minor-mode (viper-is-in-minibuffer)
+ viper-vi-local-user-minor-mode t
+ viper-vi-kbd-minor-mode (not (viper-is-in-minibuffer))
+ viper-vi-global-user-minor-mode t
+ viper-vi-state-modifier-minor-mode t
+ ;; don't let the diehard keymap block command completion
;; and other things in the minibuffer
- vip-vi-diehard-minor-mode (not
- (or vip-want-emacs-keys-in-vi
- (vip-is-in-minibuffer)))
- vip-vi-basic-minor-mode t
- vip-emacs-intercept-minor-mode nil
- vip-emacs-local-user-minor-mode nil
- vip-emacs-kbd-minor-mode nil
- vip-emacs-global-user-minor-mode nil
- vip-emacs-state-modifier-minor-mode nil
+ viper-vi-diehard-minor-mode (not
+ (or viper-want-emacs-keys-in-vi
+ (viper-is-in-minibuffer)))
+ viper-vi-basic-minor-mode t
+ viper-emacs-intercept-minor-mode nil
+ viper-emacs-local-user-minor-mode nil
+ viper-emacs-kbd-minor-mode nil
+ viper-emacs-global-user-minor-mode nil
+ viper-emacs-state-modifier-minor-mode nil
))
-
+
;; Insert and Replace states
(if (member state '(insert-state replace-state))
- (setq
- vip-insert-intercept-minor-mode t
- vip-replace-minor-mode (eq state 'replace-state)
- vip-insert-minibuffer-minor-mode (vip-is-in-minibuffer)
- vip-insert-local-user-minor-mode t
- vip-insert-kbd-minor-mode (not (vip-is-in-minibuffer))
- vip-insert-global-user-minor-mode t
- vip-insert-state-modifier-minor-mode t
- ;; don't let the diehard keymap block command completion
+ (setq
+ viper-insert-intercept-minor-mode t
+ viper-replace-minor-mode (eq state 'replace-state)
+ viper-insert-minibuffer-minor-mode (viper-is-in-minibuffer)
+ viper-insert-local-user-minor-mode t
+ viper-insert-kbd-minor-mode (not (viper-is-in-minibuffer))
+ viper-insert-global-user-minor-mode t
+ viper-insert-state-modifier-minor-mode t
+ ;; don't let the diehard keymap block command completion
;; and other things in the minibuffer
- vip-insert-diehard-minor-mode (not
- (or vip-want-emacs-keys-in-insert
- (vip-is-in-minibuffer)))
- vip-insert-basic-minor-mode t
- vip-emacs-intercept-minor-mode nil
- vip-emacs-local-user-minor-mode nil
- vip-emacs-kbd-minor-mode nil
- vip-emacs-global-user-minor-mode nil
- vip-emacs-state-modifier-minor-mode nil
+ viper-insert-diehard-minor-mode (not
+ (or
+ viper-want-emacs-keys-in-insert
+ (viper-is-in-minibuffer)))
+ viper-insert-basic-minor-mode t
+ viper-emacs-intercept-minor-mode nil
+ viper-emacs-local-user-minor-mode nil
+ viper-emacs-kbd-minor-mode nil
+ viper-emacs-global-user-minor-mode nil
+ viper-emacs-state-modifier-minor-mode nil
))
-
+
;; minibuffer faces
- (if (vip-has-face-support-p)
- (setq vip-minibuffer-current-face
- (cond ((eq state 'emacs-state) vip-minibuffer-emacs-face)
- ((eq state 'vi-state) vip-minibuffer-vi-face)
+ (if (viper-has-face-support-p)
+ (setq viper-minibuffer-current-face
+ (cond ((eq state 'emacs-state) viper-minibuffer-emacs-face)
+ ((eq state 'vi-state) viper-minibuffer-vi-face)
((memq state '(insert-state replace-state))
- vip-minibuffer-insert-face))))
-
- (if (vip-is-in-minibuffer)
- (vip-set-minibuffer-overlay))
+ viper-minibuffer-insert-face))))
+
+ (if (viper-is-in-minibuffer)
+ (viper-set-minibuffer-overlay))
)
;; This also takes care of the annoying incomplete lines in files.
;; Also, this fixes `undo' to work vi-style for complex commands.
-(defun vip-change-state-to-vi ()
+(defun viper-change-state-to-vi ()
"Change Viper state to Vi."
(interactive)
- (if (and vip-first-time (not (vip-is-in-minibuffer)))
+ (if (and viper-first-time (not (viper-is-in-minibuffer)))
(viper-mode)
- (if overwrite-mode (overwrite-mode nil))
+ (if overwrite-mode (overwrite-mode -1))
+ (or (viper-overlay-p viper-replace-overlay)
+ (viper-set-replace-overlay (point-min) (point-min)))
+ (viper-hide-replace-overlay)
(if abbrev-mode (expand-abbrev))
(if (and auto-fill-function (> (current-column) fill-column))
(funcall auto-fill-function))
;; don't leave whitespace lines around
(if (and (memq last-command
- '(vip-autoindent
- vip-open-line vip-Open-line
- vip-replace-state-exit-cmd))
- (vip-over-whitespace-line))
+ '(viper-autoindent
+ viper-open-line viper-Open-line
+ viper-replace-state-exit-cmd))
+ (viper-over-whitespace-line))
(indent-to-left-margin))
- (vip-add-newline-at-eob-if-necessary)
- (if vip-undo-needs-adjustment (vip-adjust-undo))
- (vip-change-state 'vi-state)
+ (viper-add-newline-at-eob-if-necessary)
+ (viper-adjust-undo)
- ;; always turn off iso-accents-mode, or else we won't be able to use the
- ;; keys `,',^ in Vi state, as they will do accents instead of Vi actions.
- (if (and (boundp 'iso-accents-mode) iso-accents-mode)
- (iso-accents-mode -1))
+ (if (eq viper-current-state 'emacs-state)
+ (viper-restore-cursor-color 'after-emacs-mode)
+ (viper-restore-cursor-color 'after-insert-mode))
- (vip-restore-cursor-color-after-insert)
-
- ;; Protection against user errors in hooks
+ (viper-change-state 'vi-state)
+
+ ;; Protect against user errors in hooks
(condition-case conds
- (run-hooks 'vip-vi-state-hook)
+ (run-hooks 'viper-vi-state-hook)
(error
- (vip-message-conditions conds)))))
+ (viper-message-conditions conds)))))
-(defun vip-change-state-to-insert ()
+(defun viper-change-state-to-insert ()
"Change Viper state to Insert."
(interactive)
- (vip-change-state 'insert-state)
- (if (and vip-automatic-iso-accents (fboundp 'iso-accents-mode))
- (iso-accents-mode 1)) ; turn iso accents on
-
- (or (stringp vip-saved-cursor-color)
- (string= (vip-get-cursor-color) vip-insert-state-cursor-color)
- (setq vip-saved-cursor-color (vip-get-cursor-color)))
- ;; Commented out, because if vip-change-state-to-insert is executed
- ;; non-interactively then the old cursor color may get lost. Same old Emacs
- ;; bug related to local variables?
-;;;(if (stringp vip-saved-cursor-color)
-;;; (vip-change-cursor-color vip-insert-state-cursor-color))
- ;; Protection against user errors in hooks
+ (viper-change-state 'insert-state)
+
+ (or (viper-overlay-p viper-replace-overlay)
+ (viper-set-replace-overlay (point-min) (point-min)))
+ (viper-hide-replace-overlay)
+
+ (let ((has-saved-cursor-color-in-insert-mode
+ (stringp (viper-get-saved-cursor-color-in-insert-mode))))
+ (or has-saved-cursor-color-in-insert-mode
+ (string= (viper-get-cursor-color) viper-insert-state-cursor-color)
+ (viper-save-cursor-color 'before-insert-mode))
+ (viper-change-cursor-color viper-insert-state-cursor-color))
+
+ ;; Protect against user errors in hooks
(condition-case conds
- (run-hooks 'vip-insert-state-hook)
+ (run-hooks 'viper-insert-state-hook)
(error
- (vip-message-conditions conds))))
-
-(defsubst vip-downgrade-to-insert ()
- (setq vip-current-state 'insert-state
- vip-replace-minor-mode nil)
- )
+ (viper-message-conditions conds))))
-
-
-;; Change to replace state. When the end of replacement region is reached,
+(defsubst viper-downgrade-to-insert ()
+ ;; Protect against user errors in hooks
+ (condition-case conds
+ (run-hooks 'viper-insert-state-hook)
+ (error
+ (viper-message-conditions conds)))
+ (setq viper-current-state 'insert-state
+ viper-replace-minor-mode nil))
+
+
+
+;; Change to replace state. When the end of replacement region is reached,
;; replace state changes to insert state.
-(defun vip-change-state-to-replace (&optional non-R-cmd)
- (vip-change-state 'replace-state)
- (if (and vip-automatic-iso-accents (fboundp 'iso-accents-mode))
- (iso-accents-mode 1)) ; turn iso accents on
+(defun viper-change-state-to-replace (&optional non-R-cmd)
+ (viper-change-state 'replace-state)
;; Run insert-state-hook
(condition-case conds
- (run-hooks 'vip-insert-state-hook 'vip-replace-state-hook)
+ (run-hooks 'viper-insert-state-hook 'viper-replace-state-hook)
(error
- (vip-message-conditions conds)))
-
+ (viper-message-conditions conds)))
+
(if non-R-cmd
- (vip-start-replace)
+ (viper-start-replace)
;; 'R' is implemented using Emacs's overwrite-mode
- (vip-start-R-mode))
+ (viper-start-R-mode))
)
-
-(defun vip-change-state-to-emacs ()
+
+(defun viper-change-state-to-emacs ()
"Change Viper state to Emacs."
(interactive)
- (vip-change-state 'emacs-state)
- (if (and vip-automatic-iso-accents (fboundp 'iso-accents-mode))
- (iso-accents-mode 1)) ; turn iso accents on
-
- ;; Protection agains user errors in hooks
+ (or (viper-overlay-p viper-replace-overlay)
+ (viper-set-replace-overlay (point-min) (point-min)))
+ (viper-hide-replace-overlay)
+
+ (if viper-emacs-state-cursor-color
+ (let ((has-saved-cursor-color-in-emacs-mode
+ (stringp (viper-get-saved-cursor-color-in-emacs-mode))))
+ (or has-saved-cursor-color-in-emacs-mode
+ (string= (viper-get-cursor-color) viper-emacs-state-cursor-color)
+ (viper-save-cursor-color 'before-emacs-mode))
+ (viper-change-cursor-color viper-emacs-state-cursor-color)))
+
+ (viper-change-state 'emacs-state)
+
+ ;; Protect against user errors in hooks
(condition-case conds
- (run-hooks 'vip-emacs-state-hook)
+ (run-hooks 'viper-emacs-state-hook)
(error
- (vip-message-conditions conds))))
-
+ (viper-message-conditions conds))))
+
;; escape to emacs mode termporarily
-(defun vip-escape-to-emacs (arg &optional events)
+(defun viper-escape-to-emacs (arg &optional events)
"Escape to Emacs state from Vi state for one Emacs command.
ARG is used as the prefix value for the executed command. If
EVENTS is a list of events, which become the beginning of the command."
(interactive "P")
- (if (= last-command-char ?\\)
+ (if (viper= last-command-char ?\\)
(message "Switched to EMACS state for the next command..."))
- (vip-escape-to-state arg events 'emacs-state))
-
+ (viper-escape-to-state arg events 'emacs-state))
+
;; escape to Vi mode termporarily
-(defun vip-escape-to-vi (arg)
+(defun viper-escape-to-vi (arg)
"Escape from Emacs state to Vi state for one Vi 1-character command.
If the Vi command that the user types has a prefix argument, e.g., `d2w', then
-Vi's prefix argument will be used. Otherwise, the prefix argument passed to
-`vip-escape-to-vi' is used."
+Vi's prefix argument will be used. Otherwise, the prefix argument passed to
+`viper-escape-to-vi' is used."
(interactive "P")
(message "Switched to VI state for the next command...")
- (vip-escape-to-state arg nil 'vi-state))
-
+ (viper-escape-to-state arg nil 'vi-state))
+
;; Escape to STATE mode for one Emacs command.
-(defun vip-escape-to-state (arg events state)
+(defun viper-escape-to-state (arg events state)
;;(let (com key prefix-arg)
(let (com key)
;; this temporarily turns off Viper's minor mode keymaps
- (vip-set-mode-vars-for state)
- (vip-normalize-minor-mode-map-alist)
- (if events (vip-set-unread-command-events events))
-
+ (viper-set-mode-vars-for state)
+ (viper-normalize-minor-mode-map-alist)
+ (if events (viper-set-unread-command-events events))
+
;; protect against keyboard quit and other errors
(condition-case nil
- (let (vip-vi-kbd-minor-mode
- vip-insert-kbd-minor-mode
- vip-emacs-kbd-minor-mode)
+ (let (viper-vi-kbd-minor-mode
+ viper-insert-kbd-minor-mode
+ viper-emacs-kbd-minor-mode)
(unwind-protect
(progn
- (setq com (key-binding (setq key
- (if vip-xemacs-p
- (read-key-sequence nil)
- (read-key-sequence nil t)))))
+ (setq com
+ (key-binding (setq key (viper-read-key-sequence nil))))
;; In case of binding indirection--chase definitions.
;; Have to do it here because we execute this command under
;; different keymaps, so command-execute may not do the
(while (vectorp com) (setq com (key-binding com))))
nil)
;; Execute command com in the original Viper state, not in state
- ;; `state'. Otherwise, if we switch buffers while executing the
+ ;; `state'. Otherwise, if we switch buffers while executing the
;; escaped to command, Viper's mode vars will remain those of
- ;; `state'. When we return to the orig buffer, the bindings will be
+ ;; `state'. When we return to the orig buffer, the bindings will be
;; screwed up.
- (vip-set-mode-vars-for vip-current-state)
-
+ (viper-set-mode-vars-for viper-current-state)
+
;; this-command, last-command-char, last-command-event
(setq this-command com)
- (if vip-xemacs-p ; XEmacs represents key sequences as vectors
- (setq last-command-event (vip-copy-event (vip-seq-last-elt key))
- last-command-char (event-to-character last-command-event))
- ;; Emacs represents them as sequences (str or vec)
- (setq last-command-event (vip-copy-event (vip-seq-last-elt key))
- last-command-char last-command-event))
-
+ (viper-cond-compile-for-xemacs-or-emacs
+ ;; XEmacs represents key sequences as vectors
+ (setq last-command-event
+ (viper-copy-event (viper-seq-last-elt key))
+ last-command-char (event-to-character last-command-event))
+ ;; Emacs represents them as sequences (str or vec)
+ (setq last-command-event
+ (viper-copy-event (viper-seq-last-elt key))
+ last-command-char last-command-event)
+ )
+
(if (commandp com)
- (progn
+ ;; pretend that current state is the state we excaped to
+ (let ((viper-current-state state))
(setq prefix-arg (or prefix-arg arg))
(command-execute com)))
)
(quit (ding))
(error (beep 1))))
;; set state in the new buffer
- (vip-set-mode-vars-for vip-current-state))
-
-(defun vip-exec-form-in-vi (form)
+ (viper-set-mode-vars-for viper-current-state))
+
+;; This is used in order to allow reading characters according to the input
+;; method. The character is read in emacs and inserted into the buffer.
+;; If an input method is in effect, this might
+;; cause several characters to be combined into one.
+;; Also takes care of the iso-accents mode
+(defun viper-special-read-and-insert-char ()
+ (viper-set-mode-vars-for 'emacs-state)
+ (viper-normalize-minor-mode-map-alist)
+ (if viper-special-input-method
+ (viper-set-input-method t))
+ (if viper-automatic-iso-accents
+ (viper-set-iso-accents-mode t))
+ (condition-case nil
+ (let (viper-vi-kbd-minor-mode
+ viper-insert-kbd-minor-mode
+ viper-emacs-kbd-minor-mode
+ ch)
+ (cond ((and viper-special-input-method
+ viper-emacs-p
+ (fboundp 'quail-input-method))
+ ;; (let ...) is used to restore unread-command-events to the
+ ;; original state. We don't want anything left in there after
+ ;; key translation. (Such left-overs are possible if the user
+ ;; types a regular key.)
+ (let (unread-command-events)
+ ;; The next cmd and viper-set-unread-command-events
+ ;; are intended to prevent the input method
+ ;; from swallowing ^M, ^Q and other special characters
+ (setq ch (read-char-exclusive))
+ ;; replace ^M with the newline
+ (if (eq ch ?\C-m) (setq ch ?\n))
+ ;; Make sure ^V and ^Q work as quotation chars
+ (if (memq ch '(?\C-v ?\C-q))
+ (setq ch (read-char-exclusive)))
+ (viper-set-unread-command-events ch)
+ (quail-input-method nil)
+
+ (if (and ch (string= quail-current-str ""))
+ (insert ch)
+ (insert quail-current-str))
+ (setq ch (or ch
+ (aref quail-current-str
+ (1- (length quail-current-str)))))
+ ))
+ ((and viper-special-input-method
+ viper-xemacs-p
+ (fboundp 'quail-start-translation))
+ ;; same as above but for XEmacs, which doesn't have
+ ;; quail-input-method
+ (let (unread-command-events)
+ (setq ch (read-char-exclusive))
+ ;; replace ^M with the newline
+ (if (eq ch ?\C-m) (setq ch ?\n))
+ ;; Make sure ^V and ^Q work as quotation chars
+ (if (memq ch '(?\C-v ?\C-q))
+ (setq ch (read-char-exclusive)))
+ (viper-set-unread-command-events ch)
+ (quail-start-translation nil)
+
+ (if (and ch (string= quail-current-str ""))
+ (insert ch)
+ (insert quail-current-str))
+ (setq ch (or ch
+ (aref quail-current-str
+ (1- (length quail-current-str)))))
+ ))
+ ((and (boundp 'iso-accents-mode) iso-accents-mode)
+ (setq ch (aref (read-key-sequence nil) 0))
+ ;; replace ^M with the newline
+ (if (eq ch ?\C-m) (setq ch ?\n))
+ ;; Make sure ^V and ^Q work as quotation chars
+ (if (memq ch '(?\C-v ?\C-q))
+ (setq ch (aref (read-key-sequence nil) 0)))
+ (insert ch))
+ (t
+ ;;(setq ch (read-char-exclusive))
+ (setq ch (aref (read-key-sequence nil) 0))
+ (if viper-xemacs-p
+ (setq ch (event-to-character ch)))
+ ;; replace ^M with the newline
+ (if (eq ch ?\C-m) (setq ch ?\n))
+ ;; Make sure ^V and ^Q work as quotation chars
+ (if (memq ch '(?\C-v ?\C-q))
+ (progn
+ ;;(setq ch (read-char-exclusive))
+ (setq ch (aref (read-key-sequence nil) 0))
+ (if viper-xemacs-p
+ (setq ch (event-to-character ch))))
+ )
+ (insert ch))
+ )
+ (setq last-command-event
+ (viper-copy-event (if viper-xemacs-p
+ (character-to-event ch) ch)))
+ ) ; let
+ (error nil)
+ ) ; condition-case
+
+ (viper-set-input-method nil)
+ (viper-set-iso-accents-mode nil)
+ (viper-set-mode-vars-for viper-current-state)
+ )
+
+
+(defun viper-exec-form-in-vi (form)
"Execute FORM in Vi state, regardless of the Ccurrent Vi state."
(let ((buff (current-buffer))
result)
- (vip-set-mode-vars-for 'vi-state)
+ (viper-set-mode-vars-for 'vi-state)
(condition-case nil
- (setq result (eval form))
+ (let (viper-vi-kbd-minor-mode) ; execute without kbd macros
+ (setq result (eval form))
+ )
(error
(signal 'quit nil)))
(if (not (equal buff (current-buffer))) ; cmd switched buffer
(save-excursion
(set-buffer buff)
- (vip-set-mode-vars-for vip-current-state)))
- (vip-set-mode-vars-for vip-current-state)
+ (viper-set-mode-vars-for viper-current-state)))
+ (viper-set-mode-vars-for viper-current-state)
result))
-(defun vip-exec-form-in-emacs (form)
+(defun viper-exec-form-in-emacs (form)
"Execute FORM in Emacs, temporarily disabling Viper's minor modes.
-Similar to vip-escape-to-emacs, but accepts forms rather than keystrokes."
+Similar to viper-escape-to-emacs, but accepts forms rather than keystrokes."
(let ((buff (current-buffer))
result)
- (vip-set-mode-vars-for 'emacs-state)
+ (viper-set-mode-vars-for 'emacs-state)
(setq result (eval form))
(if (not (equal buff (current-buffer))) ; cmd switched buffer
(save-excursion
(set-buffer buff)
- (vip-set-mode-vars-for vip-current-state)))
- (vip-set-mode-vars-for vip-current-state)
+ (viper-set-mode-vars-for viper-current-state)))
+ (viper-set-mode-vars-for viper-current-state)
result))
-
+;; This executes the last kbd event in emacs mode. Is used when we want to
+;; interpret certain keys directly in emacs (as, for example, in comint mode).
+(defun viper-exec-key-in-emacs (arg)
+ (interactive "P")
+ (viper-escape-to-emacs arg last-command-event))
+
+
;; This is needed because minor modes sometimes override essential Viper
-;; bindings. By letting Viper know which files these modes are in, it will
+;; bindings. By letting Viper know which files these modes are in, it will
;; arrange to reorganize minor-mode-map-alist so that things will work right.
-(defun vip-harness-minor-mode (load-file)
+(defun viper-harness-minor-mode (load-file)
"Familiarize Viper with a minor mode defined in LOAD_FILE.
Minor modes that have their own keymaps may overshadow Viper keymaps.
This function is designed to make Viper aware of the packages that define
such minor modes.
Usage:
- (vip-harness-minor-mode load-file)
+ (viper-harness-minor-mode load-file)
LOAD-FILE is a name of the file where the specific minor mode is defined.
Suffixes such as .el or .elc should be stripped."
(interactive "sEnter name of the load file: ")
-
- (vip-eval-after-load load-file '(vip-normalize-minor-mode-map-alist))
-
+
+ (eval-after-load load-file '(viper-normalize-minor-mode-map-alist))
+
;; Change the default for minor-mode-map-alist each time a harnessed minor
;; mode adds its own keymap to the a-list.
- (vip-eval-after-load
- load-file '(setq-default minor-mode-map-alist minor-mode-map-alist))
+ (unless
+ (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
+ (eval-after-load
+ load-file '(setq-default minor-mode-map-alist minor-mode-map-alist)))
)
-(defun vip-ESC (arg)
+(defun viper-ESC (arg)
"Emulate ESC key in Emacs.
-Prevents multiple escape keystrokes if vip-no-multiple-ESC is true.
-If vip-no-multiple-ESC is 'twice double ESC would ding in vi-state.
+Prevents multiple escape keystrokes if viper-no-multiple-ESC is true.
+If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state.
Other ESC sequences are emulated via the current Emacs's major mode
-keymap. This is more convenient on TTYs, since this won't block
-function keys such as up,down, etc. ESC will also will also work as
-a Meta key in this case. When vip-no-multiple-ESC is nil, ESC functions
+keymap. This is more convenient on TTYs, since this won't block
+function keys such as up,down, etc. ESC will also will also work as
+a Meta key in this case. When viper-no-multiple-ESC is nil, ESC functions
as a Meta key and any number of multiple escapes is allowed."
(interactive "P")
(let (char)
- (cond ((and (not vip-no-multiple-ESC) (eq vip-current-state 'vi-state))
- (setq char (vip-read-char-exclusive))
- (vip-escape-to-emacs arg (list ?\e char) ))
- ((and (eq vip-no-multiple-ESC 'twice)
- (eq vip-current-state 'vi-state))
- (setq char (vip-read-char-exclusive))
- (if (= char (string-to-char vip-ESC-key))
+ (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state))
+ (setq char (viper-read-char-exclusive))
+ (viper-escape-to-emacs arg (list ?\e char) ))
+ ((and (eq viper-no-multiple-ESC 'twice)
+ (eq viper-current-state 'vi-state))
+ (setq char (viper-read-char-exclusive))
+ (if (= char (string-to-char viper-ESC-key))
(ding)
- (vip-escape-to-emacs arg (list ?\e char) )))
+ (viper-escape-to-emacs arg (list ?\e char) )))
(t (ding)))
))
-(defun vip-alternate-Meta-key (arg)
+(defun viper-alternate-Meta-key (arg)
"Simulate Emacs Meta key."
(interactive "P")
(sit-for 1) (message "ESC-")
- (vip-escape-to-emacs arg '(?\e)))
+ (viper-escape-to-emacs arg '(?\e)))
-(defun vip-toggle-key-action ()
- "Action bound to `vip-toggle-key'."
+(defun viper-toggle-key-action ()
+ "Action bound to `viper-toggle-key'."
(interactive)
- (if (and (< vip-expert-level 2) (equal vip-toggle-key "\C-z"))
- (if (vip-window-display-p)
- (vip-iconify)
+ (if (and (< viper-expert-level 2) (equal viper-toggle-key "\C-z"))
+ (if (viper-window-display-p)
+ (viper-iconify)
(suspend-emacs))
- (vip-change-state-to-emacs)))
+ (viper-change-state-to-emacs)))
\f
;; Intercept ESC sequences on dumb terminals.
;; Check if last key was ESC and if so try to reread it as a function key.
;; But only if there are characters to read during a very short time.
;; Returns the last event, if any.
-(defun vip-envelop-ESC-key ()
+(defun viper-envelop-ESC-key ()
(let ((event last-input-event)
(keyseq [nil])
- inhibit-quit)
- (if (vip-ESC-event-p event)
- (progn
- (if (vip-fast-keysequence-p)
+ (inhibit-quit t))
+ (if (viper-ESC-event-p event)
+ (progn
+ ;; Some versions of Emacs (eg., 22.50.8 have a bug, which makes even
+ ;; a single ESC into ;; a fast keyseq. To guard against this, we
+ ;; added a check if there are other events as well. Keep the next
+ ;; line for the next time the bug reappears, so that will remember to
+ ;; report it.
+ ;;(if (and (viper-fast-keysequence-p) unread-command-events)
+ (if (viper-fast-keysequence-p) ;; for Emacsen without the above bug
(progn
- (let (minor-mode-map-alist)
- (vip-set-unread-command-events event)
- (setq keyseq
- (funcall
- (ad-get-orig-definition 'read-key-sequence) nil))
+ (let (minor-mode-map-alist emulation-mode-map-alists)
+ (viper-set-unread-command-events event)
+ (setq keyseq (read-key-sequence nil 'continue-echo))
) ; let
;; If keyseq translates into something that still has ESC
;; at the beginning, separate ESC from the rest of the seq.
;;
;; If `first-key' is not an ESC event, we make it into the
;; last-command-event in order to pretend that this key was
- ;; pressed. This is needed to allow arrow keys to be bound to
- ;; macros. Otherwise, vip-exec-mapped-kbd-macro will think that
- ;; the last event was ESC and so it'll execute whatever is
+ ;; pressed. This is needed to allow arrow keys to be bound to
+ ;; macros. Otherwise, viper-exec-mapped-kbd-macro will think
+ ;; that the last event was ESC and so it'll execute whatever is
;; bound to ESC. (Viper macros can't be bound to
;; ESC-sequences).
(let* ((first-key (elt keyseq 0))
(key-mod (event-modifiers first-key)))
- (cond ((vip-ESC-event-p first-key)
+ (cond ((and (viper-ESC-event-p first-key)
+ (not viper-translate-all-ESC-keysequences))
;; put keys following ESC on the unread list
;; and return ESC as the key-sequence
- (vip-set-unread-command-events (subseq keyseq 1))
+ (viper-set-unread-command-events (viper-subseq keyseq 1))
(setq last-input-event event
- keyseq (if vip-emacs-p
+ keyseq (if viper-emacs-p
"\e"
(vector (character-to-event ?\e)))))
- ((and vip-xemacs-p
+ ((and viper-xemacs-p
(key-press-event-p first-key)
(equal '(meta) key-mod))
- (vip-set-unread-command-events
+ (viper-set-unread-command-events
(vconcat (vector
(character-to-event (event-key first-key)))
- (subseq keyseq 1)))
+ (viper-subseq keyseq 1)))
(setq last-input-event event
keyseq (vector (character-to-event ?\e))))
((eventp first-key)
- (setq last-command-event (vip-copy-event first-key)))
+ (setq last-command-event
+ (viper-copy-event first-key)))
))
) ; end progn
-
+
;; this is escape event with nothing after it
;; put in unread-command-event and then re-read
- (vip-set-unread-command-events event)
- (setq keyseq
- (funcall (ad-get-orig-definition 'read-key-sequence) nil))
+ (viper-set-unread-command-events event)
+ (setq keyseq (read-key-sequence nil))
))
;; not an escape event
(setq keyseq (vector event)))
keyseq))
-
-
-(defadvice read-key-sequence (around vip-read-keyseq-ad activate)
- "Harness to work for Viper. This advice is harmless---don't worry!"
- (let (inhibit-quit event keyseq)
- (setq keyseq ad-do-it)
- (setq event (if vip-xemacs-p
- (elt keyseq 0) ; XEmacs returns vector of events
- (elt (listify-key-sequence keyseq) 0)))
- (if (vip-ESC-event-p event)
- (let (unread-command-events)
- (vip-set-unread-command-events keyseq)
- (if (vip-fast-keysequence-p)
- (let ((vip-vi-global-user-minor-mode nil)
- (vip-vi-local-user-minor-mode nil)
- (vip-replace-minor-mode nil) ; actually unnecessary
- (vip-insert-global-user-minor-mode nil)
- (vip-insert-local-user-minor-mode nil))
- (setq keyseq ad-do-it))
- (setq keyseq ad-do-it))))
- keyseq))
-
-(defadvice describe-key (before vip-read-keyseq-ad protect activate)
- "Force to read key via `read-key-sequence'."
- (interactive (list (vip-events-to-keys
- (read-key-sequence "Describe key: ")))))
-(defadvice describe-key-briefly (before vip-read-keyseq-ad protect activate)
- "Force to read key via `read-key-sequence'."
- (interactive (list (vip-events-to-keys
- (read-key-sequence "Describe key briefly: ")))))
;; Listen to ESC key.
;; If a sequence of keys starting with ESC is issued with very short delays,
;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key.
-(defun vip-intercept-ESC-key ()
+(defun viper-intercept-ESC-key ()
"Function that implements ESC key in Viper emulation of Vi."
(interactive)
- (let ((cmd (or (key-binding (vip-envelop-ESC-key))
+ (let ((cmd (or (key-binding (viper-envelop-ESC-key))
'(lambda () (interactive) (error "")))))
-
+
;; call the actual function to execute ESC (if no other symbols followed)
;; or the key bound to the ESC sequence (if the sequence was issued
- ;; with very short delay between characters.
- (if (eq cmd 'vip-intercept-ESC-key)
+ ;; with very short delay between characters).
+ (if (eq cmd 'viper-intercept-ESC-key)
(setq cmd
- (cond ((eq vip-current-state 'vi-state)
- 'vip-ESC)
- ((eq vip-current-state 'insert-state)
- 'vip-exit-insert-state)
- ((eq vip-current-state 'replace-state)
- 'vip-replace-state-exit-cmd)
- (t 'vip-change-state-to-vi)
+ (cond ((eq viper-current-state 'vi-state)
+ 'viper-ESC)
+ ((eq viper-current-state 'insert-state)
+ 'viper-exit-insert-state)
+ ((eq viper-current-state 'replace-state)
+ 'viper-replace-state-exit-cmd)
+ (t 'viper-change-state-to-vi)
)))
(call-interactively cmd)))
-
+
\f
;; prefix argument for Vi mode
;; command prefix such as "c", "d", "m" and "y".
;; Get value part of prefix-argument ARG.
-(defsubst vip-p-val (arg)
+(defsubst viper-p-val (arg)
(cond ((null arg) 1)
((consp arg)
(if (or (null (car arg)) (equal (car arg) '(nil)))
(t arg)))
;; Get raw value part of prefix-argument ARG.
-(defsubst vip-P-val (arg)
+(defsubst viper-P-val (arg)
(cond ((consp arg) (car arg))
(t arg)))
;; Get com part of prefix-argument ARG.
-(defsubst vip-getcom (arg)
+(defsubst viper-getcom (arg)
(cond ((null arg) nil)
((consp arg) (cdr arg))
(t nil)))
;; Get com part of prefix-argument ARG and modify it.
-(defun vip-getCom (arg)
- (let ((com (vip-getcom arg)))
- (cond ((equal com ?c) ?C)
- ((equal com ?d) ?D)
- ((equal com ?y) ?Y)
+(defun viper-getCom (arg)
+ (let ((com (viper-getcom arg)))
+ (cond ((viper= com ?c) ?c)
+ ;; Previously, ?c was being converted to ?C, but this prevented
+ ;; multiline replace regions.
+ ;;((viper= com ?c) ?C)
+ ((viper= com ?d) ?D)
+ ((viper= com ?y) ?Y)
(t com))))
-;; Compute numeric prefix arg value.
-;; Invoked by EVENT. COM is the command part obtained so far.
-(defun vip-prefix-arg-value (event com)
- (let (value func)
+;; Compute numeric prefix arg value.
+;; Invoked by EVENT-CHAR. COM is the command part obtained so far.
+(defun viper-prefix-arg-value (event-char com)
+ (let ((viper-intermediate-command 'viper-digit-argument)
+ value func)
;; read while number
- (while (and (vip-characterp event) (>= event ?0) (<= event ?9))
- (setq value (+ (* (if (integerp value) value 0) 10) (- event ?0)))
- (setq event (vip-read-event-convert-to-char)))
-
+ (while (and (viper-characterp event-char)
+ (>= event-char ?0) (<= event-char ?9))
+ (setq value (+ (* (if (integerp value) value 0) 10) (- event-char ?0)))
+ (setq event-char (viper-read-event-convert-to-char)))
+
(setq prefix-arg value)
(if com (setq prefix-arg (cons prefix-arg com)))
- (while (eq event ?U)
- (vip-describe-arg prefix-arg)
- (setq event (vip-read-event-convert-to-char)))
-
- (if (or com (and (not (eq vip-current-state 'vi-state))
+ (while (eq event-char ?U)
+ (viper-describe-arg prefix-arg)
+ (setq event-char (viper-read-event-convert-to-char)))
+
+ (if (or com (and (not (eq viper-current-state 'vi-state))
;; make sure it is a Vi command
- (vip-characterp event) (vip-vi-command-p event)
+ (viper-characterp event-char)
+ (viper-vi-command-p event-char)
))
;; If appears to be one of the vi commands,
;; then execute it with funcall and clear prefix-arg in order to not
;; confuse subsequent commands
(progn
;; last-command-char is the char we want emacs to think was typed
- ;; last. If com is not nil, the vip-digit-argument command was called
- ;; from within vip-prefix-arg command, such as `d', `w', etc., i.e.,
- ;; the user typed, say, d2. In this case, `com' would be `d', `w',
- ;; etc.
- ;; If vip-digit-argument was invoked by vip-escape-to-vi (which is
- ;; indicated by the fact that the current state is not vi-state),
- ;; then `event' represents the vi command to be executed (e.g., `d',
- ;; `w', etc). Again, last-command-char must make emacs believe that
- ;; this is the command we typed.
- (setq last-command-char (or com event))
- (setq func (vip-exec-form-in-vi
- (` (key-binding (char-to-string (, event))))))
+ ;; last. If com is not nil, the viper-digit-argument command was
+ ;; called from within viper-prefix-arg command, such as `d', `w',
+ ;; etc., i.e., the user typed, say, d2. In this case, `com' would be
+ ;; `d', `w', etc. If viper-digit-argument was invoked by
+ ;; viper-escape-to-vi (which is indicated by the fact that the
+ ;; current state is not vi-state), then `event-char' represents the
+ ;; vi command to be executed (e.g., `d', `w', etc). Again,
+ ;; last-command-char must make emacs believe that this is the command
+ ;; we typed.
+ (cond ((eq event-char 'return) (setq event-char ?\C-m))
+ ((eq event-char 'delete) (setq event-char ?\C-?))
+ ((eq event-char 'backspace) (setq event-char ?\C-h))
+ ((eq event-char 'space) (setq event-char ?\ )))
+ (setq last-command-char (or com event-char))
+ (setq func (viper-exec-form-in-vi
+ `(key-binding (char-to-string ,event-char))))
(funcall func prefix-arg)
(setq prefix-arg nil))
;; some other command -- let emacs do it in its own way
- (vip-set-unread-command-events event))
+ (viper-set-unread-command-events event-char))
))
-
+
;; Vi operator as prefix argument."
-(defun vip-prefix-arg-com (char value com)
+(defun viper-prefix-arg-com (char value com)
(let ((cont t)
- cmd-info mv-or-digit-cmd)
+ cmd-info
+ cmd-to-exec-at-end)
(while (and cont
- (memq char
- (list ?c ?d ?y ?! ?< ?> ?= ?# ?r ?R ?\"
- vip-buffer-search-char)))
+ (viper-memq-char char
+ (list ?c ?d ?y ?! ?< ?> ?= ?# ?r ?R ?\"
+ viper-buffer-search-char)))
(if com
;; this means that we already have a command character, so we
;; construct a com list and exit while. however, if char is "
;; it is an error.
(progn
;; new com is (CHAR . OLDCOM)
- (if (memq char '(?# ?\")) (error ""))
+ (if (viper-memq-char char '(?# ?\")) (error ""))
(setq com (cons char com))
(setq cont nil))
- ;; If com is nil we set com as char, and read more. Again, if char
- ;; is ", we read the name of register and store it in vip-use-register.
- ;; if char is !, =, or #, a complete com is formed so we exit the
- ;; while loop.
- (cond ((memq char '(?! ?=))
+ ;; If com is nil we set com as char, and read more. Again, if char is
+ ;; ", we read the name of register and store it in viper-use-register.
+ ;; if char is !, =, or #, a complete com is formed so we exit the while
+ ;; loop.
+ (cond ((viper-memq-char char '(?! ?=))
(setq com char)
(setq char (read-char))
(setq cont nil))
- ((= char ?#)
+ ((viper= char ?#)
;; read a char and encode it as com
(setq com (+ 128 (read-char)))
(setq char (read-char)))
- ((= char ?\")
+ ((viper= char ?\")
(let ((reg (read-char)))
- (if (vip-valid-register reg)
- (setq vip-use-register reg)
+ (if (viper-valid-register reg)
+ (setq viper-use-register reg)
(error ""))
(setq char (read-char))))
(t
(setq com char)
(setq char (read-char))))))
- (if (atom com)
- ;; `com' is a single char, so we construct the command argument
- ;; and if `char' is `?', we describe the arg; otherwise
- ;; we prepare the command that will be executed at the end.
- (progn
- (setq cmd-info (cons value com))
- (while (= char ?U)
- (vip-describe-arg cmd-info)
- (setq char (read-char)))
- ;; `char' is a movement cmd, a digit arg cmd, or a register cmd---so we
- ;; execute it at the very end
- (or (vip-movement-command-p char)
- (vip-digit-command-p char)
- (vip-regsuffix-command-p char)
- (error ""))
- (setq mv-or-digit-cmd
- (vip-exec-form-in-vi
- (` (key-binding (char-to-string (, char)))))))
+ (if (atom com)
+ ;; `com' is a single char, so we construct the command argument
+ ;; and if `char' is `?', we describe the arg; otherwise
+ ;; we prepare the command that will be executed at the end.
+ (progn
+ (setq cmd-info (cons value com))
+ (while (viper= char ?U)
+ (viper-describe-arg cmd-info)
+ (setq char (read-char)))
+ ;; `char' is a movement cmd, a digit arg cmd, or a register cmd---so
+ ;; we execute it at the very end
+ (or (viper-movement-command-p char)
+ (viper-digit-command-p char)
+ (viper-regsuffix-command-p char)
+ (viper= char ?!) ; bang command
+ (viper= char ?g) ; the gg command (like G0)
+ (error ""))
+ (setq cmd-to-exec-at-end
+ (viper-exec-form-in-vi
+ `(key-binding (char-to-string ,char)))))
+
+ ;; as com is non-nil, this means that we have a command to execute
+ (if (viper-memq-char (car com) '(?r ?R))
+ ;; execute apropriate region command.
+ (let ((char (car com)) (com (cdr com)))
+ (setq prefix-arg (cons value com))
+ (if (viper= char ?r)
+ (viper-region prefix-arg)
+ (viper-Region prefix-arg))
+ ;; reset prefix-arg
+ (setq prefix-arg nil))
+ ;; otherwise, reset prefix arg and call appropriate command
+ (setq value (if (null value) 1 value))
+ (setq prefix-arg nil)
+ (cond
+ ;; If we change ?C to ?c here, then cc will enter replacement mode
+ ;; rather than deleting lines. However, it will affect 1 less line
+ ;; than normal. We decided to not use replacement mode here and
+ ;; follow Vi, since replacement mode on n full lines can be achieved
+ ;; with nC.
+ ((equal com '(?c . ?c)) (viper-line (cons value ?C)))
+ ((equal com '(?d . ?d)) (viper-line (cons value ?D)))
+ ((equal com '(?d . ?y)) (viper-yank-defun))
+ ((equal com '(?y . ?y)) (viper-line (cons value ?Y)))
+ ((equal com '(?< . ?<)) (viper-line (cons value ?<)))
+ ((equal com '(?> . ?>)) (viper-line (cons value ?>)))
+ ((equal com '(?! . ?!)) (viper-line (cons value ?!)))
+ ((equal com '(?= . ?=)) (viper-line (cons value ?=)))
+ ;; gg acts as G0
+ ((equal (car com) ?g) (viper-goto-line 0))
+ (t (error "")))))
- ;; as com is non-nil, this means that we have a command to execute
- (if (memq (car com) '(?r ?R))
- ;; execute apropriate region command.
- (let ((char (car com)) (com (cdr com)))
- (setq prefix-arg (cons value com))
- (if (= char ?r) (vip-region prefix-arg)
- (vip-Region prefix-arg))
- ;; reset prefix-arg
- (setq prefix-arg nil))
- ;; otherwise, reset prefix arg and call appropriate command
- (setq value (if (null value) 1 value))
- (setq prefix-arg nil)
- (cond ((equal com '(?c . ?c)) (vip-line (cons value ?C)))
- ((equal com '(?d . ?d)) (vip-line (cons value ?D)))
- ((equal com '(?d . ?y)) (vip-yank-defun))
- ((equal com '(?y . ?y)) (vip-line (cons value ?Y)))
- ((equal com '(?< . ?<)) (vip-line (cons value ?<)))
- ((equal com '(?> . ?>)) (vip-line (cons value ?>)))
- ((equal com '(?! . ?!)) (vip-line (cons value ?!)))
- ((equal com '(?= . ?=)) (vip-line (cons value ?=)))
- (t (error "")))))
-
- (if mv-or-digit-cmd
- (progn
- (setq last-command-char char)
- (setq last-command-event
- (vip-copy-event
- (if vip-xemacs-p (character-to-event char) char)))
- (condition-case nil
- (funcall mv-or-digit-cmd cmd-info)
- (error
- (error "")))))
- ))
+ (if cmd-to-exec-at-end
+ (progn
+ (setq last-command-char char)
+ (setq last-command-event
+ (viper-copy-event
+ (if viper-xemacs-p (character-to-event char) char)))
+ (condition-case nil
+ (funcall cmd-to-exec-at-end cmd-info)
+ (error
+ (error "")))))
+ ))
-(defun vip-describe-arg (arg)
+(defun viper-describe-arg (arg)
(let (val com)
- (setq val (vip-P-val arg)
- com (vip-getcom arg))
+ (setq val (viper-P-val arg)
+ com (viper-getcom arg))
(if (null val)
(if (null com)
(message "Value is nil, and command is nil")
(message "Value is `%d', and command is nil" val)
(message "Value is `%d', and command is `%c'" val com)))))
-(defun vip-digit-argument (arg)
+(defun viper-digit-argument (arg)
"Begin numeric argument for the next command."
(interactive "P")
- (vip-leave-region-active)
- (vip-prefix-arg-value
+ (viper-leave-region-active)
+ (viper-prefix-arg-value
last-command-char (if (consp arg) (cdr arg) nil)))
-(defun vip-command-argument (arg)
+(defun viper-command-argument (arg)
"Accept a motion command as an argument."
(interactive "P")
- (let ((vip-inside-command-argument-action t))
+ (let ((viper-intermediate-command 'viper-command-argument))
(condition-case nil
- (vip-prefix-arg-com
- last-command-char
+ (viper-prefix-arg-com
+ last-command-char
(cond ((null arg) nil)
((consp arg) (car arg))
((integerp arg) arg)
- (t (error vip-InvalidCommandArgument)))
+ (t (error viper-InvalidCommandArgument)))
(cond ((null arg) nil)
((consp arg) (cdr arg))
((integerp arg) nil)
- (t (error vip-InvalidCommandArgument))))
- (quit (setq vip-use-register nil)
+ (t (error viper-InvalidCommandArgument))))
+ (quit (setq viper-use-register nil)
(signal 'quit nil)))
- (vip-deactivate-mark)))
+ (viper-deactivate-mark)))
\f
;; repeat last destructive command
;; Append region to text in register REG.
;; START and END are buffer positions indicating what to append.
-(defsubst vip-append-to-register (reg start end)
+(defsubst viper-append-to-register (reg start end)
(set-register reg (concat (if (stringp (get-register reg))
(get-register reg) "")
(buffer-substring start end))))
-;; Saves last inserted text for possible use by vip-repeat command.
-(defun vip-save-last-insertion (beg end)
- (setq vip-last-insertion (buffer-substring beg end))
- (or (< (length vip-d-com) 5)
- (setcar (nthcdr 4 vip-d-com) vip-last-insertion))
- (or (null vip-command-ring)
- (ring-empty-p vip-command-ring)
+;; Saves last inserted text for possible use by viper-repeat command.
+(defun viper-save-last-insertion (beg end)
+ (condition-case nil
+ (setq viper-last-insertion (buffer-substring beg end))
+ (error
+ ;; beg or end marker are somehow screwed up
+ (setq viper-last-insertion nil)))
+ (setq viper-last-insertion (buffer-substring beg end))
+ (or (< (length viper-d-com) 5)
+ (setcar (nthcdr 4 viper-d-com) viper-last-insertion))
+ (or (null viper-command-ring)
+ (ring-empty-p viper-command-ring)
(progn
- (setcar (nthcdr 4 (vip-current-ring-item vip-command-ring))
- vip-last-insertion)
+ (setcar (nthcdr 4 (viper-current-ring-item viper-command-ring))
+ viper-last-insertion)
;; del most recent elt, if identical to the second most-recent
- (vip-cleanup-ring vip-command-ring)))
+ (viper-cleanup-ring viper-command-ring)))
)
-
-(defsubst vip-yank-last-insertion ()
- "Inserts the text saved by the previous vip-save-last-insertion command."
+
+(defsubst viper-yank-last-insertion ()
+ "Inserts the text saved by the previous viper-save-last-insertion command."
(condition-case nil
- (insert vip-last-insertion)
+ (insert viper-last-insertion)
(error nil)))
-
-
+
+
;; define functions to be executed
;; invoked by the `C' command
-(defun vip-exec-change (m-com com)
- (or (and (markerp vip-com-point) (marker-position vip-com-point))
- (set-marker vip-com-point (point) (current-buffer)))
+(defun viper-exec-change (m-com com)
+ (or (and (markerp viper-com-point) (marker-position viper-com-point))
+ (set-marker viper-com-point (point) (current-buffer)))
;; handle C cmd at the eol and at eob.
- (if (or (and (eolp) (= vip-com-point (point)))
- (= vip-com-point (point-max)))
+ (if (or (and (eolp) (= viper-com-point (point)))
+ (= viper-com-point (point-max)))
(progn
(insert " ")(backward-char 1)))
- (if (= vip-com-point (point))
- (vip-forward-char-carefully))
- (if (= com ?c)
- (vip-change vip-com-point (point))
- (vip-change-subr vip-com-point (point))))
-
-;; this is invoked by vip-substitute-line
-(defun vip-exec-Change (m-com com)
+ (if (= viper-com-point (point))
+ (viper-forward-char-carefully))
+ (set-mark viper-com-point)
+ (if (eq m-com 'viper-next-line-at-bol)
+ (viper-enlarge-region (mark t) (point)))
+ (if (< (point) (mark t))
+ (exchange-point-and-mark))
+ (if (eq (preceding-char) ?\n)
+ (viper-backward-char-carefully)) ; give back the newline
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-change-subr (mark t) (point))
+ (viper-change (mark t) (point))
+ ))
+
+;; this is invoked by viper-substitute-line
+(defun viper-exec-Change (m-com com)
(save-excursion
- (set-mark vip-com-point)
- (vip-enlarge-region (mark t) (point))
- (if vip-use-register
+ (set-mark viper-com-point)
+ (viper-enlarge-region (mark t) (point))
+ (if viper-use-register
(progn
- (cond ((vip-valid-register vip-use-register '(letter digit))
- ;;(vip-valid-register vip-use-register '(letter)
+ (cond ((viper-valid-register viper-use-register '(letter digit))
(copy-to-register
- vip-use-register (mark t) (point) nil))
- ((vip-valid-register vip-use-register '(Letter))
- (vip-append-to-register
- (downcase vip-use-register) (mark t) (point)))
- (t (setq vip-use-register nil)
- (error vip-InvalidRegister vip-use-register)))
- (setq vip-use-register nil)))
+ viper-use-register (mark t) (point) nil))
+ ((viper-valid-register viper-use-register '(Letter))
+ (viper-append-to-register
+ (downcase viper-use-register) (mark t) (point)))
+ (t (setq viper-use-register nil)
+ (error viper-InvalidRegister viper-use-register)))
+ (setq viper-use-register nil)))
(delete-region (mark t) (point)))
(open-line 1)
- (if (= com ?C) (vip-change-mode-to-insert) (vip-yank-last-insertion)))
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-yank-last-insertion)
+ (viper-change-state-to-insert)
+ ))
-(defun vip-exec-delete (m-com com)
- (or (and (markerp vip-com-point) (marker-position vip-com-point))
- (set-marker vip-com-point (point) (current-buffer)))
- (if vip-use-register
- (progn
- (cond ((vip-valid-register vip-use-register '(letter digit))
- ;;(vip-valid-register vip-use-register '(letter))
- (copy-to-register
- vip-use-register vip-com-point (point) nil))
- ((vip-valid-register vip-use-register '(Letter))
- (vip-append-to-register
- (downcase vip-use-register) vip-com-point (point)))
- (t (setq vip-use-register nil)
- (error vip-InvalidRegister vip-use-register)))
- (setq vip-use-register nil)))
- (setq last-command
- (if (eq last-command 'd-command) 'kill-region nil))
- (kill-region vip-com-point (point))
- (setq this-command 'd-command)
- (if vip-ex-style-motion
- (if (and (eolp) (not (bolp))) (backward-char 1))))
-
-(defun vip-exec-Delete (m-com com)
- (save-excursion
- (set-mark vip-com-point)
- (vip-enlarge-region (mark t) (point))
- (if vip-use-register
+(defun viper-exec-delete (m-com com)
+ (or (and (markerp viper-com-point) (marker-position viper-com-point))
+ (set-marker viper-com-point (point) (current-buffer)))
+ (let (chars-deleted)
+ (if viper-use-register
(progn
- (cond ((vip-valid-register vip-use-register '(letter digit))
- ;;(vip-valid-register vip-use-register '(letter))
+ (cond ((viper-valid-register viper-use-register '(letter digit))
(copy-to-register
- vip-use-register (mark t) (point) nil))
- ((vip-valid-register vip-use-register '(Letter))
- (vip-append-to-register
- (downcase vip-use-register) (mark t) (point)))
- (t (setq vip-use-register nil)
- (error vip-InvalidRegister vip-use-register)))
- (setq vip-use-register nil)))
+ viper-use-register viper-com-point (point) nil))
+ ((viper-valid-register viper-use-register '(Letter))
+ (viper-append-to-register
+ (downcase viper-use-register) viper-com-point (point)))
+ (t (setq viper-use-register nil)
+ (error viper-InvalidRegister viper-use-register)))
+ (setq viper-use-register nil)))
(setq last-command
- (if (eq last-command 'D-command) 'kill-region nil))
- (kill-region (mark t) (point))
- (if (eq m-com 'vip-line) (setq this-command 'D-command)))
- (back-to-indentation))
-
-(defun vip-exec-yank (m-com com)
- (or (and (markerp vip-com-point) (marker-position vip-com-point))
- (set-marker vip-com-point (point) (current-buffer)))
- (if vip-use-register
- (progn
- (cond ((vip-valid-register vip-use-register '(letter digit))
- ;; (vip-valid-register vip-use-register '(letter))
- (copy-to-register
- vip-use-register vip-com-point (point) nil))
- ((vip-valid-register vip-use-register '(Letter))
- (vip-append-to-register
- (downcase vip-use-register) vip-com-point (point)))
- (t (setq vip-use-register nil)
- (error vip-InvalidRegister vip-use-register)))
- (setq vip-use-register nil)))
- (setq last-command nil)
- (copy-region-as-kill vip-com-point (point))
- (goto-char vip-com-point))
-
-(defun vip-exec-Yank (m-com com)
+ (if (eq last-command 'd-command) 'kill-region nil))
+ (setq chars-deleted (abs (- (point) viper-com-point)))
+ (if (> chars-deleted viper-change-notification-threshold)
+ (unless (viper-is-in-minibuffer)
+ (message "Deleted %d characters" chars-deleted)))
+ (kill-region viper-com-point (point))
+ (setq this-command 'd-command)
+ (if viper-ex-style-motion
+ (if (and (eolp) (not (bolp))) (backward-char 1)))))
+
+(defun viper-exec-Delete (m-com com)
(save-excursion
- (set-mark vip-com-point)
- (vip-enlarge-region (mark t) (point))
- (if vip-use-register
+ (set-mark viper-com-point)
+ (viper-enlarge-region (mark t) (point))
+ (let (lines-deleted)
+ (if viper-use-register
+ (progn
+ (cond ((viper-valid-register viper-use-register '(letter digit))
+ (copy-to-register
+ viper-use-register (mark t) (point) nil))
+ ((viper-valid-register viper-use-register '(Letter))
+ (viper-append-to-register
+ (downcase viper-use-register) (mark t) (point)))
+ (t (setq viper-use-register nil)
+ (error viper-InvalidRegister viper-use-register)))
+ (setq viper-use-register nil)))
+ (setq last-command
+ (if (eq last-command 'D-command) 'kill-region nil))
+ (setq lines-deleted (count-lines (point) viper-com-point))
+ (if (> lines-deleted viper-change-notification-threshold)
+ (unless (viper-is-in-minibuffer)
+ (message "Deleted %d lines" lines-deleted)))
+ (kill-region (mark t) (point))
+ (if (eq m-com 'viper-line) (setq this-command 'D-command)))
+ (back-to-indentation)))
+
+;; save region
+(defun viper-exec-yank (m-com com)
+ (or (and (markerp viper-com-point) (marker-position viper-com-point))
+ (set-marker viper-com-point (point) (current-buffer)))
+ (let (chars-saved)
+ (if viper-use-register
(progn
- (cond ((vip-valid-register vip-use-register '(letter digit))
+ (cond ((viper-valid-register viper-use-register '(letter digit))
(copy-to-register
- vip-use-register (mark t) (point) nil))
- ((vip-valid-register vip-use-register '(Letter))
- (vip-append-to-register
- (downcase vip-use-register) (mark t) (point)))
- (t (setq vip-use-register nil)
- (error vip-InvalidRegister vip-use-register)))
- (setq vip-use-register nil)))
+ viper-use-register viper-com-point (point) nil))
+ ((viper-valid-register viper-use-register '(Letter))
+ (viper-append-to-register
+ (downcase viper-use-register) viper-com-point (point)))
+ (t (setq viper-use-register nil)
+ (error viper-InvalidRegister viper-use-register)))
+ (setq viper-use-register nil)))
(setq last-command nil)
- (copy-region-as-kill (mark t) (point)))
- (vip-deactivate-mark)
- (goto-char vip-com-point))
-
-(defun vip-exec-bang (m-com com)
+ (copy-region-as-kill viper-com-point (point))
+ (setq chars-saved (abs (- (point) viper-com-point)))
+ (if (> chars-saved viper-change-notification-threshold)
+ (unless (viper-is-in-minibuffer)
+ (message "Saved %d characters" chars-saved)))
+ (goto-char viper-com-point)))
+
+;; save lines
+(defun viper-exec-Yank (m-com com)
+ (save-excursion
+ (set-mark viper-com-point)
+ (viper-enlarge-region (mark t) (point))
+ (let (lines-saved)
+ (if viper-use-register
+ (progn
+ (cond ((viper-valid-register viper-use-register '(letter digit))
+ (copy-to-register
+ viper-use-register (mark t) (point) nil))
+ ((viper-valid-register viper-use-register '(Letter))
+ (viper-append-to-register
+ (downcase viper-use-register) (mark t) (point)))
+ (t (setq viper-use-register nil)
+ (error viper-InvalidRegister viper-use-register)))
+ (setq viper-use-register nil)))
+ (setq last-command nil)
+ (copy-region-as-kill (mark t) (point))
+ (setq lines-saved (count-lines (mark t) (point)))
+ (if (> lines-saved viper-change-notification-threshold)
+ (unless (viper-is-in-minibuffer)
+ (message "Saved %d lines" lines-saved)))))
+ (viper-deactivate-mark)
+ (goto-char viper-com-point))
+
+(defun viper-exec-bang (m-com com)
(save-excursion
- (set-mark vip-com-point)
- (vip-enlarge-region (mark t) (point))
+ (set-mark viper-com-point)
+ (viper-enlarge-region (mark t) (point))
+ (exchange-point-and-mark)
(shell-command-on-region
(mark t) (point)
- (if (= com ?!)
- (setq vip-last-shell-com
- (vip-read-string-with-history
+ (if (viper= com ?!)
+ (setq viper-last-shell-com
+ (viper-read-string-with-history
"!"
nil
- 'vip-shell-history
- (car vip-shell-history)
+ 'viper-shell-history
+ (car viper-shell-history)
))
- vip-last-shell-com)
+ viper-last-shell-com)
t)))
-(defun vip-exec-equals (m-com com)
+(defun viper-exec-equals (m-com com)
(save-excursion
- (set-mark vip-com-point)
- (vip-enlarge-region (mark t) (point))
+ (set-mark viper-com-point)
+ (viper-enlarge-region (mark t) (point))
(if (> (mark t) (point)) (exchange-point-and-mark))
(indent-region (mark t) (point) nil)))
-(defun vip-exec-shift (m-com com)
+(defun viper-exec-shift (m-com com)
(save-excursion
- (set-mark vip-com-point)
- (vip-enlarge-region (mark t) (point))
+ (set-mark viper-com-point)
+ (viper-enlarge-region (mark t) (point))
(if (> (mark t) (point)) (exchange-point-and-mark))
- (indent-rigidly (mark t) (point)
- (if (= com ?>)
- vip-shift-width
- (- vip-shift-width))))
+ (indent-rigidly (mark t) (point)
+ (if (viper= com ?>)
+ viper-shift-width
+ (- viper-shift-width))))
;; return point to where it was before shift
- (goto-char vip-com-point))
+ (goto-char viper-com-point))
;; this is needed because some commands fake com by setting it to ?r, which
;; denotes repeated insert command.
-(defsubst vip-exec-dummy (m-com com)
+(defsubst viper-exec-dummy (m-com com)
nil)
-(defun vip-exec-buffer-search (m-com com)
- (setq vip-s-string (buffer-substring (point) vip-com-point))
- (setq vip-s-forward t)
- (setq vip-search-history (cons vip-s-string vip-search-history))
- (vip-search vip-s-string vip-s-forward 1))
+(defun viper-exec-buffer-search (m-com com)
+ (setq viper-s-string
+ (regexp-quote (buffer-substring (point) viper-com-point)))
+ (setq viper-s-forward t)
+ (setq viper-search-history (cons viper-s-string viper-search-history))
+ (setq viper-intermediate-command 'viper-exec-buffer-search)
+ (viper-search viper-s-string viper-s-forward 1))
-(defvar vip-exec-array (make-vector 128 nil))
+(defvar viper-exec-array (make-vector 128 nil))
;; Using a dispatch array allows adding functions like buffer search
-;; without affecting other functions. Buffer search can now be bound
+;; without affecting other functions. Buffer search can now be bound
;; to any character.
-(aset vip-exec-array ?c 'vip-exec-change)
-(aset vip-exec-array ?C 'vip-exec-Change)
-(aset vip-exec-array ?d 'vip-exec-delete)
-(aset vip-exec-array ?D 'vip-exec-Delete)
-(aset vip-exec-array ?y 'vip-exec-yank)
-(aset vip-exec-array ?Y 'vip-exec-Yank)
-(aset vip-exec-array ?r 'vip-exec-dummy)
-(aset vip-exec-array ?! 'vip-exec-bang)
-(aset vip-exec-array ?< 'vip-exec-shift)
-(aset vip-exec-array ?> 'vip-exec-shift)
-(aset vip-exec-array ?= 'vip-exec-equals)
+(aset viper-exec-array ?c 'viper-exec-change)
+(aset viper-exec-array ?C 'viper-exec-Change)
+(aset viper-exec-array ?d 'viper-exec-delete)
+(aset viper-exec-array ?D 'viper-exec-Delete)
+(aset viper-exec-array ?y 'viper-exec-yank)
+(aset viper-exec-array ?Y 'viper-exec-Yank)
+(aset viper-exec-array ?r 'viper-exec-dummy)
+(aset viper-exec-array ?! 'viper-exec-bang)
+(aset viper-exec-array ?< 'viper-exec-shift)
+(aset viper-exec-array ?> 'viper-exec-shift)
+(aset viper-exec-array ?= 'viper-exec-equals)
;; This function is called by various movement commands to execute a
-;; destructive command on the region specified by the movement command. For
-;; instance, if the user types cw, then the command vip-forward-word will
-;; call vip-execute-com to execute vip-exec-change, which eventually will
-;; call vip-change to invoke the replace mode on the region.
+;; destructive command on the region specified by the movement command. For
+;; instance, if the user types cw, then the command viper-forward-word will
+;; call viper-execute-com to execute viper-exec-change, which eventually will
+;; call viper-change to invoke the replace mode on the region.
;;
-;; The list (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS) is set to
-;; vip-d-com for later use by vip-repeat.
-(defun vip-execute-com (m-com val com)
- (let ((reg vip-use-register))
+;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS)
+;; via a call to viper-set-destructive-command, for later use by viper-repeat.
+(defun viper-execute-com (m-com val com)
+ (let ((reg viper-use-register))
;; this is the special command `#'
(if (> com 128)
- (vip-special-prefix-com (- com 128))
- (let ((fn (aref vip-exec-array (if (< com 0) (- com) com))))
+ (viper-special-prefix-com (- com 128))
+ (let ((fn (aref viper-exec-array com)))
(if (null fn)
- (error "%c: %s" com vip-InvalidViCommand)
+ (error "%c: %s" com viper-InvalidViCommand)
(funcall fn m-com com))))
- (if (vip-dotable-command-p com)
- (vip-set-destructive-command
- (list m-com val
- (if (memq com (list ?c ?C ?!)) (- com) com)
- reg nil nil)))
+ (if (viper-dotable-command-p com)
+ (viper-set-destructive-command
+ (list m-com val com reg nil nil)))
))
-(defun vip-repeat (arg)
+(defun viper-repeat (arg)
"Re-execute last destructive command.
-Use the info in vip-d-com, which has the form
+Use the info in viper-d-com, which has the form
\(com val ch reg inserted-text command-keys\),
where `com' is the command to be re-executed, `val' is the
argument to `com', `ch' is a flag for repeat, and `reg' is optional;
(interactive "P")
(let ((save-point (point)) ; save point before repeating prev cmd
;; Pass along that we are repeating a destructive command
- ;; This tells vip-set-destructive-command not to update
- ;; vip-command-ring
- (vip-intermediate-command 'vip-repeat))
- (if (eq last-command 'vip-undo)
- ;; if the last command was vip-undo, then undo-more
- (vip-undo-more)
- ;; otherwise execute the command stored in vip-d-com. if arg is non-nil
- ;; its prefix value is used as new prefix value for the command.
- (let ((m-com (car vip-d-com))
- (val (vip-P-val arg))
- (com (nth 2 vip-d-com))
- (reg (nth 3 vip-d-com)))
- (if (null val) (setq val (nth 1 vip-d-com)))
- (if (null m-com) (error "No previous command to repeat."))
- (setq vip-use-register reg)
- (if (nth 4 vip-d-com) ; text inserted by command
- (setq vip-last-insertion (nth 4 vip-d-com)
- vip-d-char (nth 4 vip-d-com)))
+ ;; This tells viper-set-destructive-command not to update
+ ;; viper-command-ring
+ (viper-intermediate-command 'viper-repeat))
+ (if (eq last-command 'viper-undo)
+ ;; if the last command was viper-undo, then undo-more
+ (viper-undo-more)
+ ;; otherwise execute the command stored in viper-d-com. if arg is
+ ;; non-nil its prefix value is used as new prefix value for the command.
+ (let ((m-com (car viper-d-com))
+ (val (viper-P-val arg))
+ (com (nth 2 viper-d-com))
+ (reg (nth 3 viper-d-com)))
+ (if (null val) (setq val (nth 1 viper-d-com)))
+ (if (null m-com) (error "No previous command to repeat"))
+ (setq viper-use-register reg)
+ (if (nth 4 viper-d-com) ; text inserted by command
+ (setq viper-last-insertion (nth 4 viper-d-com)
+ viper-d-char (nth 4 viper-d-com)))
(funcall m-com (cons val com))
- (if (and vip-keep-point-on-repeat (< save-point (point)))
- (goto-char save-point)) ; go back to before repeat.
+ (cond ((and (< save-point (point)) viper-keep-point-on-repeat)
+ (goto-char save-point)) ; go back to before repeat.
+ ((and (< save-point (point)) viper-ex-style-editing)
+ (or (bolp) (backward-char 1))))
(if (and (eolp) (not (bolp)))
(backward-char 1))
))
- (if vip-undo-needs-adjustment (vip-adjust-undo)) ; take care of undo
+ (viper-adjust-undo) ; take care of undo
;; If the prev cmd was rotating the command ring, this means that `.' has
- ;; just executed a command from that ring. So, push it on the ring again.
- ;; If we are just executing previous command , then don't push vip-d-com
- ;; because vip-d-com is not fully constructed in this case (its keys and
- ;; the inserted text may be nil). Besides, in this case, the command
+ ;; just executed a command from that ring. So, push it on the ring again.
+ ;; If we are just executing previous command , then don't push viper-d-com
+ ;; because viper-d-com is not fully constructed in this case (its keys and
+ ;; the inserted text may be nil). Besides, in this case, the command
;; executed by `.' is already on the ring.
- (if (eq last-command 'vip-display-current-destructive-command)
- (vip-push-onto-ring vip-d-com 'vip-command-ring))
- (vip-deactivate-mark)
+ (if (eq last-command 'viper-display-current-destructive-command)
+ (viper-push-onto-ring viper-d-com 'viper-command-ring))
+ (viper-deactivate-mark)
))
-
-(defun vip-repeat-from-history ()
+
+(defun viper-repeat-from-history ()
"Repeat a destructive command from history.
-Doesn't change vip-command-ring in any way, so `.' will work as before
+Doesn't change viper-command-ring in any way, so `.' will work as before
executing this command.
This command is supposed to be bound to a two-character Vi macro where
-the second character is a digit 0 to 9. The digit indicates which
+the second character is a digit 0 to 9. The digit indicates which
history command to execute. `<char>0' is equivalent to `.', `<char>1'
invokes the command before that, etc."
(interactive)
- (let* ((vip-intermediate-command 'repeating-display-destructive-command)
- (idx (cond (vip-this-kbd-macro
+ (let* ((viper-intermediate-command 'repeating-display-destructive-command)
+ (idx (cond (viper-this-kbd-macro
(string-to-number
- (symbol-name (elt vip-this-kbd-macro 1))))
+ (symbol-name (elt viper-this-kbd-macro 1))))
(t 0)))
(num idx)
- (vip-d-com vip-d-com))
+ (viper-d-com viper-d-com))
(or (and (numberp num) (<= 0 num) (<= num 9))
(progn
(setq idx 0
num 0)
(message
- "`vip-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'")))
+ "`viper-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'")))
(while (< 0 num)
- (setq vip-d-com (vip-special-ring-rotate1 vip-command-ring -1))
+ (setq viper-d-com (viper-special-ring-rotate1 viper-command-ring -1))
(setq num (1- num)))
- (vip-repeat nil)
+ (viper-repeat nil)
(while (> idx num)
- (vip-special-ring-rotate1 vip-command-ring 1)
+ (viper-special-ring-rotate1 viper-command-ring 1)
(setq num (1+ num)))
))
-
-
-;; The hash-command. It is invoked interactively by the key sequence #<char>.
-;; The chars that can follow `#' are determined by vip-hash-command-p
-(defun vip-special-prefix-com (char)
- (cond ((= char ?c)
- (downcase-region (min vip-com-point (point))
- (max vip-com-point (point))))
- ((= char ?C)
- (upcase-region (min vip-com-point (point))
- (max vip-com-point (point))))
- ((= char ?g)
- (push-mark vip-com-point t)
- (vip-global-execute))
- ((= char ?q)
- (push-mark vip-com-point t)
- (vip-quote-region))
- ((= char ?s) (funcall vip-spell-function vip-com-point (point)))
- (t (error "#%c: %s" char vip-InvalidViCommand))))
+
+
+;; The hash-command. It is invoked interactively by the key sequence #<char>.
+;; The chars that can follow `#' are determined by viper-hash-command-p
+(defun viper-special-prefix-com (char)
+ (cond ((viper= char ?c)
+ (downcase-region (min viper-com-point (point))
+ (max viper-com-point (point))))
+ ((viper= char ?C)
+ (upcase-region (min viper-com-point (point))
+ (max viper-com-point (point))))
+ ((viper= char ?g)
+ (push-mark viper-com-point t)
+ ;; execute the last emacs kbd macro on each line of the region
+ (viper-global-execute))
+ ((viper= char ?q)
+ (push-mark viper-com-point t)
+ (viper-quote-region))
+ ((viper= char ?s)
+ (funcall viper-spell-function viper-com-point (point)))
+ (t (error "#%c: %s" char viper-InvalidViCommand))))
\f
;; undoing
-(defun vip-undo ()
+;; hook used inside undo
+(defvar viper-undo-functions nil)
+
+;; Runs viper-before-change-functions inside before-change-functions
+(defun viper-undo-sentinel (beg end length)
+ (run-hook-with-args 'viper-undo-functions beg end length))
+
+(add-hook 'after-change-functions 'viper-undo-sentinel)
+
+;; Hook used in viper-undo
+(defun viper-after-change-undo-hook (beg end len)
+ (if (and (boundp 'undo-in-progress) undo-in-progress)
+ (setq undo-beg-posn beg
+ undo-end-posn (or end beg))
+ ;; some other hooks may be changing various text properties in
+ ;; the buffer in response to 'undo'; so remove this hook to avoid
+ ;; its repeated invocation
+ (remove-hook 'viper-undo-functions 'viper-after-change-undo-hook 'local)
+ ))
+
+(defun viper-undo ()
"Undo previous change."
(interactive)
(message "undo!")
(let ((modified (buffer-modified-p))
(before-undo-pt (point-marker))
- (after-change-functions after-change-functions)
undo-beg-posn undo-end-posn)
-
- ;; no need to remove this hook, since this var has scope inside a let.
- (add-hook 'after-change-functions
- '(lambda (beg end len)
- (setq undo-beg-posn beg
- undo-end-posn (or end beg))))
-
+
+ ;; the viper-after-change-undo-hook removes itself after the 1st invocation
+ (add-hook 'viper-undo-functions 'viper-after-change-undo-hook nil 'local)
+
(undo-start)
(undo-more 2)
- (setq undo-beg-posn (or undo-beg-posn before-undo-pt)
- undo-end-posn (or undo-end-posn undo-beg-posn))
-
- (goto-char undo-beg-posn)
- (sit-for 0)
- (if (and vip-keep-point-on-undo
- (pos-visible-in-window-p before-undo-pt))
+ ;;(setq undo-beg-posn (or undo-beg-posn (point))
+ ;; undo-end-posn (or undo-end-posn (point)))
+ ;;(setq undo-beg-posn (or undo-beg-posn before-undo-pt)
+ ;; undo-end-posn (or undo-end-posn undo-beg-posn))
+
+ (if (and undo-beg-posn undo-end-posn)
(progn
- (push-mark (point-marker) t)
- (vip-sit-for-short 300)
- (goto-char undo-end-posn)
- (vip-sit-for-short 300)
- (if (and (> (abs (- undo-beg-posn before-undo-pt)) 1)
- (> (abs (- undo-end-posn before-undo-pt)) 1))
- (goto-char before-undo-pt)
- (goto-char undo-beg-posn)))
- (push-mark before-undo-pt t))
+ (goto-char undo-beg-posn)
+ (sit-for 0)
+ (if (and viper-keep-point-on-undo
+ (pos-visible-in-window-p before-undo-pt))
+ (progn
+ (push-mark (point-marker) t)
+ (viper-sit-for-short 300)
+ (goto-char undo-end-posn)
+ (viper-sit-for-short 300)
+ (if (pos-visible-in-window-p undo-beg-posn)
+ (goto-char before-undo-pt)
+ (goto-char undo-beg-posn)))
+ (push-mark before-undo-pt t))
+ ))
+
(if (and (eolp) (not (bolp))) (backward-char 1))
- (if (not modified) (set-buffer-modified-p t)))
- (setq this-command 'vip-undo))
+ )
+ (setq this-command 'viper-undo))
;; Continue undoing previous changes.
-(defun vip-undo-more ()
+(defun viper-undo-more ()
(message "undo more!")
(condition-case nil
(undo-more 1)
(error (beep)
(message "No further undo information in this buffer")))
(if (and (eolp) (not (bolp))) (backward-char 1))
- (setq this-command 'vip-undo))
+ (setq this-command 'viper-undo))
;; The following two functions are used to set up undo properly.
;; In VI, unlike Emacs, if you open a line, say, and add a bunch of lines,
-;; they are undone all at once.
-(defun vip-adjust-undo ()
- (let ((inhibit-quit t)
- tmp tmp2)
- (setq vip-undo-needs-adjustment nil)
- (if (listp buffer-undo-list)
- (if (setq tmp (memq vip-buffer-undo-list-mark buffer-undo-list))
- (progn
- (setq tmp2 (cdr tmp)) ; the part after mark
-
- ;; cut tail from buffer-undo-list temporarily by direct
- ;; manipulation with pointers in buffer-undo-list
- (setcdr tmp nil)
-
- (setq buffer-undo-list (delq nil buffer-undo-list))
- (setq buffer-undo-list
- (delq vip-buffer-undo-list-mark buffer-undo-list))
- ;; restore tail of buffer-undo-list
- (setq buffer-undo-list (nconc buffer-undo-list tmp2)))
- (setq buffer-undo-list (delq nil buffer-undo-list))))))
-
-
-(defun vip-set-complex-command-for-undo ()
+;; they are undone all at once.
+(defun viper-adjust-undo ()
+ (if viper-undo-needs-adjustment
+ (let ((inhibit-quit t)
+ tmp tmp2)
+ (setq viper-undo-needs-adjustment nil)
+ (if (listp buffer-undo-list)
+ (if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list))
+ (progn
+ (setq tmp2 (cdr tmp)) ; the part after mark
+
+ ;; cut tail from buffer-undo-list temporarily by direct
+ ;; manipulation with pointers in buffer-undo-list
+ (setcdr tmp nil)
+
+ (setq buffer-undo-list (delq nil buffer-undo-list))
+ (setq buffer-undo-list
+ (delq viper-buffer-undo-list-mark buffer-undo-list))
+ ;; restore tail of buffer-undo-list
+ (setq buffer-undo-list (nconc buffer-undo-list tmp2)))
+ (setq buffer-undo-list (delq nil buffer-undo-list)))))
+ ))
+
+
+(defun viper-set-complex-command-for-undo ()
(if (listp buffer-undo-list)
- (if (not vip-undo-needs-adjustment)
+ (if (not viper-undo-needs-adjustment)
(let ((inhibit-quit t))
- (setq buffer-undo-list
- (cons vip-buffer-undo-list-mark buffer-undo-list))
- (setq vip-undo-needs-adjustment t)))))
+ (setq buffer-undo-list
+ (cons viper-buffer-undo-list-mark buffer-undo-list))
+ (setq viper-undo-needs-adjustment t)))))
+;;; Viper's destructive Command ring utilities
-
-(defun vip-display-current-destructive-command ()
- (let ((text (nth 4 vip-d-com))
- (keys (nth 5 vip-d-com))
+(defun viper-display-current-destructive-command ()
+ (let ((text (nth 4 viper-d-com))
+ (keys (nth 5 viper-d-com))
(max-text-len 30))
-
- (setq this-command 'vip-display-current-destructive-command)
-
+
+ (setq this-command 'viper-display-current-destructive-command)
+
(message " `.' runs %s%s"
- (concat "`" (vip-array-to-string keys) "'")
- (vip-abbreviate-string text max-text-len
- " inserting `" "'" " ......."))
+ (concat "`" (viper-array-to-string keys) "'")
+ (viper-abbreviate-string
+ (viper-cond-compile-for-xemacs-or-emacs
+ (replace-in-string ; xemacs
+ (cond ((characterp text) (char-to-string text))
+ ((stringp text) text)
+ (t ""))
+ "\n" "^J")
+ text ; emacs
+ )
+ max-text-len
+ " inserting `" "'" " ......."))
))
-
-
-;; don't change vip-d-com if it was vip-repeat command invoked with `.'
+
+
+;; don't change viper-d-com if it was viper-repeat command invoked with `.'
;; or in some other way (non-interactively).
-(defun vip-set-destructive-command (list)
- (or (eq vip-intermediate-command 'vip-repeat)
+(defun viper-set-destructive-command (list)
+ (or (eq viper-intermediate-command 'viper-repeat)
(progn
- (setq vip-d-com list)
- (setcar (nthcdr 5 vip-d-com)
- (vip-array-to-string (this-command-keys)))
- (vip-push-onto-ring vip-d-com 'vip-command-ring))))
-
-(defun vip-prev-destructive-command (next)
+ (setq viper-d-com list)
+ (setcar (nthcdr 5 viper-d-com)
+ (viper-array-to-string (if (arrayp viper-this-command-keys)
+ viper-this-command-keys
+ (this-command-keys))))
+ (viper-push-onto-ring viper-d-com 'viper-command-ring)))
+ (setq viper-this-command-keys nil))
+
+
+(defun viper-prev-destructive-command (next)
"Find previous destructive command in the history of destructive commands.
With prefix argument, find next destructive command."
(interactive "P")
- (let (cmd vip-intermediate-command)
- (if (eq last-command 'vip-display-current-destructive-command)
+ (let (cmd viper-intermediate-command)
+ (if (eq last-command 'viper-display-current-destructive-command)
;; repeated search through command history
- (setq vip-intermediate-command 'repeating-display-destructive-command)
+ (setq viper-intermediate-command
+ 'repeating-display-destructive-command)
;; first search through command history--set temp ring
- (setq vip-temp-command-ring (copy-list vip-command-ring)))
+ (setq viper-temp-command-ring (copy-list viper-command-ring)))
(setq cmd (if next
- (vip-special-ring-rotate1 vip-temp-command-ring 1)
- (vip-special-ring-rotate1 vip-temp-command-ring -1)))
+ (viper-special-ring-rotate1 viper-temp-command-ring 1)
+ (viper-special-ring-rotate1 viper-temp-command-ring -1)))
(if (null cmd)
()
- (setq vip-d-com cmd))
- (vip-display-current-destructive-command)))
-
-(defun vip-next-destructive-command ()
+ (setq viper-d-com cmd))
+ (viper-display-current-destructive-command)))
+
+
+(defun viper-next-destructive-command ()
"Find next destructive command in the history of destructive commands."
(interactive)
- (vip-prev-destructive-command 'next))
-
-(defun vip-insert-prev-from-insertion-ring (arg)
+ (viper-prev-destructive-command 'next))
+
+
+(defun viper-insert-prev-from-insertion-ring (arg)
"Cycle through insertion ring in the direction of older insertions.
Undoes previous insertion and inserts new.
With prefix argument, cycles in the direction of newer elements.
In minibuffer, this command executes whatever the invocation key is bound
to in the global map, instead of cycling through the insertion ring."
(interactive "P")
- (let (vip-intermediate-command)
- (if (eq last-command 'vip-insert-from-insertion-ring)
+ (let (viper-intermediate-command)
+ (if (eq last-command 'viper-insert-from-insertion-ring)
(progn ; repeated search through insertion history
- (setq vip-intermediate-command 'repeating-insertion-from-ring)
- (if (eq vip-current-state 'replace-state)
+ (setq viper-intermediate-command 'repeating-insertion-from-ring)
+ (if (eq viper-current-state 'replace-state)
(undo 1)
- (if vip-last-inserted-string-from-insertion-ring
+ (if viper-last-inserted-string-from-insertion-ring
(backward-delete-char
- (length vip-last-inserted-string-from-insertion-ring))))
+ (length viper-last-inserted-string-from-insertion-ring))))
)
;;first search through insertion history
- (setq vip-temp-insertion-ring (copy-list vip-insertion-ring)))
- (setq this-command 'vip-insert-from-insertion-ring)
+ (setq viper-temp-insertion-ring (copy-list viper-insertion-ring)))
+ (setq this-command 'viper-insert-from-insertion-ring)
;; so that things will be undone properly
(setq buffer-undo-list (cons nil buffer-undo-list))
- (setq vip-last-inserted-string-from-insertion-ring
- (vip-special-ring-rotate1 vip-temp-insertion-ring (if arg 1 -1)))
-
- ;; this change of vip-intermediate-command must come after
- ;; vip-special-ring-rotate1, so that the ring will rotate, but before the
+ (setq viper-last-inserted-string-from-insertion-ring
+ (viper-special-ring-rotate1 viper-temp-insertion-ring (if arg 1 -1)))
+
+ ;; this change of viper-intermediate-command must come after
+ ;; viper-special-ring-rotate1, so that the ring will rotate, but before the
;; insertion.
- (setq vip-intermediate-command nil)
- (if vip-last-inserted-string-from-insertion-ring
- (insert vip-last-inserted-string-from-insertion-ring))
+ (setq viper-intermediate-command nil)
+ (if viper-last-inserted-string-from-insertion-ring
+ (insert viper-last-inserted-string-from-insertion-ring))
))
-(defun vip-insert-next-from-insertion-ring ()
+(defun viper-insert-next-from-insertion-ring ()
"Cycle through insertion ring in the direction of older insertions.
Undo previous insertion and inserts new."
(interactive)
- (vip-insert-prev-from-insertion-ring 'next))
-
+ (viper-insert-prev-from-insertion-ring 'next))
+
+
\f
;; some region utilities
;; If at the last line of buffer, add \\n before eob, if newline is missing.
-(defun vip-add-newline-at-eob-if-necessary ()
+(defun viper-add-newline-at-eob-if-necessary ()
(save-excursion
(end-of-line)
;; make sure all lines end with newline, unless in the minibuffer or
;; when requested otherwise (require-final-newline is nil)
- (if (and (eobp)
- (not (bolp))
- require-final-newline
- (not (vip-is-in-minibuffer))
- (not buffer-read-only))
- (insert "\n"))))
-
-(defun vip-yank-defun ()
+ (save-restriction
+ (widen)
+ (if (and (eobp)
+ (not (bolp))
+ require-final-newline
+ (not (viper-is-in-minibuffer))
+ (not buffer-read-only))
+ (insert "\n")))
+ ))
+
+(defun viper-yank-defun ()
(mark-defun)
(copy-region-as-kill (point) (mark t)))
;; Enlarge region between BEG and END.
-(defun vip-enlarge-region (beg end)
+(defun viper-enlarge-region (beg end)
(or beg (setq beg end)) ; if beg is nil, set to end
(or end (setq end beg)) ; if end is nil, set to beg
-
+
(if (< beg end)
(progn (goto-char beg) (set-mark end))
(goto-char end)
;; Quote region by each line with a user supplied string.
-(defun vip-quote-region ()
- (setq vip-quote-string
- (vip-read-string-with-history
- "Quote string: "
- nil
- 'vip-quote-region-history
- vip-quote-string))
- (vip-enlarge-region (point) (mark t))
- (if (> (point) (mark t)) (exchange-point-and-mark))
- (insert vip-quote-string)
- (beginning-of-line)
- (forward-line 1)
- (while (and (< (point) (mark t)) (bolp))
- (insert vip-quote-string)
+(defun viper-quote-region ()
+ (let ((quote-str viper-quote-string)
+ (donot-change-dafault t))
+ (setq quote-str
+ (viper-read-string-with-history
+ "Quote string: "
+ nil
+ 'viper-quote-region-history
+ (cond ((string-match "tex.*-mode" (symbol-name major-mode)) "%%")
+ ((string-match "java.*-mode" (symbol-name major-mode)) "//")
+ ((string-match "perl.*-mode" (symbol-name major-mode)) "#")
+ ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;")
+ ((memq major-mode '(c-mode cc-mode c++-mode)) "//")
+ ((memq major-mode '(sh-mode shell-mode)) "#")
+ (t (setq donot-change-dafault nil)
+ quote-str))))
+ (or donot-change-dafault
+ (setq viper-quote-string quote-str))
+ (viper-enlarge-region (point) (mark t))
+ (if (> (point) (mark t)) (exchange-point-and-mark))
+ (insert quote-str)
(beginning-of-line)
- (forward-line 1)))
+ (forward-line 1)
+ (while (and (< (point) (mark t)) (bolp))
+ (insert quote-str)
+ (beginning-of-line)
+ (forward-line 1))))
;; Tells whether BEG is on the same line as END.
;; If one of the args is nil, it'll return nil.
-(defun vip-same-line (beg end)
+(defun viper-same-line (beg end)
(let ((selective-display nil)
(incr 0)
temp)
(t
;; This 'if' is needed because Emacs treats the next empty line
;; as part of the previous line.
- (if (= (vip-line-pos 'start) end)
+ (if (= (viper-line-pos 'start) end)
(setq incr 1))
(<= (+ incr (count-lines beg end)) 1))))
))
-
-
+
+
;; Check if the string ends with a newline.
-(defun vip-end-with-a-newline-p (string)
+(defun viper-end-with-a-newline-p (string)
(or (string= string "")
- (= (vip-seq-last-elt string) ?\n)))
+ (= (viper-seq-last-elt string) ?\n)))
-(defun vip-tmp-insert-at-eob (msg)
+(defun viper-tmp-insert-at-eob (msg)
(let ((savemax (point-max)))
(goto-char savemax)
(insert msg)
(sit-for 2)
(goto-char savemax) (delete-region (point) (point-max))
- ))
-
+ ))
+
\f
;;; Minibuffer business
-
-(defsubst vip-set-minibuffer-style ()
- (add-hook 'minibuffer-setup-hook 'vip-minibuffer-setup-sentinel))
-
-
-(defun vip-minibuffer-setup-sentinel ()
- (let ((hook (if vip-vi-style-in-minibuffer
- 'vip-change-state-to-insert
- 'vip-change-state-to-emacs)))
+
+(defsubst viper-set-minibuffer-style ()
+ (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel)
+ (add-hook 'post-command-hook 'viper-minibuffer-post-command-hook))
+
+
+(defun viper-minibuffer-setup-sentinel ()
+ (let ((hook (if viper-vi-style-in-minibuffer
+ 'viper-change-state-to-insert
+ 'viper-change-state-to-emacs)))
+ ;; making buffer-local variables so that normal buffers won't affect the
+ ;; minibuffer and vice versa. Otherwise, command arguments will affect
+ ;; minibuffer ops and insertions from the minibuffer will change those in
+ ;; the normal buffers
+ (make-local-variable 'viper-d-com)
+ (make-local-variable 'viper-last-insertion)
+ (make-local-variable 'viper-command-ring)
+ (setq viper-d-com nil
+ viper-last-insertion nil
+ viper-command-ring nil)
(funcall hook)
))
-
-;; Interpret last event in the local map
-(defun vip-exit-minibuffer ()
+
+;; Thie is a temp hook that uses free variables init-message and initial.
+;; A dirty feature, but it is the simplest way to have it do the right thing.
+;; The INIT-MESSAGE and INITIAL vars come from the scope set by
+;; viper-read-string-with-history
+(defun viper-minibuffer-standard-hook ()
+ (if (stringp init-message)
+ (viper-tmp-insert-at-eob init-message))
+ (if (stringp initial)
+ (progn
+ ;; don't wait if we have unread events or in kbd macro
+ (or unread-command-events
+ executing-kbd-macro
+ (sit-for 840))
+ (if (fboundp 'minibuffer-prompt-end)
+ (delete-region (minibuffer-prompt-end) (point-max))
+ (erase-buffer))
+ (insert initial))))
+
+(defsubst viper-minibuffer-real-start ()
+ (if (fboundp 'minibuffer-prompt-end)
+ (minibuffer-prompt-end)
+ (point-min)))
+
+(defun viper-minibuffer-post-command-hook()
+ (when (active-minibuffer-window)
+ (when (< (point) (viper-minibuffer-real-start))
+ (goto-char (viper-minibuffer-real-start)))))
+
+
+;; Interpret last event in the local map first; if fails, use exit-minibuffer.
+;; Run viper-minibuffer-exit-hook before exiting.
+(defun viper-exit-minibuffer ()
+ "Exit minibuffer Viper way."
(interactive)
(let (command)
(setq command (local-key-binding (char-to-string last-command-char)))
+ (run-hooks 'viper-minibuffer-exit-hook)
(if command
(command-execute command)
(exit-minibuffer))))
-
+
+
+(defcustom viper-smart-suffix-list
+ '("" "tex" "c" "cc" "C" "java" "el" "html" "htm" "xml"
+ "pl" "flr" "P" "p" "h" "H")
+ "*List of suffixes that Viper tries to append to filenames ending with a `.'.
+This is useful when the current directory contains files with the same
+prefix and many different suffixes. Usually, only one of the suffixes
+represents an editable file. However, file completion will stop at the `.'
+The smart suffix feature lets you hit RET in such a case, and Viper will
+select the appropriate suffix.
+
+Suffixes are tried in the order given and the first suffix for which a
+corresponding file exists is selected. If no file exists for any of the
+suffixes, the user is asked to confirm.
+
+To turn this feature off, set this variable to nil."
+ :type '(repeat string)
+ :group 'viper-misc)
+
+
+;; Try to add a suitable suffix to files whose name ends with a `.'
+;; Useful when the user hits RET on a non-completed file name.
+;; Used as a minibuffer exit hook in read-file-name
+(defun viper-file-add-suffix ()
+ (let ((count 0)
+ (len (length viper-smart-suffix-list))
+ (file (buffer-substring-no-properties
+ (viper-minibuffer-real-start) (point-max)))
+ found key cmd suff)
+ (goto-char (point-max))
+ (if (and viper-smart-suffix-list (string-match "\\.$" file))
+ (progn
+ (while (and (not found) (< count len))
+ (setq suff (nth count viper-smart-suffix-list)
+ count (1+ count))
+ (if (file-exists-p
+ (format "%s%s" (substitute-in-file-name file) suff))
+ (progn
+ (setq found t)
+ (insert suff))))
+
+ (if found
+ ()
+ (viper-tmp-insert-at-eob " [Please complete file name]")
+ (unwind-protect
+ (while (not (memq cmd
+ '(exit-minibuffer viper-exit-minibuffer)))
+ (setq cmd
+ (key-binding (setq key (read-key-sequence nil))))
+ (cond ((eq cmd 'self-insert-command)
+ (viper-cond-compile-for-xemacs-or-emacs
+ (insert (events-to-keys key)) ; xemacs
+ (insert key) ; emacs
+ ))
+ ((memq cmd '(exit-minibuffer viper-exit-minibuffer))
+ nil)
+ (t (command-execute cmd)))
+ )))
+ ))))
+
+
+(defun viper-minibuffer-trim-tail ()
+ "Delete junk at the end of the first line of the minibuffer input.
+Remove this function from `viper-minibuffer-exit-hook', if this causes
+problems."
+ (if (viper-is-in-minibuffer)
+ (let ((inhibit-field-text-motion t))
+ (goto-char (viper-minibuffer-real-start))
+ (end-of-line)
+ (delete-region (point) (point-max)))))
+
\f
-;;; Reading string with history
-
-(defun vip-read-string-with-history (prompt &optional initial
- history-var default keymap)
+;;; Reading string with history
+
+(defun viper-read-string-with-history (prompt &optional initial
+ history-var default keymap
+ init-message)
;; Read string, prompting with PROMPT and inserting the INITIAL
- ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the
- ;; input is an empty string. Use KEYMAP, if given, or the
- ;; minibuffer-local-map.
+ ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the
+ ;; input is an empty string.
;; Default value is displayed until the user types something in the
- ;; minibuffer.
- (let ((minibuffer-setup-hook
- '(lambda ()
- (if (stringp initial)
- (progn
- ;; don't wait if we have unread events or in kbd macro
- (or unread-command-events
- executing-kbd-macro
- (sit-for 840))
- (erase-buffer)
- (insert initial)))
- (vip-minibuffer-setup-sentinel)))
+ ;; minibuffer.
+ ;; KEYMAP is used, if given, instead of minibuffer-local-map.
+ ;; INIT-MESSAGE is the message temporarily displayed after entering the
+ ;; minibuffer.
+ (let ((minibuffer-setup-hook
+ ;; stolen from add-hook
+ (let ((old
+ (if (boundp 'minibuffer-setup-hook)
+ minibuffer-setup-hook
+ nil)))
+ (cons
+ 'viper-minibuffer-standard-hook
+ (if (or (not (listp old)) (eq (car old) 'lambda))
+ (list old) old))))
(val "")
(padding "")
temp-msg)
-
+
(setq keymap (or keymap minibuffer-local-map)
initial (or initial "")
temp-msg (if default
- (format "(default: %s) " default)
+ (format "(default %s) " default)
""))
-
- (setq vip-incomplete-ex-cmd nil)
- (setq val (read-from-minibuffer prompt
+
+ (setq viper-incomplete-ex-cmd nil)
+ (setq val (read-from-minibuffer prompt
(concat temp-msg initial val padding)
keymap nil history-var))
(setq minibuffer-setup-hook nil
- padding (vip-array-to-string (this-command-keys))
+ padding (viper-array-to-string (this-command-keys))
temp-msg "")
;; the following tries to be smart about what to put in history
(if (not (string= val (car (eval history-var))))
(if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var)))
(string= (nth 0 (eval history-var)) ""))
(set history-var (cdr (eval history-var))))
- ;; If the user enters nothing but the prev cmd wasn't vip-ex,
- ;; vip-command-argument, or `! shell-command', this probably means
- ;; that the user typed something then erased. Return "" in this case, not
+ ;; If the user enters nothing but the prev cmd wasn't viper-ex,
+ ;; viper-command-argument, or `! shell-command', this probably means
+ ;; that the user typed something then erased. Return "" in this case, not
;; the default---the default is too confusing in this case.
(cond ((and (string= val "")
(not (string= prompt "!")) ; was a `! shell-command'
(not (memq last-command
- '(vip-ex
- vip-command-argument
+ '(viper-ex
+ viper-command-argument
t)
)))
"")
((string= val "") (or default ""))
(t val))
))
-
+
\f
;; insertion commands
;; Called when state changes from Insert Vi command mode.
;; Repeats the insertion command if Insert state was entered with prefix
;; argument > 1.
-(defun vip-repeat-insert-command ()
- (let ((i-com (car vip-d-com))
- (val (nth 1 vip-d-com))
- (char (nth 2 vip-d-com)))
+(defun viper-repeat-insert-command ()
+ (let ((i-com (car viper-d-com))
+ (val (nth 1 viper-d-com))
+ (char (nth 2 viper-d-com)))
(if (and val (> val 1)) ; first check that val is non-nil
- (progn
- (setq vip-d-com (list i-com (1- val) ?r nil nil nil))
- (vip-repeat nil)
- (setq vip-d-com (list i-com val char nil nil nil))
+ (progn
+ (setq viper-d-com (list i-com (1- val) ?r nil nil nil))
+ (viper-repeat nil)
+ (setq viper-d-com (list i-com val char nil nil nil))
))))
-(defun vip-insert (arg)
+(defun viper-insert (arg)
"Insert before point."
(interactive "P")
- (vip-set-complex-command-for-undo)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-set-destructive-command (list 'vip-insert val ?r nil nil nil))
- (if com
- (vip-loop val (vip-yank-last-insertion))
- (vip-change-state-to-insert))))
+ (viper-set-complex-command-for-undo)
+ (let ((val (viper-p-val arg))
+ ;;(com (viper-getcom arg))
+ )
+ (viper-set-destructive-command (list 'viper-insert val ?r nil nil nil))
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-loop val (viper-yank-last-insertion))
+ (viper-change-state-to-insert))))
-(defun vip-append (arg)
+(defun viper-append (arg)
"Append after point."
(interactive "P")
- (vip-set-complex-command-for-undo)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-set-destructive-command (list 'vip-append val ?r nil nil nil))
+ (viper-set-complex-command-for-undo)
+ (let ((val (viper-p-val arg))
+ ;;(com (viper-getcom arg))
+ )
+ (viper-set-destructive-command (list 'viper-append val ?r nil nil nil))
(if (not (eolp)) (forward-char))
- (if (equal com ?r)
- (vip-loop val (vip-yank-last-insertion))
- (vip-change-state-to-insert))))
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-loop val (viper-yank-last-insertion))
+ (viper-change-state-to-insert))))
-(defun vip-Append (arg)
+(defun viper-Append (arg)
"Append at end of line."
(interactive "P")
- (vip-set-complex-command-for-undo)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-set-destructive-command (list 'vip-Append val ?r nil nil nil))
+ (viper-set-complex-command-for-undo)
+ (let ((val (viper-p-val arg))
+ ;;(com (viper-getcom arg))
+ )
+ (viper-set-destructive-command (list 'viper-Append val ?r nil nil nil))
(end-of-line)
- (if (equal com ?r)
- (vip-loop val (vip-yank-last-insertion))
- (vip-change-state-to-insert))))
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-loop val (viper-yank-last-insertion))
+ (viper-change-state-to-insert))))
-(defun vip-Insert (arg)
+(defun viper-Insert (arg)
"Insert before first non-white."
(interactive "P")
- (vip-set-complex-command-for-undo)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-set-destructive-command (list 'vip-Insert val ?r nil nil nil))
+ (viper-set-complex-command-for-undo)
+ (let ((val (viper-p-val arg))
+ ;;(com (viper-getcom arg))
+ )
+ (viper-set-destructive-command (list 'viper-Insert val ?r nil nil nil))
(back-to-indentation)
- (if (equal com ?r)
- (vip-loop val (vip-yank-last-insertion))
- (vip-change-state-to-insert))))
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-loop val (viper-yank-last-insertion))
+ (viper-change-state-to-insert))))
-(defun vip-open-line (arg)
+(defun viper-open-line (arg)
"Open line below."
(interactive "P")
- (vip-set-complex-command-for-undo)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-set-destructive-command (list 'vip-open-line val ?r nil nil nil))
+ (viper-set-complex-command-for-undo)
+ (let ((val (viper-p-val arg))
+ ;;(com (viper-getcom arg))
+ )
+ (viper-set-destructive-command (list 'viper-open-line val ?r nil nil nil))
(let ((col (current-indentation)))
- (if (equal com ?r)
- (vip-loop val
- (progn
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-loop val
(end-of-line)
(newline 1)
- (if vip-auto-indent
- (progn
- (setq vip-cted t)
- (if vip-electric-mode
- (indent-according-to-mode)
- (indent-to col))
- ))
- (vip-yank-last-insertion)))
+ (viper-indent-line col)
+ (viper-yank-last-insertion))
(end-of-line)
(newline 1)
- (if vip-auto-indent
- (progn
- (setq vip-cted t)
- (if vip-electric-mode
- (indent-according-to-mode)
- (indent-to col))))
- (vip-change-state-to-insert)))))
+ (viper-indent-line col)
+ (viper-change-state-to-insert)))))
-(defun vip-Open-line (arg)
+(defun viper-Open-line (arg)
"Open line above."
(interactive "P")
- (vip-set-complex-command-for-undo)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-set-destructive-command (list 'vip-Open-line val ?r nil nil nil))
+ (viper-set-complex-command-for-undo)
+ (let ((val (viper-p-val arg))
+ ;;(com (viper-getcom arg))
+ )
+ (viper-set-destructive-command (list 'viper-Open-line val ?r nil nil nil))
(let ((col (current-indentation)))
- (if (equal com ?r)
- (vip-loop val
- (progn
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-loop val
(beginning-of-line)
(open-line 1)
- (if vip-auto-indent
- (progn
- (setq vip-cted t)
- (if vip-electric-mode
- (indent-according-to-mode)
- (indent-to col))
- ))
- (vip-yank-last-insertion)))
+ (viper-indent-line col)
+ (viper-yank-last-insertion))
(beginning-of-line)
(open-line 1)
- (if vip-auto-indent
- (progn
- (setq vip-cted t)
- (if vip-electric-mode
- (indent-according-to-mode)
- (indent-to col))
- ))
- (vip-change-state-to-insert)))))
-
-(defun vip-open-line-at-point (arg)
+ (viper-indent-line col)
+ (viper-change-state-to-insert)))))
+
+(defun viper-open-line-at-point (arg)
"Open line at point."
(interactive "P")
- (vip-set-complex-command-for-undo)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-set-destructive-command
- (list 'vip-open-line-at-point val ?r nil nil nil))
- (if (equal com ?r)
- (vip-loop val
- (progn
+ (viper-set-complex-command-for-undo)
+ (let ((val (viper-p-val arg))
+ ;;(com (viper-getcom arg))
+ )
+ (viper-set-destructive-command
+ (list 'viper-open-line-at-point val ?r nil nil nil))
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-loop val
(open-line 1)
- (vip-yank-last-insertion)))
+ (viper-yank-last-insertion))
(open-line 1)
- (vip-change-state-to-insert))))
+ (viper-change-state-to-insert))))
-(defun vip-substitute (arg)
+;; bound to s
+(defun viper-substitute (arg)
"Substitute characters."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
+ (let ((val (viper-p-val arg))
+ ;;(com (viper-getcom arg))
+ )
(push-mark nil t)
(forward-char val)
- (if (equal com ?r)
- (vip-change-subr (mark t) (point))
- (vip-change (mark t) (point)))
- (vip-set-destructive-command (list 'vip-substitute val ?r nil nil nil))
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (viper-change-subr (mark t) (point))
+ (viper-change (mark t) (point)))
+ ;; com is set to ?r when we repeat this comand with dot
+ (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil))
))
-(defun vip-substitute-line (arg)
+;; Command bound to S
+(defun viper-substitute-line (arg)
"Substitute lines."
(interactive "p")
- (vip-set-complex-command-for-undo)
- (vip-line (cons arg ?C)))
+ (viper-set-complex-command-for-undo)
+ (viper-line (cons arg ?C)))
;; Prepare for replace
-(defun vip-start-replace ()
- (setq vip-began-as-replace t
- vip-sitting-in-replace t
- vip-replace-chars-to-delete 0
- vip-replace-chars-deleted 0)
- (vip-add-hook 'vip-after-change-functions 'vip-replace-mode-spy-after t)
- (vip-add-hook 'vip-before-change-functions 'vip-replace-mode-spy-before t)
+(defun viper-start-replace ()
+ (setq viper-began-as-replace t
+ viper-sitting-in-replace t
+ viper-replace-chars-to-delete 0)
+ (add-hook
+ 'viper-after-change-functions 'viper-replace-mode-spy-after t 'local)
+ (add-hook
+ 'viper-before-change-functions 'viper-replace-mode-spy-before t 'local)
;; this will get added repeatedly, but no harm
- (add-hook 'after-change-functions 'vip-after-change-sentinel t)
- (add-hook 'before-change-functions 'vip-before-change-sentinel t)
- (vip-move-marker-locally 'vip-last-posn-in-replace-region
- (vip-replace-start))
- (vip-add-hook
- 'vip-post-command-hooks 'vip-replace-state-post-command-sentinel t)
- (vip-add-hook
- 'vip-pre-command-hooks 'vip-replace-state-pre-command-sentinel t)
+ (add-hook 'after-change-functions 'viper-after-change-sentinel t)
+ (add-hook 'before-change-functions 'viper-before-change-sentinel t)
+ (viper-move-marker-locally
+ 'viper-last-posn-in-replace-region (viper-replace-start))
+ (add-hook
+ 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel
+ t 'local)
+ (add-hook
+ 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
;; guard against a smartie who switched from R-replace to normal replace
- (vip-remove-hook
- 'vip-post-command-hooks 'vip-R-state-post-command-sentinel)
- (if overwrite-mode (overwrite-mode nil))
+ (remove-hook
+ 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local)
+ (if overwrite-mode (overwrite-mode -1))
+ )
+
+
+(defun viper-replace-mode-spy-before (beg end)
+ (setq viper-replace-region-chars-deleted (viper-chars-in-region beg end))
)
-
-
-;; checks how many chars were deleted by the last change
-(defun vip-replace-mode-spy-before (beg end)
- (setq vip-replace-chars-deleted
- (- end beg
- (max 0 (- end (vip-replace-end)))
- (max 0 (- (vip-replace-start) beg))
- )))
-
-;; Invoked as an after-change-function to set up parameters of the last change
-(defun vip-replace-mode-spy-after (beg end length)
- (if (memq vip-intermediate-command '(repeating-insertion-from-ring))
+
+;; Invoked as an after-change-function to calculate how many chars have to be
+;; deleted. This function may be called several times within a single command,
+;; if this command performs several separate buffer changes. Therefore, if
+;; adds up the number of chars inserted and subtracts the number of chars
+;; deleted.
+(defun viper-replace-mode-spy-after (beg end length)
+ (if (memq viper-intermediate-command
+ '(dabbrev-expand hippie-expand repeating-insertion-from-ring))
+ ;; Take special care of text insertion from insertion ring inside
+ ;; replacement overlays.
(progn
- (setq vip-replace-chars-to-delete 0)
- (vip-move-marker-locally
- 'vip-last-posn-in-replace-region (point)))
-
- (let (beg-col end-col real-end chars-to-delete)
- (setq real-end (min end (vip-replace-end)))
- (save-excursion
- (goto-char beg)
- (setq beg-col (current-column))
- (goto-char real-end)
- (setq end-col (current-column)))
-
- ;; If beg of change is outside the replacement region, then don't
- ;; delete anything in the repl region (set chars-to-delete to 0).
- ;;
- ;; This works fine except that we have to take special care of
- ;; dabbrev-expand. The problem stems from new-dabbrev.el, which
- ;; sometimes simply shifts the repl region rightwards, without
- ;; deleting an equal amount of characters.
- ;;
- ;; The reason why new-dabbrev.el causes this are this:
- ;; if one dinamically completes a partial word that starts before the
- ;; replacement region (but ends inside) then new-dabbrev.el first
- ;; moves cursor backwards, to the beginning of the word to be
- ;; completed (say, pt A). Then it inserts the
- ;; completed word and then deletes the old, incomplete part.
- ;; Since the complete word is inserted at position before the repl
- ;; region, the next If-statement would have set chars-to-delete to 0
- ;; unless we check for the current command, which must be
- ;; dabbrev-expand.
- ;;
- ;; In fact, it might be also useful to have overlays for insert
- ;; regions as well, since this will let us capture the situation when
- ;; dabbrev-expand goes back past the insertion point to find the
- ;; beginning of the word to be expanded.
- (if (or (and (<= (vip-replace-start) beg)
- (<= beg (vip-replace-end)))
- (and (= length 0) (eq this-command 'dabbrev-expand)))
- (setq chars-to-delete
- (max (- end-col beg-col) (- real-end beg) 0))
- (setq chars-to-delete 0))
-
- ;; if beg = last change position, it means that we are within the
- ;; same command that does multiple changes. Moreover, it means
- ;; that we have two subsequent changes (insert/delete) that
- ;; complement each other.
- (if (= beg (marker-position vip-last-posn-in-replace-region))
- (setq vip-replace-chars-to-delete
- (- (+ chars-to-delete vip-replace-chars-to-delete)
- vip-replace-chars-deleted))
- (setq vip-replace-chars-to-delete chars-to-delete))
-
- (vip-move-marker-locally
- 'vip-last-posn-in-replace-region
- (max (if (> end (vip-replace-end)) (vip-replace-start) end)
- (or (marker-position vip-last-posn-in-replace-region)
- (vip-replace-start))
+ (setq viper-replace-chars-to-delete 0)
+ (viper-move-marker-locally
+ 'viper-last-posn-in-replace-region (point)))
+
+ (let* ((real-end (min end (viper-replace-end)))
+ (column-shift (- (save-excursion (goto-char real-end)
+ (current-column))
+ (save-excursion (goto-char beg)
+ (current-column))))
+ (chars-deleted 0))
+
+ (if (> length 0)
+ (setq chars-deleted viper-replace-region-chars-deleted))
+ (setq viper-replace-region-chars-deleted 0)
+ (setq viper-replace-chars-to-delete
+ (+ viper-replace-chars-to-delete
+ (-
+ ;; if column shift is bigger, due to a TAB insertion, take
+ ;; column-shift instead of the number of inserted chars
+ (max (viper-chars-in-region beg real-end)
+ ;; This test accounts for Chinese/Japanese/... chars,
+ ;; which occupy 2 columns instead of one. If we use
+ ;; column-shift here, we may delete two chars instead of
+ ;; one when the user types one Chinese character.
+ ;; Deleting two would be OK, if they were European chars,
+ ;; but it is not OK if they are Chinese chars.
+ ;; Since it is hard to
+ ;; figure out which characters are being deleted in any
+ ;; given region, we decided to treat Eastern and European
+ ;; characters equally, even though Eastern chars may
+ ;; occupy more columns.
+ (if (memq this-command '(self-insert-command
+ quoted-insert viper-insert-tab))
+ column-shift
+ 0))
+ ;; the number of deleted chars
+ chars-deleted)))
+
+ (viper-move-marker-locally
+ 'viper-last-posn-in-replace-region
+ (max (if (> end (viper-replace-end)) (viper-replace-end) end)
+ (or (marker-position viper-last-posn-in-replace-region)
+ (viper-replace-start))
))
-
- (setq vip-replace-chars-to-delete
- (max 0
- (min vip-replace-chars-to-delete
- (- (vip-replace-end) vip-last-posn-in-replace-region)
- (- (vip-line-pos 'end) vip-last-posn-in-replace-region)
- )))
+
)))
-;; Delete stuff between posn and the end of vip-replace-overlay-marker, if
-;; posn is within the overlay.
-(defun vip-finish-change (posn)
- (vip-remove-hook 'vip-after-change-functions 'vip-replace-mode-spy-after)
- (vip-remove-hook 'vip-before-change-functions 'vip-replace-mode-spy-before)
- (vip-remove-hook 'vip-post-command-hooks
- 'vip-replace-state-post-command-sentinel)
- (vip-remove-hook
- 'vip-pre-command-hooks 'vip-replace-state-pre-command-sentinel)
- (vip-restore-cursor-color-after-replace)
- (setq vip-sitting-in-replace nil) ; just in case we'll need to know it
+;; Delete stuff between viper-last-posn-in-replace-region and the end of
+;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within
+;; the overlay and current point is before the end of the overlay.
+;; Don't delete anything if current point is past the end of the overlay.
+(defun viper-finish-change ()
+ (remove-hook
+ 'viper-after-change-functions 'viper-replace-mode-spy-after 'local)
+ (remove-hook
+ 'viper-before-change-functions 'viper-replace-mode-spy-before 'local)
+ (remove-hook
+ 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local)
+ (remove-hook
+ 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local)
+ (viper-restore-cursor-color 'after-replace-mode)
+ (setq viper-sitting-in-replace nil) ; just in case we'll need to know it
(save-excursion
- (if (and
- vip-replace-overlay
- (>= posn (vip-replace-start))
- (< posn (vip-replace-end)))
- (delete-region posn (vip-replace-end)))
- )
-
- (if (eq vip-current-state 'replace-state)
- (vip-downgrade-to-insert))
- ;; replace mode ended => nullify vip-last-posn-in-replace-region
- (vip-move-marker-locally 'vip-last-posn-in-replace-region nil)
- (vip-hide-replace-overlay)
- (vip-refresh-mode-line)
- (vip-put-string-on-kill-ring vip-last-replace-region)
+ (if (and viper-replace-overlay
+ (viper-pos-within-region viper-last-posn-in-replace-region
+ (viper-replace-start)
+ (viper-replace-end))
+ (< (point) (viper-replace-end)))
+ (delete-region
+ viper-last-posn-in-replace-region (viper-replace-end))))
+
+ (if (eq viper-current-state 'replace-state)
+ (viper-downgrade-to-insert))
+ ;; replace mode ended => nullify viper-last-posn-in-replace-region
+ (viper-move-marker-locally 'viper-last-posn-in-replace-region nil)
+ (viper-hide-replace-overlay)
+ (viper-refresh-mode-line)
+ (viper-put-string-on-kill-ring viper-last-replace-region)
)
;; Make STRING be the first element of the kill ring.
-(defun vip-put-string-on-kill-ring (string)
+(defun viper-put-string-on-kill-ring (string)
(setq kill-ring (cons string kill-ring))
(if (> (length kill-ring) kill-ring-max)
(setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))
(setq kill-ring-yank-pointer kill-ring))
-(defun vip-finish-R-mode ()
- (vip-remove-hook 'vip-post-command-hooks 'vip-R-state-post-command-sentinel)
- (vip-remove-hook
- 'vip-pre-command-hooks 'vip-replace-state-pre-command-sentinel)
- (vip-downgrade-to-insert))
-
-(defun vip-start-R-mode ()
+(defun viper-finish-R-mode ()
+ (remove-hook
+ 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local)
+ (remove-hook
+ 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local)
+ (viper-downgrade-to-insert))
+
+(defun viper-start-R-mode ()
;; Leave arg as 1, not t: XEmacs insists that it must be a pos number
(overwrite-mode 1)
- (vip-add-hook
- 'vip-post-command-hooks 'vip-R-state-post-command-sentinel t)
- (vip-add-hook
- 'vip-pre-command-hooks 'vip-replace-state-pre-command-sentinel t)
+ (add-hook
+ 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local)
+ (add-hook
+ 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
;; guard against a smartie who switched from R-replace to normal replace
- (vip-remove-hook
- 'vip-post-command-hooks 'vip-replace-state-post-command-sentinel)
+ (remove-hook
+ 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local)
)
-
-(defun vip-replace-state-exit-cmd ()
+
+(defun viper-replace-state-exit-cmd ()
"Binding for keys that cause Replace state to switch to Vi or to Insert.
These keys are ESC, RET, and LineFeed"
(interactive)
- (if overwrite-mode ;; If you are in replace mode invoked via 'R'
- (vip-finish-R-mode)
- (vip-finish-change vip-last-posn-in-replace-region))
+ (if overwrite-mode ; if in replace mode invoked via 'R'
+ (viper-finish-R-mode)
+ (viper-finish-change))
(let (com)
- (if (eq this-command 'vip-intercept-ESC-key)
- (setq com 'vip-exit-insert-state)
- (vip-set-unread-command-events last-input-char)
- (setq com (key-binding (read-key-sequence nil))))
-
+ (if (eq this-command 'viper-intercept-ESC-key)
+ (setq com 'viper-exit-insert-state)
+ (viper-set-unread-command-events last-input-char)
+ (setq com (key-binding (viper-read-key-sequence nil))))
+
(condition-case conds
(command-execute com)
(error
- (vip-message-conditions conds)))
+ (viper-message-conditions conds)))
)
- (vip-hide-replace-overlay))
+ (viper-hide-replace-overlay))
-(defun vip-replace-state-carriage-return ()
- "Implements carriage return in Viper replace state."
+
+(defun viper-replace-state-carriage-return ()
+ "Carriage return in Viper replace state."
(interactive)
;; If Emacs start supporting overlay maps, as it currently supports
- ;; text-property maps, we could do away with vip-replace-minor-mode and
- ;; just have keymap attached to replace overlay. Then the "if part" of this
+ ;; text-property maps, we could do away with viper-replace-minor-mode and
+ ;; just have keymap attached to replace overlay. Then the "if part" of this
;; statement can be deleted.
- (if (or (< (point) (vip-replace-start))
- (> (point) (vip-replace-end)))
- (let (vip-replace-minor-mode com)
- (vip-set-unread-command-events last-input-char)
+ (if (or (< (point) (viper-replace-start))
+ (> (point) (viper-replace-end)))
+ (let (viper-replace-minor-mode com)
+ (viper-set-unread-command-events last-input-char)
(setq com (key-binding (read-key-sequence nil)))
(condition-case conds
(command-execute com)
(error
- (vip-message-conditions conds))))
- (if (not vip-allow-multiline-replace-regions)
- (vip-replace-state-exit-cmd)
- (if (vip-same-line (point) (vip-replace-end))
- (vip-replace-state-exit-cmd)
- (vip-kill-line nil)
- (vip-next-line-at-bol nil)))))
-
-
+ (viper-message-conditions conds))))
+ (if (not viper-allow-multiline-replace-regions)
+ (viper-replace-state-exit-cmd)
+ (if (viper-same-line (point) (viper-replace-end))
+ (viper-replace-state-exit-cmd)
+ ;; delete the rest of line
+ (delete-region (point) (viper-line-pos 'end))
+ (save-excursion
+ (end-of-line)
+ (if (eobp) (error "Last line in buffer")))
+ ;; skip to the next line
+ (forward-line 1)
+ (back-to-indentation)
+ ))))
+
+
;; This is the function bound to 'R'---unlimited replace.
;; Similar to Emacs's own overwrite-mode.
-(defun vip-overwrite (arg)
+(defun viper-overwrite (arg)
"Begin overwrite mode."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)) (len))
- (vip-set-destructive-command (list 'vip-overwrite val ?r nil nil nil))
- (if com
- (progn
- ;; Viper saves inserted text in vip-last-insertion
- (setq len (length vip-last-insertion))
- (delete-char len)
- (vip-loop val (vip-yank-last-insertion)))
- (setq last-command 'vip-overwrite)
- (vip-set-complex-command-for-undo)
- (vip-set-replace-overlay (point) (vip-line-pos 'end))
- (vip-change-state-to-replace)
+ (let ((val (viper-p-val arg))
+ ;;(com (viper-getcom arg))
+ (len))
+ (viper-set-destructive-command (list 'viper-overwrite val ?r nil nil nil))
+ (if (eq viper-intermediate-command 'viper-repeat)
+ (progn
+ ;; Viper saves inserted text in viper-last-insertion
+ (setq len (length viper-last-insertion))
+ (delete-char (min len (- (point-max) (point) 1)))
+ (viper-loop val (viper-yank-last-insertion)))
+ (setq last-command 'viper-overwrite)
+ (viper-set-complex-command-for-undo)
+ (viper-set-replace-overlay (point) (viper-line-pos 'end))
+ (viper-change-state-to-replace)
)))
\f
;; line commands
-(defun vip-line (arg)
+(defun viper-line (arg)
(let ((val (car arg))
(com (cdr arg)))
- (vip-move-marker-locally 'vip-com-point (point))
+ (viper-move-marker-locally 'viper-com-point (point))
(if (not (eobp))
- (vip-next-line-carefully (1- val)))
- ;; this ensures that dd, cc, D, yy will do the right thing on the last
- ;; line of buffer when this line has no \n.
- (vip-add-newline-at-eob-if-necessary)
- (vip-execute-com 'vip-line val com))
- (if (and (eobp) (not (bobp))) (forward-line -1))
+ (viper-next-line-carefully (1- val)))
+ ;; the following ensures that dd, cc, D, yy will do the right thing on the
+ ;; last line of buffer when this line has no \n.
+ (viper-add-newline-at-eob-if-necessary)
+ (viper-execute-com 'viper-line val com))
+ (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
)
-(defun vip-yank-line (arg)
+(defun viper-yank-line (arg)
"Yank ARG lines (in Vi's sense)."
(interactive "P")
- (let ((val (vip-p-val arg)))
- (vip-line (cons val ?Y))))
+ (let ((val (viper-p-val arg)))
+ (viper-line (cons val ?Y))))
\f
;; region commands
-(defun vip-region (arg)
+(defun viper-region (arg)
"Execute command on a region."
(interactive "P")
- (let ((val (vip-P-val arg))
- (com (vip-getcom arg)))
- (vip-move-marker-locally 'vip-com-point (point))
+ (let ((val (viper-P-val arg))
+ (com (viper-getcom arg)))
+ (viper-move-marker-locally 'viper-com-point (point))
(exchange-point-and-mark)
- (vip-execute-com 'vip-region val com)))
+ (viper-execute-com 'viper-region val com)))
-(defun vip-Region (arg)
+(defun viper-Region (arg)
"Execute command on a Region."
(interactive "P")
- (let ((val (vip-P-val arg))
- (com (vip-getCom arg)))
- (vip-move-marker-locally 'vip-com-point (point))
+ (let ((val (viper-P-val arg))
+ (com (viper-getCom arg)))
+ (viper-move-marker-locally 'viper-com-point (point))
(exchange-point-and-mark)
- (vip-execute-com 'vip-Region val com)))
+ (viper-execute-com 'viper-Region val com)))
-(defun vip-replace-char (arg)
+(defun viper-replace-char (arg)
"Replace the following ARG chars by the character read."
(interactive "P")
(if (and (eolp) (bolp)) (error "No character to replace here"))
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-replace-char-subr com val)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (viper-replace-char-subr com val)
(if (and (eolp) (not (bolp))) (forward-char 1))
- (vip-set-destructive-command
- (list 'vip-replace-char val ?r nil vip-d-char nil))
+ (setq viper-this-command-keys
+ (format "%sr" (if (integerp arg) arg "")))
+ (viper-set-destructive-command
+ (list 'viper-replace-char val ?r nil viper-d-char nil))
))
-(defun vip-replace-char-subr (com arg)
- (let ((take-care-of-iso-accents
- (and (boundp 'iso-accents-mode) vip-automatic-iso-accents))
+(defun viper-replace-char-subr (com arg)
+ (let ((inhibit-quit t)
char)
- (setq char (if (equal com ?r)
- vip-d-char
- (read-char)))
- (if (and take-care-of-iso-accents (memq char '(?' ?\" ?^ ?~)))
- ;; get European characters
- (progn
- (iso-accents-mode 1)
- (vip-set-unread-command-events char)
- (setq char (aref (read-key-sequence nil) 0))
- (iso-accents-mode -1)))
- (delete-char arg t)
- (setq vip-d-char char)
- (vip-loop (if (> arg 0) arg (- arg))
- (if (eq char ?\C-m) (insert "\n") (insert char)))
- (backward-char arg)))
+ (viper-set-complex-command-for-undo)
+ (or (eq viper-intermediate-command 'viper-repeat)
+ (viper-special-read-and-insert-char))
+
+ (delete-char 1 t)
+ (setq char (if com viper-d-char (viper-char-at-pos 'backward)))
+
+ (if com (insert char))
+
+ (setq viper-d-char char)
+
+ (viper-loop (1- (if (> arg 0) arg (- arg)))
+ (delete-char 1 t)
+ (insert char))
+
+ (viper-adjust-undo)
+ (backward-char arg)
+ ))
\f
;; basic cursor movement. j, k, l, h commands.
-(defun vip-forward-char (arg)
+(defun viper-forward-char (arg)
"Move point right ARG characters (left if ARG negative).
On reaching end of line, stop and signal error."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (if vip-ex-style-motion
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (if viper-ex-style-motion
(progn
;; the boundary condition check gets weird here because
;; forward-char may be the parameter of a delete, and 'dl' works
;; just like 'x' for the last char on a line, so we have to allow
- ;; the forward motion before the 'vip-execute-com', but, of
+ ;; the forward motion before the 'viper-execute-com', but, of
;; course, 'dl' doesn't work on an empty line, so we have to
- ;; catch that condition before 'vip-execute-com'
+ ;; catch that condition before 'viper-execute-com'
(if (and (eolp) (bolp)) (error "") (forward-char val))
- (if com (vip-execute-com 'vip-forward-char val com))
+ (if com (viper-execute-com 'viper-forward-char val com))
(if (eolp) (progn (backward-char 1) (error ""))))
(forward-char val)
- (if com (vip-execute-com 'vip-forward-char val com)))))
+ (if com (viper-execute-com 'viper-forward-char val com)))))
-(defun vip-backward-char (arg)
- "Move point left ARG characters (right if ARG negative).
+
+(defun viper-backward-char (arg)
+ "Move point left ARG characters (right if ARG negative).
On reaching beginning of line, stop and signal error."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (if vip-ex-style-motion
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (if viper-ex-style-motion
(progn
(if (bolp) (error "") (backward-char val))
- (if com (vip-execute-com 'vip-backward-char val com)))
+ (if com (viper-execute-com 'viper-backward-char val com)))
(backward-char val)
- (if com (vip-execute-com 'vip-backward-char val com)))))
-
+ (if com (viper-execute-com 'viper-backward-char val com)))))
+
+
;; Like forward-char, but doesn't move at end of buffer.
-(defun vip-forward-char-carefully (&optional arg)
+;; Returns distance traveled
+;; (positive or 0, if arg positive; negative if arg negative).
+(defun viper-forward-char-carefully (&optional arg)
(setq arg (or arg 1))
- (if (>= (point-max) (+ (point) arg))
- (forward-char arg)
- (goto-char (point-max))))
-
-;; Like backward-char, but doesn't move at end of buffer.
-(defun vip-backward-char-carefully (&optional arg)
+ (let ((pt (point)))
+ (condition-case nil
+ (forward-char arg)
+ (error nil))
+ (if (< (point) pt) ; arg was negative
+ (- (viper-chars-in-region pt (point)))
+ (viper-chars-in-region pt (point)))))
+
+
+;; Like backward-char, but doesn't move at beg of buffer.
+;; Returns distance traveled
+;; (negative or 0, if arg positive; positive if arg negative).
+(defun viper-backward-char-carefully (&optional arg)
(setq arg (or arg 1))
- (if (<= (point-min) (- (point) arg))
- (backward-char arg)
- (goto-char (point-min))))
+ (let ((pt (point)))
+ (condition-case nil
+ (backward-char arg)
+ (error nil))
+ (if (> (point) pt) ; arg was negative
+ (viper-chars-in-region pt (point))
+ (- (viper-chars-in-region pt (point))))))
-(defun vip-next-line-carefully (arg)
+(defun viper-next-line-carefully (arg)
(condition-case nil
(next-line arg)
(error nil)))
\f
;;; Word command
-;; Words are formed from alpha's and nonalphas - <sp>,\t\n are separators
-;; for word movement. When executed with a destructive command, \n is
-;; usually left untouched for the last word.
-;; Viper uses syntax table to determine what is a word and what is a
-;; separator. However, \n is always a separator. Also, if vip-syntax-preference
-;; is 'vi, then `_' is part of the word.
+;; Words are formed from alpha's and nonalphas - <sp>,\t\n are separators for
+;; word movement. When executed with a destructive command, \n is usually left
+;; untouched for the last word. Viper uses syntax table to determine what is a
+;; word and what is a separator. However, \n is always a separator. Also, if
+;; viper-syntax-preference is 'vi, then `_' is part of the word.
;; skip only one \n
-(defun vip-skip-separators (forward)
+(defun viper-skip-separators (forward)
(if forward
(progn
- (vip-skip-all-separators-forward 'within-line)
+ (viper-skip-all-separators-forward 'within-line)
(if (looking-at "\n")
(progn
(forward-char)
- (vip-skip-all-separators-forward 'within-line))))
- (vip-skip-all-separators-backward 'within-line)
- (backward-char)
+ (viper-skip-all-separators-forward 'within-line))))
+ ;; check for eob and white space before it. move off of eob
+ (if (and (eobp) (save-excursion
+ (viper-backward-char-carefully)
+ (viper-looking-at-separator)))
+ (viper-backward-char-carefully))
+ (viper-skip-all-separators-backward 'within-line)
+ (viper-backward-char-carefully)
(if (looking-at "\n")
- (vip-skip-all-separators-backward 'within-line)
- (forward-char))))
-
-(defun vip-forward-word-kernel (val)
+ (viper-skip-all-separators-backward 'within-line)
+ (or (viper-looking-at-separator) (forward-char)))))
+
+
+(defun viper-forward-word-kernel (val)
(while (> val 0)
- (cond ((vip-looking-at-alpha)
- (vip-skip-alpha-forward "_")
- (vip-skip-separators t))
- ((vip-looking-at-separator)
- (vip-skip-separators t))
- ((not (vip-looking-at-alphasep))
- (vip-skip-nonalphasep-forward)
- (vip-skip-separators t)))
+ (cond ((viper-looking-at-alpha)
+ (viper-skip-alpha-forward "_")
+ (viper-skip-separators t))
+ ((viper-looking-at-separator)
+ (viper-skip-separators t))
+ ((not (viper-looking-at-alphasep))
+ (viper-skip-nonalphasep-forward)
+ (viper-skip-separators t)))
(setq val (1- val))))
-;; first search backward for pat. Then skip chars backwards using aux-pat
-(defun vip-fwd-skip (pat aux-pat lim)
- (if (and (save-excursion
- (re-search-backward pat lim t))
- (= (point) (match-end 0)))
- (goto-char (match-beginning 0)))
- (skip-chars-backward aux-pat lim)
- (if (= (point) lim)
- (vip-forward-char-carefully))
- )
+;; first skip non-newline separators backward, then skip \n. Then, if TWICE is
+;; non-nil, skip non-\n back again, but don't overshoot the limit LIM.
+(defun viper-separator-skipback-special (twice lim)
+ (let ((prev-char (viper-char-at-pos 'backward))
+ (saved-point (point)))
+ ;; skip non-newline separators backward
+ (while (and (not (viper-memq-char prev-char '(nil \n)))
+ (< lim (point))
+ ;; must be non-newline separator
+ (if (eq viper-syntax-preference 'strict-vi)
+ (viper-memq-char prev-char '(?\ ?\t))
+ (viper-memq-char (char-syntax prev-char) '(?\ ?-))))
+ (viper-backward-char-carefully)
+ (setq prev-char (viper-char-at-pos 'backward)))
+
+ (if (and (< lim (point)) (eq prev-char ?\n))
+ (backward-char)
+ ;; If we skipped to the next word and the prefix of this line doesn't
+ ;; consist of separators preceded by a newline, then don't skip backwards
+ ;; at all.
+ (goto-char saved-point))
+ (setq prev-char (viper-char-at-pos 'backward))
+
+ ;; skip again, but make sure we don't overshoot the limit
+ (if twice
+ (while (and (not (viper-memq-char prev-char '(nil \n)))
+ (< lim (point))
+ ;; must be non-newline separator
+ (if (eq viper-syntax-preference 'strict-vi)
+ (viper-memq-char prev-char '(?\ ?\t))
+ (viper-memq-char (char-syntax prev-char) '(?\ ?-))))
+ (viper-backward-char-carefully)
+ (setq prev-char (viper-char-at-pos 'backward))))
+
+ (if (= (point) lim)
+ (viper-forward-char-carefully))
+ ))
+
-
-(defun vip-forward-word (arg)
+(defun viper-forward-word (arg)
"Forward word."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-forward-word-kernel val)
- (if com (progn
- (cond ((memq com (list ?c (- ?c)))
- (vip-fwd-skip "\n[ \t]*" " \t" vip-com-point))
- ;; Yank words including the whitespace, but not newline
- ((memq com (list ?y (- ?y)))
- (vip-fwd-skip "\n[ \t]*" "" vip-com-point))
- ((vip-dotable-command-p com)
- (vip-fwd-skip "\n[ \t]*" "" vip-com-point)))
- (vip-execute-com 'vip-forward-word val com)))))
-
-
-(defun vip-forward-Word (arg)
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-forward-word-kernel val)
+ (if com
+ (progn
+ (cond ((viper-char-equal com ?c)
+ (viper-separator-skipback-special 'twice viper-com-point))
+ ;; Yank words including the whitespace, but not newline
+ ((viper-char-equal com ?y)
+ (viper-separator-skipback-special nil viper-com-point))
+ ((viper-dotable-command-p com)
+ (viper-separator-skipback-special nil viper-com-point)))
+ (viper-execute-com 'viper-forward-word val com)))
+ ))
+
+
+(defun viper-forward-Word (arg)
"Forward word delimited by white characters."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-loop val
- (progn
- (vip-skip-nonseparators 'forward)
- (vip-skip-separators t)))
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-loop val
+ (viper-skip-nonseparators 'forward)
+ (viper-skip-separators t))
(if com (progn
- (cond ((memq com (list ?c (- ?c)))
- (vip-fwd-skip "\n[ \t]*" " \t" vip-com-point))
+ (cond ((viper-char-equal com ?c)
+ (viper-separator-skipback-special 'twice viper-com-point))
;; Yank words including the whitespace, but not newline
- ((memq com (list ?y (- ?y)))
- (vip-fwd-skip "\n[ \t]*" "" vip-com-point))
- ((vip-dotable-command-p com)
- (vip-fwd-skip "\n[ \t]*" "" vip-com-point)))
- (vip-execute-com 'vip-forward-Word val com)))))
+ ((viper-char-equal com ?y)
+ (viper-separator-skipback-special nil viper-com-point))
+ ((viper-dotable-command-p com)
+ (viper-separator-skipback-special nil viper-com-point)))
+ (viper-execute-com 'viper-forward-Word val com)))))
-;; this is a bit different from Vi, but Vi's end of word
+;; this is a bit different from Vi, but Vi's end of word
;; makes no sense whatsoever
-(defun vip-end-of-word-kernel ()
- (if (vip-end-of-word-p) (forward-char))
- (if (vip-looking-at-separator)
- (vip-skip-all-separators-forward))
-
- (cond ((vip-looking-at-alpha) (vip-skip-alpha-forward "_"))
- ((not (vip-looking-at-alphasep)) (vip-skip-nonalphasep-forward)))
- (vip-backward-char-carefully))
-
-(defun vip-end-of-word-p ()
- (or (eobp)
+(defun viper-end-of-word-kernel ()
+ (if (viper-end-of-word-p) (forward-char))
+ (if (viper-looking-at-separator)
+ (viper-skip-all-separators-forward))
+
+ (cond ((viper-looking-at-alpha) (viper-skip-alpha-forward "_"))
+ ((not (viper-looking-at-alphasep)) (viper-skip-nonalphasep-forward)))
+ (viper-backward-char-carefully))
+
+(defun viper-end-of-word-p ()
+ (or (eobp)
(save-excursion
- (cond ((vip-looking-at-alpha)
+ (cond ((viper-looking-at-alpha)
(forward-char)
- (not (vip-looking-at-alpha)))
- ((not (vip-looking-at-alphasep))
+ (not (viper-looking-at-alpha)))
+ ((not (viper-looking-at-alphasep))
(forward-char)
- (vip-looking-at-alphasep))))))
+ (viper-looking-at-alphasep))))))
-(defun vip-end-of-word (arg &optional careful)
+(defun viper-end-of-word (arg &optional careful)
"Move point to end of current word."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-loop val (vip-end-of-word-kernel))
- (if com
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-loop val (viper-end-of-word-kernel))
+ (if com
(progn
(forward-char)
- (vip-execute-com 'vip-end-of-word val com)))))
+ (viper-execute-com 'viper-end-of-word val com)))))
-(defun vip-end-of-Word (arg)
+(defun viper-end-of-Word (arg)
"Forward to end of word delimited by white character."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-loop val
- (progn
- (vip-end-of-word-kernel)
- (vip-skip-nonseparators 'forward)
- (backward-char)))
- (if com
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-loop val
+ (viper-end-of-word-kernel)
+ (viper-skip-nonseparators 'forward)
+ (backward-char))
+ (if com
(progn
(forward-char)
- (vip-execute-com 'vip-end-of-Word val com)))))
+ (viper-execute-com 'viper-end-of-Word val com)))))
-(defun vip-backward-word-kernel (val)
+(defun viper-backward-word-kernel (val)
(while (> val 0)
- (backward-char)
- (cond ((vip-looking-at-alpha)
- (vip-skip-alpha-backward "_"))
- ((vip-looking-at-separator)
+ (viper-backward-char-carefully)
+ (cond ((viper-looking-at-alpha)
+ (viper-skip-alpha-backward "_"))
+ ((viper-looking-at-separator)
(forward-char)
- (vip-skip-separators nil)
- (backward-char)
- (cond ((vip-looking-at-alpha)
- (vip-skip-alpha-backward "_"))
- ((not (vip-looking-at-alphasep))
- (vip-skip-nonalphasep-backward))
+ (viper-skip-separators nil)
+ (viper-backward-char-carefully)
+ (cond ((viper-looking-at-alpha)
+ (viper-skip-alpha-backward "_"))
+ ((not (viper-looking-at-alphasep))
+ (viper-skip-nonalphasep-backward))
+ ((bobp)) ; could still be at separator, but at beg of buffer
(t (forward-char))))
- ((not (vip-looking-at-alphasep))
- (vip-skip-nonalphasep-backward)))
+ ((not (viper-looking-at-alphasep))
+ (viper-skip-nonalphasep-backward)))
(setq val (1- val))))
-(defun vip-backward-word (arg)
+(defun viper-backward-word (arg)
"Backward word."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
(if com
(let (i)
(if (setq i (save-excursion (backward-char) (looking-at "\n")))
(backward-char))
- (vip-move-marker-locally 'vip-com-point (point))
+ (viper-move-marker-locally 'viper-com-point (point))
(if i (forward-char))))
- (vip-backward-word-kernel val)
- (if com (vip-execute-com 'vip-backward-word val com))))
+ (viper-backward-word-kernel val)
+ (if com (viper-execute-com 'viper-backward-word val com))))
-(defun vip-backward-Word (arg)
+(defun viper-backward-Word (arg)
"Backward word delimited by white character."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
(if com
(let (i)
(if (setq i (save-excursion (backward-char) (looking-at "\n")))
(backward-char))
- (vip-move-marker-locally 'vip-com-point (point))
+ (viper-move-marker-locally 'viper-com-point (point))
(if i (forward-char))))
- (vip-loop val
- (progn
- (vip-skip-separators nil)
- (vip-skip-nonseparators 'backward)))
- (if com (vip-execute-com 'vip-backward-Word val com))))
+ (viper-loop val
+ (viper-skip-separators nil) ; nil means backward here
+ (viper-skip-nonseparators 'backward))
+ (if com (viper-execute-com 'viper-backward-Word val com))))
\f
;; line commands
-(defun vip-beginning-of-line (arg)
+(defun viper-beginning-of-line (arg)
"Go to beginning of line."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(beginning-of-line val)
- (if com (vip-execute-com 'vip-beginning-of-line val com))))
+ (if com (viper-execute-com 'viper-beginning-of-line val com))))
-(defun vip-bol-and-skip-white (arg)
+(defun viper-bol-and-skip-white (arg)
"Beginning of line at first non-white character."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(forward-to-indentation (1- val))
- (if com (vip-execute-com 'vip-bol-and-skip-white val com))))
+ (if com (viper-execute-com 'viper-bol-and-skip-white val com))))
-(defun vip-goto-eol (arg)
+(defun viper-goto-eol (arg)
"Go to end of line."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(end-of-line val)
- (if com (vip-execute-com 'vip-goto-eol val com))
- (if vip-ex-style-motion
- (if (and (eolp) (not (bolp))
- ;; a fix for vip-change-to-eol
- (not (equal vip-current-state 'insert-state)))
+ (if com (viper-execute-com 'viper-goto-eol val com))
+ (if viper-ex-style-motion
+ (if (and (eolp) (not (bolp))
+ ;; a fix for viper-change-to-eol
+ (not (equal viper-current-state 'insert-state)))
(backward-char 1)
))))
-(defun vip-goto-col (arg)
+(defun viper-goto-col (arg)
"Go to ARG's column."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg))
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg))
line-len)
- (setq line-len (- (vip-line-pos 'end) (vip-line-pos 'start)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (setq line-len
+ (viper-chars-in-region
+ (viper-line-pos 'start) (viper-line-pos 'end)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(beginning-of-line)
(forward-char (1- (min line-len val)))
(while (> (current-column) (1- val))
(backward-char 1))
- (if com (vip-execute-com 'vip-goto-col val com))
+ (if com (viper-execute-com 'viper-goto-col val com))
(save-excursion
(end-of-line)
(if (> val (current-column)) (error "")))
))
-
-(defun vip-next-line (arg)
+
+(defun viper-next-line (arg)
"Go to next line."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(next-line val)
- (if vip-ex-style-motion
+ (if viper-ex-style-motion
(if (and (eolp) (not (bolp))) (backward-char 1)))
(setq this-command 'next-line)
- (if com (vip-execute-com 'vip-next-line val com))))
+ (if com (viper-execute-com 'viper-next-line val com))))
-(defun vip-next-line-at-bol (arg)
- "Next line at beginning of line."
- (interactive "P")
- (vip-leave-region-active)
- (save-excursion
- (end-of-line)
- (if (eobp) (error "Last line in buffer")))
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (forward-line val)
- (back-to-indentation)
- (if com (vip-execute-com 'vip-next-line-at-bol val com))))
-(defun vip-previous-line (arg)
- "Go to previous line."
+(defun viper-next-line-at-bol (arg)
+ "Next line at beginning of line.
+If point is on a widget or a button, simulate clicking on that widget/button."
(interactive "P")
- (vip-leave-region-active)
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (let* ((field (get-char-property (point) 'field))
+ (button (get-char-property (point) 'button))
+ (doc (get-char-property (point) 'widget-doc))
+ (widget (or field button doc)))
+ (if (and widget
+ (if (symbolp widget)
+ (get widget 'widget-type)
+ (and (consp widget)
+ (get (widget-type widget) 'widget-type))))
+ (widget-button-press (point))
+ (if (and (fboundp 'button-at) (fboundp 'push-button) (button-at (point)))
+ (push-button)
+ ;; not a widget or a button
+ (viper-leave-region-active)
+ (save-excursion
+ (end-of-line)
+ (if (eobp) (error "Last line in buffer")))
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (forward-line val)
+ (back-to-indentation)
+ (if com (viper-execute-com 'viper-next-line-at-bol val com)))))))
+
+
+(defun viper-previous-line (arg)
+ "Go to previous line."
+ (interactive "P")
+ (viper-leave-region-active)
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(previous-line val)
- (if vip-ex-style-motion
+ (if viper-ex-style-motion
(if (and (eolp) (not (bolp))) (backward-char 1)))
(setq this-command 'previous-line)
- (if com (vip-execute-com 'vip-previous-line val com))))
+ (if com (viper-execute-com 'viper-previous-line val com))))
-(defun vip-previous-line-at-bol (arg)
+(defun viper-previous-line-at-bol (arg)
"Previous line at beginning of line."
(interactive "P")
- (vip-leave-region-active)
+ (viper-leave-region-active)
(save-excursion
(beginning-of-line)
(if (bobp) (error "First line in buffer")))
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(forward-line (- val))
(back-to-indentation)
- (if com (vip-execute-com 'vip-previous-line val com))))
+ (if com (viper-execute-com 'viper-previous-line val com))))
-(defun vip-change-to-eol (arg)
+(defun viper-change-to-eol (arg)
"Change to end of line."
(interactive "P")
- (vip-goto-eol (cons arg ?c)))
+ (viper-goto-eol (cons arg ?c)))
-(defun vip-kill-line (arg)
+(defun viper-kill-line (arg)
"Delete line."
(interactive "P")
- (vip-goto-eol (cons arg ?d)))
+ (viper-goto-eol (cons arg ?d)))
-(defun vip-erase-line (arg)
+(defun viper-erase-line (arg)
"Erase line."
(interactive "P")
- (vip-beginning-of-line (cons arg ?d)))
+ (viper-beginning-of-line (cons arg ?d)))
\f
;;; Moving around
-(defun vip-goto-line (arg)
+(defun viper-goto-line (arg)
"Go to ARG's line. Without ARG go to end of buffer."
(interactive "P")
- (let ((val (vip-P-val arg))
- (com (vip-getCom arg)))
- (vip-move-marker-locally 'vip-com-point (point))
- (vip-deactivate-mark)
+ (let ((val (viper-P-val arg))
+ (com (viper-getCom arg)))
+ (viper-move-marker-locally 'viper-com-point (point))
+ (viper-deactivate-mark)
(push-mark nil t)
(if (null val)
(goto-char (point-max))
(goto-char (point-min))
(forward-line (1- val)))
-
+
;; positioning is done twice: before and after command execution
(if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
(back-to-indentation)
-
- (if com (vip-execute-com 'vip-goto-line val com))
-
+
+ (if com (viper-execute-com 'viper-goto-line val com))
+
(if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
(back-to-indentation)
))
-;; Find ARG's occurrence of CHAR on the current line.
+;; Find ARG's occurrence of CHAR on the current line.
;; If FORWARD then search is forward, otherwise backward. OFFSET is used to
;; adjust point after search.
-(defun vip-find-char (arg char forward offset)
+(defun viper-find-char (arg char forward offset)
(or (char-or-string-p char) (error ""))
(let ((arg (if forward arg (- arg)))
- (cmd (if (eq vip-intermediate-command 'vip-repeat)
- (nth 5 vip-d-com)
- (vip-array-to-string (this-command-keys))))
- point)
+ (cmd (if (eq viper-intermediate-command 'viper-repeat)
+ (nth 5 viper-d-com)
+ (viper-array-to-string (this-command-keys))))
+ point region-beg region-end)
(save-excursion
(save-restriction
- (if (> arg 0)
- (narrow-to-region
- ;; forward search begins here
- (if (eolp) (error "Command `%s': At end of line" cmd) (point))
- ;; forward search ends here
- (progn (end-of-line) (point)))
- (narrow-to-region
- ;; backward search begins from here
- (if (bolp)
- (error "Command `%s': At beginning of line" cmd) (point))
- ;; backward search ends here
- (progn (beginning-of-line) (point))))
+ (if (> arg 0) ; forward
+ (progn
+ (setq region-beg (point))
+ (if viper-allow-multiline-replace-regions
+ (viper-forward-paragraph 1)
+ (end-of-line))
+ (setq region-end (point)))
+ (setq region-end (point))
+ (if viper-allow-multiline-replace-regions
+ (viper-backward-paragraph 1)
+ (beginning-of-line))
+ (setq region-beg (point)))
+ (if (or (and (< arg 0)
+ (< (- region-end region-beg)
+ (if viper-allow-multiline-replace-regions
+ 2 1))
+ (bolp))
+ (and (> arg 0)
+ (< (- region-end region-beg)
+ (if viper-allow-multiline-replace-regions
+ 3 2))
+ (eolp)))
+ (error "Command `%s': At %s of %s"
+ cmd
+ (if (> arg 0) "end" "beginning")
+ (if viper-allow-multiline-replace-regions
+ "paragraph" "line")))
+ (narrow-to-region region-beg region-end)
;; if arg > 0, point is forwarded before search.
(if (> arg 0) (goto-char (1+ (point-min)))
(goto-char (point-max)))
(search-forward (char-to-string char) nil 0 arg))
(setq point (point))
(error "Command `%s': `%c' not found" cmd char))))
- (goto-char (+ point (if (> arg 0) (if offset -2 -1) (if offset 1 0))))))
+ (goto-char point)
+ (if (> arg 0)
+ (backward-char (if offset 2 1))
+ (forward-char (if offset 1 0)))))
-(defun vip-find-char-forward (arg)
- "Find char on the line.
+(defun viper-find-char-forward (arg)
+ "Find char on the line.
If called interactively read the char to find from the terminal, and if
-called from vip-repeat, the char last used is used. This behaviour is
+called from viper-repeat, the char last used is used. This behavior is
controlled by the sign of prefix numeric value."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg))
- (cmd-representation (nth 5 vip-d-com)))
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg))
+ (cmd-representation (nth 5 viper-d-com)))
(if (> val 0)
;; this means that the function was called interactively
- (setq vip-f-char (read-char)
- vip-f-forward t
- vip-f-offset nil)
- ;; vip-repeat --- set vip-F-char from command-keys
- (setq vip-F-char (if (stringp cmd-representation)
- (vip-seq-last-elt cmd-representation)
- vip-F-char)
- vip-f-char vip-F-char)
+ (setq viper-f-char (read-char)
+ viper-f-forward t
+ viper-f-offset nil)
+ ;; viper-repeat --- set viper-F-char from command-keys
+ (setq viper-F-char (if (stringp cmd-representation)
+ (viper-seq-last-elt cmd-representation)
+ viper-F-char)
+ viper-f-char viper-F-char)
(setq val (- val)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-find-char val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) t nil)
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-find-char
+ val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t nil)
(setq val (- val))
(if com
(progn
- (setq vip-F-char vip-f-char) ; set new vip-F-char
+ (setq viper-F-char viper-f-char) ; set new viper-F-char
(forward-char)
- (vip-execute-com 'vip-find-char-forward val com)))))
+ (viper-execute-com 'viper-find-char-forward val com)))))
-(defun vip-goto-char-forward (arg)
+(defun viper-goto-char-forward (arg)
"Go up to char ARG forward on line."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg))
- (cmd-representation (nth 5 vip-d-com)))
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg))
+ (cmd-representation (nth 5 viper-d-com)))
(if (> val 0)
;; this means that the function was called interactively
- (setq vip-f-char (read-char)
- vip-f-forward t
- vip-f-offset t)
- ;; vip-repeat --- set vip-F-char from command-keys
- (setq vip-F-char (if (stringp cmd-representation)
- (vip-seq-last-elt cmd-representation)
- vip-F-char)
- vip-f-char vip-F-char)
+ (setq viper-f-char (read-char)
+ viper-f-forward t
+ viper-f-offset t)
+ ;; viper-repeat --- set viper-F-char from command-keys
+ (setq viper-F-char (if (stringp cmd-representation)
+ (viper-seq-last-elt cmd-representation)
+ viper-F-char)
+ viper-f-char viper-F-char)
(setq val (- val)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-find-char val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) t t)
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-find-char
+ val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t t)
(setq val (- val))
(if com
(progn
- (setq vip-F-char vip-f-char) ; set new vip-F-char
+ (setq viper-F-char viper-f-char) ; set new viper-F-char
(forward-char)
- (vip-execute-com 'vip-goto-char-forward val com)))))
+ (viper-execute-com 'viper-goto-char-forward val com)))))
-(defun vip-find-char-backward (arg)
+(defun viper-find-char-backward (arg)
"Find char ARG on line backward."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg))
- (cmd-representation (nth 5 vip-d-com)))
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg))
+ (cmd-representation (nth 5 viper-d-com)))
(if (> val 0)
;; this means that the function was called interactively
- (setq vip-f-char (read-char)
- vip-f-forward nil
- vip-f-offset nil)
- ;; vip-repeat --- set vip-F-char from command-keys
- (setq vip-F-char (if (stringp cmd-representation)
- (vip-seq-last-elt cmd-representation)
- vip-F-char)
- vip-f-char vip-F-char)
+ (setq viper-f-char (read-char)
+ viper-f-forward nil
+ viper-f-offset nil)
+ ;; viper-repeat --- set viper-F-char from command-keys
+ (setq viper-F-char (if (stringp cmd-representation)
+ (viper-seq-last-elt cmd-representation)
+ viper-F-char)
+ viper-f-char viper-F-char)
(setq val (- val)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-find-char
- val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) nil nil)
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-find-char
+ val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil nil)
(setq val (- val))
(if com
(progn
- (setq vip-F-char vip-f-char) ; set new vip-F-char
- (vip-execute-com 'vip-find-char-backward val com)))))
+ (setq viper-F-char viper-f-char) ; set new viper-F-char
+ (viper-execute-com 'viper-find-char-backward val com)))))
-(defun vip-goto-char-backward (arg)
+(defun viper-goto-char-backward (arg)
"Go up to char ARG backward on line."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg))
- (cmd-representation (nth 5 vip-d-com)))
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg))
+ (cmd-representation (nth 5 viper-d-com)))
(if (> val 0)
;; this means that the function was called interactively
- (setq vip-f-char (read-char)
- vip-f-forward nil
- vip-f-offset t)
- ;; vip-repeat --- set vip-F-char from command-keys
- (setq vip-F-char (if (stringp cmd-representation)
- (vip-seq-last-elt cmd-representation)
- vip-F-char)
- vip-f-char vip-F-char)
+ (setq viper-f-char (read-char)
+ viper-f-forward nil
+ viper-f-offset t)
+ ;; viper-repeat --- set viper-F-char from command-keys
+ (setq viper-F-char (if (stringp cmd-representation)
+ (viper-seq-last-elt cmd-representation)
+ viper-F-char)
+ viper-f-char viper-F-char)
(setq val (- val)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-find-char val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) nil t)
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-find-char
+ val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil t)
(setq val (- val))
(if com
(progn
- (setq vip-F-char vip-f-char) ; set new vip-F-char
- (vip-execute-com 'vip-goto-char-backward val com)))))
+ (setq viper-F-char viper-f-char) ; set new viper-F-char
+ (viper-execute-com 'viper-goto-char-backward val com)))))
-(defun vip-repeat-find (arg)
+(defun viper-repeat-find (arg)
"Repeat previous find command."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-deactivate-mark)
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-find-char val vip-f-char vip-f-forward vip-f-offset)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (viper-deactivate-mark)
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-find-char val viper-f-char viper-f-forward viper-f-offset)
(if com
(progn
- (if vip-f-forward (forward-char))
- (vip-execute-com 'vip-repeat-find val com)))))
+ (if viper-f-forward (forward-char))
+ (viper-execute-com 'viper-repeat-find val com)))))
-(defun vip-repeat-find-opposite (arg)
+(defun viper-repeat-find-opposite (arg)
"Repeat previous find command in the opposite direction."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (vip-deactivate-mark)
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (vip-find-char val vip-f-char (not vip-f-forward) vip-f-offset)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (viper-deactivate-mark)
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (viper-find-char val viper-f-char (not viper-f-forward) viper-f-offset)
(if com
(progn
- (if vip-f-forward (forward-char))
- (vip-execute-com 'vip-repeat-find-opposite val com)))))
+ (if viper-f-forward (forward-char))
+ (viper-execute-com 'viper-repeat-find-opposite val com)))))
\f
;; window scrolling etc.
-(defun vip-other-window (arg)
- "Switch to other window."
- (interactive "p")
- (other-window arg)
- (or (not (eq vip-current-state 'emacs-state))
- (string= (buffer-name (current-buffer)) " *Minibuf-1*")
- (vip-change-state-to-vi)))
-
-(defun vip-window-top (arg)
+(defun viper-window-top (arg)
"Go to home window line."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (push-mark nil t)
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (viper-leave-region-active)
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (push-mark nil t)
(move-to-window-line (1- val))
;; positioning is done twice: before and after command execution
(if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
(back-to-indentation)
-
- (if com (vip-execute-com 'vip-window-top val com))
-
+
+ (if com (viper-execute-com 'viper-window-top val com))
+
(if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
(back-to-indentation)
))
-(defun vip-window-middle (arg)
+(defun viper-window-middle (arg)
"Go to middle window line."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg))
- lines)
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (push-mark nil t)
- (if (not (pos-visible-in-window-p (point-max)))
- (move-to-window-line (+ (/ (1- (window-height)) 2) (1- val)))
- (setq lines (count-lines (window-start) (point-max)))
- (move-to-window-line (+ (/ lines 2) (1- val))))
-
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (viper-leave-region-active)
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (push-mark nil t)
+ (move-to-window-line (+ (/ (1- (window-height)) 2) (1- val)))
+
;; positioning is done twice: before and after command execution
(if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
(back-to-indentation)
- (if com (vip-execute-com 'vip-window-middle val com))
-
+ (if com (viper-execute-com 'viper-window-middle val com))
+
(if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
(back-to-indentation)
))
-(defun vip-window-bottom (arg)
+(defun viper-window-bottom (arg)
"Go to last window line."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (push-mark nil t)
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (viper-leave-region-active)
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (push-mark nil t)
(move-to-window-line (- val))
-
+
;; positioning is done twice: before and after command execution
(if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
(back-to-indentation)
- (if com (vip-execute-com 'vip-window-bottom val com))
-
+ (if com (viper-execute-com 'viper-window-bottom val com))
+
(if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
(back-to-indentation)
))
-(defun vip-line-to-top (arg)
+(defun viper-line-to-top (arg)
"Put current line on the home line."
(interactive "p")
(recenter (1- arg)))
-(defun vip-line-to-middle (arg)
+(defun viper-line-to-middle (arg)
"Put current line on the middle line."
(interactive "p")
(recenter (+ (1- arg) (/ (1- (window-height)) 2))))
-(defun vip-line-to-bottom (arg)
+(defun viper-line-to-bottom (arg)
"Put current line on the last line."
(interactive "p")
(recenter (- (window-height) (1+ arg))))
-;; If point is within vip-search-scroll-threshold of window top or bottom,
+;; If point is within viper-search-scroll-threshold of window top or bottom,
;; scroll up or down 1/7 of window height, depending on whether we are at the
-;; bottom or at the top of the window. This function is called by vip-search
-;; (which is called from vip-search-forward/backward/next). If the value of
-;; vip-search-scroll-threshold is negative - don't scroll.
-(defun vip-adjust-window ()
- (let ((win-height (if vip-emacs-p
- (1- (window-height)) ; adjust for modeline
- (window-displayed-height)))
+;; bottom or at the top of the window. This function is called by viper-search
+;; (which is called from viper-search-forward/backward/next). If the value of
+;; viper-search-scroll-threshold is negative - don't scroll.
+(defun viper-adjust-window ()
+ (let ((win-height (viper-cond-compile-for-xemacs-or-emacs
+ (window-displayed-height) ; xemacs
+ ;; emacs
+ (1- (window-height)) ; adjust for modeline
+ ))
(pt (point))
at-top-p at-bottom-p
min-scroll direction)
(move-to-window-line 0) ; top
(setq at-top-p
(<= (count-lines pt (point))
- vip-search-scroll-threshold))
+ viper-search-scroll-threshold))
(move-to-window-line -1) ; bottom
(setq at-bottom-p
- (<= (count-lines pt (point)) vip-search-scroll-threshold))
+ (<= (count-lines pt (point)) viper-search-scroll-threshold))
)
- (cond (at-top-p (setq min-scroll (1- vip-search-scroll-threshold)
+ (cond (at-top-p (setq min-scroll (1- viper-search-scroll-threshold)
direction 1))
- (at-bottom-p (setq min-scroll (1+ vip-search-scroll-threshold)
+ (at-bottom-p (setq min-scroll (1+ viper-search-scroll-threshold)
direction -1)))
(if min-scroll
(recenter
\f
;; paren match
-;; must correct this to only match ( to ) etc. On the other hand
+;; must correct this to only match ( to ) etc. On the other hand
;; it is good that paren match gets confused, because that way you
-;; catch _all_ imbalances.
+;; catch _all_ imbalances.
-(defun vip-paren-match (arg)
+(defun viper-paren-match (arg)
"Go to the matching parenthesis."
(interactive "P")
- (vip-leave-region-active)
- (let ((com (vip-getcom arg))
- (parse-sexp-ignore-comments vip-parse-sexp-ignore-comments)
+ (viper-leave-region-active)
+ (let ((com (viper-getcom arg))
+ (parse-sexp-ignore-comments viper-parse-sexp-ignore-comments)
anchor-point)
(if (integerp arg)
(if (or (> arg 99) (< arg 1))
(setq beg-lim (point))
(end-of-line)
(setq end-lim (point)))
- (cond ((re-search-forward "[][(){}]" end-lim t)
+ (cond ((re-search-forward "[][(){}]" end-lim t)
(backward-char) )
((re-search-backward "[][(){}]" beg-lim t))
(t
(error "No matching character on line"))))
(cond ((looking-at "[\(\[{]")
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(forward-sexp 1)
(if com
- (vip-execute-com 'vip-paren-match nil com)
+ (viper-execute-com 'viper-paren-match nil com)
(backward-char)))
(anchor-point
(if com
(progn
- (vip-move-marker-locally 'vip-com-point anchor-point)
+ (viper-move-marker-locally 'viper-com-point anchor-point)
(forward-char 1)
- (vip-execute-com 'vip-paren-match nil com)
+ (viper-execute-com 'viper-paren-match nil com)
)))
((looking-at "[])}]")
(forward-char)
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(backward-sexp 1)
- (if com (vip-execute-com 'vip-paren-match nil com)))
+ (if com (viper-execute-com 'viper-paren-match nil com)))
(t (error ""))))))
-(defun vip-toggle-parse-sexp-ignore-comments ()
+(defun viper-toggle-parse-sexp-ignore-comments ()
(interactive)
- (setq vip-parse-sexp-ignore-comments (not vip-parse-sexp-ignore-comments))
- (prin1 (format "`%%' will %signore parentheses inside the comments"
- (if vip-parse-sexp-ignore-comments "" "NOT ")))
- )
+ (setq viper-parse-sexp-ignore-comments
+ (not viper-parse-sexp-ignore-comments))
+ (princ (format
+ "From now on, `%%' will %signore parentheses inside comment fields"
+ (if viper-parse-sexp-ignore-comments "" "NOT "))))
\f
-;; sentence ,paragraph and heading
+;; sentence, paragraph and heading
-(defun vip-forward-sentence (arg)
+(defun viper-forward-sentence (arg)
"Forward sentence."
(interactive "P")
- (push-mark nil t)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (or (eq last-command this-command)
+ (push-mark nil t))
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(forward-sentence val)
- (if com (vip-execute-com 'vip-forward-sentence nil com))))
+ (if com (viper-execute-com 'viper-forward-sentence nil com))))
-(defun vip-backward-sentence (arg)
+(defun viper-backward-sentence (arg)
"Backward sentence."
(interactive "P")
- (push-mark nil t)
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (or (eq last-command this-command)
+ (push-mark nil t))
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(backward-sentence val)
- (if com (vip-execute-com 'vip-backward-sentence nil com))))
+ (if com (viper-execute-com 'viper-backward-sentence nil com))))
-(defun vip-forward-paragraph (arg)
+(defun viper-forward-paragraph (arg)
"Forward paragraph."
(interactive "P")
- (push-mark nil t)
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (or (eq last-command this-command)
+ (push-mark nil t))
+ (let ((val (viper-p-val arg))
+ ;; if you want d} operate on whole lines, change viper-getcom to
+ ;; viper-getCom below
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(forward-paragraph val)
(if com
(progn
(backward-char 1)
- (vip-execute-com 'vip-forward-paragraph nil com)))))
+ (viper-execute-com 'viper-forward-paragraph nil com)))))
-(defun vip-backward-paragraph (arg)
+(defun viper-backward-paragraph (arg)
"Backward paragraph."
(interactive "P")
- (push-mark nil t)
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (or (eq last-command this-command)
+ (push-mark nil t))
+ (let ((val (viper-p-val arg))
+ ;; if you want d{ operate on whole lines, change viper-getcom to
+ ;; viper-getCom below
+ (com (viper-getcom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(backward-paragraph val)
(if com
(progn
(forward-char 1)
- (vip-execute-com 'vip-backward-paragraph nil com)
+ (viper-execute-com 'viper-backward-paragraph nil com)
(backward-char 1)))))
-;; should be mode-specific etc.
-
-(defun vip-prev-heading (arg)
+;; should be mode-specific
+(defun viper-prev-heading (arg)
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (re-search-backward vip-heading-start nil t val)
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (re-search-backward viper-heading-start nil t val)
(goto-char (match-beginning 0))
- (if com (vip-execute-com 'vip-prev-heading nil com))))
+ (if com (viper-execute-com 'viper-prev-heading nil com))))
-(defun vip-heading-end (arg)
+(defun viper-heading-end (arg)
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (re-search-forward vip-heading-end nil t val)
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (re-search-forward viper-heading-end nil t val)
(goto-char (match-beginning 0))
- (if com (vip-execute-com 'vip-heading-end nil com))))
+ (if com (viper-execute-com 'viper-heading-end nil com))))
-(defun vip-next-heading (arg)
+(defun viper-next-heading (arg)
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getCom arg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
+ (let ((val (viper-p-val arg))
+ (com (viper-getCom arg)))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
(end-of-line)
- (re-search-forward vip-heading-start nil t val)
+ (re-search-forward viper-heading-start nil t val)
(goto-char (match-beginning 0))
- (if com (vip-execute-com 'vip-next-heading nil com))))
+ (if com (viper-execute-com 'viper-next-heading nil com))))
\f
;; scrolling
-(setq scroll-step 1)
-
-(defun vip-scroll-screen (arg)
+(defun viper-scroll-screen (arg)
"Scroll to next screen."
(interactive "p")
(condition-case nil
(goto-char (point-min))))
))
-(defun vip-scroll-screen-back (arg)
+(defun viper-scroll-screen-back (arg)
"Scroll to previous screen."
(interactive "p")
- (vip-scroll-screen (- arg)))
+ (viper-scroll-screen (- arg)))
-(defun vip-scroll-down (arg)
+(defun viper-scroll-down (arg)
"Pull down half screen."
(interactive "P")
(condition-case nil
(message "Beginning of buffer")
(goto-char (point-min)))))
-(defun vip-scroll-down-one (arg)
+(defun viper-scroll-down-one (arg)
"Scroll up one line."
(interactive "p")
(scroll-down arg))
-(defun vip-scroll-up (arg)
+(defun viper-scroll-up (arg)
"Pull up half screen."
(interactive "P")
(condition-case nil
(message "End of buffer")
(goto-char (point-max)))))
-(defun vip-scroll-up-one (arg)
+(defun viper-scroll-up-one (arg)
"Scroll down one line."
(interactive "p")
(scroll-up arg))
\f
;; searching
-(defun vip-if-string (prompt)
- (let ((s (vip-read-string-with-history
+(defun viper-if-string (prompt)
+ (if (memq viper-intermediate-command
+ '(viper-command-argument viper-digit-argument viper-repeat))
+ (setq viper-this-command-keys (this-command-keys)))
+ (let ((s (viper-read-string-with-history
prompt
nil ; no initial
- 'vip-search-history
- (car vip-search-history))))
+ 'viper-search-history
+ (car viper-search-history))))
(if (not (string= s ""))
- (setq vip-s-string s))))
-
-
-(defun vip-toggle-search-style (arg)
- "Toggle the value of vip-case-fold-search/vip-re-search.
-Without prefix argument, will ask which search style to toggle. With prefix
-arg 1,toggles vip-case-fold-search; with arg 2 toggles vip-re-search.
+ (setq viper-s-string s))))
+
+
+(defun viper-toggle-search-style (arg)
+ "Toggle the value of viper-case-fold-search/viper-re-search.
+Without prefix argument, will ask which search style to toggle. With prefix
+arg 1,toggles viper-case-fold-search; with arg 2 toggles viper-re-search.
-Although this function is bound to \\[vip-toggle-search-style], the most
+Although this function is bound to \\[viper-toggle-search-style], the most
convenient way to use it is to bind `//' to the macro
-`1 M-x vip-toggle-search-style' and `///' to
-`2 M-x vip-toggle-search-style'. In this way, hitting `//' quickly will
+`1 M-x viper-toggle-search-style' and `///' to
+`2 M-x viper-toggle-search-style'. In this way, hitting `//' quickly will
toggle case-fold-search and hitting `/' three times witth toggle regexp
-search. Macros are more convenient in this case because they don't affect
+search. Macros are more convenient in this case because they don't affect
the Emacs binding of `/'."
(interactive "P")
(let (msg)
(cond ((or (eq arg 1)
(and (null arg)
- (y-or-n-p (format "Search style: '%s'. Want '%s'? "
- (if vip-case-fold-search
+ (y-or-n-p (format "Search style: '%s'. Want '%s'? "
+ (if viper-case-fold-search
"case-insensitive" "case-sensitive")
- (if vip-case-fold-search
+ (if viper-case-fold-search
"case-sensitive"
"case-insensitive")))))
- (setq vip-case-fold-search (null vip-case-fold-search))
- (if vip-case-fold-search
+ (setq viper-case-fold-search (null viper-case-fold-search))
+ (if viper-case-fold-search
(setq msg "Search becomes case-insensitive")
(setq msg "Search becomes case-sensitive")))
((or (eq arg 2)
(and (null arg)
- (y-or-n-p (format "Search style: '%s'. Want '%s'? "
- (if vip-re-search
+ (y-or-n-p (format "Search style: '%s'. Want '%s'? "
+ (if viper-re-search
"regexp-search" "vanilla-search")
- (if vip-re-search
+ (if viper-re-search
"vanilla-search"
"regexp-search")))))
- (setq vip-re-search (null vip-re-search))
- (if vip-re-search
+ (setq viper-re-search (null viper-re-search))
+ (if viper-re-search
(setq msg "Search becomes regexp-style")
(setq msg "Search becomes vanilla-style")))
(t
(setq msg "Search style remains unchanged")))
- (prin1 msg t)))
+ (princ msg t)))
-(defun vip-set-vi-search-style-macros (unset)
+(defun viper-set-searchstyle-toggling-macros (unset &optional major-mode)
"Set the macros for toggling the search style in Viper's vi-state.
The macro that toggles case sensitivity is bound to `//', and the one that
toggles regexp search is bound to `///'.
-With a prefix argument, this function unsets the macros. "
+With a prefix argument, this function unsets the macros.
+If MAJOR-MODE is set, set the macros only in that major mode."
+ (interactive "P")
+ (let (scope)
+ (if (and major-mode (symbolp major-mode))
+ (setq scope major-mode)
+ (setq scope 't))
+ (or noninteractive
+ (if (not unset)
+ (progn
+ ;; toggle case sensitivity in search
+ (viper-record-kbd-macro
+ "//" 'vi-state
+ [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]
+ scope)
+ ;; toggle regexp/vanila search
+ (viper-record-kbd-macro
+ "///" 'vi-state
+ [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]
+ scope)
+ (if (interactive-p)
+ (message
+ "// and /// now toggle case-sensitivity and regexp search")))
+ (viper-unrecord-kbd-macro "//" 'vi-state)
+ (sit-for 2)
+ (viper-unrecord-kbd-macro "///" 'vi-state)))
+ ))
+
+
+(defun viper-set-parsing-style-toggling-macro (unset)
+ "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses.
+This is used in conjunction with the `%' command.
+
+With a prefix argument, unsets the macro."
(interactive "P")
(or noninteractive
(if (not unset)
(progn
- ;; toggle case sensitivity in search
- (vip-record-kbd-macro
- "//" 'vi-state
- [1 (meta x) v i p - t o g g l e - s e a r c h - s t y l e return]
- 't)
- ;; toggle regexp/vanila search
- (vip-record-kbd-macro
- "///" 'vi-state
- [2 (meta x) v i p - t o g g l e - s e a r c h - s t y l e return]
+ ;; Make %%% toggle parsing comments for matching parentheses
+ (viper-record-kbd-macro
+ "%%%" 'vi-state
+ [(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]
't)
(if (interactive-p)
(message
- "// and /// now toggle case-sensitivity and regexp search.")))
- (vip-unrecord-kbd-macro "//" 'vi-state)
- (sit-for 2)
- (vip-unrecord-kbd-macro "///" 'vi-state))))
+ "%%%%%% now toggles whether comments should be parsed for matching parentheses")))
+ (viper-unrecord-kbd-macro "%%%" 'vi-state))))
-(defun vip-set-emacs-search-style-macros (unset &optional arg-majormode)
+
+(defun viper-set-emacs-state-searchstyle-macros (unset &optional arg-majormode)
"Set the macros for toggling the search style in Viper's emacs-state.
The macro that toggles case sensitivity is bound to `//', and the one that
toggles regexp search is bound to `///'.
-With a prefix argument, this function unsets the macros.
+With a prefix argument, this function unsets the macros.
If the optional prefix argument is non-nil and specifies a valid major mode,
-this sets the macros only in the macros in that major mode. Otherwise,
+this sets the macros only in the macros in that major mode. Otherwise,
the macros are set in the current major mode.
\(When unsetting the macros, the second argument has no effect.\)"
(interactive "P")
(if (not unset)
(progn
;; toggle case sensitivity in search
- (vip-record-kbd-macro
+ (viper-record-kbd-macro
"//" 'emacs-state
- [1 (meta x) v i p - t o g g l e - s e a r c h - s t y l e return]
+ [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]
(or arg-majormode major-mode))
;; toggle regexp/vanila search
- (vip-record-kbd-macro
+ (viper-record-kbd-macro
"///" 'emacs-state
- [2 (meta x) v i p - t o g g l e - s e a r c h - s t y l e return]
+ [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]
(or arg-majormode major-mode))
(if (interactive-p)
(message
"// and /// now toggle case-sensitivity and regexp search.")))
- (vip-unrecord-kbd-macro "//" 'emacs-state)
+ (viper-unrecord-kbd-macro "//" 'emacs-state)
(sit-for 2)
- (vip-unrecord-kbd-macro "///" 'emacs-state))))
+ (viper-unrecord-kbd-macro "///" 'emacs-state))))
-(defun vip-search-forward (arg)
- "Search a string forward.
+(defun viper-search-forward (arg)
+ "Search a string forward.
ARG is used to find the ARG's occurrence of the string.
Null string will repeat previous search."
(interactive "P")
- (let ((val (vip-P-val arg))
- (com (vip-getcom arg))
- (old-str vip-s-string))
- (setq vip-s-forward t)
- (vip-if-string "/")
+ (let ((val (viper-P-val arg))
+ (com (viper-getcom arg))
+ (old-str viper-s-string)
+ debug-on-error)
+ (setq viper-s-forward t)
+ (viper-if-string "/")
;; this is not used at present, but may be used later
- (if (or (not (equal old-str vip-s-string))
- (not (markerp vip-local-search-start-marker))
- (not (marker-buffer vip-local-search-start-marker)))
- (setq vip-local-search-start-marker (point-marker)))
- (vip-search vip-s-string t val)
+ (if (or (not (equal old-str viper-s-string))
+ (not (markerp viper-local-search-start-marker))
+ (not (marker-buffer viper-local-search-start-marker)))
+ (setq viper-local-search-start-marker (point-marker)))
+ (viper-search viper-s-string t val)
(if com
(progn
- (vip-move-marker-locally 'vip-com-point (mark t))
- (vip-execute-com 'vip-search-next val com)))))
+ (viper-move-marker-locally 'viper-com-point (mark t))
+ (viper-execute-com 'viper-search-next val com)))
+ ))
-(defun vip-search-backward (arg)
- "Search a string backward.
+(defun viper-search-backward (arg)
+ "Search a string backward.
ARG is used to find the ARG's occurrence of the string.
Null string will repeat previous search."
(interactive "P")
- (let ((val (vip-P-val arg))
- (com (vip-getcom arg))
- (old-str vip-s-string))
- (setq vip-s-forward nil)
- (vip-if-string "?")
+ (let ((val (viper-P-val arg))
+ (com (viper-getcom arg))
+ (old-str viper-s-string)
+ debug-on-error)
+ (setq viper-s-forward nil)
+ (viper-if-string "?")
;; this is not used at present, but may be used later
- (if (or (not (equal old-str vip-s-string))
- (not (markerp vip-local-search-start-marker))
- (not (marker-buffer vip-local-search-start-marker)))
- (setq vip-local-search-start-marker (point-marker)))
- (vip-search vip-s-string nil val)
+ (if (or (not (equal old-str viper-s-string))
+ (not (markerp viper-local-search-start-marker))
+ (not (marker-buffer viper-local-search-start-marker)))
+ (setq viper-local-search-start-marker (point-marker)))
+ (viper-search viper-s-string nil val)
(if com
(progn
- (vip-move-marker-locally 'vip-com-point (mark t))
- (vip-execute-com 'vip-search-next val com)))))
-
+ (viper-move-marker-locally 'viper-com-point (mark t))
+ (viper-execute-com 'viper-search-next val com)))))
+
;; Search for COUNT's occurrence of STRING.
;; Search is forward if FORWARD is non-nil, otherwise backward.
;; INIT-POINT is the position where search is to start.
;; Arguments:
;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND)
-(defun vip-search (string forward arg
- &optional no-offset init-point fail-if-not-found)
+(defun viper-search (string forward arg
+ &optional no-offset init-point fail-if-not-found)
(if (not (equal string ""))
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg))
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg))
(offset (not no-offset))
- (case-fold-search vip-case-fold-search)
+ (case-fold-search viper-case-fold-search)
(start-point (or init-point (point))))
- (vip-deactivate-mark)
+ (viper-deactivate-mark)
(if forward
(condition-case nil
(progn
- (if offset (vip-forward-char-carefully))
- (if vip-re-search
+ (if offset (viper-forward-char-carefully))
+ (if viper-re-search
(progn
(re-search-forward string nil nil val)
(re-search-backward string))
(search-forward string nil nil val)
(search-backward string))
(if (not (equal start-point (point)))
- (push-mark start-point t)))
+ (push-mark start-point t)))
(search-failed
- (if (and (not fail-if-not-found) vip-search-wrap-around-t)
+ (if (and (not fail-if-not-found) viper-search-wrap-around-t)
(progn
(message "Search wrapped around BOTTOM of buffer")
(goto-char (point-min))
- (vip-search string forward (cons 1 com) t start-point 'fail)
+ (viper-search string forward (cons 1 com) t start-point 'fail)
;; don't wait in macros
- (or executing-kbd-macro (sit-for 2))
+ (or executing-kbd-macro
+ (memq viper-intermediate-command
+ '(viper-repeat
+ viper-digit-argument
+ viper-command-argument))
+ (sit-for 2))
;; delete the wrap-around message
(message "")
)
(goto-char start-point)
(error "`%s': %s not found"
string
- (if vip-re-search "Pattern" "String"))
+ (if viper-re-search "Pattern" "String"))
)))
;; backward
(condition-case nil
(progn
- (if vip-re-search
+ (if viper-re-search
(re-search-backward string nil nil val)
(search-backward string nil nil val))
(if (not (equal start-point (point)))
- (push-mark start-point t)))
+ (push-mark start-point t)))
(search-failed
- (if (and (not fail-if-not-found) vip-search-wrap-around-t)
+ (if (and (not fail-if-not-found) viper-search-wrap-around-t)
(progn
(message "Search wrapped around TOP of buffer")
(goto-char (point-max))
- (vip-search string forward (cons 1 com) t start-point 'fail)
+ (viper-search string forward (cons 1 com) t start-point 'fail)
;; don't wait in macros
- (or executing-kbd-macro (sit-for 2))
+ (or executing-kbd-macro
+ (memq viper-intermediate-command
+ '(viper-repeat
+ viper-digit-argument
+ viper-command-argument))
+ (sit-for 2))
;; delete the wrap-around message
(message "")
)
(goto-char start-point)
(error "`%s': %s not found"
string
- (if vip-re-search "Pattern" "String"))
+ (if viper-re-search "Pattern" "String"))
))))
;; pull up or down if at top/bottom of window
- (vip-adjust-window)
+ (viper-adjust-window)
;; highlight the result of search
;; don't wait and don't highlight in macros
(or executing-kbd-macro
- vip-inside-command-argument-action
- (vip-flash-search-pattern))
+ (memq viper-intermediate-command
+ '(viper-repeat viper-digit-argument viper-command-argument))
+ (viper-flash-search-pattern))
)))
-(defun vip-search-next (arg)
+(defun viper-search-next (arg)
"Repeat previous search."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if (null vip-s-string) (error vip-NoPrevSearch))
- (vip-search vip-s-string vip-s-forward arg)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg))
+ debug-on-error)
+ (if (or (null viper-s-string) (string= viper-s-string ""))
+ (error viper-NoPrevSearch))
+ (viper-search viper-s-string viper-s-forward arg)
(if com
(progn
- (vip-move-marker-locally 'vip-com-point (mark t))
- (vip-execute-com 'vip-search-next val com)))))
+ (viper-move-marker-locally 'viper-com-point (mark t))
+ (viper-execute-com 'viper-search-next val com)))))
-(defun vip-search-Next (arg)
+(defun viper-search-Next (arg)
"Repeat previous search in the reverse direction."
(interactive "P")
- (let ((val (vip-p-val arg))
- (com (vip-getcom arg)))
- (if (null vip-s-string) (error vip-NoPrevSearch))
- (vip-search vip-s-string (not vip-s-forward) arg)
+ (let ((val (viper-p-val arg))
+ (com (viper-getcom arg))
+ debug-on-error)
+ (if (null viper-s-string) (error viper-NoPrevSearch))
+ (viper-search viper-s-string (not viper-s-forward) arg)
(if com
(progn
- (vip-move-marker-locally 'vip-com-point (mark t))
- (vip-execute-com 'vip-search-Next val com)))))
+ (viper-move-marker-locally 'viper-com-point (mark t))
+ (viper-execute-com 'viper-search-Next val com)))))
;; Search contents of buffer defined by one of Viper's motion commands.
;; Repeatable via `n' and `N'.
-(defun vip-buffer-search-enable (&optional c)
- (cond (c (setq vip-buffer-search-char c))
- ((null vip-buffer-search-char)
- (setq vip-buffer-search-char ?g)))
- (define-key vip-vi-basic-map
- (char-to-string vip-buffer-search-char) 'vip-command-argument)
- (aset vip-exec-array vip-buffer-search-char 'vip-exec-buffer-search)
- (setq vip-prefix-commands (cons vip-buffer-search-char vip-prefix-commands)))
+(defun viper-buffer-search-enable (&optional c)
+ (cond (c (setq viper-buffer-search-char c))
+ ((null viper-buffer-search-char)
+ ;; ?g acts as a default value for viper-buffer-search-char
+ (setq viper-buffer-search-char ?g)))
+ (define-key viper-vi-basic-map
+ (cond ((viper-characterp viper-buffer-search-char)
+ (char-to-string viper-buffer-search-char))
+ (t (error "viper-buffer-search-char: wrong value type, %S"
+ viper-buffer-search-char)))
+ 'viper-command-argument)
+ (aset viper-exec-array viper-buffer-search-char 'viper-exec-buffer-search)
+ (setq viper-prefix-commands
+ (cons viper-buffer-search-char viper-prefix-commands)))
;; This is a Viper wraper for isearch-forward.
-(defun vip-isearch-forward (arg)
+(defun viper-isearch-forward (arg)
"Do incremental search forward."
(interactive "P")
;; emacs bug workaround
(if (listp arg) (setq arg (car arg)))
- (vip-exec-form-in-emacs (list 'isearch-forward arg)))
+ (viper-exec-form-in-emacs (list 'isearch-forward arg)))
;; This is a Viper wraper for isearch-backward."
-(defun vip-isearch-backward (arg)
+(defun viper-isearch-backward (arg)
"Do incremental search backward."
(interactive "P")
;; emacs bug workaround
(if (listp arg) (setq arg (car arg)))
- (vip-exec-form-in-emacs (list 'isearch-backward arg)))
+ (viper-exec-form-in-emacs (list 'isearch-backward arg)))
\f
;; visiting and killing files, buffers
-(defun vip-switch-to-buffer ()
+(defun viper-switch-to-buffer ()
"Switch to buffer in the current window."
(interactive)
- (let (buffer)
+ (let ((other-buffer (other-buffer (current-buffer)))
+ buffer)
(setq buffer
- (read-buffer
- (format "Switch to buffer in this window \(%s\): "
- (buffer-name (other-buffer (current-buffer))))))
- (switch-to-buffer buffer)
- ))
+ (funcall viper-read-buffer-function
+ "Switch to buffer in this window: " other-buffer))
+ (switch-to-buffer buffer)))
-(defun vip-switch-to-buffer-other-window ()
+(defun viper-switch-to-buffer-other-window ()
"Switch to buffer in another window."
(interactive)
- (let (buffer)
+ (let ((other-buffer (other-buffer (current-buffer)))
+ buffer)
(setq buffer
- (read-buffer
- (format "Switch to buffer in another window \(%s\): "
- (buffer-name (other-buffer (current-buffer))))))
- (switch-to-buffer-other-window buffer)
- ))
+ (funcall viper-read-buffer-function
+ "Switch to buffer in another window: " other-buffer))
+ (switch-to-buffer-other-window buffer)))
-(defun vip-kill-buffer ()
+(defun viper-kill-buffer ()
"Kill a buffer."
(interactive)
(let (buffer buffer-name)
(setq buffer-name
- (read-buffer
- (format "Kill buffer \(%s\): "
- (buffer-name (current-buffer)))))
+ (funcall viper-read-buffer-function
+ (format "Kill buffer \(%s\): "
+ (buffer-name (current-buffer)))))
(setq buffer
(if (null buffer-name)
(current-buffer)
(get-buffer buffer-name)))
(if (null buffer) (error "`%s': No such buffer" buffer-name))
(if (or (not (buffer-modified-p buffer))
- (y-or-n-p
+ (y-or-n-p
(format
"Buffer `%s' is modified, are you sure you want to kill it? "
buffer-name)))
(error "Buffer not killed"))))
-(defvar vip-smart-suffix-list
- '("" "tex" "c" "cc" "C" "el" "java" "html" "htm" "pl" "P" "p")
- "*List of suffixes that Viper automatically tries to append to filenames ending with a `.'.
-This is useful when you the current directory contains files with the same
-prefix and many different suffixes. Usually, only one of the suffixes
-represents an editable file. However, file completion will stop at the `.'
-The smart suffix feature lets you hit RET in such a case, and Viper will
-select the appropriate suffix.
-
-Suffixes are tried in the order given and the first suffix for which a
-corresponding file exists is selected. If no file exists for any of the
-suffixes, the user is asked to confirm.
-
-To turn this feature off, set this variable to nil.")
-
-;; Try to add suffix to files ending with a `.'
-;; Useful when the user hits RET on a non-completed file name.
-(defun vip-file-add-suffix ()
- (let ((count 0)
- (len (length vip-smart-suffix-list))
- (file (buffer-string))
- found key cmd suff)
- (goto-char (point-max))
- (if (and vip-smart-suffix-list (string-match "\\.$" file))
- (progn
- (while (and (not found) (< count len))
- (setq suff (nth count vip-smart-suffix-list)
- count (1+ count))
- (if (file-exists-p (format "%s%s" file suff))
- (progn
- (setq found t)
- (insert suff))))
-
- (if found
- ()
- (vip-tmp-insert-at-eob " [Please complete file name]")
- (unwind-protect
- (while (not (memq cmd '(exit-minibuffer vip-exit-minibuffer)))
- (setq cmd
- (key-binding (setq key (read-key-sequence nil))))
- (cond ((eq cmd 'self-insert-command)
- (if vip-xemacs-p
- (insert (events-to-keys key))
- (insert key)))
- ((memq cmd '(exit-minibuffer vip-exit-minibuffer))
- nil)
- (t (command-execute cmd)))
- )))
- ))
- ))
-
-
-;; Advice for use in find-file and read-file-name commands.
-(defadvice exit-minibuffer (before vip-exit-minibuffer-advice activate)
- "Run `vip-minibuffer-exit-hook' just before exiting the minibuffer."
- (run-hooks 'vip-minibuffer-exit-hook))
-
-(defadvice find-file (before vip-add-suffix-advice activate)
- "Use `read-file-name' for reading arguments."
- (interactive (cons (read-file-name "Find file: " nil default-directory)
- ;; if Mule and prefix argument, ask for coding system
- (if (or (boundp 'MULE) ; mule integrated Emacs 19
- (featurep 'mule)) ; mule integrated XEmacs 20
- (list
- (and current-prefix-arg
- (read-coding-system "Coding-system: "))))
- )))
-
-(defadvice find-file-other-window (before vip-add-suffix-advice activate)
- "Use `read-file-name' for reading arguments."
- (interactive (cons (read-file-name "Find file in other window: "
- nil default-directory)
- ;; if Mule and prefix argument, ask for coding system
- (if (or (boundp 'MULE) ; mule integrated Emacs 19
- (featurep 'mule)) ; mule integrated XEmacs 20
- (list
- (and current-prefix-arg
- (read-coding-system "Coding-system: "))))
- )))
-
-(defadvice find-file-other-frame (before vip-add-suffix-advice activate)
- "Use `read-file-name' for reading arguments."
- (interactive (cons (read-file-name "Find file in other frame: "
- nil default-directory)
- ;; if Mule and prefix argument, ask for coding system
- (if (or (boundp 'MULE) ; mule integrated Emacs 19
- (featurep 'mule)) ; mule integrated XEmacs 20
- (list
- (and current-prefix-arg
- (read-coding-system "Coding-system: "))))
- )))
-
-(defadvice read-file-name (around vip-suffix-advice activate)
- "Tell `exit-minibuffer' to run `vip-file-add-suffix' as a hook."
- (let ((vip-minibuffer-exit-hook 'vip-file-add-suffix))
- ad-do-it))
-
-
\f
;; yank and pop
-(defsubst vip-yank (text)
- "Yank TEXT silently. This works correctly with Emacs's yank-pop command."
+(defsubst viper-yank (text)
+ "Yank TEXT silently. This works correctly with Emacs's yank-pop command."
(insert text)
(setq this-command 'yank))
-(defun vip-put-back (arg)
+(defun viper-put-back (arg)
"Put back after point/below line."
(interactive "P")
- (let ((val (vip-p-val arg))
- (text (if vip-use-register
- (cond ((vip-valid-register vip-use-register '(digit))
- (current-kill (- vip-use-register ?1) 'do-not-rotate))
- ((vip-valid-register vip-use-register)
- (get-register (downcase vip-use-register)))
- (t (error vip-InvalidRegister vip-use-register)))
- (current-kill 0))))
+ (let ((val (viper-p-val arg))
+ (text (if viper-use-register
+ (cond ((viper-valid-register viper-use-register '(digit))
+ (current-kill
+ (- viper-use-register ?1) 'do-not-rotate))
+ ((viper-valid-register viper-use-register)
+ (get-register (downcase viper-use-register)))
+ (t (error viper-InvalidRegister viper-use-register)))
+ (current-kill 0)))
+ sv-point chars-inserted lines-inserted)
(if (null text)
- (if vip-use-register
- (let ((reg vip-use-register))
- (setq vip-use-register nil)
- (error vip-EmptyRegister reg))
+ (if viper-use-register
+ (let ((reg viper-use-register))
+ (setq viper-use-register nil)
+ (error viper-EmptyRegister reg))
(error "")))
- (setq vip-use-register nil)
- (if (vip-end-with-a-newline-p text)
+ (setq viper-use-register nil)
+ (if (viper-end-with-a-newline-p text)
(progn
(end-of-line)
(if (eobp)
(insert "\n")
(forward-line 1))
(beginning-of-line))
- (if (not (eolp)) (vip-forward-char-carefully)))
- (set-marker (vip-mark-marker) (point) (current-buffer))
- (vip-set-destructive-command
- (list 'vip-put-back val nil vip-use-register nil nil))
- (vip-loop val (vip-yank text)))
+ (if (not (eolp)) (viper-forward-char-carefully)))
+ (set-marker (viper-mark-marker) (point) (current-buffer))
+ (viper-set-destructive-command
+ (list 'viper-put-back val nil viper-use-register nil nil))
+ (setq sv-point (point))
+ (viper-loop val (viper-yank text))
+ (setq chars-inserted (abs (- (point) sv-point))
+ lines-inserted (abs (count-lines (point) sv-point)))
+ (if (or (> chars-inserted viper-change-notification-threshold)
+ (> lines-inserted viper-change-notification-threshold))
+ (unless (viper-is-in-minibuffer)
+ (message "Inserted %d character(s), %d line(s)"
+ chars-inserted lines-inserted))))
;; Vi puts cursor on the last char when the yanked text doesn't contain a
- ;; newline; it leaves the cursor at the beginning when the text contains
+ ;; newline; it leaves the cursor at the beginning when the text contains
;; a newline
- (if (vip-same-line (point) (mark))
- (or (= (point) (mark)) (vip-backward-char-carefully))
+ (if (viper-same-line (point) (mark))
+ (or (= (point) (mark)) (viper-backward-char-carefully))
(exchange-point-and-mark)
(if (bolp)
(back-to-indentation)))
- (vip-deactivate-mark))
+ (viper-deactivate-mark))
-(defun vip-Put-back (arg)
+(defun viper-Put-back (arg)
"Put back at point/above line."
(interactive "P")
- (let ((val (vip-p-val arg))
- (text (if vip-use-register
- (cond ((vip-valid-register vip-use-register '(digit))
- (current-kill (- vip-use-register ?1) 'do-not-rotate))
- ((vip-valid-register vip-use-register)
- (get-register (downcase vip-use-register)))
- (t (error vip-InvalidRegister vip-use-register)))
- (current-kill 0))))
+ (let ((val (viper-p-val arg))
+ (text (if viper-use-register
+ (cond ((viper-valid-register viper-use-register '(digit))
+ (current-kill
+ (- viper-use-register ?1) 'do-not-rotate))
+ ((viper-valid-register viper-use-register)
+ (get-register (downcase viper-use-register)))
+ (t (error viper-InvalidRegister viper-use-register)))
+ (current-kill 0)))
+ sv-point chars-inserted lines-inserted)
(if (null text)
- (if vip-use-register
- (let ((reg vip-use-register))
- (setq vip-use-register nil)
- (error vip-EmptyRegister reg))
+ (if viper-use-register
+ (let ((reg viper-use-register))
+ (setq viper-use-register nil)
+ (error viper-EmptyRegister reg))
(error "")))
- (setq vip-use-register nil)
- (if (vip-end-with-a-newline-p text) (beginning-of-line))
- (vip-set-destructive-command
- (list 'vip-Put-back val nil vip-use-register nil nil))
- (set-marker (vip-mark-marker) (point) (current-buffer))
- (vip-loop val (vip-yank text)))
+ (setq viper-use-register nil)
+ (if (viper-end-with-a-newline-p text) (beginning-of-line))
+ (viper-set-destructive-command
+ (list 'viper-Put-back val nil viper-use-register nil nil))
+ (set-marker (viper-mark-marker) (point) (current-buffer))
+ (setq sv-point (point))
+ (viper-loop val (viper-yank text))
+ (setq chars-inserted (abs (- (point) sv-point))
+ lines-inserted (abs (count-lines (point) sv-point)))
+ (if (or (> chars-inserted viper-change-notification-threshold)
+ (> lines-inserted viper-change-notification-threshold))
+ (unless (viper-is-in-minibuffer)
+ (message "Inserted %d character(s), %d line(s)"
+ chars-inserted lines-inserted))))
;; Vi puts cursor on the last char when the yanked text doesn't contain a
- ;; newline; it leaves the cursor at the beginning when the text contains
+ ;; newline; it leaves the cursor at the beginning when the text contains
;; a newline
- (if (vip-same-line (point) (mark))
- (or (= (point) (mark)) (vip-backward-char-carefully))
+ (if (viper-same-line (point) (mark))
+ (or (= (point) (mark)) (viper-backward-char-carefully))
(exchange-point-and-mark)
(if (bolp)
(back-to-indentation)))
- (vip-deactivate-mark))
-
+ (viper-deactivate-mark))
+
;; Copy region to kill-ring.
;; If BEG and END do not belong to the same buffer, copy empty region.
-(defun vip-copy-region-as-kill (beg end)
+(defun viper-copy-region-as-kill (beg end)
(condition-case nil
(copy-region-as-kill beg end)
(error (copy-region-as-kill beg beg))))
-
-(defun vip-delete-char (arg)
- "Delete character."
+
+(defun viper-delete-char (arg)
+ "Delete next character."
(interactive "P")
- (let ((val (vip-p-val arg)))
- (vip-set-destructive-command (list 'vip-delete-char val nil nil nil nil))
- (if (> val 1)
- (save-excursion
- (let ((here (point)))
- (end-of-line)
- (if (> val (- (point) here))
- (setq val (- (point) here))))))
- (if (and (eq val 0) (not vip-ex-style-motion)) (setq val 1))
- (if (and vip-ex-style-motion (eolp))
+ (let ((val (viper-p-val arg))
+ end-del-pos)
+ (viper-set-destructive-command
+ (list 'viper-delete-char val nil nil nil nil))
+ (if (and viper-ex-style-editing
+ (> val (viper-chars-in-region (point) (viper-line-pos 'end))))
+ (setq val (viper-chars-in-region (point) (viper-line-pos 'end))))
+ (if (and viper-ex-style-motion (eolp))
(if (bolp) (error "") (setq val 0))) ; not bol---simply back 1 ch
- (if vip-use-register
+ (save-excursion
+ (viper-forward-char-carefully val)
+ (setq end-del-pos (point)))
+ (if viper-use-register
(progn
- (cond ((vip-valid-register vip-use-register '((Letter)))
- (vip-append-to-register
- (downcase vip-use-register) (point) (- (point) val)))
- ((vip-valid-register vip-use-register)
+ (cond ((viper-valid-register viper-use-register '((Letter)))
+ (viper-append-to-register
+ (downcase viper-use-register) (point) end-del-pos))
+ ((viper-valid-register viper-use-register)
(copy-to-register
- vip-use-register (point) (- (point) val) nil))
- (t (error vip-InvalidRegister vip-use-register)))
- (setq vip-use-register nil)))
- (if vip-ex-style-motion
- (progn
- (delete-char val t)
- (if (and (eolp) (not (bolp))) (backward-char 1)))
- (if (eolp)
- (delete-backward-char val t)
- (delete-char val t)))))
-
-(defun vip-delete-backward-char (arg)
- "Delete previous character. On reaching beginning of line, stop and beep."
+ viper-use-register (point) end-del-pos nil))
+ (t (error viper-InvalidRegister viper-use-register)))
+ (setq viper-use-register nil)))
+
+ (delete-char val t)
+ (if viper-ex-style-motion
+ (if (and (eolp) (not (bolp))) (backward-char 1)))
+ ))
+
+(defun viper-delete-backward-char (arg)
+ "Delete previous character. On reaching beginning of line, stop and beep."
(interactive "P")
- (let ((val (vip-p-val arg)))
- (vip-set-destructive-command
- (list 'vip-delete-backward-char val nil nil nil nil))
- (if (> val 1)
- (save-excursion
- (let ((here (point)))
- (beginning-of-line)
- (if (> val (- here (point)))
- (setq val (- here (point)))))))
- (if vip-use-register
+ (let ((val (viper-p-val arg))
+ end-del-pos)
+ (viper-set-destructive-command
+ (list 'viper-delete-backward-char val nil nil nil nil))
+ (if (and
+ viper-ex-style-editing
+ (> val (viper-chars-in-region (viper-line-pos 'start) (point))))
+ (setq val (viper-chars-in-region (viper-line-pos 'start) (point))))
+ (save-excursion
+ (viper-backward-char-carefully val)
+ (setq end-del-pos (point)))
+ (if viper-use-register
(progn
- (cond ((vip-valid-register vip-use-register '(Letter))
- (vip-append-to-register
- (downcase vip-use-register) (point) (+ (point) val)))
- ((vip-valid-register vip-use-register)
+ (cond ((viper-valid-register viper-use-register '(Letter))
+ (viper-append-to-register
+ (downcase viper-use-register) end-del-pos (point)))
+ ((viper-valid-register viper-use-register)
(copy-to-register
- vip-use-register (point) (+ (point) val) nil))
- (t (error vip-InvalidRegister vip-use-register)))
- (setq vip-use-register nil)))
- (if (bolp) (ding)
- (delete-backward-char val t))))
-
-(defun vip-del-backward-char-in-insert ()
+ viper-use-register end-del-pos (point) nil))
+ (t (error viper-InvalidRegister viper-use-register)))
+ (setq viper-use-register nil)))
+ (if (and (bolp) viper-ex-style-editing)
+ (ding))
+ (delete-backward-char val t)))
+
+
+(defun viper-del-backward-char-in-insert ()
"Delete 1 char backwards while in insert mode."
- (interactive)
- (if (and vip-ex-style-editing-in-insert (bolp))
+ (interactive)
+ (if (and viper-ex-style-editing (bolp))
(beep 1)
- (delete-backward-char 1 t)))
-
-(defun vip-del-backward-char-in-replace ()
+ ;; don't put on kill ring
+ (delete-backward-char 1 nil)))
+
+
+(defun viper-del-backward-char-in-replace ()
"Delete one character in replace mode.
-If `vip-delete-backwards-in-replace' is t, then DEL key actually deletes
-charecters. If it is nil, then the cursor just moves backwards, similarly
-to Vi. The variable `vip-ex-style-editing-in-insert', if t, doesn't let the
+If `viper-delete-backwards-in-replace' is t, then DEL key actually deletes
+charecters. If it is nil, then the cursor just moves backwards, similarly
+to Vi. The variable `viper-ex-style-editing', if t, doesn't let the
cursor move past the beginning of line."
(interactive)
- (cond (vip-delete-backwards-in-replace
+ (cond (viper-delete-backwards-in-replace
(cond ((not (bolp))
- (delete-backward-char 1 t))
- (vip-ex-style-editing-in-insert
+ ;; don't put on kill ring
+ (delete-backward-char 1 nil))
+ (viper-ex-style-editing
(beep 1))
((bobp)
(beep 1))
(t
- (delete-backward-char 1 t))))
- (vip-ex-style-editing-in-insert
+ ;; don't put on kill ring
+ (delete-backward-char 1 nil))))
+ (viper-ex-style-editing
(if (bolp)
(beep 1)
(backward-char 1)))
- (t
+ (t
(backward-char 1))))
\f
;; join lines.
-(defun vip-join-lines (arg)
+(defun viper-join-lines (arg)
"Join this line to next, if ARG is nil. Otherwise, join ARG lines."
(interactive "*P")
- (let ((val (vip-P-val arg)))
- (vip-set-destructive-command (list 'vip-join-lines val nil nil nil nil))
- (vip-loop (if (null val) 1 (1- val))
- (progn
+ (let ((val (viper-P-val arg)))
+ (viper-set-destructive-command
+ (list 'viper-join-lines val nil nil nil nil))
+ (viper-loop (if (null val) 1 (1- val))
(end-of-line)
(if (not (eobp))
(progn
(forward-line 1)
(delete-region (point) (1- (point)))
- (fixup-whitespace)))))))
+ (fixup-whitespace)
+ ;; fixup-whitespace sometimes does not leave space
+ ;; between objects, so we insert it as in Vi
+ (or (looking-at " ")
+ (insert " ")
+ (backward-char 1))
+ )))))
\f
;; Replace state
-(defun vip-change (beg end)
+(defun viper-change (beg end)
(if (markerp beg) (setq beg (marker-position beg)))
(if (markerp end) (setq end (marker-position end)))
;; beg is sometimes (mark t), which may be nil
(or beg (setq beg end))
-
- (vip-set-complex-command-for-undo)
- (if vip-use-register
+
+ (viper-set-complex-command-for-undo)
+ (if viper-use-register
(progn
- (copy-to-register vip-use-register beg end nil)
- (setq vip-use-register nil)))
- (vip-set-replace-overlay beg end)
+ (copy-to-register viper-use-register beg end nil)
+ (setq viper-use-register nil)))
+ (viper-set-replace-overlay beg end)
(setq last-command nil) ; separate repl text from prev kills
-
- (if (= (vip-replace-start) (point-max))
+
+ (if (= (viper-replace-start) (point-max))
(error "End of buffer"))
-
- (setq vip-last-replace-region
- (buffer-substring (vip-replace-start)
- (vip-replace-end)))
-
+
+ (setq viper-last-replace-region
+ (buffer-substring (viper-replace-start)
+ (viper-replace-end)))
+
;; protect against error while inserting "@" and other disasters
;; (e.g., read-only buff)
(condition-case conds
- (if (or vip-allow-multiline-replace-regions
- (vip-same-line (vip-replace-start)
- (vip-replace-end)))
+ (if (or viper-allow-multiline-replace-regions
+ (viper-same-line (viper-replace-start)
+ (viper-replace-end)))
(progn
;; tabs cause problems in replace, so untabify
- (goto-char (vip-replace-end))
+ (goto-char (viper-replace-end))
(insert-before-markers "@") ; put placeholder after the TAB
- (untabify (vip-replace-start) (point))
- ;; del @, don't put on kill ring
+ (untabify (viper-replace-start) (point))
+ ;; del @, don't put on kill ring
(delete-backward-char 1)
-
- (vip-set-replace-overlay-glyphs
- vip-replace-region-start-delimiter
- vip-replace-region-end-delimiter)
+
+ (viper-set-replace-overlay-glyphs
+ viper-replace-region-start-delimiter
+ viper-replace-region-end-delimiter)
;; this move takes care of the last posn in the overlay, which
- ;; has to be shifted because of insert. We can't simply insert
+ ;; has to be shifted because of insert. We can't simply insert
;; "$" before-markers because then overlay-start will shift the
;; beginning of the overlay in case we are replacing a single
- ;; character. This fixes the bug with `s' and `cl' commands.
- (vip-move-replace-overlay (vip-replace-start) (point))
- (goto-char (vip-replace-start))
- (vip-change-state-to-replace t))
- (kill-region (vip-replace-start)
- (vip-replace-end))
- (vip-hide-replace-overlay)
- (vip-change-state-to-insert))
+ ;; character. This fixes the bug with `s' and `cl' commands.
+ (viper-move-replace-overlay (viper-replace-start) (point))
+ (goto-char (viper-replace-start))
+ (viper-change-state-to-replace t))
+ (kill-region (viper-replace-start)
+ (viper-replace-end))
+ (viper-hide-replace-overlay)
+ (viper-change-state-to-insert))
(error ;; make sure that the overlay doesn't stay.
;; go back to the original point
- (goto-char (vip-replace-start))
- (vip-hide-replace-overlay)
- (vip-message-conditions conds))))
+ (goto-char (viper-replace-start))
+ (viper-hide-replace-overlay)
+ (viper-message-conditions conds))))
-(defun vip-change-subr (beg end)
+(defun viper-change-subr (beg end)
;; beg is sometimes (mark t), which may be nil
(or beg (setq beg end))
-
- (if vip-use-register
+ (if viper-use-register
(progn
- (copy-to-register vip-use-register beg end nil)
- (setq vip-use-register nil)))
+ (copy-to-register viper-use-register beg end nil)
+ (setq viper-use-register nil)))
(kill-region beg end)
- (setq this-command 'vip-change)
- (vip-yank-last-insertion))
+ (setq this-command 'viper-change)
+ (viper-yank-last-insertion))
-(defun vip-toggle-case (arg)
+(defun viper-toggle-case (arg)
"Toggle character case."
(interactive "P")
- (let ((val (vip-p-val arg)) (c))
- (vip-set-destructive-command (list 'vip-toggle-case val nil nil nil nil))
+ (let ((val (viper-p-val arg)) (c))
+ (viper-set-destructive-command
+ (list 'viper-toggle-case val nil nil nil nil))
(while (> val 0)
(setq c (following-char))
(delete-char 1 nil)
\f
;; query replace
-(defun vip-query-replace ()
- "Query replace.
+(defun viper-query-replace ()
+ "Query replace.
If a null string is suplied as the string to be replaced,
the query replace mode will toggle between string replace
and regexp replace."
(interactive)
(let (str)
- (setq str (vip-read-string-with-history
- (if vip-re-query-replace "Query replace regexp: "
+ (setq str (viper-read-string-with-history
+ (if viper-re-query-replace "Query replace regexp: "
"Query replace: ")
nil ; no initial
- 'vip-replace1-history
- (car vip-replace1-history) ; default
+ 'viper-replace1-history
+ (car viper-replace1-history) ; default
))
(if (string= str "")
(progn
- (setq vip-re-query-replace (not vip-re-query-replace))
+ (setq viper-re-query-replace (not viper-re-query-replace))
(message "Query replace mode changed to %s"
- (if vip-re-query-replace "regexp replace"
+ (if viper-re-query-replace "regexp replace"
"string replace")))
- (if vip-re-query-replace
+ (if viper-re-query-replace
(query-replace-regexp
str
- (vip-read-string-with-history
+ (viper-read-string-with-history
(format "Query replace regexp `%s' with: " str)
nil ; no initial
- 'vip-replace1-history
- (car vip-replace1-history) ; default
+ 'viper-replace1-history
+ (car viper-replace1-history) ; default
))
(query-replace
str
- (vip-read-string-with-history
+ (viper-read-string-with-history
(format "Query replace `%s' with: " str)
nil ; no initial
- 'vip-replace1-history
- (car vip-replace1-history) ; default
+ 'viper-replace1-history
+ (car viper-replace1-history) ; default
))))))
\f
;; marking
-(defun vip-mark-beginning-of-buffer ()
+(defun viper-mark-beginning-of-buffer ()
"Mark beginning of buffer."
(interactive)
(push-mark (point))
(exchange-point-and-mark)
(message "Mark set at the beginning of buffer"))
-(defun vip-mark-end-of-buffer ()
+(defun viper-mark-end-of-buffer ()
"Mark end of buffer."
(interactive)
(push-mark (point))
(exchange-point-and-mark)
(message "Mark set at the end of buffer"))
-(defun vip-mark-point ()
+(defun viper-mark-point ()
"Set mark at point of buffer."
(interactive)
(let ((char (read-char)))
(cond ((and (<= ?a char) (<= char ?z))
- (point-to-register (1+ (- char ?a))))
- ((= char ?<) (vip-mark-beginning-of-buffer))
- ((= char ?>) (vip-mark-end-of-buffer))
- ((= char ?.) (vip-set-mark-if-necessary))
- ((= char ?,) (vip-cycle-through-mark-ring))
- ((= char ?D) (mark-defun))
+ (point-to-register (viper-int-to-char (1+ (- char ?a)))))
+ ((viper= char ?<) (viper-mark-beginning-of-buffer))
+ ((viper= char ?>) (viper-mark-end-of-buffer))
+ ((viper= char ?.) (viper-set-mark-if-necessary))
+ ((viper= char ?,) (viper-cycle-through-mark-ring))
+ ((viper= char ?^) (push-mark viper-saved-mark t t))
+ ((viper= char ?D) (mark-defun))
(t (error ""))
)))
-
+
;; Algorithm: If first invocation of this command save mark on ring, goto
;; mark, M0, and pop the most recent elt from the mark ring into mark,
;; making it into the new mark, M1.
;; So, if you hit '' or `` then you can return to p1.
;;
;; If repeated command, pop top elt from the ring into mark and
-;; jump there. This forgets the position, p1, and puts M1 back into mark.
+;; jump there. This forgets the position, p1, and puts M1 back into mark.
;; Then we save the current pos, which is M0, jump to M1 and pop M2 from
;; the ring into mark. Push M2 back on the ring and set mark to M0.
;; etc.
-(defun vip-cycle-through-mark-ring ()
+(defun viper-cycle-through-mark-ring ()
"Visit previous locations on the mark ring.
One can use `` and '' to temporarily jump 1 step back."
(let* ((sv-pt (point)))
;; if repeated `m,' command, pop the previously saved mark.
- ;; Prev saved mark is actually prev saved point. It is used if the
- ;; user types `` or '' and is discarded
- ;; from the mark ring by the next `m,' command.
+ ;; Prev saved mark is actually prev saved point. It is used if the
+ ;; user types `` or '' and is discarded
+ ;; from the mark ring by the next `m,' command.
;; In any case, go to the previous or previously saved mark.
;; Then push the current mark (popped off the ring) and set current
- ;; point to be the mark. Current pt as mark is discarded by the next
+ ;; point to be the mark. Current pt as mark is discarded by the next
;; m, command.
- (if (eq last-command 'vip-cycle-through-mark-ring)
+ (if (eq last-command 'viper-cycle-through-mark-ring)
()
;; save current mark if the first iteration
- (setq mark-ring (delete (vip-mark-marker) mark-ring))
+ (setq mark-ring (delete (viper-mark-marker) mark-ring))
(if (mark t)
(push-mark (mark t) t)) )
(pop-mark)
(set-mark-command 1)
;; don't duplicate mark on the ring
- (setq mark-ring (delete (vip-mark-marker) mark-ring))
+ (setq mark-ring (delete (viper-mark-marker) mark-ring))
(push-mark sv-pt t)
- (vip-deactivate-mark)
- (setq this-command 'vip-cycle-through-mark-ring)
+ (viper-deactivate-mark)
+ (setq this-command 'viper-cycle-through-mark-ring)
))
-
-(defun vip-goto-mark (arg)
+
+(defun viper-goto-mark (arg)
"Go to mark."
(interactive "P")
(let ((char (read-char))
- (com (vip-getcom arg)))
- (vip-goto-mark-subr char com nil)))
+ (com (viper-getcom arg)))
+ (viper-goto-mark-subr char com nil)))
-(defun vip-goto-mark-and-skip-white (arg)
+(defun viper-goto-mark-and-skip-white (arg)
"Go to mark and skip to first non-white character on line."
(interactive "P")
(let ((char (read-char))
- (com (vip-getCom arg)))
- (vip-goto-mark-subr char com t)))
+ (com (viper-getCom arg)))
+ (viper-goto-mark-subr char com t)))
-(defun vip-goto-mark-subr (char com skip-white)
- (if (eobp)
+(defun viper-goto-mark-subr (char com skip-white)
+ (if (eobp)
(if (bobp)
(error "Empty buffer")
(backward-char 1)))
- (cond ((vip-valid-register char '(letter))
+ (cond ((viper-valid-register char '(letter))
(let* ((buff (current-buffer))
- (reg (1+ (- char ?a)))
+ (reg (viper-int-to-char (1+ (- char ?a))))
(text-marker (get-register reg)))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (if (not (vip-valid-marker text-marker))
- (error vip-EmptyTextmarker char))
- (if (and (vip-same-line (point) vip-last-jump)
- (= (point) vip-last-jump-ignore))
- (push-mark vip-last-jump t)
+ ;; If marker points to file that had markers set (and those markers
+ ;; were saved (as e.g., in session.el), then restore those markers
+ (if (and (consp text-marker)
+ (eq (car text-marker) 'file-query)
+ (or (find-buffer-visiting (nth 1 text-marker))
+ (y-or-n-p (format "Visit file %s again? "
+ (nth 1 text-marker)))))
+ (save-excursion
+ (find-file (nth 1 text-marker))
+ (when (and (<= (nth 2 text-marker) (point-max))
+ (<= (point-min) (nth 2 text-marker)))
+ (setq text-marker (copy-marker (nth 2 text-marker)))
+ (set-register reg text-marker))))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (if (not (viper-valid-marker text-marker))
+ (error viper-EmptyTextmarker char))
+ (if (and (viper-same-line (point) viper-last-jump)
+ (= (point) viper-last-jump-ignore))
+ (push-mark viper-last-jump t)
(push-mark nil t)) ; no msg
- (vip-register-to-point reg)
- (setq vip-last-jump (point-marker))
- (cond (skip-white
+ (viper-register-to-point reg)
+ (setq viper-last-jump (point-marker))
+ (cond (skip-white
(back-to-indentation)
- (setq vip-last-jump-ignore (point))))
+ (setq viper-last-jump-ignore (point))))
(if com
(if (equal buff (current-buffer))
- (vip-execute-com (if skip-white
- 'vip-goto-mark-and-skip-white
- 'vip-goto-mark)
+ (viper-execute-com (if skip-white
+ 'viper-goto-mark-and-skip-white
+ 'viper-goto-mark)
nil com)
(switch-to-buffer buff)
- (goto-char vip-com-point)
- (vip-change-state-to-vi)
+ (goto-char viper-com-point)
+ (viper-change-state-to-vi)
(error "")))))
- ((and (not skip-white) (= char ?`))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (if (and (vip-same-line (point) vip-last-jump)
- (= (point) vip-last-jump-ignore))
- (goto-char vip-last-jump))
+ ((and (not skip-white) (viper= char ?`))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (if (and (viper-same-line (point) viper-last-jump)
+ (= (point) viper-last-jump-ignore))
+ (goto-char viper-last-jump))
(if (null (mark t)) (error "Mark is not set in this buffer"))
(if (= (point) (mark t)) (pop-mark))
(exchange-point-and-mark)
- (setq vip-last-jump (point-marker)
- vip-last-jump-ignore 0)
- (if com (vip-execute-com 'vip-goto-mark nil com)))
- ((and skip-white (= char ?'))
- (if com (vip-move-marker-locally 'vip-com-point (point)))
- (if (and (vip-same-line (point) vip-last-jump)
- (= (point) vip-last-jump-ignore))
- (goto-char vip-last-jump))
+ (setq viper-last-jump (point-marker)
+ viper-last-jump-ignore 0)
+ (if com (viper-execute-com 'viper-goto-mark nil com)))
+ ((and skip-white (viper= char ?'))
+ (if com (viper-move-marker-locally 'viper-com-point (point)))
+ (if (and (viper-same-line (point) viper-last-jump)
+ (= (point) viper-last-jump-ignore))
+ (goto-char viper-last-jump))
(if (= (point) (mark t)) (pop-mark))
(exchange-point-and-mark)
- (setq vip-last-jump (point))
+ (setq viper-last-jump (point))
(back-to-indentation)
- (setq vip-last-jump-ignore (point))
- (if com (vip-execute-com 'vip-goto-mark-and-skip-white nil com)))
- (t (error vip-InvalidTextmarker char))))
-
-(defun vip-insert-tab ()
+ (setq viper-last-jump-ignore (point))
+ (if com (viper-execute-com 'viper-goto-mark-and-skip-white nil com)))
+ (t (error viper-InvalidTextmarker char))))
+
+(defun viper-insert-tab ()
(interactive)
(insert-tab))
-(defun vip-exchange-point-and-mark ()
+(defun viper-exchange-point-and-mark ()
(interactive)
(exchange-point-and-mark)
(back-to-indentation))
;; Input Mode Indentation
;; Returns t, if the string before point matches the regexp STR.
-(defsubst vip-looking-back (str)
+(defsubst viper-looking-back (str)
(and (save-excursion (re-search-backward str nil t))
(= (point) (match-end 0))))
-(defun vip-forward-indent ()
+(defun viper-forward-indent ()
"Indent forward -- `C-t' in Vi."
(interactive)
- (setq vip-cted t)
- (indent-to (+ (current-column) vip-shift-width)))
+ (setq viper-cted t)
+ (indent-to (+ (current-column) viper-shift-width)))
-(defun vip-backward-indent ()
+(defun viper-backward-indent ()
"Backtab, C-d in VI"
(interactive)
- (if vip-cted
+ (if viper-cted
(let ((p (point)) (c (current-column)) bol (indent t))
- (if (vip-looking-back "[0^]")
+ (if (viper-looking-back "[0^]")
(progn
(if (eq ?^ (preceding-char))
- (setq vip-preserve-indent t))
+ (setq viper-preserve-indent t))
(delete-backward-char 1)
(setq p (point))
(setq indent nil)))
(if (re-search-backward "[^ \t]" bol 1) (forward-char))
(delete-region (point) p)
(if indent
- (indent-to (- c vip-shift-width)))
- (if (or (bolp) (vip-looking-back "[^ \t]"))
- (setq vip-cted nil)))))
+ (indent-to (- c viper-shift-width)))
+ (if (or (bolp) (viper-looking-back "[^ \t]"))
+ (setq viper-cted nil)))))
+
+;; do smart indent
+(defun viper-indent-line (col)
+ (if viper-auto-indent
+ (progn
+ (setq viper-cted t)
+ (if (and viper-electric-mode
+ (not (memq major-mode '(fundamental-mode
+ text-mode
+ paragraph-indent-text-mode))))
+ (indent-according-to-mode)
+ (indent-to col)))))
-(defun vip-autoindent ()
+
+(defun viper-autoindent ()
"Auto Indentation, Vi-style."
(interactive)
(let ((col (current-indentation)))
(if abbrev-mode (expand-abbrev))
- (if vip-preserve-indent
- (setq vip-preserve-indent nil)
- (setq vip-current-indent col))
+ (if viper-preserve-indent
+ (setq viper-preserve-indent nil)
+ (setq viper-current-indent col))
;; don't leave whitespace lines around
(if (memq last-command
- '(vip-autoindent
- vip-open-line vip-Open-line
- vip-replace-state-exit-cmd))
+ '(viper-autoindent
+ viper-open-line viper-Open-line
+ viper-replace-state-exit-cmd))
(indent-to-left-margin))
;; use \n instead of newline, or else <Return> will move the insert point
;;(newline 1)
(insert "\n")
- (if vip-auto-indent
- (progn
- (setq vip-cted t)
- (if vip-electric-mode
- (indent-according-to-mode)
- (indent-to vip-current-indent))
- ))
+ (viper-indent-line viper-current-indent)
))
-
+
;; Viewing registers
-(defun vip-ket-function (arg)
- "Function called by \], the ket. View registers and call \]\]."
+(defun viper-ket-function (arg)
+ "Function called by \], the ket. View registers and call \]\]."
(interactive "P")
(let ((reg (read-char)))
- (cond ((vip-valid-register reg '(letter Letter))
+ (cond ((viper-valid-register reg '(letter Letter))
(view-register (downcase reg)))
- ((vip-valid-register reg '(digit))
+ ((viper-valid-register reg '(digit))
(let ((text (current-kill (- reg ?1) 'do-not-rotate)))
- (save-excursion
- (set-buffer (get-buffer-create "*Output*"))
- (delete-region (point-min) (point-max))
- (insert (format "Register %c contains the string:\n" reg))
- (insert text)
- (goto-char (point-min)))
- (display-buffer "*Output*")))
- ((= ?\] reg)
- (vip-next-heading arg))
+ (with-output-to-temp-buffer " *viper-info*"
+ (princ (format "Register %c contains the string:\n" reg))
+ (princ text))
+ ))
+ ((viper= ?\] reg)
+ (viper-next-heading arg))
(t (error
- vip-InvalidRegister reg)))))
+ viper-InvalidRegister reg)))))
-(defun vip-brac-function (arg)
- "Function called by \[, the brac. View textmarkers and call \[\["
+(defun viper-brac-function (arg)
+ "Function called by \[, the brac. View textmarkers and call \[\["
(interactive "P")
(let ((reg (read-char)))
- (cond ((= ?\[ reg)
- (vip-prev-heading arg))
- ((= ?\] reg)
- (vip-heading-end arg))
- ((vip-valid-register reg '(letter))
- (let* ((val (get-register (1+ (- reg ?a))))
- (buf (if (not val)
- (error vip-EmptyTextmarker reg)
+ (cond ((viper= ?\[ reg)
+ (viper-prev-heading arg))
+ ((viper= ?\] reg)
+ (viper-heading-end arg))
+ ((viper-valid-register reg '(letter))
+ (let* ((val (get-register (viper-int-to-char (1+ (- reg ?a)))))
+ (buf (if (not (markerp val))
+ (error viper-EmptyTextmarker reg)
(marker-buffer val)))
(pos (marker-position val))
line-no text (s pos) (e pos))
- (save-excursion
- (set-buffer (get-buffer-create "*Output*"))
- (delete-region (point-min) (point-max))
+ (with-output-to-temp-buffer " *viper-info*"
(if (and buf pos)
(progn
- (save-excursion
+ (save-excursion
(set-buffer buf)
(setq line-no (1+ (count-lines (point-min) val)))
(goto-char pos)
(end-of-line)
(setq e (point))))
(setq text (buffer-substring s e))
- (setq text (format "%s<%c>%s"
- (substring text 0 (- pos s))
+ (setq text (format "%s<%c>%s"
+ (substring text 0 (- pos s))
reg (substring text (- pos s)))))
- (insert
+ (princ
(format
"Textmarker `%c' is in buffer `%s' at line %d.\n"
reg (buffer-name buf) line-no))
- (insert (format "Here is some text around %c:\n\n %s"
+ (princ (format "Here is some text around %c:\n\n %s"
reg text)))
- (insert (format vip-EmptyTextmarker reg)))
- (goto-char (point-min)))
- (display-buffer "*Output*")))
- (t (error vip-InvalidTextmarker reg)))))
-
+ (princ (format viper-EmptyTextmarker reg))))
+ ))
+ (t (error viper-InvalidTextmarker reg)))))
-\f
-;; commands in insertion mode
-(defun vip-delete-backward-word (arg)
+
+(defun viper-delete-backward-word (arg)
"Delete previous word."
(interactive "p")
(save-excursion
(delete-region (point) (mark t))
(pop-mark)))
+\f
+
+;; Get viper standard value of SYMBOL. If symbol is customized, get its
+;; standard value. Otherwise, get the value saved in the alist STORAGE. If
+;; STORAGE is nil, use viper-saved-user-settings.
+(defun viper-standard-value (symbol &optional storage)
+ (or (eval (car (get symbol 'customized-value)))
+ (eval (car (get symbol 'saved-value)))
+ (nth 1 (assoc symbol (or storage viper-saved-user-settings)))))
-(defun vip-set-expert-level (&optional dont-change-unless)
+
+
+(defun viper-set-expert-level (&optional dont-change-unless)
"Sets the expert level for a Viper user.
Can be called interactively to change (temporarily or permanently) the
current expert level.
-The optional argument DONT-CHANGE-UNLESS if not nil, says that
+The optional argument DONT-CHANGE-UNLESS, if not nil, says that
the level should not be changed, unless its current value is
meaningless (i.e., not one of 1,2,3,4,5).
User level determines the setting of Viper variables that are most
sensitive for VI-style look-and-feel."
-
+
(interactive)
-
- (if (not (natnump vip-expert-level)) (setq vip-expert-level 0))
-
+
+ (if (not (natnump viper-expert-level)) (setq viper-expert-level 0))
+
(save-window-excursion
(delete-other-windows)
- ;; if 0 < vip-expert-level < vip-max-expert-level
+ ;; if 0 < viper-expert-level < viper-max-expert-level
;; & dont-change-unless = t -- use it; else ask
- (vip-ask-level dont-change-unless))
-
- (setq vip-always t
- vip-ex-style-motion t
- vip-ex-style-editing-in-insert t
- vip-want-ctl-h-help nil)
-
- (cond ((eq vip-expert-level 1) ; novice or beginner
- (global-set-key ; in emacs-state
- vip-toggle-key
- (if (vip-window-display-p) 'vip-iconify 'suspend-emacs))
- (setq vip-no-multiple-ESC t
- vip-re-search t
- vip-vi-style-in-minibuffer t
- vip-search-wrap-around-t t
- vip-want-emacs-keys-in-vi nil
- vip-want-emacs-keys-in-insert nil))
-
- ((and (> vip-expert-level 1) (< vip-expert-level 5))
+ (viper-ask-level dont-change-unless))
+
+ (setq viper-always t
+ viper-ex-style-motion t
+ viper-ex-style-editing t
+ viper-want-ctl-h-help nil)
+
+ (cond ((eq viper-expert-level 1) ; novice or beginner
+ (global-set-key ; in emacs-state
+ viper-toggle-key
+ (if (viper-window-display-p) 'viper-iconify 'suspend-emacs))
+ (setq viper-no-multiple-ESC t
+ viper-re-search t
+ viper-vi-style-in-minibuffer t
+ viper-search-wrap-around-t t
+ viper-electric-mode nil
+ viper-want-emacs-keys-in-vi nil
+ viper-want-emacs-keys-in-insert nil))
+
+ ((and (> viper-expert-level 1) (< viper-expert-level 5))
;; intermediate to guru
- (setq vip-no-multiple-ESC (if (vip-window-display-p) t 'twice)
- vip-want-emacs-keys-in-vi t
- vip-want-emacs-keys-in-insert (> vip-expert-level 2))
-
- (if (eq vip-expert-level 4) ; respect user's ex-style motions
- ; and vip-no-multiple-ESC
+ (setq viper-no-multiple-ESC (if (viper-window-display-p)
+ t 'twice)
+ viper-electric-mode t
+ viper-want-emacs-keys-in-vi t
+ viper-want-emacs-keys-in-insert (> viper-expert-level 2))
+
+ (if (eq viper-expert-level 4) ; respect user's ex-style motion
+ ; and viper-no-multiple-ESC
(progn
- (setq-default vip-ex-style-editing-in-insert
- (cdr (assoc 'vip-ex-style-editing-in-insert
- vip-saved-user-settings))
- vip-ex-style-motion
- (cdr (assoc 'vip-ex-style-motion
- vip-saved-user-settings)))
- (setq vip-ex-style-motion
- (cdr (assoc 'vip-ex-style-motion vip-saved-user-settings))
- vip-ex-style-editing-in-insert
- (cdr (assoc 'vip-ex-style-editing-in-insert
- vip-saved-user-settings))
- vip-re-search
- (cdr (assoc 'vip-re-search vip-saved-user-settings))
- vip-no-multiple-ESC
- (cdr (assoc 'vip-no-multiple-ESC
- vip-saved-user-settings))))))
-
+ (setq-default
+ viper-ex-style-editing
+ (viper-standard-value 'viper-ex-style-editing)
+ viper-ex-style-motion
+ (viper-standard-value 'viper-ex-style-motion))
+ (setq viper-ex-style-motion
+ (viper-standard-value 'viper-ex-style-motion)
+ viper-ex-style-editing
+ (viper-standard-value 'viper-ex-style-editing)
+ viper-re-search
+ (viper-standard-value 'viper-re-search)
+ viper-no-multiple-ESC
+ (viper-standard-value 'viper-no-multiple-ESC)))))
+
;; A wizard!!
;; Ideally, if 5 is selected, a buffer should pop up to let the
;; user toggle the values of variables.
- (t (setq-default vip-ex-style-editing-in-insert
- (cdr (assoc 'vip-ex-style-editing-in-insert
- vip-saved-user-settings))
- vip-ex-style-motion
- (cdr (assoc 'vip-ex-style-motion
- vip-saved-user-settings)))
- (setq vip-want-ctl-h-help
- (cdr (assoc 'vip-want-ctl-h-help vip-saved-user-settings))
- vip-always
- (cdr (assoc 'vip-always vip-saved-user-settings))
- vip-no-multiple-ESC
- (cdr (assoc 'vip-no-multiple-ESC vip-saved-user-settings))
- vip-ex-style-motion
- (cdr (assoc 'vip-ex-style-motion vip-saved-user-settings))
- vip-ex-style-editing-in-insert
- (cdr (assoc 'vip-ex-style-editing-in-insert
- vip-saved-user-settings))
- vip-re-search
- (cdr (assoc 'vip-re-search vip-saved-user-settings))
- vip-want-emacs-keys-in-vi
- (cdr (assoc 'vip-want-emacs-keys-in-vi
- vip-saved-user-settings))
- vip-want-emacs-keys-in-insert
- (cdr (assoc 'vip-want-emacs-keys-in-insert
- vip-saved-user-settings)))))
- (vip-set-mode-vars-for vip-current-state)
- (if (or vip-always
- (and (> vip-expert-level 0) (> 5 vip-expert-level)))
- (vip-set-hooks)))
+ (t (setq-default viper-ex-style-editing
+ (viper-standard-value 'viper-ex-style-editing)
+ viper-ex-style-motion
+ (viper-standard-value 'viper-ex-style-motion))
+ (setq viper-want-ctl-h-help
+ (viper-standard-value 'viper-want-ctl-h-help)
+ viper-always
+ (viper-standard-value 'viper-always)
+ viper-no-multiple-ESC
+ (viper-standard-value 'viper-no-multiple-ESC)
+ viper-ex-style-motion
+ (viper-standard-value 'viper-ex-style-motion)
+ viper-ex-style-editing
+ (viper-standard-value 'viper-ex-style-editing)
+ viper-re-search
+ (viper-standard-value 'viper-re-search)
+ viper-electric-mode
+ (viper-standard-value 'viper-electric-mode)
+ viper-want-emacs-keys-in-vi
+ (viper-standard-value 'viper-want-emacs-keys-in-vi)
+ viper-want-emacs-keys-in-insert
+ (viper-standard-value 'viper-want-emacs-keys-in-insert))))
+
+ (viper-set-mode-vars-for viper-current-state)
+ (if (or viper-always
+ (and (> viper-expert-level 0) (> 5 viper-expert-level)))
+ (viper-set-hooks)))
+
;; Ask user expert level.
-(defun vip-ask-level (dont-change-unless)
- (let ((ask-buffer " *vip-ask-level*")
+(defun viper-ask-level (dont-change-unless)
+ (let ((ask-buffer " *viper-ask-level*")
level-changed repeated)
(save-window-excursion
(switch-to-buffer ask-buffer)
-
- (or (eq this-command 'vip-set-expert-level)
- (and
- (<= vip-expert-level vip-max-expert-level)
- (>= vip-expert-level 1))
- (progn
- (insert "
-
- *** Important Notice for VIP users***
-
- This is VIPER
-
-@joke
-Viper Is a Package for Emacs Rebels,
-a VI Plan for Emacs Rescue,
-and a venomous VI PERil.
-@end joke
-
-Technically speaking, Viper is a new Vi emulator that replaces
-the old VIP package.
-
-Viper emulates Vi much better than VIP. It also significantly
-extends and improves upon Vi in many useful ways.
-
-Although many VIP settings in your ~/.vip are compatible with Viper,
-you may have to change some of them. Please refer to the documentation,
-which can be obtained by executing
-
-:help
-
-when Viper is in Vi state.
-
-If you will be so lucky as to find a bug, report it via the command
-
-:submitReport
-
-Type any key to continue... ")
-
- (read-char)
- (erase-buffer)))
-
- (while (or (> vip-expert-level vip-max-expert-level)
- (< vip-expert-level 1)
+
+ (while (or (> viper-expert-level viper-max-expert-level)
+ (< viper-expert-level 1)
(null dont-change-unless))
(erase-buffer)
(if repeated
level-changed t)
(insert "
Please specify your level of familiarity with the venomous VI PERil
-(and the VI Plan for Emacs Rescue).
-You can change it at any time by typing `M-x vip-set-expert-level RET'
-
+\(and the VI Plan for Emacs Rescue).
+You can change it at any time by typing `M-x viper-set-expert-level RET'
+
1 -- BEGINNER: Almost all Emacs features are suppressed.
- Feels almost like straight Vi. File name completion and
- command history in the minibuffer are thrown in as a bonus.
- To use Emacs productively, you must reach level 3 or higher.
+ Feels almost like straight Vi. File name completion and
+ command history in the minibuffer are thrown in as a bonus.
+ To use Emacs productively, you must reach level 3 or higher.
2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state,
- so most Emacs commands can be used when Viper is in Vi state.
- Good progress---you are well on the way to level 3!
- 3 -- GRAND MASTER: Like 3, but most Emacs commands are available also
- in Viper's insert state.
- 4 -- GURU: Like 3, but user settings are respected for vip-no-multiple-ESC,
- vip-re-search, vip-ex-style-motion, & vip-ex-style-editing-in-insert
- variables. Adjust these settings to your taste.
- 5 -- WIZARD: Like 4, but user settings are also respected for vip-always,
- vip-want-ctl-h-help, vip-want-emacs-keys-in-vi, and
- vip-want-emacs-keys-in-insert. Adjust these to your taste.
-
+ so most Emacs commands can be used when Viper is in Vi state.
+ Good progress---you are well on the way to level 3!
+ 3 -- GRAND MASTER: Like 2, but most Emacs commands are available also
+ in Viper's insert state.
+ 4 -- GURU: Like 3, but user settings are respected for viper-no-multiple-ESC,
+ viper-ex-style-motion, viper-ex-style-editing, and
+ viper-re-search variables. Adjust these settings to your taste.
+ 5 -- WIZARD: Like 4, but user settings are also respected for viper-always,
+ viper-electric-mode, viper-want-ctl-h-help, viper-want-emacs-keys-in-vi,
+ and viper-want-emacs-keys-in-insert. Adjust these to your taste.
+
Please, specify your level now: ")
-
- (setq vip-expert-level (- (vip-read-char-exclusive) ?0))
+
+ (setq viper-expert-level (- (viper-read-char-exclusive) ?0))
) ; end while
-
+
;; tell the user if level was changed
(and level-changed
(progn
(insert
(format "\n\n\n\n\n\t\tYou have selected user level %d"
- vip-expert-level))
+ viper-expert-level))
(if (y-or-n-p "Do you wish to make this change permanent? ")
- ;; save the setting for vip-expert-level
- (vip-save-setting
- 'vip-expert-level
- (format "Saving user level %d ..." vip-expert-level)
- vip-custom-file-name))
+ ;; save the setting for viper-expert-level
+ (viper-save-setting
+ 'viper-expert-level
+ (format "Saving user level %d ..." viper-expert-level)
+ viper-custom-file-name))
))
(bury-buffer) ; remove ask-buffer from screen
(message "")
)))
-(defun vip-nil ()
+(defun viper-nil ()
(interactive)
(beep 1))
-
-
+
+
;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer
-(defun vip-register-to-point (char &optional enforce-buffer)
+(defun viper-register-to-point (char &optional enforce-buffer)
"Like jump-to-register, but switches to another buffer in another window."
(interactive "cViper register to point: ")
(let ((val (get-register char)))
(set-frame-configuration val))
((window-configuration-p val)
(set-window-configuration val))
- ((vip-valid-marker val)
+ ((viper-valid-marker val)
(if (and enforce-buffer
(not (equal (current-buffer) (marker-buffer val))))
- (error (concat vip-EmptyTextmarker " in this buffer")
- (1- (+ char ?a))))
+ (error (concat viper-EmptyTextmarker " in this buffer")
+ (viper-int-to-char (1- (+ char ?a)))))
(pop-to-buffer (marker-buffer val))
(goto-char val))
((and (consp val) (eq (car val) 'file))
(find-file (cdr val)))
(t
- (error vip-EmptyTextmarker (1- (+ char ?a)))))))
+ (error viper-EmptyTextmarker (viper-int-to-char (1- (+ char ?a))))))))
-(defun vip-save-kill-buffer ()
- "Save then kill current buffer. "
+(defun viper-save-kill-buffer ()
+ "Save then kill current buffer."
(interactive)
- (if (< vip-expert-level 2)
+ (if (< viper-expert-level 2)
(save-buffers-kill-emacs)
(save-buffer)
(kill-buffer (current-buffer))))
\f
;;; Bug Report
-(defun vip-submit-report ()
+(defun viper-submit-report ()
"Submit bug report on Viper."
(interactive)
(let ((reporter-prompt-for-summary-p t)
- (vip-device-type (vip-device-type))
+ (viper-device-type (viper-device-type))
color-display-p frame-parameters
minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face
varlist salutation window-config)
-
+
;; If mode info is needed, add variable to `let' and then set it below,
;; like we did with color-display-p.
- (setq color-display-p (if (vip-window-display-p)
- (vip-color-display-p)
+ (setq color-display-p (if (viper-window-display-p)
+ (viper-color-display-p)
'non-x)
- minibuffer-vi-face (if (vip-has-face-support-p)
- (vip-get-face vip-minibuffer-vi-face)
+ minibuffer-vi-face (if (viper-has-face-support-p)
+ (viper-get-face viper-minibuffer-vi-face)
'non-x)
- minibuffer-insert-face (if (vip-has-face-support-p)
- (vip-get-face vip-minibuffer-insert-face)
+ minibuffer-insert-face (if (viper-has-face-support-p)
+ (viper-get-face
+ viper-minibuffer-insert-face)
'non-x)
- minibuffer-emacs-face (if (vip-has-face-support-p)
- (vip-get-face vip-minibuffer-emacs-face)
+ minibuffer-emacs-face (if (viper-has-face-support-p)
+ (viper-get-face
+ viper-minibuffer-emacs-face)
'non-x)
frame-parameters (if (fboundp 'frame-parameters)
(frame-parameters (selected-frame))))
-
- (setq varlist (list 'vip-vi-minibuffer-minor-mode
- 'vip-insert-minibuffer-minor-mode
- 'vip-vi-intercept-minor-mode
- 'vip-vi-local-user-minor-mode
- 'vip-vi-kbd-minor-mode
- 'vip-vi-global-user-minor-mode
- 'vip-vi-state-modifier-minor-mode
- 'vip-vi-diehard-minor-mode
- 'vip-vi-basic-minor-mode
- 'vip-replace-minor-mode
- 'vip-insert-intercept-minor-mode
- 'vip-insert-local-user-minor-mode
- 'vip-insert-kbd-minor-mode
- 'vip-insert-global-user-minor-mode
- 'vip-insert-state-modifier-minor-mode
- 'vip-insert-diehard-minor-mode
- 'vip-insert-basic-minor-mode
- 'vip-emacs-intercept-minor-mode
- 'vip-emacs-local-user-minor-mode
- 'vip-emacs-kbd-minor-mode
- 'vip-emacs-global-user-minor-mode
- 'vip-emacs-state-modifier-minor-mode
- 'vip-automatic-iso-accents
- 'vip-want-emacs-keys-in-insert
- 'vip-want-emacs-keys-in-vi
- 'vip-keep-point-on-undo
- 'vip-no-multiple-ESC
- 'vip-ESC-key
- 'vip-want-ctl-h-help
- 'vip-ex-style-editing-in-insert
- 'vip-delete-backwards-in-replace
- 'vip-vi-style-in-minibuffer
- 'vip-vi-state-hook
- 'vip-insert-state-hook
- 'vip-replace-state-hook
- 'vip-emacs-state-hook
+
+ (setq varlist (list 'viper-vi-minibuffer-minor-mode
+ 'viper-insert-minibuffer-minor-mode
+ 'viper-vi-intercept-minor-mode
+ 'viper-vi-local-user-minor-mode
+ 'viper-vi-kbd-minor-mode
+ 'viper-vi-global-user-minor-mode
+ 'viper-vi-state-modifier-minor-mode
+ 'viper-vi-diehard-minor-mode
+ 'viper-vi-basic-minor-mode
+ 'viper-replace-minor-mode
+ 'viper-insert-intercept-minor-mode
+ 'viper-insert-local-user-minor-mode
+ 'viper-insert-kbd-minor-mode
+ 'viper-insert-global-user-minor-mode
+ 'viper-insert-state-modifier-minor-mode
+ 'viper-insert-diehard-minor-mode
+ 'viper-insert-basic-minor-mode
+ 'viper-emacs-intercept-minor-mode
+ 'viper-emacs-local-user-minor-mode
+ 'viper-emacs-kbd-minor-mode
+ 'viper-emacs-global-user-minor-mode
+ 'viper-emacs-state-modifier-minor-mode
+ 'viper-automatic-iso-accents
+ 'viper-special-input-method
+ 'viper-want-emacs-keys-in-insert
+ 'viper-want-emacs-keys-in-vi
+ 'viper-keep-point-on-undo
+ 'viper-no-multiple-ESC
+ 'viper-electric-mode
+ 'viper-ESC-key
+ 'viper-want-ctl-h-help
+ 'viper-ex-style-editing
+ 'viper-delete-backwards-in-replace
+ 'viper-vi-style-in-minibuffer
+ 'viper-vi-state-hook
+ 'viper-insert-state-hook
+ 'viper-replace-state-hook
+ 'viper-emacs-state-hook
'ex-cycle-other-window
'ex-cycle-through-non-files
- 'vip-expert-level
+ 'viper-expert-level
'major-mode
- 'vip-device-type
+ 'viper-device-type
'color-display-p
'frame-parameters
'minibuffer-vi-face
-------------------------------------------------------------------")
(setq window-config (current-window-configuration))
- (with-output-to-temp-buffer " *vip-info*"
- (switch-to-buffer " *vip-info*")
+ (with-output-to-temp-buffer " *viper-info*"
+ (switch-to-buffer " *viper-info*")
(delete-other-windows)
(princ "
PLEASE FOLLOW THESE PROCEDURES
not cause by other packages you are using.
Don't report compilation warnings, unless you are certain that there is a
-problem. These warnings are normal and unavoidable.
+problem. These warnings are normal and unavoidable.
Please note that users should not modify variables and keymaps other than
-those advertised in the manual. Such `customization' is likely to crash
+those advertised in the manual. Such `customization' is likely to crash
Viper, as it would any other improperly customized Emacs package.
If you are reporting an error message received while executing one of the
Viper commands, type:
M-x set-variable <Return> debug-on-error <Return> t <Return>
-
-Then reproduce the error. The above command will cause Emacs to produce a
-back trace of the execution that leads to the error. Please include this
+
+Then reproduce the error. The above command will cause Emacs to produce a
+back trace of the execution that leads to the error. Please include this
trace in your bug report.
If you believe that one of Viper's commands goes into an infinite loop
\(e.g., Emacs freezes\), type:
M-x set-variable <Return> debug-on-quit <Return> t <Return>
-
-Then reproduce the problem. Wait for a few seconds, then type C-g to abort
-the current command. Include the resulting back trace in the bug report.
+
+Then reproduce the problem. Wait for a few seconds, then type C-g to abort
+the current command. Include the resulting back trace in the bug report.
Mail anyway (y or n)? ")
(if (y-or-n-p "Mail anyway? ")
(require 'reporter)
(set-window-configuration window-config)
-
- (reporter-submit-bug-report "kifer@cs.sunysb.edu"
- (vip-version)
+
+ (reporter-submit-bug-report "kifer@cs.stonybrook.edu"
+ (viper-version)
varlist
nil 'delete-other-windows
salutation)
))
-
-
-
-;; Smoothes out the difference between Emacs' unread-command-events
-;; and XEmacs unread-command-event. Arg is a character, an event, a list of
-;; events or a sequence of keys.
-;;
-;; Due to the way unread-command-events in Emacs (not XEmacs), a non-event
-;; symbol in unread-command-events list may cause Emacs to turn this symbol
-;; into an event. Below, we delete nil from event lists, since nil is the most
-;; common symbol that might appear in this wrong context.
-(defun vip-set-unread-command-events (arg)
- (if vip-emacs-p
- (setq
- unread-command-events
- (let ((new-events
- (cond ((eventp arg) (list arg))
- ((listp arg) arg)
- ((sequencep arg)
- (listify-key-sequence arg))
- (t (error
- "vip-set-unread-command-events: Invalid argument, %S"
- arg)))))
- (if (not (eventp nil))
- (setq new-events (delq nil new-events)))
- (append new-events unread-command-events)))
- ;; XEmacs
- (setq
- unread-command-events
- (append
- (cond ((vip-characterp arg) (list (character-to-event arg)))
- ((eventp arg) (list arg))
- ((stringp arg) (mapcar 'character-to-event arg))
- ((vectorp arg) (append arg nil)) ; turn into list
- ((listp arg) (vip-eventify-list-xemacs arg))
- (t (error
- "vip-set-unread-command-events: Invalid argument, %S" arg)))
- unread-command-events))))
-
-;; list is assumed to be a list of events of characters
-(defun vip-eventify-list-xemacs (lis)
- (mapcar
- (function (lambda (elt)
- (cond ((vip-characterp elt) (character-to-event elt))
- ((eventp elt) elt)
- (t (error
- "vip-eventify-list-xemacs: can't convert to event, %S"
- elt)))))
- lis))
-
-
-
-;;; viper-cmd.el ends here
+
+
+
+;; arch-tag: 739a6450-5fda-44d0-88b0-325053d888c2
+;;; viper-cmd.el ends here