From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alex Kosorukoff Newsgroups: gmane.emacs.devel Subject: [PATCH] 24.3; locate-library returning spurious paths Date: Sun, 11 May 2014 09:35:59 -0700 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=047d7b2e401629cba104f9226e1a X-Trace: ger.gmane.org 1399826802 31244 80.91.229.3 (11 May 2014 16:46:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 11 May 2014 16:46:42 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 11 18:46:37 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WjWtW-00053u-P7 for ged-emacs-devel@m.gmane.org; Sun, 11 May 2014 18:46:34 +0200 Original-Received: from localhost ([::1]:33658 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjWtW-0001Y6-8a for ged-emacs-devel@m.gmane.org; Sun, 11 May 2014 12:46:34 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjWjj-000829-6T for emacs-devel@gnu.org; Sun, 11 May 2014 12:36:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WjWjf-0003gP-DO for emacs-devel@gnu.org; Sun, 11 May 2014 12:36:27 -0400 Original-Received: from mail-oa0-x22b.google.com ([2607:f8b0:4003:c02::22b]:52129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjWjf-0003gL-5b for emacs-devel@gnu.org; Sun, 11 May 2014 12:36:23 -0400 Original-Received: by mail-oa0-f43.google.com with SMTP id l6so7142538oag.2 for ; Sun, 11 May 2014 09:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to:content-type; bh=pu7OaE1sSzsuA5XIgbk+POePIOmp3aLgQW1yj/2L2wE=; b=xJ5m5D1RnY88vpJAhhGD/yNX27T+WrxIApWGOc62lSfMtag46kzVKjIWpwNB9lZ6U7 CTEnEI8yNd9PCnH6FKYBXhInUkw2+1BHr73EHq6qAVhQQxe/vXM1bE7O+GuLIZvxXOEu 5EIlTTmbrf2i8hGj3Ifh/mIdbMYcvUocHn9wvy7+1ErZ29Hzv3OYEm0YDwssOkbuu+hj eQSjmwj48PlLrOZFLOouvKZ3cSaOqQC4fhC5RWB2IKHvuYpSAHRETa10Xw0ZKXPk7yQv TfwJ2MWlInJCTYfYSDQ+G7jkMmaqKlXQ2OMlfTRcsxAaahw8KHCPi0qkoxe1JrWSarIO uN7g== X-Received: by 10.182.79.9 with SMTP id f9mr3047885obx.64.1399826179277; Sun, 11 May 2014 09:36:19 -0700 (PDT) Original-Received: by 10.182.240.131 with HTTP; Sun, 11 May 2014 09:35:59 -0700 (PDT) X-Google-Sender-Auth: qzHUA4kBO7x9205BZYu6LvZgPxg X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::22b X-Mailman-Approved-At: Sun, 11 May 2014 12:46:32 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:171802 Archived-At: --047d7b2e401629cba104f9226e1a Content-Type: text/plain; charset=UTF-8 Hello: locate-library incorrectly generates a set of suffixes to extend the base library name (".elc" ".elc.gz" ".el" ".el.gz" "" ".gz"), while it should be just (".elc" ".elc.gz" ".el" ".el.gz") when nosuffix is nil. This leads to spurious paths found, like name.gz. I found this issue because (locate-library "tramp") was returning "/home/alex/.emacs.d/trump" not "../lisp/net/trum.elc". The workaround is (locate-file "tramp" load-path (get-load-suffixes)) Here is a patch to fix this # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alex@3form.com-20140511055846-cdjb3ui1aqby0jy1 # target_branch: bzr://bzr.sv.gnu.org/emacs/trunk/ # testament_sha1: 026e246535785206c6c31c4e089f60eba3143716 # timestamp: 2014-05-10 23:00:03 -0700 # base_revision_id: monnier@iro.umontreal.ca-20140511034953-\ # 1mzcrftziwhrw9hl # # Begin patch === modified file 'lisp/subr.el' --- lisp/subr.el 2014-04-09 01:48:07 +0000 +++ lisp/subr.el 2014-05-11 05:58:46 +0000 @@ -1859,8 +1859,7 @@ t)) (let ((file (locate-file library (or path load-path) - (append (unless nosuffix (get-load-suffixes)) - load-file-rep-suffixes)))) + (unless nosuffix (get-load-suffixes))))) (if interactive-call (if file (message "Library is file %s" (abbreviate-file-name file)) # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTQ4wWQAAXPfgCAwUGP/93MI AAC////wUANaTdvdvZsdg8GKJMjTZUbR6TCE9MmkZqGjT1AGUiZpPJqn4KYmpmhHlMm1PUMhk9BJ ECAQ0KexCepGjI9Q0APUGSo8Gpkg0NAAAAAAEpNUxNNHqekZGj1AeoAAACcIFuHKbfWK3DGNfGwC uQ8oPwtu/tHw8uDMx69l+o0apMTKl009Pb9xiflkw5kIO+Znt24BiBga70HfYrlOkZdgMga5Hg2W VL6tO2ujO8CYmo3AUO0OpiBS4GCagjB1pBbHQQF4KJo+pLFUHVFGVsyPya8V/k45wwdRitaUQcTD OupAy/JNSm5dK6+KskI5r1HoXaeYZjA7KzG3g4NjUCsW6pbGgVoM6AQoqEkXHSi17gLM4sBJKJpG EC0XDOH0qkS9lSN7mSgL2FwIVE6MBnKRTXymLfO5Uc0YxJ3wJINKjnJW8pi0B6xCbFJPaZkWqKkS y6swaVUFEpK6S2DCeNYNtF9ASuuqdzkFizQ0pbQc9sEgsSW0rlpmkLZ55Cx40GYTwTbLtkYq0zgW jd1rDCL23XvC2F7Tm4pOmm0SgRyLx1YjDfyhMmq/tzxJ5AXyaUEl3Y10zoiOtrRaAwBseEOd6lOA kAiNQQ7rc99FIODCJbBFF8Bf/g1Si4p35GD8z7g7gIDCOujQ7EDa7IHytatCSVbjdNC8P34qyC5c Jp4r0rtMx7vA0FTjRU7eLZts7ucPGrfUzymHvuAfiIzNt0HXKvWiwyZ/JWd2B4vKMIbKQNVXVqnp FMoDQBnMUKDRPwZrMQzDedzxafO3pIdziWi6cq4jLhxsVgEeB9y821zgrY+xT8/4pgEfEUFghgA6 FM7dYHwDUE8MCN+sK8bhICPLtIXn4UxgwJgmUMpuMirZ/qkunzflrHrdqLakzKnO8zlAKwk54qcg rlAINZgFREJ7VuRAKOmWV4VrAfXzyAoHTECZ7QytEfGC779s6sfYzJyNXCNFxS81xSoDlwRRPK0x VXWtI3hXC+Uo9E9rG2UncuMmrsBprWqNFMOn3aVeyV2NTv2MIPfQ6RszsKgrAeDrDNdVNbmXoKP0 AhubwMxoAaYnjiMjoY5EJQIXANB6g16MxeFpK/xdyRThQkDQ4wWQ --047d7b2e401629cba104f9226e1a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hello:

locate-library incorrectly = generates a set of suffixes to extend the
base library name (&quo= t;.elc" ".elc.gz" ".el" ".el.gz" "&= quot; ".gz"), while it
should be just (".elc" ".elc.gz" ".el" &= quot;.el.gz") when nosuffix is
nil. This leads to spurious p= aths found, like name.gz. I found
this issue because (locate-libr= ary "tramp") was returning
"/home/alex/.emacs.d/trump" not "../lisp/net/trum.elc&q= uot;. The workaround
is (locate-file "tramp" load-path = (get-load-suffixes))

Here is a patch t= o fix this

# Bazaar merge directive format 2 (Baz= aar 0.90)
# revision_id: alex@3form.com-20140511055846-cdjb3ui1aq= by0jy1
# target_branch: bzr://bzr.sv.gnu.org/emacs/trunk/
# testament_sha1: 026e246535785206c6c31c4e089f60eba3143716
#= timestamp: 2014-05-10 23:00:03 -0700
# base_revision_id: monnier= @iro.umontreal.ca-20140511034953-\
# =C2=A0 1mzcrftziwhrw9hl
#=C2=A0
# Begin patch
=3D=3D=3D modified file '= ;lisp/subr.el'
--- lisp/subr.el =C2=A0 =C2=A0 =C2=A0 =C2=A020= 14-04-09 01:48:07 +0000
+++ lisp/subr.el =C2=A0 =C2=A0 =C2=A0 =C2= =A02014-05-11 05:58:46 +0000
@@ -1859,8 +1859,7 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0t))
=C2=A0 =C2=A0(let ((file (locate-file library
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(or path load-path)
- =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(a= ppend (unless nosuffix (get-load-suffixes))
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0load-file-rep-suffixes)= )))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(unless nosuffix (get-load-suffixes)))))
=C2=A0 =C2=A0 =C2=A0(if interactive-call
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 (if file
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (me= ssage "Library is file %s" (abbreviate-file-name file))

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZG= xlIHY0CiMKQlpoOTFBWSZTWTQ4wWQAAXPfgCAwUGP/93MI
AAC////wUANaTdvdvZ= sdg8GKJMjTZUbR6TCE9MmkZqGjT1AGUiZpPJqn4KYmpmhHlMm1PUMhk9BJ
ECAQ0K= exCepGjI9Q0APUGSo8Gpkg0NAAAAAAEpNUxNNHqekZGj1AeoAAACcIFuHKbfWK3DGNfGwC
uQ8oPwtu/tHw8uDMx69l+o0apMTKl009Pb9xiflkw5kIO+Znt24BiBga70HfYrlOkZdgMg= a5Hg2W
VL6tO2ujO8CYmo3AUO0OpiBS4GCagjB1pBbHQQF4KJo+pLFUHVFGVsyPya= 8V/k45wwdRitaUQcTD
OupAy/JNSm5dK6+KskI5r1HoXaeYZjA7KzG3g4NjUCsW6p= bGgVoM6AQoqEkXHSi17gLM4sBJKJpG
EC0XDOH0qkS9lSN7mSgL2FwIVE6MBnKRTXymLfO5Uc0YxJ3wJINKjnJW8pi0B6xCbFJPaZ= kWqKkS
y6swaVUFEpK6S2DCeNYNtF9ASuuqdzkFizQ0pbQc9sEgsSW0rlpmkLZ55C= x40GYTwTbLtkYq0zgW
jd1rDCL23XvC2F7Tm4pOmm0SgRyLx1YjDfyhMmq/tzxJ5A= XyaUEl3Y10zoiOtrRaAwBseEOd6lOA
kAiNQQ7rc99FIODCJbBFF8Bf/g1Si4p35GD8z7g7gIDCOujQ7EDa7IHytatCSVbjdNC8P3= 4qyC5c
Jp4r0rtMx7vA0FTjRU7eLZts7ucPGrfUzymHvuAfiIzNt0HXKvWiwyZ/JW= d2B4vKMIbKQNVXVqnp
FMoDQBnMUKDRPwZrMQzDedzxafO3pIdziWi6cq4jLhxsVg= EeB9y821zgrY+xT8/4pgEfEUFghgA6
FM7dYHwDUE8MCN+sK8bhICPLtIXn4UxgwJgmUMpuMirZ/qkunzflrHrdqLakzKnO8zlAKw= k54qcg
rlAINZgFREJ7VuRAKOmWV4VrAfXzyAoHTECZ7QytEfGC779s6sfYzJyNXC= NFxS81xSoDlwRRPK0x
VXWtI3hXC+Uo9E9rG2UncuMmrsBprWqNFMOn3aVeyV2NTv= 2MIPfQ6RszsKgrAeDrDNdVNbmXoKP0
AhubwMxoAaYnjiMjoY5EJQIXANB6g16MxeFpK/xdyRThQkDQ4wWQ

--047d7b2e401629cba104f9226e1a--