From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.devel Subject: [PATCH] Do not use ~USER/ on MS-DOS Date: Mon, 2 Mar 2015 10:07:05 +0100 Message-ID: <1425287225-11192-1-git-send-email-mpn@google.com> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1425287276 17958 80.91.229.3 (2 Mar 2015 09:07:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Mar 2015 09:07:56 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii , Pete Williamson Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 02 10:07:55 2015 Return-path: Envelope-to: ged-emacs-devel@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 1YSMKQ-0007oU-SZ for ged-emacs-devel@m.gmane.org; Mon, 02 Mar 2015 10:07:55 +0100 Original-Received: from localhost ([::1]:55667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSMKQ-0000wJ-38 for ged-emacs-devel@m.gmane.org; Mon, 02 Mar 2015 04:07:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSMK5-0000vo-MT for emacs-devel@gnu.org; Mon, 02 Mar 2015 04:07:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSMJq-0004gt-Gh for emacs-devel@gnu.org; Mon, 02 Mar 2015 04:07:33 -0500 Original-Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:42507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSMJq-0004fD-9i for emacs-devel@gnu.org; Mon, 02 Mar 2015 04:07:18 -0500 Original-Received: by wiwh11 with SMTP id h11so13063308wiw.1 for ; Mon, 02 Mar 2015 01:07:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=/3sGSmSCDIVAYqbLL7E0YnmTavn8eaRECTobHF/KqEM=; b=UUXkHXqQE5pycC67y1XoKxj226Ci+F58sBVHlSwMNq9apNua0vzqwMRbjs0DO/xBsd X3SxaG/UJ6MT1kGa2fnExVr7Pb11Ia9JUv1sycaptnApp+T+KRyJHgiuw3cN7Uf2BMVI N/DxNIhTETwBbIoHgqaiMblVmMOuYa7J8jgTtoMWSafBQUhkGsGFHoxzdJg+ZK7R8cBm PbWTgpG7BH/SU2RVEu2h/NM6TnR5kSJWRygefnC3pr4MoPPh53pu+q+x+wvDp9j/FF00 wf1D9SwaB6KO3uToI8YjAHd/om0h3DmBYqVUZZ9qf6O80z1auBH7P6SU998gmlcDDiim 1Svw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/3sGSmSCDIVAYqbLL7E0YnmTavn8eaRECTobHF/KqEM=; b=dbC2ExAIbyhNkekRjcgHpLFb6bIKfIbwhp19HdYmfaxzpKzLTW7FPJLJoqXthopyTK L1+xIuRbgk5mcsh6hd9XnABUExPhtUBtIT1Ncnt1BWQb3Cm+W+iprSuKb/rRmGAZykPj zHZH4sD/j4U46PjZ7H4DnB0upuZGDSDecurwXXcOP7NdbyUbt6nMDStUzlC8n+WyZP+Z 6H/Evgqh3Y4J1QsqNZ1md8OnHjKwMtH+MZh/AevcpVVXD/srxKg6mRn5TBKiQoZfwWbm 3CIbBkC+6SgJkh6VPe2Aq5yjkKbIXltjXVyH0mRD1+qEk+UA9srW81Uu/Xucz3lJRkgi OZdg== X-Gm-Message-State: ALoCoQlVl+e4l5pCllAD2jA5Iu3Wn6FQVa5fujGnvGJzExEJ1wH3HViwVqGo44Sapn8lWCjpOCzO X-Received: by 10.180.109.33 with SMTP id hp1mr33307771wib.33.1425287237265; Mon, 02 Mar 2015 01:07:17 -0800 (PST) Original-Received: from mpn-glaptop.corp.google.com ([2620:0:1047:9:d161:1889:ce2f:9d53]) by mx.google.com with ESMTPSA id hj10sm18271890wjc.48.2015.03.02.01.07.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Mar 2015 01:07:16 -0800 (PST) X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::234 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:183560 Archived-At: From: Michal Nazarewicz * lisp/startup.el (command-line): Since ~USER path expansion is not supported on MS-DOS, use ~/_emacs instead of ~/USER/_emacs on that system. --- lisp/startup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/startup.el b/lisp/startup.el index 999e53e..c10c264 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1084,7 +1084,7 @@ (defun command-line () (let ((user-init-file-1 (cond ((eq system-type 'ms-dos) - (concat "~" init-file-user "/_emacs")) + "~/_emacs") ((not (eq system-type 'windows-nt)) (concat "~" init-file-user "/.emacs")) ;; Else deal with the Windows situation -- 2.2.0.rc0.207.ga3a616c