# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1055033646 0
# Node ID 6445bf9b37f801d954c1d9a172e4f14a13970425
# Parent  ebea7b5863627ae1045a80df41e9193100b6a8ae
(skeleton-proxy-new): Consume the mark-active state.

diff -r ebea7b586362 -r 6445bf9b37f8 lisp/skeleton.el
--- 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.