From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.bugs Subject: bug#10124: 24.0.91; Choosing a remote file, when the current directory is remote too Date: Tue, 29 Nov 2011 12:08:02 +0100 Message-ID: <87d3cb6val.fsf@gmx.de> References: <871uswcya5.fsf@gmx.de> <87ehwsgzk7.fsf@gmx.de> <87aa7ggxcz.fsf@gmx.de> <83d3cc6tk6.fsf@gnu.org> <87ipm372wr.fsf@gmx.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1322564964 30685 80.91.229.12 (29 Nov 2011 11:09:24 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 29 Nov 2011 11:09:24 +0000 (UTC) Cc: 10124@debbugs.gnu.org To: dmoncayo@gmail.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 29 12:09:15 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RVLYp-0007ET-1H for geb-bug-gnu-emacs@m.gmane.org; Tue, 29 Nov 2011 12:09:15 +0100 Original-Received: from localhost ([::1]:43429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVLYo-0005u2-Gm for geb-bug-gnu-emacs@m.gmane.org; Tue, 29 Nov 2011 06:09:14 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:35758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVLYi-0005tb-Go for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2011 06:09:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RVLYc-0001mu-Ne for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2011 06:09:08 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:43583) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVLYc-0001mq-KH for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2011 06:09:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1RVLaX-0001ea-FW for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2011 06:11:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michael Albinus Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Nov 2011 11:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10124 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 10124-submit@debbugs.gnu.org id=B10124.13225650106299 (code B ref 10124); Tue, 29 Nov 2011 11:11:01 +0000 Original-Received: (at 10124) by debbugs.gnu.org; 29 Nov 2011 11:10:10 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RVLZi-0001dV-2y for submit@debbugs.gnu.org; Tue, 29 Nov 2011 06:10:10 -0500 Original-Received: from mailout-de.gmx.net ([213.165.64.22]) by debbugs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1RVLZf-0001dN-B0 for 10124@debbugs.gnu.org; Tue, 29 Nov 2011 06:10:08 -0500 Original-Received: (qmail invoked by alias); 29 Nov 2011 11:08:05 -0000 Original-Received: from p57BB98FE.dip0.t-ipconnect.de (EHLO detlef.gmx.de) [87.187.152.254] by mail.gmx.net (mp066) with SMTP; 29 Nov 2011 12:08:05 +0100 X-Authenticated: #3708877 X-Provags-ID: V01U2FsdGVkX1+KmfBWuEOKcTJMYchW6PdRYubst7VROWlfBtgs4e JD8AKiQmsmKUkZ In-Reply-To: <87ipm372wr.fsf@gmx.de> (Michael Albinus's message of "Tue, 29 Nov 2011 09:23:32 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.91 (gnu/linux) X-Y-GMX-Trusted: 0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Tue, 29 Nov 2011 06:11:01 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:54407 Archived-At: Michael Albinus writes: > Fortunately, it isn't related to the diff program in use. I could > reproduce it on a Windows XP machine, using the ftp access > method, and a GnuWin32 diff.exe: > > (executable-find "diff.exe") => "c:/Program Files/GnuWin32/bin/diff.exe" > > I'll work on a patch. Dani, could you, please, check this patch: --8<---------------cut here---------------start------------->8--- *** /home/albinus/src/emacs/lisp/vc/diff-mode.el.~106543~ 2011-11-29 11:43:26.039703592 +0100 --- /home/albinus/src/emacs/lisp/vc/diff-mode.el 2011-11-29 11:42:27.087411264 +0100 *************** *** 815,823 **** (diff-find-file-name old noprompt (match-string 1))) ;; if all else fails, ask the user (unless noprompt ! (let ((file (read-file-name (format "Use file %s: " ! (or (first fs) "")) ! nil (first fs) t (first fs)))) (set (make-local-variable 'diff-remembered-files-alist) (cons (cons fs file) diff-remembered-files-alist)) file)))))) --- 815,825 ---- (diff-find-file-name old noprompt (match-string 1))) ;; if all else fails, ask the user (unless noprompt ! (let ((file (expand-file-name (or (first fs) ""))) ! (default-directory "/")) ! (setq file ! (read-file-name (format "Use file %s: " file) ! nil file t file)) (set (make-local-variable 'diff-remembered-files-alist) (cons (cons fs file) diff-remembered-files-alist)) file)))))) --8<---------------cut here---------------end--------------->8--- > Worse: When I check it with a local RHEL5 machine, the test scenario > from Dani results in > > if: Not a Tramp file name: > /ftp\:slbhao\:/home/albinus/src/tramp/lisp/tramp.el > > So we seem to have also a quoting problem. Grrr. For this one, I'll write a new bug report. Best regards, Michael.