* lisp/desktop.el (desktop-create-buffer): Use activate-mark to set

`mark-active' (bug#19058).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6bf57b6082bb3c438fc500a445f0af48b3dfa9f5..e174d5969d9a27f536f84828bafdc69b53d512b6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,12 @@
+2014-11-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * desktop.el (desktop-create-buffer): Use activate-mark to set
+       `mark-active' (bug#19058).
+
 2014-11-21  Eric S. Raymond  <esr@snark>
 
-       * vc/vc-src.el (vc-src-state): Fix bug that produced spurious nil state.
+       * vc/vc-src.el (vc-src-state): Fix bug that produced spurious
+       nil state.
 
 2014-11-21  Eli Zaretskii  <eliz@gnu.org>
 
@@ -108,8 +114,8 @@
 2014-11-18  Leo Liu  <sdl.web@gmail.com>
 
        * emacs-lisp/nadvice.el (define-advice): New macro.
-       * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
-       define-advice.
+       * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression):
+       Add define-advice.
        (lisp-font-lock-keywords-1): Add define-advice.
 
 2014-11-18  Daiki Ueno  <ueno@gnu.org>
@@ -188,26 +194,26 @@
        immediately marked as obsolete, used to handle deprecated
        `tildify-ignored-environments-alist'.
 
-       * textmodes/tex-mode.el (tex-common-initialization): Set
-       `tildify-space-string' and `tildify-foreach-region-function'
+       * textmodes/tex-mode.el (tex-common-initialization):
+       Set `tildify-space-string' and `tildify-foreach-region-function'
        variables in all variants of TeX mode since `tildify-string-alist'
        and `tildify-ignored-environments-alist' are now empty by default.
 
-       * nxml/nxml-mode.el (nxml-mode): Ditto in `nxml-mode'.  If
-       encoding supports it use no-break space instead of character
+       * nxml/nxml-mode.el (nxml-mode): Ditto in `nxml-mode'.
+       If encoding supports it use no-break space instead of character
        entity; this changes previous default which used a numeric
        reference.
 
-       * textmodes/sgml-mode.el (sgml-mode): ditto in `sgml-mode'.  If
-       encoding does not support no-break space, use numeric reference;
+       * textmodes/sgml-mode.el (sgml-mode): ditto in `sgml-mode'.
+       If encoding does not support no-break space, use numeric reference;
        this changes previous default which used named entity (“&nbsp;”)
        in HTML mode.
 
 2014-11-17  Ulf Jasper  <ulf.jasper@web.de>
 
        Fix bug#5433.
-       * calendar/icalendar.el (icalendar-export-alarms): New
-       customizable variable.
+       * calendar/icalendar.el (icalendar-export-alarms):
+       New customizable variable.
        (icalendar-export-region): Export alarms as specified in
        `icalendar-export-alarms'.
        (icalendar--create-ical-alarm, icalendar--do-create-ical-alarm):
@@ -2838,8 +2844,8 @@
        (c-typeless-decl-kwds): Append "auto" onto the C++ value.
        (c-not-decl-init-keywords): Also exclude c-typeof-kwds from value.
 
-       Make ">>" act as double template ender in C++ Mode.  Fix
-       bug#11386.
+       Make ">>" act as double template ender in C++ Mode.
+       Fix bug#11386.
        * progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split
        off from c->-op-cont-re.
        (c->-op-cont-tokens): Change to use the above.

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 360ff48339bb62b402b4ff14cd994a70c850b6cc..bad0073fbbab4dbf961f5ded557c11ca3e396553 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1413,8 +1413,8 @@ after that many seconds of idle time."
             (if (consp desktop-buffer-mark)
                 (progn
                   (move-marker (mark-marker) (car desktop-buffer-mark))
-                  ;; FIXME: Should we call (de)activate-mark instead?
-                  (setq mark-active (car (cdr desktop-buffer-mark))))
+                  (if (car (cdr desktop-buffer-mark))
+                      (activate-mark 'dont-touch-tmm)))
               (move-marker (mark-marker) desktop-buffer-mark)))
          ;; Never override file system if the file really is read-only marked.
          (when desktop-buffer-read-only (setq buffer-read-only desktop-buffer-read-only))