diff options
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 360ff48339b..bcf038762da 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -940,7 +940,7 @@ Frames with a non-nil `desktop-dont-save' parameter are not saved." (and desktop-restore-frames (frameset-save nil :app desktop--app-id - :name (concat user-login-name "@" system-name) + :name (concat user-login-name "@" (system-name)) :predicate #'desktop--check-dont-save)))) ;;;###autoload @@ -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)) |