summaryrefslogtreecommitdiff
path: root/lisp/skeleton.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2003-06-08 00:54:06 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2003-06-08 00:54:06 +0000
commitb532266db674fb9840a139386b1e2cdc410438be (patch)
treed993293f967664f852b35e580c9f127130b3b44b /lisp/skeleton.el
parent8a591d52426ccedd66e333b1c3de3ec65925c23e (diff)
downloademacs-b532266db674fb9840a139386b1e2cdc410438be.tar.gz
(skeleton-proxy-new): Consume the mark-active state.
Diffstat (limited to 'lisp/skeleton.el')
-rw-r--r--lisp/skeleton.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 95ac378e442..3cb37b44aee 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -164,7 +164,12 @@ of `str' whereas the skeleton's interactor is then ignored."
(and skeleton-autowrap
(or (eq last-command 'mouse-drag-region)
(and transient-mark-mode mark-active))
- -1))
+ ;; Deactivate the mark, in case one of the
+ ;; elements of the skeleton is sensitive
+ ;; to such situations (e.g. it is itself a
+ ;; skeleton).
+ (progn (deactivate-mark)
+ -1)))
(if (stringp str)
str))
;; Return non-nil to tell expand-abbrev that expansion has happened.