[Emacs-diffs] Changes to emacs/lisp/emulation/viper-cmd.el

[Michael Kifer]

Index: emacs/lisp/emulation/viper-cmd.el
diff -c emacs/lisp/emulation/viper-cmd.el:1.48 
emacs/lisp/emulation/viper-cmd.el:1.49
*** emacs/lisp/emulation/viper-cmd.el:1.48      Sat Aug  6 16:58:54 2005
--- emacs/lisp/emulation/viper-cmd.el   Tue Sep 20 17:47:26 2005
***************
*** 358,364 ****
                                          'viper-insertion-ring))
  
                (if viper-ESC-moves-cursor-back
!                   (or (bolp) (backward-char 1))))
               ))
  
        ;; insert or replace
--- 358,364 ----
                                          'viper-insertion-ring))
  
                (if viper-ESC-moves-cursor-back
!                   (or (bolp) (viper-beginning-of-field) (backward-char 1))))
               ))
  
        ;; insert or replace
***************
*** 1996,2002 ****
  ;;; Minibuffer business
  
  (defsubst viper-set-minibuffer-style ()
!   (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel))
  
  
  (defun viper-minibuffer-setup-sentinel ()
--- 1996,2003 ----
  ;;; Minibuffer business
  
  (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 ()
***************
*** 2039,2044 ****
--- 2040,2050 ----
        (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.
***************
*** 2570,2576 ****
      ;; 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) (not (bobp))) (forward-line -1))
    )
  
  (defun viper-yank-line (arg)
--- 2576,2582 ----
      ;; 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 viper-yank-line (arg)