diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/desktop.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 1f460b7a3ed..e83891bf05d 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -1157,13 +1157,13 @@ This function also sets `desktop-dirname' to nil." | |||
| 1157 | ;; ---------------------------------------------------------------------------- | 1157 | ;; ---------------------------------------------------------------------------- |
| 1158 | (defun desktop-restoring-frameset-p () | 1158 | (defun desktop-restoring-frameset-p () |
| 1159 | "True if calling `desktop-restore-frameset' will actually restore it." | 1159 | "True if calling `desktop-restore-frameset' will actually restore it." |
| 1160 | (and desktop-restore-frames desktop-saved-frameset t)) | 1160 | (and desktop-restore-frames desktop-saved-frameset (display-graphic-p) t)) |
| 1161 | 1161 | ||
| 1162 | (defun desktop-restore-frameset () | 1162 | (defun desktop-restore-frameset () |
| 1163 | "Restore the state of a set of frames. | 1163 | "Restore the state of a set of frames. |
| 1164 | This function depends on the value of `desktop-saved-frameset' | 1164 | This function depends on the value of `desktop-saved-frameset' |
| 1165 | being set (usually, by reading it from the desktop)." | 1165 | being set (usually, by reading it from the desktop)." |
| 1166 | (when (and (display-graphic-p) (desktop-restoring-frameset-p)) | 1166 | (when (desktop-restoring-frameset-p) |
| 1167 | (frameset-restore desktop-saved-frameset | 1167 | (frameset-restore desktop-saved-frameset |
| 1168 | :reuse-frames (eq desktop-restore-reuses-frames t) | 1168 | :reuse-frames (eq desktop-restore-reuses-frames t) |
| 1169 | :cleanup-frames (not (eq desktop-restore-reuses-frames 'keep)) | 1169 | :cleanup-frames (not (eq desktop-restore-reuses-frames 'keep)) |