From unknown Thu Aug 14 18:32:11 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#28708 <28708@debbugs.gnu.org> To: bug#28708 <28708@debbugs.gnu.org> Subject: Status: 27.0.50; [PATCH] Fix search for ~/.Xdefaults-HOSTNAME Reply-To: bug#28708 <28708@debbugs.gnu.org> Date: Fri, 15 Aug 2025 01:32:11 +0000 retitle 28708 27.0.50; [PATCH] Fix search for ~/.Xdefaults-HOSTNAME reassign 28708 emacs submitter 28708 Johan Bockg=C3=A5rd severity 28708 normal tag 28708 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 17:44:48 2017 Received: (at submit) by debbugs.gnu.org; 4 Oct 2017 21:44:48 +0000 Received: from localhost ([127.0.0.1]:49416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzrTE-0007mP-9J for submit@debbugs.gnu.org; Wed, 04 Oct 2017 17:44:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzrTC-0007mB-8H for submit@debbugs.gnu.org; Wed, 04 Oct 2017 17:44:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzrT6-0006t3-1F for submit@debbugs.gnu.org; Wed, 04 Oct 2017 17:44:40 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:54984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dzrT5-0006sp-Tz for submit@debbugs.gnu.org; Wed, 04 Oct 2017 17:44:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzrT4-0004rG-MZ for bug-gnu-emacs@gnu.org; Wed, 04 Oct 2017 17:44:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzrSz-0006mP-QJ for bug-gnu-emacs@gnu.org; Wed, 04 Oct 2017 17:44:38 -0400 Received: from manu26.manufrog.com ([98.142.98.2]:52564) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dzrSz-0006lg-LJ for bug-gnu-emacs@gnu.org; Wed, 04 Oct 2017 17:44:33 -0400 Received: from c-3902e555.04-211-6c6b701.cust.bredbandsbolaget.se ([85.229.2.57]:34276 helo=muon.localdomain) by manu26.manufrog.com with esmtpa (Exim 4.89) (envelope-from ) id 1dzrSx-0008HW-Tu for bug-gnu-emacs@gnu.org; Wed, 04 Oct 2017 23:44:32 +0200 Received: by muon.localdomain (Postfix, from userid 1000) id 4BC7048421D; Wed, 4 Oct 2017 23:44:31 +0200 (CEST) From: =?utf-8?Q?Johan_Bockg=C3=A5rd?= To: bug-gnu-emacs@gnu.org Subject: 27.0.50; [PATCH] Fix search for ~/.Xdefaults-HOSTNAME X-Debbugs-CC: eggert@cs.ucla.edu Date: Wed, 04 Oct 2017 23:44:31 +0200 Message-ID: <87infuy4e8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - manu26.manufrog.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - gnu.org X-Get-Message-Sender-Via: manu26.manufrog.com: authenticated_id: noreply@tryserumgardar.se X-Authenticated-Sender: manu26.manufrog.com: noreply@tryserumgardar.se X-Source: X-Source-Args: X-Source-Dir: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Emacs is supposed to look for X resources in ~/.Xdefaults-HOSTNAME, but the code forgets the hyphen in the filename. The bug was introduced in Emacs 25.1, by commit 1e6879dbdb0832427f5c588c89a53a8a80768a00: 2014-12-25 Paul Eggert Prefer stpcpy to strcat ... ** The patch (should this go in the emacs-26 branch?): diff --git a/src/xrdb.c b/src/xrdb.c index 15a0147..3c1bad1 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -345,6 +345,7 @@ get_user_db (Display *display) db = XrmGetStringDatabase (xdefs); else { + /* Use ~/.Xdefaults. */ char *home = gethomedir (); ptrdiff_t homelen = strlen (home); char *filename = xrealloc (home, homelen + sizeof xdefaults); @@ -375,13 +376,15 @@ get_environ_db (void) if (!p) { + /* Use ~/.Xdefaults-HOSTNAME. */ char *home = gethomedir (); ptrdiff_t homelen = strlen (home); Lisp_Object system_name = Fsystem_name (); ptrdiff_t filenamesize = (homelen + sizeof xdefaults - + SBYTES (system_name)); + + 1 + SBYTES (system_name)); p = filename = xrealloc (home, filenamesize); - lispstpcpy (stpcpy (filename + homelen, xdefaults), system_name); + lispstpcpy (stpcpy (stpcpy (filename + homelen, xdefaults), "-"), + system_name); } db = XrmGetFileDatabase (p); From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 18:26:42 2017 Received: (at 28708-done) by debbugs.gnu.org; 4 Oct 2017 22:26:42 +0000 Received: from localhost ([127.0.0.1]:49448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzs7l-0000Nc-Pz for submit@debbugs.gnu.org; Wed, 04 Oct 2017 18:26:41 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:38250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzs7i-0000NJ-Rz for 28708-done@debbugs.gnu.org; Wed, 04 Oct 2017 18:26:40 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id E22C816004F; Wed, 4 Oct 2017 15:26:32 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id i-6oQsJ4nzad; Wed, 4 Oct 2017 15:26:32 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 4BD9A160E21; Wed, 4 Oct 2017 15:26:32 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id HWGLbR_7hVnO; Wed, 4 Oct 2017 15:26:32 -0700 (PDT) Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 3382A16004F; Wed, 4 Oct 2017 15:26:32 -0700 (PDT) Subject: Re: bug#28708: 27.0.50; [PATCH] Fix search for ~/.Xdefaults-HOSTNAME To: =?UTF-8?Q?Johan_Bockg=c3=a5rd?= , 28708-done@debbugs.gnu.org References: <87infuy4e8.fsf@gnu.org> From: Paul Eggert Organization: UCLA Computer Science Department Message-ID: Date: Wed, 4 Oct 2017 15:26:31 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <87infuy4e8.fsf@gnu.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 28708-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Thanks for catching that bug. I installed the patch in your name into the emacs-26 branch. From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 05 10:28:57 2017 Received: (at control) by debbugs.gnu.org; 5 Oct 2017 14:28:57 +0000 Received: from localhost ([127.0.0.1]:51671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e078z-0001bd-J4 for submit@debbugs.gnu.org; Thu, 05 Oct 2017 10:28:57 -0400 Received: from mail-wr0-f176.google.com ([209.85.128.176]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e078y-0001bG-0s for control@debbugs.gnu.org; Thu, 05 Oct 2017 10:28:56 -0400 Received: by mail-wr0-f176.google.com with SMTP id p10so9182393wrc.6 for ; Thu, 05 Oct 2017 07:28:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=njIh16FuL0KGZkDCnfroiq1OehBLdHrEcDB+w515+MU=; b=O4dZs5y6BPYMqXb4898KHjL9PdstdnJHRev6ZAonO7FTquD3Rku0E6/LiDuvCfzirR dZf4GnuMv928mmk+XxaT2zWhF7UjgVCzTixsf0ArBUhs45UExgcDDaP93WSYBWWnl/Iy hWmUIrwVs90tt/OKSZ0peM02TemfaEbsPczWvFI7PIMEYkRJwI6qcXRbDxfN9UW8HMXN 6DBORsSyzJQNfWomPgMQQaEfef5ZCoGB26RY+9NZzFlX0f/qadX//DTY3e0iEGUjSf2r JLbjrS06HS7syZK1t6VpdypyLHBQ2nVEhoR/uMAqBBgFC5wWWX4M7n9W7NaqWDjNlTw8 ko+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=njIh16FuL0KGZkDCnfroiq1OehBLdHrEcDB+w515+MU=; b=KQXFUSUbw0L/rh3uEz0fBxRxYwAYnnRSigDGOsRT0Cy2Xik4FaehjMWmYwwaFYv051 yIdIMhOSKCd7P3T4vyhY9/whpE7fUm/cT3ToknlVVddCo6LRXVMNoT0fM0Ux+3uTNzME qMktwv3B7BztAMzppUo9t0ZgOew9/peb0zaSkhCvtMnqi7IBW+A1CdNknI44xu6pWF0e 4vFYc+n33KlKEFAddOQCBP2aHvgI9AsywDJv7xMLk1GgdyTo0xNwA36XvDuUyXDXKLVf NNrf798d6fiRt2T/JHNMBW4Qg9+1u+S6FGC3wZsVIRkMORcKMk/uSYuLQYA0NthevmQj 7+QA== X-Gm-Message-State: AMCzsaWSvRuk/bwWSikE9MHxGJ85heh6WMShTq7otg0aAwvs4VoeWyHH RoN2vwzGqCeVRAhskKlhRGpn3oXvQXzDrG03pWU= X-Google-Smtp-Source: AOwi7QCSUhjOSfWw/Us2tnznVkKzl2pWbCum+8wqMRkEj2D8UxcLhHHRGTbP+SX6T+OYtnex3gqEO/kQ2PSVdgiB7AQ= X-Received: by 10.223.157.45 with SMTP id k45mr4543433wre.94.1507213730052; Thu, 05 Oct 2017 07:28:50 -0700 (PDT) MIME-Version: 1.0 Received: by 10.223.146.161 with HTTP; Thu, 5 Oct 2017 07:28:49 -0700 (PDT) In-Reply-To: <9cafc3d6-55a0-e270-b4de-120bf199adb7@scieneer.com> References: <9cafc3d6-55a0-e270-b4de-120bf199adb7@scieneer.com> From: Noam Postavsky Date: Thu, 5 Oct 2017 10:28:49 -0400 X-Google-Sender-Auth: GDy1Zxipk0GhhfY1wxdjf_GA8NM Message-ID: Subject: Re: bug#28712: 25.3; get_environ_db not inserting dash after .Xdefaults To: Douglas Crosher Content-Type: text/plain; charset="UTF-8" Bcc: control@debbugs.gnu.org X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: control Cc: 28712@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) close 28712 26.1 merge 28708 28712 quit On Thu, Oct 5, 2017 at 9:01 AM, Douglas Crosher wrote: > > Perhaps src/xrdb.c: get_user_db() should be inserting a dash '-' between > .Xdefaults and the hostname. Looking at a trace it tries to open > .Xdefaults$HOSTNAME rather than .Xdefaults-$HOSTNAME This was recently fixed in emacs-26. From unknown Thu Aug 14 18:32:11 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 03 Nov 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator