Commit c0a7f300 authored by Bob Nnamtrop's avatar Bob Nnamtrop Committed by Chong Yidong

Limit triggering of abbrev expansion in viper-mode (Bug#9038)

* lisp/emulation/viper-cmd.el (viper-change-state-to-vi): Limit
triggering of abbrev expansion.
parent 0b608d02
2011-07-09 Bob Nnamtrop <bobnnamtrop@gmail.com> (tiny change)
* emulation/viper-cmd.el (viper-change-state-to-vi): Limit
triggering of abbrev expansion (Bug#9038).
2011-07-09 Martin Rudalics <rudalics@gmx.at>
* window.el (display-buffer-default-specifiers): Remove.
......
......@@ -617,7 +617,10 @@
(or (viper-overlay-p viper-replace-overlay)
(viper-set-replace-overlay (point-min) (point-min)))
(viper-hide-replace-overlay)
(if abbrev-mode (expand-abbrev))
;; Expand abbrevs iff the previous character has word syntax.
(and abbrev-mode
(eq (char-syntax (preceding-char)) ?w)
(expand-abbrev))
(if (and auto-fill-function (> (current-column) fill-column))
(funcall auto-fill-function))
;; don't leave whitespace lines around
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment