]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 43022f9) | patch
Repair desktop restoration on text terminals
authorEli Zaretskii <eliz@gnu.org>
Sat, 17 Dec 2016 17:05:21 +0000 (19:05 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 17 Dec 2016 17:05:21 +0000 (19:05 +0200)
commit3d94931cec5850fc4dc5ffc9f1bf88a291aa3a5b
tree754aba67960d882912c63176beb22d63c25d1ceftree | snapshot
parent43022f9860d00b0f1baad34c6ea7ffd51f3cfc1dcommit | diff
Repair desktop restoration on text terminals

* lisp/desktop.el (desktop-restoring-frameset-p): Test for the GUI
frame here, instead of in desktop-restoring-frameset.  That's
because desktop-read wants to know whether frameset will actually
be restored, and has fallback procedures up its sleeve when it
won't be; these fallbacks need to be invoked when the frameset is
not going to be restored.  (Bug#24298)
lisp/desktop.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.