| commit | 3d94931cec5850fc4dc5ffc9f1bf88a291aa3a5b | |
| author | Eli Zaretskii <eliz@gnu.org> | |
| Sat, 17 Dec 2016 17:05:21 +0000 (17 19:05 +0200) | ||
| committer | Eli Zaretskii <eliz@gnu.org> | |
| Sat, 17 Dec 2016 17:05:21 +0000 (17 19:05 +0200) | ||
| tree | 754aba67960d882912c63176beb22d63c25d1cef | treesnapshot (tar.gz zip) |
| parent | 43022f9860d00b0f1baad34c6ea7ffd51f3cfc1d | commitdiff |
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 (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 | diffblobblamehistory |