Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
61dcf9bc
Commit
61dcf9bc
authored
Jul 15, 2014
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* lisp/desktop.el (after-init-hook): Disable startup frame restoration
in non-graphical situations. Fixes: debbugs:17693
parent
50426c32
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/desktop.el
lisp/desktop.el
+9
-2
No files found.
lisp/ChangeLog
View file @
61dcf9bc
2014-07-16 Glenn Morris <rgm@gnu.org>
* desktop.el (after-init-hook): Disable startup frame restoration
in non-graphical situations. (Bug#17693)
2014-07-14 Glenn Morris <rgm@gnu.org>
* vc/vc-dispatcher.el (vc-log-edit): Do set up the log buffer
...
...
lisp/desktop.el
View file @
61dcf9bc
...
...
@@ -1516,8 +1516,15 @@ If there are no buffers left to create, kill the timer."
(
setq
command-line-args
(
delete
key
command-line-args
))
(
desktop-save-mode
0
)))
(
when
desktop-save-mode
(
desktop-read
)
(
setq
inhibit-startup-screen
t
))))
;; People don't expect emacs -nw, or --daemon,
;; to create graphical frames (bug#17693).
;; TODO perhaps there should be a separate value
;; for desktop-restore-frames to control this startup behavior?
(
let
((
desktop-restore-frames
(
and
desktop-restore-frames
initial-window-system
(
not
(
daemonp
)))))
(
desktop-read
)
(
setq
inhibit-startup-screen
t
)))))
;; So we can restore vc-dir buffers.
(
autoload
'vc-dir-mode
"vc-dir"
nil
t
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment