From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 23 09:00:14 2010 Received: (at submit) by debbugs.gnu.org; 23 Sep 2010 13:00:14 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OylPJ-0003Vt-Uf for submit@debbugs.gnu.org; Thu, 23 Sep 2010 09:00:14 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OylPH-0003Vm-9m for submit@debbugs.gnu.org; Thu, 23 Sep 2010 09:00:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OylRn-0008Ju-T5 for submit@debbugs.gnu.org; Thu, 23 Sep 2010 09:02:48 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED,T_RP_MATCHES_RCVD,T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:40903) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OylRn-0008Jp-Qo for submit@debbugs.gnu.org; Thu, 23 Sep 2010 09:02:47 -0400 Received: from [140.186.70.92] (port=35785 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OylRm-00037E-GJ for bug-gnu-emacs@gnu.org; Thu, 23 Sep 2010 09:02:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OylRl-0008JI-1S for bug-gnu-emacs@gnu.org; Thu, 23 Sep 2010 09:02:46 -0400 Received: from ppsw-31.csi.cam.ac.uk ([131.111.8.131]:50876) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OylRk-0008Iv-RU for bug-gnu-emacs@gnu.org; Thu, 23 Sep 2010 09:02:45 -0400 X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com ([86.9.122.85]:63141 helo=Victoria.local) by ppsw-31.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.157]:587) with esmtpsa (PLAIN:sl392) (TLSv1:DHE-RSA-AES128-SHA:128) id 1OylRj-0000S8-KT (Exim 4.72) for bug-gnu-emacs@gnu.org (return-path ); Thu, 23 Sep 2010 14:02:43 +0100 From: Leo To: bug-gnu-emacs@gnu.org Subject: 23.2; [PATCH] Fix return value of dnd-get-local-file-name Date: Thu, 23 Sep 2010 14:02:42 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -6.3 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) `dnd-get-local-file-name' returns nil when must-exist is nil, which contradicts its doc string. The patch fixes this. diff --git a/lisp/dnd.el b/lisp/dnd.el index d7cbb64..ef41b76 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -137,7 +137,7 @@ Return nil if URI is not a local file." (defun dnd-get-local-file-name (uri &optional must-exist) "Return file name converted from file:/// or file: syntax. URI is the uri for the file. If MUST-EXIST is given and non-nil, -only return non-nil if the file exists. +only return non-nil if the file is readable. Return nil if URI is not a local file." (let ((f (cond ((string-match "^file:///" uri) ; XDND format. (substring uri (1- (match-end 0)))) @@ -154,9 +154,11 @@ Return nil if URI is not a local file." (let* ((decoded-f (decode-coding-string f (or file-name-coding-system - default-file-name-coding-system))) - (try-f (if (file-readable-p decoded-f) decoded-f f))) - (when (file-readable-p try-f) try-f))))) + default-file-name-coding-system)))) + (setq f (cond ((file-readable-p decoded-f) decoded-f) + ((file-readable-p f) f) + (t nil))))) + f)) (defun dnd-open-local-file (uri action) From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 02 21:21:14 2010 Received: (at 7090) by debbugs.gnu.org; 3 Oct 2010 01:21:14 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P2DGM-0001Yq-7j for submit@debbugs.gnu.org; Sat, 02 Oct 2010 21:21:14 -0400 Received: from pantheon-po42.its.yale.edu ([130.132.50.101]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P2DGK-0001Yl-Vi for 7090@debbugs.gnu.org; Sat, 02 Oct 2010 21:21:13 -0400 Received: from furry (173-9-75-145-NewEngland.hfc.comcastbusiness.net [173.9.75.145]) (authenticated bits=0) by pantheon-po42.its.yale.edu (8.12.11.20060308/8.12.11) with ESMTP id o931OECh001715 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 2 Oct 2010 21:24:15 -0400 Received: by furry (Postfix, from userid 1000) id C7363C018; Sat, 2 Oct 2010 21:24:14 -0400 (EDT) From: Chong Yidong To: Leo Subject: Re: bug#7090: 23.2; [PATCH] Fix return value of dnd-get-local-file-name References: Date: Sat, 02 Oct 2010 21:24:14 -0400 In-Reply-To: (Leo's message of "Thu, 23 Sep 2010 14:02:42 +0100") Message-ID: <87pqvsgjb5.fsf@stupidchicken.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-YaleITSMailFilter: Version 1.2c (attachment(s) not renamed) X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 7090 Cc: 7090@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) Leo writes: > `dnd-get-local-file-name' returns nil when must-exist is nil, which > contradicts its doc string. The patch fixes this. Thanks; applied. From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 23 20:48:24 2011 Received: (at control) by debbugs.gnu.org; 24 Feb 2011 01:48:24 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PsQJb-0000fD-V9 for submit@debbugs.gnu.org; Wed, 23 Feb 2011 20:48:24 -0500 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PsQJa-0000ez-SP for control@debbugs.gnu.org; Wed, 23 Feb 2011 20:48:23 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1PsQJV-00007C-Ut for control@debbugs.gnu.org; Wed, 23 Feb 2011 20:48:17 -0500 Date: Wed, 23 Feb 2011 20:48:17 -0500 Message-Id: Subject: control message for bug 7090 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -6.3 (------) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) close 7090 23.3 From unknown Sat Sep 06 00:11:03 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 24 Mar 2011 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator