[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emulation/viper-cmd.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emulation/viper-cmd.el |
Date: |
Sat, 06 Aug 2005 12:58:56 -0400 |
Index: emacs/lisp/emulation/viper-cmd.el
diff -c emacs/lisp/emulation/viper-cmd.el:1.47
emacs/lisp/emulation/viper-cmd.el:1.48
*** emacs/lisp/emulation/viper-cmd.el:1.47 Mon Aug 1 14:51:28 2005
--- emacs/lisp/emulation/viper-cmd.el Sat Aug 6 16:58:54 2005
***************
*** 942,949 ****
;; Change the default for minor-mode-map-alist each time a harnessed minor
;; mode adds its own keymap to the a-list.
! (eval-after-load
! load-file '(setq-default minor-mode-map-alist minor-mode-map-alist))
)
--- 942,951 ----
;; Change the default for minor-mode-map-alist each time a harnessed minor
;; mode adds its own keymap to the a-list.
! (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)))
)
***************
*** 1421,1427 ****
(if (eq last-command 'd-command) 'kill-region nil))
(setq chars-deleted (abs (- (point) viper-com-point)))
(if (> chars-deleted viper-change-notification-threshold)
! (message "Deleted %d characters" chars-deleted))
(kill-region viper-com-point (point))
(setq this-command 'd-command)
(if viper-ex-style-motion
--- 1423,1430 ----
(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
***************
*** 1447,1453 ****
(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)
! (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)))
--- 1450,1457 ----
(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)))
***************
*** 1472,1478 ****
(copy-region-as-kill viper-com-point (point))
(setq chars-saved (abs (- (point) viper-com-point)))
(if (> chars-saved viper-change-notification-threshold)
! (message "Saved %d characters" chars-saved))
(goto-char viper-com-point)))
;; save lines
--- 1476,1483 ----
(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
***************
*** 1496,1502 ****
(copy-region-as-kill (mark t) (point))
(setq lines-saved (count-lines (mark t) (point)))
(if (> lines-saved viper-change-notification-threshold)
! (message "Saved %d lines" lines-saved))))
(viper-deactivate-mark)
(goto-char viper-com-point))
--- 1501,1508 ----
(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))
***************
*** 4020,4027 ****
lines-inserted (abs (count-lines (point) sv-point)))
(if (or (> chars-inserted viper-change-notification-threshold)
(> lines-inserted viper-change-notification-threshold))
! (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
;; a newline
--- 4026,4034 ----
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
;; a newline
***************
*** 4062,4069 ****
lines-inserted (abs (count-lines (point) sv-point)))
(if (or (> chars-inserted viper-change-notification-threshold)
(> lines-inserted viper-change-notification-threshold))
! (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
;; a newline
--- 4069,4077 ----
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
;; a newline