From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: npostavs@users.sourceforge.net Newsgroups: gmane.emacs.bugs Subject: bug#25951: 26.0.50; Error when ediffing files that are visited using quoted file names Date: Sat, 22 Apr 2017 16:32:40 -0400 Message-ID: <87inlwp4if.fsf@users.sourceforge.net> References: <877f2dqst0.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1492893130 32512 195.159.176.226 (22 Apr 2017 20:32:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 22 Apr 2017 20:32:10 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Cc: 25951@debbugs.gnu.org To: Philipp Stephani Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Apr 22 22:32:07 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 1d21hO-0008L9-Qo for geb-bug-gnu-emacs@m.gmane.org; Sat, 22 Apr 2017 22:32:06 +0200 Original-Received: from localhost ([::1]:36772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d21hU-000421-DF for geb-bug-gnu-emacs@m.gmane.org; Sat, 22 Apr 2017 16:32:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d21hO-00041u-SG for bug-gnu-emacs@gnu.org; Sat, 22 Apr 2017 16:32:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d21hK-0005b9-TB for bug-gnu-emacs@gnu.org; Sat, 22 Apr 2017 16:32:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36560) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d21hK-0005b3-Pn for bug-gnu-emacs@gnu.org; Sat, 22 Apr 2017 16:32:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d21hK-0002AL-FX for bug-gnu-emacs@gnu.org; Sat, 22 Apr 2017 16:32:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: npostavs@users.sourceforge.net Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 22 Apr 2017 20:32: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.14928930788271 (code B ref 25951); Sat, 22 Apr 2017 20:32:02 +0000 Original-Received: (at 25951) by debbugs.gnu.org; 22 Apr 2017 20:31:18 +0000 Original-Received: from localhost ([127.0.0.1]:34759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d21gc-00029L-7A for submit@debbugs.gnu.org; Sat, 22 Apr 2017 16:31:18 -0400 Original-Received: from mail-it0-f48.google.com ([209.85.214.48]:37975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d21gZ-000297-N7 for 25951@debbugs.gnu.org; Sat, 22 Apr 2017 16:31:15 -0400 Original-Received: by mail-it0-f48.google.com with SMTP id e132so18131015ite.1 for <25951@debbugs.gnu.org>; Sat, 22 Apr 2017 13:31:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=Efy/f0a54ChCN5H4jfJSt28p9qf1DChJPIqOOThLfu4=; b=GlT8T0SyTPUSj63G5t6IxG+BzZRAwREWlTK0OG9TSP7gRLLv9hMuRuwlDSSV2I+ovr qrAJFs0WLmEpv+Ini8NaZVCdNY6WctMEML72hn11iAqTI1KaWpq5L1w3/y2s47MRNQ3o oBhkUHwQxiWezr2wZwqyiDtqXihQdAE2QAfXZ3TlxuDk3GcfyD8yDEU+ZBsZnRhf14aa SqsCTUSH/A6DiXm5523i/R2qIGZbURdvfOjbJHuTAh2lfQHGLpmyamfC7iUkL5qrBe81 PWNHU4FIidF3r6ZhM4dHOKNa+9dNm4WpxU8nGMMG5PQBy9w1tej3w5tH3Wj/0/vTjSNw xBHQ== 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:references:date :in-reply-to:message-id:user-agent:mime-version; bh=Efy/f0a54ChCN5H4jfJSt28p9qf1DChJPIqOOThLfu4=; b=S/ny3AHQ+ao04Xw6PvFXGa0Wg2MTgkQx+UM7dBqtxVFQCU1VXygxmLvl8oR/hjiAr/ sLCqYVNj2eA8lIBXLuzY1HZYrGM6GiFGjHFgGLhEyyLUX5VQ7vWNuJEsBT4ORzOkC0vC KdUAaJemx8oTyMHPQoCvoJ1thxoyOAy+hyEYmQyho47CdjYz5SpOcNeqqsn8zCnbmjta J6XvaL9Us2hlVdLlF+JC/5DPie8WqVLCbLeFiZfht7Y4/oYjEf966EPq9GyaGNkmiL3L jTAl+hgjew/SdYk7UIBMXsaWnauO7Qo/AtOJGiiXBnJQrci9egq89TlKGazWSDq8V2Av 5RRg== X-Gm-Message-State: AN3rC/6jtxVB/zYw04Fev5qztCqhqY4X4EGqrM3FCPDoqTg0BFluPOcw wc7UbkMkHcyluA== X-Received: by 10.36.104.213 with SMTP id v204mr5574642itb.65.1492893070146; Sat, 22 Apr 2017 13:31:10 -0700 (PDT) Original-Received: from zony ([45.2.7.65]) by smtp.googlemail.com with ESMTPSA id a10sm2288466itj.1.2017.04.22.13.31.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Apr 2017 13:31:09 -0700 (PDT) In-Reply-To: (Philipp Stephani's message of "Sat, 22 Apr 2017 19:43:09 +0000") 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:131894 Archived-At: Philipp Stephani writes: > schrieb am Sa., 22. Apr. 2017 um 00:48 Uhr: > >> Philipp Stephani writes: >> >> > + (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. >> > + (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)))))) >> >> I think this could be simplified by using the buffer-file-name function: >> >> (let ((buffer-file-name >> (substring (buffer-file-name (car arguments)) 2))) >> (apply operation arguments)) >> > > That's not the same, it will set the file name of the wrong buffer. Oh, I think I get it now. It could be written like this, right? (cl-letf* ((buf (or (car arguments) (current-buffer))) ((buffer-local-value buffer-file-name buf) (substring (buffer-file-name buf) 2))) (apply operation arguments))