From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#17693: 24.3.91.1; desktop-save-mode disables option -nw Date: Wed, 16 Jul 2014 00:30:43 -0400 Message-ID: References: <68748658-E1E0-4EED-B18E-3A1A49925127@automata.se> <861B03B7-8256-4FF0-B07B-9BCFDE2B6422@automata.se> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1405485076 8833 80.91.229.3 (16 Jul 2014 04:31:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 16 Jul 2014 04:31:16 +0000 (UTC) To: 17693-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 16 06:31:10 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1X7Gs1-0003Zz-6k for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Jul 2014 06:31:09 +0200 Original-Received: from localhost ([::1]:37621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7Gs0-0004up-Qb for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Jul 2014 00:31:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7Grx-0004tg-63 for bug-gnu-emacs@gnu.org; Wed, 16 Jul 2014 00:31:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7Grv-0002n9-4Y for bug-gnu-emacs@gnu.org; Wed, 16 Jul 2014 00:31:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7Grv-0002n0-29 for bug-gnu-emacs@gnu.org; Wed, 16 Jul 2014 00:31:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1X7Gru-0000AG-Nd for bug-gnu-emacs@gnu.org; Wed, 16 Jul 2014 00:31:02 -0400 Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Wed, 16 Jul 2014 04:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 17693 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 17693@debbugs.gnu.org, rgm@gnu.org, stefan@automata.se Original-Received: via spool by 17693-done@debbugs.gnu.org id=D17693.1405485048602 (code D ref 17693); Wed, 16 Jul 2014 04:31:02 +0000 Original-Received: (at 17693-done) by debbugs.gnu.org; 16 Jul 2014 04:30:48 +0000 Original-Received: from localhost ([127.0.0.1]:56046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X7Grg-00009e-AJ for submit@debbugs.gnu.org; Wed, 16 Jul 2014 00:30:48 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:55618 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X7Grd-00009V-K7 for 17693-done@debbugs.gnu.org; Wed, 16 Jul 2014 00:30:46 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1X7Grc-00052A-1j; Wed, 16 Jul 2014 00:30:44 -0400 X-Spook: fissionable cracking supercomputer illuminati Jiang Zemin X-Ran: l0UJO*bUSiLxT/AZKXvRWYj^f8Yn!ugP;5+XC{AL%;uk(92$p_!^JQ7ray9OG2Q(N?~qY5 X-Hue: blue X-Attribution: GM In-Reply-To: (Glenn Morris's message of "Sun, 06 Jul 2014 20:11:47 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:91580 Archived-At: Version: 24.3.93 I applied a simple workaround. Hopefully good enough for now at least. --- a/lisp/desktop.el 2014-07-03 23:48:24 +0000 +++ b/lisp/desktop.el 2014-07-16 04:28:42 +0000 @@ -1516,8 +1516,15 @@ (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)))))