(skeleton-proxy-new): Consume the mark-active state.

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.