From: Stefan Monnier Date: Fri, 21 Nov 2014 18:01:40 +0000 (-0500) Subject: * lisp/desktop.el (desktop-create-buffer): Use activate-mark to set X-Git-Tag: emacs-25.0.90~2635^2~396 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf642130c1694c4c4cb0b981d3fa3044db6ed5fe;p=emacs.git * lisp/desktop.el (desktop-create-buffer): Use activate-mark to set `mark-active' (bug#19058). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6bf57b6082b..e174d5969d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,12 @@ +2014-11-21 Stefan Monnier + + * desktop.el (desktop-create-buffer): Use activate-mark to set + `mark-active' (bug#19058). + 2014-11-21 Eric S. Raymond - * 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 @@ -108,8 +114,8 @@ 2014-11-18 Leo Liu * 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 @@ -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 (“ â€) in HTML mode. 2014-11-17 Ulf Jasper 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 360ff48339b..bad0073fbba 100644 --- 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))