From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Juanma Barranquero" Newsgroups: gmane.emacs.devel Subject: Re: emacsclient's option decoding code Date: Thu, 13 Nov 2008 10:00:53 +0100 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1226566882 833 80.91.229.12 (13 Nov 2008 09:01:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2008 09:01:22 +0000 (UTC) Cc: Eli Zaretskii , cyd@stupidchicken.com, emacs-devel@gnu.org To: "Stefan Monnier" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 10:02:22 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1L0Y5m-00028C-9I for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2008 10:02:22 +0100 Original-Received: from localhost ([127.0.0.1]:38821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L0Y4e-0007ca-Fr for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2008 04:01:12 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L0Y4O-0007WP-Db for emacs-devel@gnu.org; Thu, 13 Nov 2008 04:00:56 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L0Y4M-0007Vu-Ny for emacs-devel@gnu.org; Thu, 13 Nov 2008 04:00:55 -0500 Original-Received: from [199.232.76.173] (port=51252 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L0Y4M-0007Vo-Ik for emacs-devel@gnu.org; Thu, 13 Nov 2008 04:00:54 -0500 Original-Received: from yw-out-1718.google.com ([74.125.46.152]:19240) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L0Y4M-000777-75 for emacs-devel@gnu.org; Thu, 13 Nov 2008 04:00:54 -0500 Original-Received: by yw-out-1718.google.com with SMTP id 9so371527ywk.66 for ; Thu, 13 Nov 2008 01:00:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=j7/TVtTMWmbs/2s9XtwHj1woD3h/oiVatxLN7MpBFvw=; b=pS193Z3su4kLtEm0d/mlk9x/bb5FVo7vLh5PXc1vFop3SZZoAxySFq84wKUtymCRpO 3F/J9ea7pQdVZpLLso7dSKpslL0Kf6RjPKRSQlH0+9dnFHwyvdZitHtl3BMl6gFZ3ZXU rHnaEG3buTXi96Por/UJ5+QlFjqCQLRKKhchc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=USgq+nyLwN/kRO7Ed4sP8JCquqj1cAQmv/vj4oJpx2X48FPE48SOl3qGifOHN7dAEA POtfk33IiNoL11QsnNFNPT9llYyOA8Bp0tsPKoAQCZsmsh2B6ZbcybnZkN7pZbVtetHg 9FqHN1ZUsUei/D3nvbo8lZfMGQEFxbOJTGaTY= Original-Received: by 10.101.69.10 with SMTP id w10mr2418876ank.98.1226566853247; Thu, 13 Nov 2008 01:00:53 -0800 (PST) Original-Received: by 10.100.13.13 with HTTP; Thu, 13 Nov 2008 01:00:53 -0800 (PST) In-Reply-To: Content-Disposition: inline X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:105632 Archived-At: On Wed, Nov 12, 2008 at 17:37, Juanma Barranquero wrote: OK, let's try to clear somewhat the issues. About these changes: > - Do I change term/w32-win.el to use ":0.0" as argument to `x-open-connection'? > > - If yes, do we leave `make-frame-on-display' as it stands now, i.e. > accepting any DISPLAY string as valid when called from Windows, or do > we change it to accept just ":0.0" for the time being? (I favor the > second, which is simpler and cleaner: it's just removing the recent > three-line patch by Chong.) The attached patch uses ":0.0" on Windows (which seems to be the preferred answer) and *removes* Window-specific code in `make-frame-on-display' (in fact, it removes also a tiny bit of X-specific code). It is still not possible to do "emacsclient -c my-file" on Windows because of the -c/-t problem, but that will have to wait for some consensus. It is OK to install this? Juanma 2008-11-13 Juanma Barranquero * frame.el (make-frame-on-display): Remove Windows-specific hack. Pass the current window-system to `make-frame', not a hard-coded `x'. * term/w32-win.el (w32-initialize-window-system): Use ":0.0" instead of "" to represent the Windows display. Index: lisp/frame.el =================================================================== RCS file: /sources/emacs/emacs/lisp/frame.el,v retrieving revision 1.289 diff -u -2 -r1.289 frame.el --- lisp/frame.el 7 Nov 2008 14:52:04 -0000 1.289 +++ lisp/frame.el 13 Nov 2008 08:48:28 -0000 @@ -617,7 +617,4 @@ (make-frame `((window-system . ns) (display . ,display) . ,parameters))) - ((eq system-type 'windows-nt) - ;; On Windows, ignore DISPLAY. - (make-frame parameters)) (t (unless (string-match-p "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'" display) @@ -626,5 +623,5 @@ (setq x-display-name display) (x-initialize-window-system)) - (make-frame `((window-system . x) + (make-frame `((window-system . ,window-system) (display . ,display) . ,parameters))))) Index: lisp/term/w32-win.el =================================================================== RCS file: /sources/emacs/emacs/lisp/term/w32-win.el,v retrieving revision 1.105 diff -u -2 -r1.105 w32-win.el --- lisp/term/w32-win.el 11 Aug 2008 01:23:07 -0000 1.105 +++ lisp/term/w32-win.el 13 Nov 2008 08:17:25 -0000 @@ -246,5 +246,5 @@ (replace-regexp-in-string "[.*]" "-" (invocation-name)))) - (x-open-connection "" x-command-line-resources + (x-open-connection ":0.0" x-command-line-resources ;; Exit with a fatal error if this fails and we ;; are the initial display