bug#17467: 24.3; locate-library returning spurious path

[Alex Kosorukoff <alex@3form.com>]

[-- Attachment #1: Type: text/plain, Size: 3576 bytes --]

Yes, this makes sense. Here is a patch that the issues you mentioned.

(locate-library "tramp.el.gz")
(locate-library "tramp.el")
(locate-library "tramp")

all are working as expected

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alex@3form.com-20140511184813-t6p0r8ac4em9kuyf
# target_branch: :parent
# testament_sha1: 66b596e6da58c1cb71dedd7fa9ba2fcf20e2964c
# timestamp: 2014-05-11 11:48:22 -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 18:48:13 +0000
@@ -1857,10 +1857,13 @@
                                        load-path (get-load-suffixes)))
                     nil nil
                     t))
-  (let ((file (locate-file library
-                          (or path load-path)
-                          (append (unless nosuffix (get-load-suffixes))
-                                  load-file-rep-suffixes))))
+  (let ((file
+         (locate-file library
+                      (or path load-path)
+                      (unless (or nosuffix (string-suffix-p ".el.gz"
library))
+                        (if (string-suffix-p ".el" library)
+                            load-file-rep-suffixes
+                          (get-load-suffixes))))))
     (if interactive-call
        (if file
            (message "Library is file %s" (abbreviate-file-name file))

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYwVAfIAAv3/gDIwFUBQY//3
cwgAAL////BQBZY8tZs1llc7udAaowkqTTQZAM0gBoxAaaAAAJKajTEap+ijaR6I0AA0AAACRTQk
2iTTyJiTTR6j0jJoNAyYgHMAAAAAAAAAABUogmgJgmJiGmpkm0j1MIaAyTLbLDZxNRGLHnrLAyW9
r/aHw7fgG/B1bYJK8emKqTIKmSSJCycvA8sP7hSOWceg7jgMYw8fyi0yw11PqgkQRnWDExNp4bj8
RqO+pIz8yQ2Fww34eP+zJEGZqnl4bjuROkkiD4Ps7JHW+xjfE2vX85EqNzn/x57Z2nVtP9DoxN6P
Dx6uqxRre9Oq+7Y/xotaU8c1dRpQ6+5KWepxa8+ita+XW4lFLHOLnZNgjZOOdrqoLX0kJBMRZUNh
SPeX3UE4RGEyH9RCEE88XW3iMhYSKhgywGRWVrOSpZC37Qy9RhZCYmLzLgVCpqg1zy5r55azmFoF
9mLE1MZFiWq2u1nfQ0/XIm9OebVuTe48Jgal/BGZspfft7pfRpNz1qmChGCYGXkuXN2wpuNGMkp5
sDLMNpfcDpmwpCrjabGLxRHsWsmWnMvxIVR8k2VMoi7Vd0d4gYjGK1bd4IxiQpzAzHBfUTypURs6
AyNExSsr5mphmGZbkw0tYmDK1XsZbIcc7PlcbcJpzYI0nKtLUaGj2Ymdxb+C4CkZk+YRlaGQ6Zlr
lvpPcUMal5eLIhgDg2rIFXMLm1X0maHF1M9uiOYk5GA8CNBQkbKUl3OoQxewiAoDhV31WkywYsmX
tqFRr5EahVsWkK641lETqtGlOo9OqcEmaQoc1DQnY/y9E913ZerM80YJVYzrGVS9eqLlUovUtMUl
+JRpbHzODoye/fSlaLFHk+zW9UOJ7mVhSiGx+UoNJiaSaD5cIDPgh65gbJdO02V4bYqLt4mjQ2yV
N7gptiiqlf6eHa7WDQjzzosjlN8bKBHAQ/RERDRV9VYo5xQD6PwtQjOBAS0nWYG3G0pR/YEUSfc1
kwhj7CTKQ2GiuILRIo3AqVyGQuxwaY7dCqiMrIimZDyQt7KlhiNdhXwhaIkZVi0docU1mcuhkZ9x
KB7TiW1Kw5FC5Lr9wYbjidMEz8fnmTez3Vezk8RfdjclHhu/lYcE2HvSkl3dwczZ3vYsU2uZTmyC
pGCWvoxbFZxnDbiWK3R0F0VCmwaytPBnFWzFgJUHGY1GknHUEbBFk9XGUWvWGR5+nNydadRj5T5z
SnowbUU3afKKana/CUVL2vob4WG74SaMjF3Na1sH1PgNL0cJofdSTEu0o80cZsdsmpxk7pO8pDIM
io8ZPZ31VyN/3Y0OPNR8lnc8X3uvYVaHQNaGlKqxkd7SclywzFyp1l9wyLlklikzNRgWl7YmZFhi
qlE45zGmiSvR+fEjEPBrF82OsnFmkj2sT8NrVpYmr2TM27xjE6wFxhtqWFuEUb7RYB7BMIShLUFE
ZcHNnN0x+WDJCbytnYuXWukzWKFC1sUKSJLFaW3eWAZVe1p6CZcKqW44HeMqWXK1L8WfaquSxY+R
2LJVoYHitMnNlMJMaKKVWVTsc50S9NdIfFFr4mDau6p8kyptF8zTp3pnTC1eoUQpFEvkXI/dHRPP
Vt6zGnryeP4u5IpwoSEYKgPk



On Sun, May 11, 2014 at 11:10 AM, Eli Zaretskii <eliz@gnu.org> wrote:

> > From: Alex Kosorukoff <alex@3form.com>
> > Date: Sun, 11 May 2014 10:53:34 -0700
> > Cc: 17467@debbugs.gnu.org
> >
> > did you mean the following
> >
> > (locate-library "tramp.el") returning the path to tramp.el.gz?
>
> Yes.  But also (locate-library "tramp.el") being able to find
> tramp.el.
>

[-- Attachment #2: Type: text/html, Size: 5028 bytes --]