diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-02-28 06:16:44 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-02-28 06:16:44 +0000 |
| commit | 55d7ff38f14396444ef366bfe74eee6dadcf9853 (patch) | |
| tree | a8137d4485668b1f6b3bab36682127a990b681a5 /lisp/emulation/viper-util.el | |
| parent | 387023ee15566c21fd04a9137a0d6c1fd2410269 (diff) | |
| download | emacs-55d7ff38f14396444ef366bfe74eee6dadcf9853.tar.gz | |
* viper-cmd.el (viper-envelop-ESC-key): added the option to
translate all ESC key sequences.
(viper-goto-mark-subr): restore markers for files for which
they were saved.
* viper-init.el (viper-translate-all-ESC-keysequences): new variable.
* viper-util.el (viper-set-replace-overlay-glyphs,
viper-set-replace-overlay): always check if the replacement
overlay is live.
* viper.el (viper-vi-state-mode-list): added major modes.
* ediff-wind.el: minor comment changes.
* ediff.el: copyright notice date fix.
Diffstat (limited to 'lisp/emulation/viper-util.el')
| -rw-r--r-- | lisp/emulation/viper-util.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index b8fdf3365ba..b384710e1e3 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -73,6 +73,7 @@ (fset 'viper-overlay-p (symbol-function 'extentp)) (fset 'viper-overlay-get (symbol-function 'extent-property)) (fset 'viper-move-overlay (symbol-function 'set-extent-endpoints)) + (fset 'viper-overlay-live-p (symbol-function 'extent-live-p)) (if (viper-window-display-p) (fset 'viper-iconify (symbol-function 'iconify-frame))) (cond ((viper-has-face-support-p) @@ -88,6 +89,7 @@ (fset 'viper-overlay-p (symbol-function 'overlayp)) (fset 'viper-overlay-get (symbol-function 'overlay-get)) (fset 'viper-move-overlay (symbol-function 'move-overlay)) + (fset 'viper-overlay-live-p (symbol-function 'overlayp)) (if (viper-window-display-p) (fset 'viper-iconify (symbol-function 'iconify-or-deiconify-frame))) (cond ((viper-has-face-support-p) @@ -704,7 +706,7 @@ (viper-move-overlay viper-replace-overlay beg end)) (defun viper-set-replace-overlay (beg end) - (if (viper-overlay-p viper-replace-overlay) + (if (viper-overlay-live-p viper-replace-overlay) (viper-move-replace-overlay beg end) (setq viper-replace-overlay (viper-make-overlay beg end (current-buffer))) ;; never detach @@ -729,6 +731,8 @@ (defun viper-set-replace-overlay-glyphs (before-glyph after-glyph) + (or (viper-overlay-live-p viper-replace-overlay) + (viper-set-replace-overlay (point-min) (point-min))) (if (or (not (viper-has-face-support-p)) viper-use-replace-region-delimiters) (let ((before-name (if viper-xemacs-p 'begin-glyph 'before-string)) |