Mercurial > emacs
diff lisp/emulation/viper.el @ 16248:b2fae8abc5b0
*** empty log message ***
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Fri, 20 Sep 1996 01:10:05 +0000 |
parents | de1340e6ddb4 |
children | beb94a5271e2 |
line wrap: on
line diff
--- a/lisp/emulation/viper.el Fri Sep 20 01:08:36 1996 +0000 +++ b/lisp/emulation/viper.el Fri Sep 20 01:10:05 1996 +0000 @@ -821,7 +821,7 @@ (defvar vip-always t "t means, arrange that vi-state will be a default.") -(defvar vip-custom-file-name (convert-standard-filename "~/.vip") +(defvar vip-custom-file-name (vip-convert-standard-file-name "~/.vip") "Viper customisation file. This variable must be set _before_ loading Viper.") @@ -2847,10 +2847,8 @@ (setq vip-cted t) (if vip-electric-mode (indent-according-to-mode) - (indent-to col)) - )) - (vip-change-state-to-insert) - )))) + (indent-to col)))) + (vip-change-state-to-insert))))) (defun vip-Open-line (arg) "Open line above." @@ -3851,8 +3849,9 @@ (defun vip-paren-match (arg) "Go to the matching parenthesis." (interactive "P") + (vip-leave-region-active) (let ((com (vip-getcom arg)) - anchor-point) + parse-sexp-ignore-comments anchor-point) (if (integerp arg) (if (or (> arg 99) (< arg 1)) (error "Prefix must be between 1 and 99") @@ -4904,7 +4903,9 @@ vip-open-line vip-Open-line vip-replace-state-exit-cmd)) (indent-to-left-margin)) - (newline 1) + ;; 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)