From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.bugs Subject: bug#25951: 26.0.50; Error when ediffing files that are visited using quoted file names Date: Sun, 23 Apr 2017 16:54:12 +0000 Message-ID: References: <877f2dqst0.fsf@users.sourceforge.net> <87inlwp4if.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=f403045f572eb2ddbf054dd857f7 X-Trace: blaine.gmane.org 1492966513 1197 195.159.176.226 (23 Apr 2017 16:55:13 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 23 Apr 2017 16:55:13 +0000 (UTC) Cc: 25951@debbugs.gnu.org To: npostavs@users.sourceforge.net Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Apr 23 18:55:09 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 1d2Kmy-00007q-5B for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Apr 2017 18:55:08 +0200 Original-Received: from localhost ([::1]:39942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2Kn2-0005B1-D0 for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Apr 2017 12:55:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2Kmw-00059F-8U for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2017 12:55:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2Kms-0005fw-Bx for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2017 12:55:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38463) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d2Kms-0005fr-7r for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2017 12:55:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d2Kms-0006MS-1l for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2017 12:55:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 23 Apr 2017 16:55:01 +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.149296647124408 (code B ref 25951); Sun, 23 Apr 2017 16:55:01 +0000 Original-Received: (at 25951) by debbugs.gnu.org; 23 Apr 2017 16:54:31 +0000 Original-Received: from localhost ([127.0.0.1]:36662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2KmN-0006Lb-24 for submit@debbugs.gnu.org; Sun, 23 Apr 2017 12:54:31 -0400 Original-Received: from mail-wr0-f178.google.com ([209.85.128.178]:34332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2KmL-0006LP-8c for 25951@debbugs.gnu.org; Sun, 23 Apr 2017 12:54:29 -0400 Original-Received: by mail-wr0-f178.google.com with SMTP id z109so79112207wrb.1 for <25951@debbugs.gnu.org>; Sun, 23 Apr 2017 09:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=dTgafak4mDwbbdcEYKDjhga3MiLkdBGTIowh6TScXNw=; b=fWzt0Q3+Do5B8yBIJTp1QMXx3RTBv9sodqK0Y+4yfBEUEjNk9TF5jjiJ75ILxPR6BA O+XJQa8ucM1ujIRNBeJAU2fcASp+oUbaoXKzRaVAOs+xa3RlLfPsf6h87s+c9FBHm68t 1FzQG2dxq07kHv68ug5rOYIk0qeJZTOr8m9XdMoKgA/WfXACrhvI6zwk1lw7gLekxnIn ArOlBAtxNFJRHTbrB0NWmQT/nQmo39JZEv4v1C9L+evohuBVlhgLf07SLhXv9ZvaMVaC wQWKKwZgQqLxZjluvXQ1jXu67tpZXSoSj+LZaUzsRXH8o6E3GAqQBzfI2YNnMASubqZl ZDrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dTgafak4mDwbbdcEYKDjhga3MiLkdBGTIowh6TScXNw=; b=U99x2R0jkFWZS+BFTjm9SGybknGyWDcb+qj/gnMn3K8UGQoGH56ilzNIC1d/xY9Y1S Kn6oI/YYBAAF+n8e77hUCoC7xV3JaRFyoxUpc88YO0oIPInZfeki9BRf2pnJ2fl1ebeQ pWqKKweyvTDoQFtaKyW/338XCFYS4MG4XZmCGad2Og3fB7PiN8bu2CsHQUQmhhed2nGN ixgjMZxygQt/8FFv7e3t+sYzTcWhmtKDMgZZC4KbZkIYgQTl0YJf7NhWcbXWqrSv8cQn IM27Wx3ELM91Ab1MmrSUiFcq08nsJhuAI0Yv3rFGUO+UtnH60WdG2J954bk90Xn7rmDu P1BA== X-Gm-Message-State: AN3rC/5xk0wdHpIMWplraxh0hRKJ+gCikKvH2RN9d7QQC23RJGr47AG/ ggFkwJ8nB9URM1AtZeaFr2qO4CG4gw== X-Received: by 10.223.154.40 with SMTP id z37mr2705518wrb.136.1492966463166; Sun, 23 Apr 2017 09:54:23 -0700 (PDT) In-Reply-To: <87inlwp4if.fsf@users.sourceforge.net> 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:131909 Archived-At: --f403045f572eb2ddbf054dd857f7 Content-Type: text/plain; charset=UTF-8 schrieb am Sa., 22. Apr. 2017 um 22:31 Uhr: > 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)) > Yes, that should work, thanks. Will send a new patch in a second. --f403045f572eb2ddbf054dd857f7 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


<npostavs@users.sourceforge.= net> schrieb am Sa., 22. Apr. 2017 um 22:31=C2=A0Uhr:
Philipp Stephani <p.stephani2@gmail.com> writes:

> <npostavs@users.sourceforge.net> schrieb am Sa., 22. Apr. 2017 um 0= 0:48 Uhr:
>
>> Philipp Stephani <p.stephani2@gmail.com> writes:
>>
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0(let ((buffer (current-buffer)))<= br> >> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; `unquote-then-quote'= ; is only used for the
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; `verify-visited-file-mo= dtime' action, which takes a buffer
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; as only optional argume= nt.
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(with-current-buffer (or (= car arguments) buffer)
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(let ((buffer-file-= name (substring buffer-file-name 2)))
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; Make sure= to hide the temporary buffer change from the
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; underlyin= g operation.
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(with-curren= t-buffer buffer
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(appl= y operation arguments))))))
>>
>> I think this could be simplified by using the buffer-file-name fun= ction:
>>
>>=C2=A0 =C2=A0 =C2=A0(let ((buffer-file-name
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (substring (buffer-file-n= ame (car arguments)) 2)))
>>=C2=A0 =C2=A0 =C2=A0 =C2=A0(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.=C2=A0 It could be written like this, right?

=C2=A0 =C2=A0 (cl-letf* ((buf (or (car arguments) (current-buffer)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0((buffer-local-value= buffer-file-name buf)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (substring (buffer-= file-name buf) 2)))
=C2=A0 =C2=A0 =C2=A0 (apply operation arguments))

=
Yes, that should work, thanks. Will send a new patch in a second= .=C2=A0
--f403045f572eb2ddbf054dd857f7--