diff options
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r-- | lisp/desktop.el | 2 |
2 files changed, 5 insertions, 1 deletions
| @@ -361,6 +361,10 @@ recommended to do this as soon as you have firmly upgraded to Emacs | |||
| 361 | 25.1 (or later). Should you ever need to downgrade your desktop file | 361 | 25.1 (or later). Should you ever need to downgrade your desktop file |
| 362 | to version 206, you can do this with 'C-u C-u M-x desktop-save'. | 362 | to version 206, you can do this with 'C-u C-u M-x desktop-save'. |
| 363 | 363 | ||
| 364 | --- | ||
| 365 | *** desktop-restore-in-current-display now defaults to t, not nil. | ||
| 366 | That is, Emacs by default now restores frames into the current display. | ||
| 367 | |||
| 364 | +++ | 368 | +++ |
| 365 | ** New function 'bookmark-set-no-overwrite' bound to 'C-x r M'. | 369 | ** New function 'bookmark-set-no-overwrite' bound to 'C-x r M'. |
| 366 | It raises an error if a bookmark of that name already exists, | 370 | It raises an error if a bookmark of that name already exists, |
diff --git a/lisp/desktop.el b/lisp/desktop.el index dba3277c091..1f460b7a3ed 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -408,7 +408,7 @@ See related options `desktop-restore-reuses-frames', | |||
| 408 | :group 'desktop | 408 | :group 'desktop |
| 409 | :version "24.4") | 409 | :version "24.4") |
| 410 | 410 | ||
| 411 | (defcustom desktop-restore-in-current-display nil | 411 | (defcustom desktop-restore-in-current-display t |
| 412 | "Controls how restoring of frames treats displays. | 412 | "Controls how restoring of frames treats displays. |
| 413 | If t, restores frames into the current display. | 413 | If t, restores frames into the current display. |
| 414 | If nil, restores frames into their original displays (if possible). | 414 | If nil, restores frames into their original displays (if possible). |