From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Philipp Newsgroups: gmane.emacs.bugs Subject: bug#25951: [PATCH] Fix bootstrap build of files.el Date: Sat, 6 May 2017 23:21:57 +0200 Message-ID: <20170506212157.62158-1-phst__2625.58744657344$1494115275$gmane$org@google.com> References: <8760hdlnux.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1494115275 6921 195.159.176.226 (7 May 2017 00:01:15 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 7 May 2017 00:01:15 +0000 (UTC) Cc: Philipp To: rgm@gnu.org, npostavs@users.sourceforge.net, emacs-devel@gnu.org, 25951@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun May 07 02:01:10 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d79dM-0001fL-Kx for geb-bug-gnu-emacs@m.gmane.org; Sun, 07 May 2017 02:01:08 +0200 Original-Received: from localhost ([::1]:53066 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d79dS-0001PH-Au for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 May 2017 20:01:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d79dJ-0001Ob-Ie for bug-gnu-emacs@gnu.org; Sat, 06 May 2017 20:01:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d79dG-0006H7-J0 for bug-gnu-emacs@gnu.org; Sat, 06 May 2017 20:01:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:60563) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d79dG-0006H1-Eh for bug-gnu-emacs@gnu.org; Sat, 06 May 2017 20:01:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d79dG-00080R-5f for bug-gnu-emacs@gnu.org; Sat, 06 May 2017 20:01:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philipp Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 07 May 2017 00:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25951 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 25951-submit@debbugs.gnu.org id=B25951.149411521830712 (code B ref 25951); Sun, 07 May 2017 00:01:02 +0000 Original-Received: (at 25951) by debbugs.gnu.org; 7 May 2017 00:00:18 +0000 Original-Received: from localhost ([127.0.0.1]:58762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d79cX-0007zH-Tr for submit@debbugs.gnu.org; Sat, 06 May 2017 20:00:18 -0400 Original-Received: from mail-wr0-f193.google.com ([209.85.128.193]:34557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d779U-0004Mq-QW for 25951@debbugs.gnu.org; Sat, 06 May 2017 17:22:09 -0400 Original-Received: by mail-wr0-f193.google.com with SMTP id 6so3806153wrb.1 for <25951@debbugs.gnu.org>; Sat, 06 May 2017 14:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=d/ap04k79ls5++n7O0Gvp3rQRA/lTWdIDkz2kwc8AUo=; b=Qr2ql9+BbW3Xi0Uqz+Px6JtTHptDdkfb6mPikb+XxOGGhjoOoCC5obhtB6mPk8y9gE tYU+MN27Joe3EgLNVOWtQXbW/NVLt0E74fzxseolUXYepNPoh5JVdUvY4DQNAWIWlMT7 B1Om/8LZKvhUhzxIWL9Lcw8M/YociaiEdczFJuKUkVjSj9fcsWtuHpwclry7O9BsoZMW yqpzQBVUhwKeF5CrrUXKruFwBqhv63+rg3srfHuPGzCw1KR+7bo0EcyTEZmzxSsxPfay oTw/AoAJizkKk52vC6srje9hENV347gKE1KbI42TUvnCeQrNyhXCgbzjIgrSOIBZCJVW 5TCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=d/ap04k79ls5++n7O0Gvp3rQRA/lTWdIDkz2kwc8AUo=; b=NxnxbMxItpR1nc+hwDdv4Oe4oLhH9gnP67U/40/DQ6GQJdj9sBvdAyRJ6OLm11atAK lvAKlVbqb3qOde3CNs91wWjkgrY222dCiAusp8zF2xbsDX29wFfLzI81sPii7jFnoJOM RawLDlzvZZUV3vzSnswHnKk6AH5jIpkiEq9EpN0xO18g8smGWnPe5faMG0XxkTuCe7Ib 3Zw7QFPbepblM6zNcsw6p7H+VPRiqtdvn+qJ2nobNFnAzWLFN7LOze8yWzwAvqR/NSGZ KcqVSZelMGnNPx5WaP6azVnyDNL2InrP2Pd+RyN1tMPSXi0dT11eZoU7aBmTLYjzIopT uF7g== X-Gm-Message-State: AN3rC/74UnHuVAyCj7z5OQ4AkHCdjYv2UHNsytFCwoIAX9EbdrEdRI83 EyTPWTULPSekJQ== X-Received: by 10.223.160.139 with SMTP id m11mr32263592wrm.99.1494105723063; Sat, 06 May 2017 14:22:03 -0700 (PDT) Original-Received: from p.cm.cablesurf.de (46.128.198.151.dynamic.cablesurf.de. [46.128.198.151]) by smtp.gmail.com with ESMTPSA id 4sm9033159wry.31.2017.05.06.14.22.01 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 06 May 2017 14:22:02 -0700 (PDT) X-Google-Original-From: Philipp X-Mailer: git-send-email 2.12.2 In-Reply-To: <8760hdlnux.fsf@users.sourceforge.net> X-Mailman-Approved-At: Sat, 06 May 2017 20:00:16 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:132325 Archived-At: * lisp/files.el (file-name-non-special): Don't use cl-letf. --- lisp/files.el | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index 7e627d36d4..8ac1993754 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -29,7 +29,6 @@ ;;; Code: (eval-when-compile - (require 'cl-lib) (require 'pcase) (require 'easy-mmode)) ; For `define-minor-mode'. @@ -7032,13 +7031,18 @@ file-name-non-special (when (and visit buffer-file-name) (setq buffer-file-name (concat "/:" buffer-file-name)))))) (`unquote-then-quote - (cl-letf* ((buffer (or (car arguments) (current-buffer))) - ((buffer-local-value 'buffer-file-name buffer) - (substring (buffer-file-name buffer) 2))) + ;; We can't use `cl-letf' with `(buffer-local-value)' here + ;; because it wouldn't work during bootstrapping. + (let ((buffer (current-buffer))) ;; `unquote-then-quote' is only used for the ;; `verify-visited-file-modtime' action, which takes a buffer ;; as only optional argument. - (apply operation arguments))) + (with-current-buffer (or (car arguments) buffer) + (let ((buffer-file-name (substring buffer-file-name 2))) + ;; Make sure to hide the temporary buffer change from the + ;; underlying operation. + (with-current-buffer buffer + (apply operation arguments)))))) (_ (apply operation arguments))))) -- 2.12.2