changeset 51526:6445bf9b37f8

(skeleton-proxy-new): Consume the mark-active state.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 08 Jun 2003 00:54:06 +0000
parents ebea7b586362
children 6dd58876664c
files lisp/skeleton.el
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/skeleton.el	Sun Jun 08 00:49:38 2003 +0000
+++ b/lisp/skeleton.el	Sun Jun 08 00:54:06 2003 +0000
@@ -164,7 +164,12 @@
 		     (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.