Easy configuration of a site-lisp directory

Easy configuration of a site-lisp directory

[Philip Kaludercic]

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


Hi,

I have been using something along these lines for a while now, and
wanted to suggest adding this to Emacs/ELPA:


[-- Attachment #2: site-lisp.el --]
[-- Type: application/emacs-lisp, Size: 2891 bytes --]

[-- Attachment #3: Type: text/plain, Size: 656 bytes --]


The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
directory where a user can clone any repository or create their own,
without having to manually add these to load-path, generate autoloads or
byte compile.

All my personal packages are managed this way without any issues that I
have noticed. My hope is that something like this would ease working on
and contributing to packages.

The above attachment is a stand-alone file, while my version is just a
blob at the beginning of my init.el. If there is any interest, it might
also be possible to add it to an existing file, but I was not sure where
it would fit in best.

-- 
	Philip K.

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

Philip Kaludercic [2021-08-08 15:40:57] wrote:
> I have been using something along these lines for a while now, and
> wanted to suggest adding this to Emacs/ELPA:
[...]
> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
> directory where a user can clone any repository or create their own,
> without having to manually add these to load-path, generate autoloads or
> byte compile.

FWIW, I use `elpa-admin.el` for that.
The advantage being that the package.el is made aware of them.

Admittedly, `elpa-admin.el` doesn't provide that "out of the box", but
I'd welcome changes to improve this use case.  It go become an
alternative to `straight.el`.


        Stefan

Re: Easy configuration of a site-lisp directory

[Philip Kaludercic]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Philip Kaludercic [2021-08-08 15:40:57] wrote:
>> I have been using something along these lines for a while now, and
>> wanted to suggest adding this to Emacs/ELPA:
> [...]
>> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
>> directory where a user can clone any repository or create their own,
>> without having to manually add these to load-path, generate autoloads or
>> byte compile.
>
> FWIW, I use `elpa-admin.el` for that.
> The advantage being that the package.el is made aware of them.

What is the advantage in making package.el aware?

> Admittedly, `elpa-admin.el` doesn't provide that "out of the box", but
> I'd welcome changes to improve this use case.  It go become an
> alternative to `straight.el`.

On the topic of package.el, a more general idea I had was to make
package.el more generic, with different backends. Then you could have
one backend for elpa packages, one for local "packages", etc. But that
would certainly take more effort to design and implement that what I
have suggested here.

>
>         Stefan
>
>
>

-- 
	Philip Kaludercic

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

>> FWIW, I use `elpa-admin.el` for that.
>> The advantage being that the package.el is made aware of them.
> What is the advantage in making package.el aware?

It lets you install `dash` via Git and then install packages that depend
on `dash` via `M-x package-install`.

>> Admittedly, `elpa-admin.el` doesn't provide that "out of the box", but
>> I'd welcome changes to improve this use case.  It go become an
>> alternative to `straight.el`.
> On the topic of package.el, a more general idea I had was to make
> package.el more generic, with different backends.

I think most of it is there already: package.el is divided between
a part that activates packages that are installed and a part which
installs packages from ELPA archives.

The part that activate the locally installed packages is quite
independent and doesn't care about the format of ELPA archives.
All it cares about is the contents of <FOO>-pkg.el and
<FOO>-autoloads.el, both of which are created by the installer.


        Stefan

Re: Easy configuration of a site-lisp directory

[dick]

SM> Admittedly, `elpa-admin.el` doesn't provide that "out of the box", but I'd
SM> welcome changes to improve this use case.  It go become an alternative to
SM> `straight.el`.

I was hoping ELPASO (https://github.com/dickmao/elpaso) would be the
elpa-admin-aware alternative to straight.  I do appreciate that "not invented here"
is reason enough not to look into someone else's project.

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

> SM> Admittedly, `elpa-admin.el` doesn't provide that "out of the box", but I'd
> SM> welcome changes to improve this use case.  It go become an alternative to
> SM> `straight.el`.
> I was hoping ELPASO (https://github.com/dickmao/elpaso) would be the
> elpa-admin-aware alternative to straight.  I do appreciate that "not invented here"
> is reason enough not to look into someone else's project.

I wasn't aware (or forgot about) that one.  AFAICT it generates
a tarball from a remote Git repository and then installs it
"normally", right?  I think Philip intends instead to have the local Git
clone *be* the installed package (which is also how I use
elpa-admin.el).

Basically, the way I do it is to setup a local nongnu.git clone with
something like `git clone ../nongnu.git; cd nongnu; make`.
Then add this local `.../nongnu` to your `package-directory-list`.
This is done once and for all.

Once that is done, installing a new package amounts to:

- edit `nongnu/elpa-packages` to add the package's spec
- `cd .../nongnu; make packages/PKG>; make packages/PKG>`
- That's it

[ The second `make` is because the first only fetches the package and
  crates the worktree, while the second then builds the <PKG>-pkg.el
  and <PKG>-autoloads.el and compiles the files.  ]

Packages can be updated with:

- `cd .../nongnu; make worktrees; make`.

But as it stands, this comes with its fair share of rough edges, some of
which are plain bugs in `elpa-admin.el`, others are simply
missing features.

The main advantage for me is that things like `C-h f` bring me straight
to the Git-managed source code.


        Stefan

Re: Easy configuration of a site-lisp directory

[dick]

> ... to have the local Git clone *be* the installed package

Yes, that is quite a distinct and useful conception, and not at all isomorphic
to what casual users construe "packaging" to mean.  My apologies.  "Package"
*qua* "git repo" is a straight- (and also borg-) specific notion that the
control freaks among us (and what card-carrying emacser is not?) swear by.

> The main advantage for me is that things like `C-h f` bring me straight to
> the Git-managed source code.

Aye, one of the great pleasures of running emacs directly out of the git repo
via "src/emacs" (as opposed to the emacs produced from `make install`) is
xref-find-definitions (M-.) NOT jumping to an .el.gz file (people who
immediately appreciate this sentiment, and *only* those people, will know what
I'm talking about).

Re: Easy configuration of a site-lisp directory

[Clément Pit-Claudel]

On 8/8/21 8:43 PM, dick wrote:
> Aye, one of the great pleasures of running emacs directly out of the git repo
> via "src/emacs" (as opposed to the emacs produced from `make install`) is
> xref-find-definitions (M-.) NOT jumping to an .el.gz file (people who
> immediately appreciate this sentiment, and *only* those people, will know what
> I'm talking about).

It would be nice if that could be fixed; M-. works for C functions, so maybe it could work for Lisp functions too?  Though the .el files could be out of sync with the .el.gz files, presumably.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

dick <dick.r.chiang@gmail.com> writes:

> SM> Admittedly, `elpa-admin.el` doesn't provide that "out of the box", but I'd
> SM> welcome changes to improve this use case.  It go become an alternative to
> SM> `straight.el`.
>
> I was hoping ELPASO (https://github.com/dickmao/elpaso) would be the
> elpa-admin-aware alternative to straight.  I do appreciate that "not invented here"
> is reason enough not to look into someone else's project.

Never heard of Elpaso before. What is the advantage compared to
straight?

While I think it is convenient to be able to install directly from Git,
a centralized reviewed source is also at least some security safety
net. Elisp can do anything on your harddrive. Download any source from
wild wild web does infere  some security risks too.

Re: Easy configuration of a site-lisp directory

[dick]

> Never heard of Elpaso before. What is the advantage compared to straight?

It embraces package.el.  Straight would prefer its users eliminate all
package.el configuration.  As I am a contemptuous (and contemptible) being,
I'll take this opportunity to badmouth straight.  Its answer to GNU ELPA being
"stupidly complex" was hosting a Heroku mirror to "bypass terrible package
management decisions" and to avoid having to understand the elpa-admin
code. [1] One particularly unsightly side effect of this is 50 lines of gnarly
elisp to get around org-mode's needing a preliminary call to `make`.

It's also impossible to take seriously a README that is 23,000 words, but what
do I know?  My reading of r/emacs suggests roughly half the forum's enthusiasts
use straight, not to mention all the zoomer doomers.

> a centralized reviewed source is also at least some security safety net.

Statements like this only encourage the invidious-minded among us to "check
your privilege."  It's obvious to everyone that baseline measures like
package-signing or secure http only ensure the trojan horse you're getting is
authentically the trojan horse that my blackhat alias wrote.  The ELPAs rely
on our good faith and the limited financial upside of exploiting a userbase of
our modest size (and probably modest means -- emacsers use free software not
only for philosophical reasons!).

[1] https://github.com/raxod502/straight.el/issues/762#issuecomment-841859211

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

dick <dick.r.chiang@gmail.com> writes:

>> Never heard of Elpaso before. What is the advantage compared to straight?
>
> It embraces package.el.  Straight would prefer its users eliminate all
> package.el configuration.  As I am a contemptuous (and contemptible) being,
> I'll take this opportunity to badmouth straight.  Its answer to GNU ELPA being
> "stupidly complex" was hosting a Heroku mirror to "bypass terrible package
> management decisions" and to avoid having to understand the elpa-admin
> code. [1] One particularly unsightly side effect of this is 50 lines of gnarly
> elisp to get around org-mode's needing a preliminary call to `make`.

Ok. thanks for the bird view. I actually took some time to skimm through
the github page, I red now that it is an explicit goal to be
incompatible with package.el.

> It's also impossible to take seriously a README that is 23,000 words,

Well, I don't think author ment you to take him seriously in all those
words either :-):

"straight.el frees you from needing to think about package management,
since I already did all the thinking to figure how best to design
everything."

He does have humour.

>             My reading of r/emacs suggests roughly half the forum's enthusiasts
> use straight, not to mention all the zoomer doomers.

Yes, straight seems to be very popular. I don't use it myself, but
as I understand people really like to be able to just auto-download code
from some online git repo. Doom indeed has added a lot to it's popularity.

>> a centralized reviewed source is also at least some security safety net.
>
> Statements like this only encourage the invidious-minded among us to "check
> your privilege."  It's obvious to everyone that baseline measures like
> package-signing or secure http only ensure the trojan horse you're getting is
> authentically the trojan horse that my blackhat alias wrote.  The ELPAs rely
> on our good faith and the limited financial upside of exploiting a userbase of
> our modest size (and probably modest means -- emacsers use free software not
> only for philosophical reasons!).

Well I hope that someone who is managing Elpa (Stefans?) is looking at
what people contribute to it. With looking at I mean, looking like in a
"code review"? At least that seems to be case with Melpa.

But yes, in general, of course, it is a weak guarantee, but for
non-developers it is at least some guarantee. For a developer it is
probably no brainer to decide if something is bull or OK, I use loads of
lisp code form people's gits, emacs wiki and other places which are not
in elpa/melpa repos, but for some random Joe who never opened a lisp 
file it can be a difference between opening the computer to maffia or
running something secure. I admit that it indeed is a low risk
considering current (im)popularity of Emacs, but I wouldn't count on
that one.

> [1] https://github.com/raxod502/straight.el/issues/762#issuecomment-841859211

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Clément Pit-Claudel <cpitclaudel@gmail.com>
> Date: Sun, 8 Aug 2021 23:13:44 -0400
> 
> M-. works for C functions, so maybe it could work for Lisp functions too?

It already does, always did.

Re: Easy configuration of a site-lisp directory

[Clément Pit-Claudel]

On 8/9/21 12:59 PM, Eli Zaretskii wrote:
>> From: Clément Pit-Claudel <cpitclaudel@gmail.com>
>> Date: Sun, 8 Aug 2021 23:13:44 -0400
>>
>> M-. works for C functions, so maybe it could work for Lisp functions too?
> 
> It already does, always did.

This was a response to Dick's comment:

> Aye, one of the great pleasures of running emacs directly out of the git repo
via "src/emacs" (as opposed to the emacs produced from `make install`) is
xref-find-definitions (M-.) NOT jumping to an .el.gz file

On a typical install Emacs takes you to the .el.gz, not to the .el in the original repo; whereas for C files in takes you to the original repo.  That's what I meant by "work".

Re: Easy configuration of a site-lisp directory

[dick]

CP> On a typical install Emacs takes you to the .el.gz, not to the .el in the
CP> original repo; whereas for C files in takes you to the original repo.
CP> That's what I meant by "work".

I hear you, but emacs would have to be telepathic to know that you wanted to
jump to your "working copy" .el's instead of the "installed copy" .el.gz's.

This is why true believers only ever run emacs from their git clone.  Running
the emacs executable from one's PATH or, to return to the original thread regarding
straight.el, running package code from the default package-user-dir, is purely
for normies (among whom I am proud to number).

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> Cc: emacs-devel@gnu.org
> From: Clément Pit-Claudel <cpitclaudel@gmail.com>
> Date: Mon, 9 Aug 2021 14:33:48 -0400
> 
> On a typical install Emacs takes you to the .el.gz, not to the .el in the original repo

Why is that a problem for you?  M-. takes you to the code you are
actually running, whereas the files in Git could have been modified
meanwhile, and are no longer the code your installed Emacs runs.

But if it _is_ a problem, for some reason, the solution is a two-step
dance:

  . run 'etags' to produce TAGS that names the *.el files in the Git
    checkout where you want to go

  . configure Xref to use etags for ELisp files (instead of the
    built-in ELisp backend)

Re: Easy configuration of a site-lisp directory

[Clément Pit-Claudel]

On 8/9/21 2:49 PM, dick wrote:
> I hear you, but emacs would have to be telepathic to know that you wanted to
> jump to your "working copy" .el's instead of the "installed copy" .el.gz's.

Well, it knows not to jump to a disassembly of the Emacs binary when I ask it about a C function, nor to a disassembly of the .elc files that *actually* get loaded instead of the .el.gz, so it doesn't sound like that much more of a stretch to jump to the original .el files :)

Re: Easy configuration of a site-lisp directory

[Clément Pit-Claudel]

On 8/9/21 2:52 PM, Eli Zaretskii wrote:
>> Cc: emacs-devel@gnu.org
>> From: Clément Pit-Claudel <cpitclaudel@gmail.com>
>> Date: Mon, 9 Aug 2021 14:33:48 -0400
>>
>> On a typical install Emacs takes you to the .el.gz, not to the .el in the original repo
> 
> Why is that a problem for you?  M-. takes you to the code you are
> actually running, 

No, I'm running from .elc files, am I not?  Not from .el.gz ones.

> whereas the files in Git could have been modified
> meanwhile, and are no longer the code your installed Emacs runs.

Yep, that's precisely why I wrote "Though the .el files could be out of sync with the .el.gz files, presumably."  But the same issue exists with the C files, which could be out of date as well.

> But if it _is_ a problem, for some reason, the solution is a two-step
> dance:
> 
>   . run 'etags' to produce TAGS that names the *.el files in the Git
>     checkout where you want to go
> 
>   . configure Xref to use etags for ELisp files (instead of the
>     built-in ELisp backend)

Thanks.  Is there a way to do that only for Emacs source files, not for all ELisp files?

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Clément Pit-Claudel <cpitclaudel@gmail.com> writes:

> On 8/9/21 12:59 PM, Eli Zaretskii wrote:
>>> From: Clément Pit-Claudel <cpitclaudel@gmail.com>
>>> Date: Sun, 8 Aug 2021 23:13:44 -0400
>>>
>>> M-. works for C functions, so maybe it could work for Lisp functions too?
>> 
>> It already does, always did.
>
> This was a response to Dick's comment:
>
>> Aye, one of the great pleasures of running emacs directly out of the git repo
> via "src/emacs" (as opposed to the emacs produced from `make install`) is
> xref-find-definitions (M-.) NOT jumping to an .el.gz file
>
> On a typical install Emacs takes you to the .el.gz, not to the .el in the
> original repo; whereas for C files in takes you to the original repo.  That's
> what I meant by "work".

I am not sure if --without-compress-install does it also even for make
install, but yes, that is why I also run from src folder. It save time
for compressing files and for copying files over.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Clément Pit-Claudel <cpitclaudel@gmail.com> writes:

> On 8/9/21 2:49 PM, dick wrote:
>> I hear you, but emacs would have to be telepathic to know that you wanted to
>> jump to your "working copy" .el's instead of the "installed copy" .el.gz's.
>
> Well, it knows not to jump to a disassembly of the Emacs binary when I ask it
> about a C function, nor to a disassembly of the .elc files that *actually* get
> loaded instead of the .el.gz, so it doesn't sound like that much more of a
> stretch to jump to the original .el files :)

If you have a 3rd party package in elpa dir in .emacs.d and some
"working git copy" elsewhere, I don't see how Emacs will know where to
jump without some additional logic you will have to code in. I don't
think it is difficult to hack it, just that it is not there by default.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

dick <dick.r.chiang@gmail.com> writes:

> CP> On a typical install Emacs takes you to the .el.gz, not to the .el in the
> CP> original repo; whereas for C files in takes you to the original repo.
> CP> That's what I meant by "work".
>
> I hear you, but emacs would have to be telepathic to know that you wanted to
> jump to your "working copy" .el's instead of the "installed copy" .el.gz's.
>
> This is why true believers only ever run emacs from their git clone.  Running
> the emacs executable from one's PATH or, to return to the original thread regarding
> straight.el, running package code from the default package-user-dir, is purely
> for normies (among whom I am proud to number).

To return to this discussion about straight and package and git, I have
been myself thinking of using git repos as default install for packages,
since not so many people recently seem to care about packaging for
either melpa nor elpa. That is why I was looking at straight, quelpa and
borg. I haven't been aware of your elpaso.

However, I am not yet convinced it is so desirable to run Emacs from
development sources? I understand the idea, but if you work on
something, need to hack to hack som fast fix etc, try out something etc,
I would always have to be aware to make branch, do change, etc so I can
pull form origin to update etc. I haven't setuped yet anything, but I
was thinking of having two different places, one for installation and
one for working git clone.

Also, do you fork everything on a service like github or gitlab, or you
clone directly to the drive from other people's public repos?

Currently I jsut have one lisp directory for which I generate autoloads
and have that dir in path, similar as what Philip has suggested, and I just
copy any lisp files I wish to use, not packages for a package.el to that
dir. 

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> Cc: emacs-devel@gnu.org
> From: Clément Pit-Claudel <cpitclaudel@gmail.com>
> Date: Mon, 9 Aug 2021 18:14:46 -0400
> 
> > Why is that a problem for you?  M-. takes you to the code you are
> > actually running, 
> 
> No, I'm running from .elc files, am I not?  Not from .el.gz ones.

You are also running native machine code, not the C source files.  And
yet you want M-. to show you the C source code, not the disassembly of
the machine instructions.  Same with *.el.gz files: they are the exact
_source_code_ of what you are running.

> > whereas the files in Git could have been modified
> > meanwhile, and are no longer the code your installed Emacs runs.
> 
> Yep, that's precisely why I wrote "Though the .el files could be out of sync with the .el.gz files, presumably."  But the same issue exists with the C files, which could be out of date as well.

In the case of C sources there's no alternative if you install from
the Git checkout (as opposed to from a source tree produced by
unpacking the tarball).  At the time, some people argued for
installing the C sources at "make install" time, which I think would
be taking things too far.  Especially as installing allows you to
delete the source tree, in which case there would be no TAGS to
support M-. anyway.

> >   . run 'etags' to produce TAGS that names the *.el files in the Git
> >     checkout where you want to go
> > 
> >   . configure Xref to use etags for ELisp files (instead of the
> >     built-in ELisp backend)
> 
> Thanks.  Is there a way to do that only for Emacs source files, not for all ELisp files?

The beauty of TAGS is that you control what will be in it: by
specifying the file names to be submitted to the 'etags' program.
Only what you submit to it will be in TAGS.

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Arthur Miller <arthur.miller@live.com>
> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org
> Date: Tue, 10 Aug 2021 10:10:43 +0200
> 
> > On a typical install Emacs takes you to the .el.gz, not to the .el in the
> > original repo; whereas for C files in takes you to the original repo.  That's
> > what I meant by "work".
> 
> I am not sure if --without-compress-install does it also even for make
> install, but yes, that is why I also run from src folder. It save time
> for compressing files and for copying files over.

What is your problem with compressed *.el files?  When Emacs visits
such a file, it uncompresses it, so you see the original source.  And
yet people keep mentioning the .gz extension as if it were a huge
problem.  What am I missing?

Re: Easy configuration of a site-lisp directory

[Yuri Khan]

On Tue, 10 Aug 2021 at 19:08, Eli Zaretskii <eliz@gnu.org> wrote:

> What is your problem with compressed *.el files?  When Emacs visits
> such a file, it uncompresses it, so you see the original source.  And
> yet people keep mentioning the .gz extension as if it were a huge
> problem.  What am I missing?

I have an unconfirmed guess that some people want not only to see the
code but also hack it. In this use case, it is desirable for M-. to
take them to the actual hackable code so that any changes persist
across Emacs restarts and are seen by version control.

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Yuri Khan <yuri.v.khan@gmail.com>
> Date: Tue, 10 Aug 2021 20:43:30 +0700
> Cc: Arthur Miller <arthur.miller@live.com>, Clément Pit-Claudel <cpitclaudel@gmail.com>, 
> 	Emacs developers <emacs-devel@gnu.org>
> 
> On Tue, 10 Aug 2021 at 19:08, Eli Zaretskii <eliz@gnu.org> wrote:
> 
> > What is your problem with compressed *.el files?  When Emacs visits
> > such a file, it uncompresses it, so you see the original source.  And
> > yet people keep mentioning the .gz extension as if it were a huge
> > problem.  What am I missing?
> 
> I have an unconfirmed guess that some people want not only to see the
> code but also hack it. In this use case, it is desirable for M-. to
> take them to the actual hackable code so that any changes persist
> across Emacs restarts and are seen by version control.

But the .el.gz files that Emacs displays _are_ "hackable", in the
sense that you can modify it and then save the results.  Right?

Re: Easy configuration of a site-lisp directory

[Yuri Khan]

On Tue, 10 Aug 2021 at 21:01, Eli Zaretskii <eliz@gnu.org> wrote:

> > I have an unconfirmed guess that some people want not only to see the
> > code but also hack it. In this use case, it is desirable for M-. to
> > take them to the actual hackable code so that any changes persist
> > across Emacs restarts and are seen by version control.
>
> But the .el.gz files that Emacs displays _are_ "hackable", in the
> sense that you can modify it and then save the results.  Right?

Right… technically.

0. I[*] have an itch and go to scratch it. M-. takes me to an .el.gz
somewhere in /usr/share/emacs.
1. I want to start hacking but the buffer is read-only because (x): my
regular user does not have write access to system-wide
platform-independent files.
1a. I can switch to the hackable /home/me/src/emacs/lisp/{filename}.el
right away while lamenting that M-. did not take me right there, or
1b. I can press C-x C-q to remove the readonlyness. For the sake of
argument, let’s see where this leads.
2. I make a change and want to save it. I cannot because (x).
2a. Again, at this point, I can C-x C-w
/home/you/src/emacs/lisp/{filename}.el, cursing under my breath.
Alternatively,
2b. Since I have admin rights, I can take ownership or loosen access
rights on the file so I can save it. Again, let’s say I do this just
to prove a point.
3. I finish my work and want to do a self-review before committing.
But /usr/share/emacs is not under version control and I did not make a
backup and now I still have to go to my git clone.

[*]: for a suitable value of “I”. If I frequently wanted to make
changes to Emacs proper, that would be my reasoning. As it is, I
merely project it onto people who do.

Re: Easy configuration of a site-lisp directory

[dick]

0. git clone git://git.savannah.gnu.org/emacs.git $HOME/emacs
1. git checkout -b dev
2. ./autogen.sh ; ./configure ; make -j4
3. alias emacs=$HOME/emacs/src/emacs
4. Live out your dreams

Apart from betraying a fundamental misunderstanding about UNIX's reification
of installed binaries, your dream scenario couldn't realize anyway because
apparently you lack the system privileges to even `make install` (which is a
crucial but missing step in your previous message).

YK> As it is, I merely project it onto people who do.

This, I think, is one of the unspoken benefits of keeping emacs development
via mailing list patches and debbugs as arcane and awkward as possible.

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Yuri Khan <yuri.v.khan@gmail.com>
> Date: Tue, 10 Aug 2021 22:10:22 +0700
> Cc: Arthur Miller <arthur.miller@live.com>, Clément Pit-Claudel <cpitclaudel@gmail.com>, 
> 	Emacs developers <emacs-devel@gnu.org>
> 
> > But the .el.gz files that Emacs displays _are_ "hackable", in the
> > sense that you can modify it and then save the results.  Right?
> 
> Right… technically.
> 
> 0. I[*] have an itch and go to scratch it. M-. takes me to an .el.gz
> somewhere in /usr/share/emacs.
> 1. I want to start hacking but the buffer is read-only because (x): my
> regular user does not have write access to system-wide
> platform-independent files.
> 1a. I can switch to the hackable /home/me/src/emacs/lisp/{filename}.el
> right away while lamenting that M-. did not take me right there, or
> 1b. I can press C-x C-q to remove the readonlyness. For the sake of
> argument, let’s see where this leads.
> 2. I make a change and want to save it. I cannot because (x).
> 2a. Again, at this point, I can C-x C-w
> /home/you/src/emacs/lisp/{filename}.el, cursing under my breath.
> Alternatively,
> 2b. Since I have admin rights, I can take ownership or loosen access
> rights on the file so I can save it. Again, let’s say I do this just
> to prove a point.
> 3. I finish my work and want to do a self-review before committing.
> But /usr/share/emacs is not under version control and I did not make a
> backup and now I still have to go to my git clone.

This is entirely unrelated to the fact that the *.el files are
compressed, right?  You'd get the same results if they were installed
uncompressed, right?  Thus, the original question "why people care
about the fact it's a .el.gz file" still stands.

If we now change the subject, as you did, and talk about the fact that
the installed *.el files are not modifiable by your user, I will claim
that it's a mis-configuration of your system's access rights and/or
a problem with the way Emacs was installed, because if you _want_ to
hack the sources of an installed Emacs, you should make sure you have
write access to those sources.  If all else fails (e.g., you need to
work on a system where you don't call the shots wrt access rights),
you can always install Emacs under your home directory.  Right?

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

> 3. alias emacs=$HOME/emacs/src/emacs

FWIW, I instead have `PATH=~/bin:$PATH` and then in `~/bin` I put a symlink
to my `.../src/emacs`.


        Stefan

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Arthur Miller <arthur.miller@live.com>
>> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org
>> Date: Tue, 10 Aug 2021 10:10:43 +0200
>> 
>> > On a typical install Emacs takes you to the .el.gz, not to the .el in the
>> > original repo; whereas for C files in takes you to the original repo.  That's
>> > what I meant by "work".
>> 
>> I am not sure if --without-compress-install does it also even for make
>> install, but yes, that is why I also run from src folder. It save time
>> for compressing files and for copying files over.
>
> What is your problem with compressed *.el files?  When Emacs visits
> such a file, it uncompresses it, so you see the original source.  And
> yet people keep mentioning the .gz extension as if it were a huge
> problem.  What am I missing?
It takes time, at least on my computer. There is a noticable delay,
where everything freezes for a small amount of time, but it is like a
sudden break. I use to lookup helm for functions and variables a lot, so
it is annoying in the long run. At least for me on my fastest
computer. On the laptop it is even slower.

I also don't see the point of running make install every time after I
pulled and rebuild emacs, when I can equally well run it from src
folder. Just me.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Yuri Khan <yuri.v.khan@gmail.com> writes:

> On Tue, 10 Aug 2021 at 19:08, Eli Zaretskii <eliz@gnu.org> wrote:
>
>> What is your problem with compressed *.el files?  When Emacs visits
>> such a file, it uncompresses it, so you see the original source.  And
>> yet people keep mentioning the .gz extension as if it were a huge
>> problem.  What am I missing?
>
> I have an unconfirmed guess that some people want not only to see the
> code but also hack it. In this use case, it is desirable for M-. to
> take them to the actual hackable code so that any changes persist
> across Emacs restarts and are seen by version control.

I actually usually don't, but that is a valid reason too. If I hack
something in Emacs, I copy that piece of code somewhere else, or entire
file and use that instead.

Re: Easy configuration of a site-lisp directory

[Clément Pit-Claudel]

On 8/10/21 11:44 AM, Eli Zaretskii wrote:
> If we now change the subject, as you did, and talk about the fact that
> the installed *.el files are not modifiable by your user, I will claim
> that it's a mis-configuration of your system's access rights and/or
> a problem with the way Emacs was installed

But it's not the installed Emacs I want to hack, it's the sources that are under git.
I think my mistake is simply to have run make install at all, I should just run Emacs from src/emacs in the git repo.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

dick <dick.r.chiang@gmail.com> writes:

> 0. git clone git://git.savannah.gnu.org/emacs.git $HOME/emacs
> 1. git checkout -b dev
> 2. ./autogen.sh ; ./configure ; make -j4
> 3. alias emacs=$HOME/emacs/src/emacs
> 4. Live out your dreams
>
> Apart from betraying a fundamental misunderstanding about UNIX's reification
> of installed binaries, your dream scenario couldn't realize anyway because
> apparently you lack the system privileges to even `make install` (which is a
> crucial but missing step in your previous message).
>
> YK> As it is, I merely project it onto people who do.
>
> This, I think, is one of the unspoken benefits of keeping emacs development
> via mailing list patches and debbugs as arcane and awkward as possible.

One can configure with PREFIX being somewhere in the home dir, or
elsewhere with write priviledges, and on our home/personal computers it
is not of a problem anyway, but still; why doing it and spending time
compressing/decompressing when it works just fine from src dir.

Re: Easy configuration of a site-lisp directory

[Clément Pit-Claudel]

On 8/10/21 11:10 AM, Yuri Khan wrote:
> On Tue, 10 Aug 2021 at 21:01, Eli Zaretskii <eliz@gnu.org> wrote:
> 
>>> I have an unconfirmed guess that some people want not only to see the
>>> code but also hack it. In this use case, it is desirable for M-. to
>>> take them to the actual hackable code so that any changes persist
>>> across Emacs restarts and are seen by version control.
>>
>> But the .el.gz files that Emacs displays _are_ "hackable", in the
>> sense that you can modify it and then save the results.  Right?
> 
> Right… technically.
> 
> 0. I[*] have an itch and go to scratch it. M-. takes me to an .el.gz
> somewhere in /usr/share/emacs.
> 1. I want to start hacking but the buffer is read-only because (x): my
> regular user does not have write access to system-wide
> platform-independent files.
> 1a. I can switch to the hackable /home/me/src/emacs/lisp/{filename}.el
> right away while lamenting that M-. did not take me right there, or
> 1b. I can press C-x C-q to remove the readonlyness. For the sake of
> argument, let’s see where this leads.
> 2. I make a change and want to save it. I cannot because (x).
> 2a. Again, at this point, I can C-x C-w
> /home/you/src/emacs/lisp/{filename}.el, cursing under my breath.
> Alternatively,
> 2b. Since I have admin rights, I can take ownership or loosen access
> rights on the file so I can save it. Again, let’s say I do this just
> to prove a point.
> 3. I finish my work and want to do a self-review before committing.
> But /usr/share/emacs is not under version control and I did not make a
> backup and now I still have to go to my git clone.

I think that's a perfect description of my typical flow :) And I think Arthur's suggestion is right: I shouldn't make install, just run from src/.

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Arthur Miller <arthur.miller@live.com>
> Cc: cpitclaudel@gmail.com,  emacs-devel@gnu.org
> Date: Tue, 10 Aug 2021 19:22:47 +0200
> 
> > What is your problem with compressed *.el files?  When Emacs visits
> > such a file, it uncompresses it, so you see the original source.  And
> > yet people keep mentioning the .gz extension as if it were a huge
> > problem.  What am I missing?
> It takes time, at least on my computer. There is a noticable delay,
> where everything freezes for a small amount of time, but it is like a
> sudden break.

You can always install without compressing.

> I also don't see the point of running make install every time after I
> pulled and rebuild emacs, when I can equally well run it from src
> folder.

Then don't install.  This whole discussion was for people who do, for
one reason or another.

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> Cc: arthur.miller@live.com, emacs-devel@gnu.org
> From: Clément Pit-Claudel <cpitclaudel@gmail.com>
> Date: Tue, 10 Aug 2021 13:25:25 -0400
> 
> On 8/10/21 11:44 AM, Eli Zaretskii wrote:
> > If we now change the subject, as you did, and talk about the fact that
> > the installed *.el files are not modifiable by your user, I will claim
> > that it's a mis-configuration of your system's access rights and/or
> > a problem with the way Emacs was installed
> 
> But it's not the installed Emacs I want to hack, it's the sources that are under git.

Then why not do just that?  If you edit the sources in the Git
checkout, and use the TAGS table there, M-. will give you sources in
Git, not those of the installed Emacs.  I do that all the time: run an
installed Emacs to develop the master branch.

> I think my mistake is simply to have run make install at all, I should just run Emacs from src/emacs in the git repo.

That's possible, but not necessary, see above.  You can M-. to the
sources of Emacs other than the one you are running exactly as you can
do that while editing any other program.  Just think of the Emacs
sources in Git as a program you develop, not the program you run.

Re: Easy configuration of a site-lisp directory

[Clément Pit-Claudel]

On 8/10/21 1:50 PM, Eli Zaretskii wrote:
> and use the TAGS table there, M-. will give you sources in
> Git, not those of the installed Emacs.

Yep, that's the part I was missing: setting up Elisp tags to point to the git repo.  There's a nice magic to the way it works with C sources that isn't the same with the (installed) Elisp sources, that's it.

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> Cc: yuri.v.khan@gmail.com, arthur.miller@live.com, emacs-devel@gnu.org
> From: Clément Pit-Claudel <cpitclaudel@gmail.com>
> Date: Tue, 10 Aug 2021 14:06:53 -0400
> 
> On 8/10/21 1:50 PM, Eli Zaretskii wrote:
> > and use the TAGS table there, M-. will give you sources in
> > Git, not those of the installed Emacs.
> 
> Yep, that's the part I was missing: setting up Elisp tags to point to the git repo.  There's a nice magic to the way it works with C sources that isn't the same with the (installed) Elisp sources, that's it.

"make TAGS" in the Git checkout will produce such a TAGS table
automatically, you just need to visit-tags-table it before you start
using M-.

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

Clément Pit-Claudel [2021-08-10 14:06:53] wrote:
> On 8/10/21 1:50 PM, Eli Zaretskii wrote:
>> and use the TAGS table there, M-. will give you sources in
>> Git, not those of the installed Emacs.
> Yep, that's the part I was missing: setting up Elisp tags to point to the
> git repo.  There's a nice magic to the way it works with C sources that
> isn't the same with the (installed) Elisp sources, that's it.

The magic is the `find-function-C-source-directory` variable (and the
code that uses it) which "manually" tells where to redirect.  We could
add similar redirections for ELisp source code (even go crazy and add
such redirections for non-builtin packages, in case you have a source
dir corresponding to a package installed via `package-install` or
somesuch).


        Stefan

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org,
>  arthur.miller@live.com,  yuri.v.khan@gmail.com
> Date: Tue, 10 Aug 2021 16:51:29 -0400
> 
> Clément Pit-Claudel [2021-08-10 14:06:53] wrote:
> > On 8/10/21 1:50 PM, Eli Zaretskii wrote:
> >> and use the TAGS table there, M-. will give you sources in
> >> Git, not those of the installed Emacs.
> > Yep, that's the part I was missing: setting up Elisp tags to point to the
> > git repo.  There's a nice magic to the way it works with C sources that
> > isn't the same with the (installed) Elisp sources, that's it.
> 
> The magic is the `find-function-C-source-directory` variable

That's irrelevant to M-. I think.

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

>> >> and use the TAGS table there, M-. will give you sources in
>> >> Git, not those of the installed Emacs.
>> > Yep, that's the part I was missing: setting up Elisp tags to point to the
>> > git repo.  There's a nice magic to the way it works with C sources that
>> > isn't the same with the (installed) Elisp sources, that's it.
>> The magic is the `find-function-C-source-directory` variable
> That's irrelevant to M-. I think.

Oh, indeed, I was thinking of `C-h o`. sorry.  Don't mind me.


        Stefan

Re: Easy configuration of a site-lisp directory

[Basil L. Contovounesios]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Stefan Monnier <monnier@iro.umontreal.ca>
>> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org,
>>  arthur.miller@live.com,  yuri.v.khan@gmail.com
>> Date: Tue, 10 Aug 2021 16:51:29 -0400
>> 
>> Clément Pit-Claudel [2021-08-10 14:06:53] wrote:
>> > On 8/10/21 1:50 PM, Eli Zaretskii wrote:
>> >> and use the TAGS table there, M-. will give you sources in
>> >> Git, not those of the installed Emacs.
>> > Yep, that's the part I was missing: setting up Elisp tags to point to the
>> > git repo.  There's a nice magic to the way it works with C sources that
>> > isn't the same with the (installed) Elisp sources, that's it.
>> 
>> The magic is the `find-function-C-source-directory` variable
>
> That's irrelevant to M-. I think.

FWIW, I run an installed Emacs, but tell M-. to prefer the Git sources
with the following MWE:

(defvar blc-dataroot-dir
  (file-name-directory (directory-file-name data-directory))
  "Machine-independent data root directory.")

(defun blc-dataroot-to-src (file)
  "Map FILE under `blc-dataroot-dir' to `source-directory'.
Return FILE unchanged if not under `blc-dataroot-dir'."
  (if (and (stringp file)
           (file-in-directory-p file blc-dataroot-dir))
      (expand-file-name (file-relative-name file blc-dataroot-dir)
                        source-directory)
    file))

(define-advice find-function-search-for-symbol
    (:around (search sym type lib) blc-dataroot-to-src)
  "Pass LIB through `blc-dataroot-to-src'."
  (funcall search sym type (blc-dataroot-to-src lib)))

-- 
Basil

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: "Basil L. Contovounesios" <contovob@tcd.ie>
> Cc: Stefan Monnier <monnier@iro.umontreal.ca>,  cpitclaudel@gmail.com,
>   yuri.v.khan@gmail.com,  arthur.miller@live.com,  emacs-devel@gnu.org
> Date: Wed, 11 Aug 2021 14:42:31 +0100
> 
> >> The magic is the `find-function-C-source-directory` variable
> >
> > That's irrelevant to M-. I think.
> 
> FWIW, I run an installed Emacs, but tell M-. to prefer the Git sources
> with the following MWE:

Is this for Lisp only?  Because AFAICT it does nothing for C sources.

Re: Easy configuration of a site-lisp directory

[Basil L. Contovounesios]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: "Basil L. Contovounesios" <contovob@tcd.ie>
>> Cc: Stefan Monnier <monnier@iro.umontreal.ca>,  cpitclaudel@gmail.com,
>>   yuri.v.khan@gmail.com,  arthur.miller@live.com,  emacs-devel@gnu.org
>> Date: Wed, 11 Aug 2021 14:42:31 +0100
>> 
>> >> The magic is the `find-function-C-source-directory` variable
>> >
>> > That's irrelevant to M-. I think.
>> 
>> FWIW, I run an installed Emacs, but tell M-. to prefer the Git sources
>> with the following MWE:
>
> Is this for Lisp only?

Yes.

> Because AFAICT it does nothing for C sources.

When installed from a Git checkout, source-directory already holds the
correct value, so M-. works OOTB for definitions in C.

In other installations, the user need only set that one variable
appropriately.  Even if they don't, M-. will prompt for it
interactively.

-- 
Basil

Re: Easy configuration of a site-lisp directory

[No Wayman]

>One particularly unsightly side effect of this is 50 lines of 
>gnarly
>elisp to get around org-mode's needing a preliminary call to 
>`make`.

Could you point me to the 50 lines you're referring to and perhaps 
give a few words on what you feel is particularly 'gnarly' about 
them?
(Feel free to open an issue on our repository or drop the 
In-Reply-To if you feel like this is getting too far off topic)
I'm open to criticism, but I'm not exactly sure what you're 
critiquing here.
The org-mode recipe we provide uses elisp to execute some 
pre-build steps that are necessary to generate org-vesrion.el.
We chose to use elisp rather than rely on Org's provided makefile 
because we received complaints from Windows users who were missing
make on their systems. 
However, this elisp is very similar (almost identical) to the code 
Org uses itself in its makefile to do the same.

Or perhaps you're referring to the need for such "pre-build" 
machinery in the first place?
In that case, I would ask how el-paso deals with packages which 
require build steps (whether running make or some other arbitrary 
steps) prior to being compiled/generating autoloads?
For example, how does el-paso build Org, mu4e, or magit correctly 
and directly from source?
I believe last time I asked the answer was "it doesn't", but I'm 
curious if that has changed at all or if you plan to address that 
in a future version of el-paso.

>It's also impossible to take seriously a README that is 23,000 
>words, but what do I know?

I agree with you that the README should be shortened.
I have been working on that when I can, but other issues take 
priority over that right now.
For what it's worth, many users compliment us on the thoroughness 
and length of the README.
Probably just a matter of taste.

I'll have to dedicate some time to reviewing el-paso.
I'm sure I'll learn something.

Thanks,

Nick (co-maintainer of straight.el)

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: "Basil L. Contovounesios" <contovob@tcd.ie>
> Cc: monnier@iro.umontreal.ca,  cpitclaudel@gmail.com,
>   yuri.v.khan@gmail.com,  arthur.miller@live.com,  emacs-devel@gnu.org
> Date: Wed, 11 Aug 2021 19:21:50 +0100
> 
> >> FWIW, I run an installed Emacs, but tell M-. to prefer the Git sources
> >> with the following MWE:
> >
> > Is this for Lisp only?
> 
> Yes.
> 
> > Because AFAICT it does nothing for C sources.
> 
> When installed from a Git checkout, source-directory already holds the
> correct value, so M-. works OOTB for definitions in C.
> 
> In other installations, the user need only set that one variable
> appropriately.  Even if they don't, M-. will prompt for it
> interactively.

YMMV, but IMO configuring Xref to use etags for Lisp is an easier and
more versatile technique.  All it needs is this:

  (add-hook 'emacs-lisp-mode-hook 'xref-etags-mode)

I did that long ago, and never looked back.

Re: Easy configuration of a site-lisp directory

[dick]

Ah, the craven pleasure of having one's flamebait reach its target via the
intertubes.

Like the straight author, I also prefer a Halstedian approach to
garbage code, but elpa-admin is not that, and maintaining a Heroku mirror to
normalize relations with ELPA is as cost-effective as erecting a Trumpian
border wall.  I suppose, relative to that undertaking, having to replicate
elpa-admin's pre-build treatment and default-inclusive recipe were but
afterthoughts. [1]

Ever unconvincingly trying to appear aloof, I'll add the requisite disclaimer
that none of these decisions actually matters except to a hundred or so
obsessives.  Most emacsers' configurations are so flawed that nothing we do
prevents them from having to issue shell commands to manage third-party
elisp.

[1] https://github.com/raxod502/straight.el/blob/08b0ecf525b4b53e0952c1575644f82f52264961/straight.el#L3059-L3122

Re: Easy configuration of a site-lisp directory

[No Wayman]

dick <dick.r.chiang@gmail.com> writes:

> Ah, the craven pleasure of having one's flamebait reach its 
> target via the
> intertubes.
>
> Like the straight author, I also prefer a Halstedian approach to
> garbage code, but elpa-admin is not that, and maintaining a 
> Heroku mirror to
> normalize relations with ELPA is as cost-effective as erecting a 
> Trumpian
> border wall.  I suppose, relative to that undertaking, having to 
> replicate
> elpa-admin's pre-build treatment and default-inclusive recipe 
> were but
> afterthoughts. [1]
 
> Ever unconvincingly trying to appear aloof, I'll add the 
> requisite disclaimer
> that none of these decisions actually matters except to a 
> hundred or so
> obsessives.  Most emacsers' configurations are so flawed that 
> nothing we do
> prevents them from having to issue shell commands to manage 
> third-party
> elisp.
>
> [1]
> https://github.com/raxod502/straight.el/blob/08b0ecf525b4b53e0952c1575644f82f52264961/straight.el#L3059-L3122


So you take issue with the Org specific code I mentioned earlier?
Again, this is almost exactly what Org does in its makefile.
I'm not sure what qualifies that as 'gnarly', or even what you 
mean by 'gnarly' in that context.
At one point straight.el ignored this step altogether and provided 
a hack to work around it.
I considered that to be a worse solution than implementing general 
pre-build commands, especially
considering Org is not the only popular package to require such 
treatment (see mu4e, magit, etc).

Writing in a flowery, over-the-top manner isn't a substitute for 
substance.
If you have any concrete technical criticisms, I'm open to hearing 
them.
Still waiting to hear how el-paso deals with the issue of packages 
with similar requirements, too.

However, this conversation has strayed from the original topic and 
doesn't belong on emacs-devel.
As such, this is the last reply I'll make to this thread.
Feel free to email me directly or open an issue at straight's 
repo.

Re: Easy configuration of a site-lisp directory

[dick]

> Still waiting to hear how el-paso deals with the issue of packages with
> similar requirements, too.

The elpa-admin code handles it for me.

Re: Easy configuration of a site-lisp directory

[Philip Kaludercic]

Just wanted to ping this message to check if there is any interest in
doing something with my initial suggestion?

Philip Kaludercic <philipk@posteo.net> writes:

> Hi,
>
> I have been using something along these lines for a while now, and
> wanted to suggest adding this to Emacs/ELPA:
>
>
>
> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
> directory where a user can clone any repository or create their own,
> without having to manually add these to load-path, generate autoloads or
> byte compile.
>
> All my personal packages are managed this way without any issues that I
> have noticed. My hope is that something like this would ease working on
> and contributing to packages.
>
> The above attachment is a stand-alone file, while my version is just a
> blob at the beginning of my init.el. If there is any interest, it might
> also be possible to add it to an existing file, but I was not sure where
> it would fit in best.

-- 
	Philip Kaludercic

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Philip Kaludercic <philipk@posteo.net> writes:

> Just wanted to ping this message to check if there is any interest in
> doing something with my initial suggestion?

I do something similar as you do, but I use it only for some loose
files I write myself, and for some I download from emacs wiki etc.

>> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
>> directory where a user can clone any repository or create their own,
>> without having to manually add these to load-path, generate autoloads or
>> byte compile.

I have a question: is it desirable to use a working git directory as
installed package? When I write my own files, I usually don't wish to
copy them over to my "lisp" directory which I autoload in Emacs, untill
I am done. Admittedly I started doing so before git has entered the
scene. Now I guess one can switch branches every time one works on a package
between some development branch and some stable, but isn't it a bit tedious?

What you are suggesting is to effectively use "site-lisp" as another
package-user-dir (~/.emacs.d/elpa on my machine). You are also auto
recursing in all dirs, so if user wish to remove something they have to
remove that directory from the path?

Why not hack pacakge.el to use "local archives", would work something like this:

(add-to-list 'package-archives '("site-lisp" . "file://path/to/my/site-lisp"))

Or maybe we can skip 'file://', and just use path, say like this:

(add-to-list 'package-archives '("local" . "~/.emacs.d/lisp"))

Package.el would need to be hacked to install a package either from
a single file, which it can already do, or from a directory, which would
need to be added. That would also work out of th ebox with
package-quickstart.el generation.

The only bigger work there would be to make package.el install
directories.

Alternatively, package.el could treat local directories slightly
differently and just add their paths to load-path and generates
autoloads, but that complicates package.el slightly more which maybe is
unnecessary.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Arthur Miller <arthur.miller@live.com> writes:

> Philip Kaludercic <philipk@posteo.net> writes:
>
>> Just wanted to ping this message to check if there is any interest in
>> doing something with my initial suggestion?
>
> I do something similar as you do, but I use it only for some loose
> files I write myself, and for some I download from emacs wiki etc.
>
>>> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
>>> directory where a user can clone any repository or create their own,
>>> without having to manually add these to load-path, generate autoloads or
>>> byte compile.
>
> I have a question: is it desirable to use a working git directory as
> installed package? When I write my own files, I usually don't wish to
> copy them over to my "lisp" directory which I autoload in Emacs, untill
> I am done. Admittedly I started doing so before git has entered the
> scene. Now I guess one can switch branches every time one works on a package
> between some development branch and some stable, but isn't it a bit tedious?
>
> What you are suggesting is to effectively use "site-lisp" as another
> package-user-dir (~/.emacs.d/elpa on my machine). You are also auto
> recursing in all dirs, so if user wish to remove something they have to
> remove that directory from the path?
>
> Why not hack pacakge.el to use "local archives", would work something like this:
>
> (add-to-list 'package-archives '("site-lisp" . "file://path/to/my/site-lisp"))
>
> Or maybe we can skip 'file://', and just use path, say like this:
>
> (add-to-list 'package-archives '("local" . "~/.emacs.d/lisp"))
>
> Package.el would need to be hacked to install a package either from
> a single file, which it can already do, or from a directory, which would
> need to be added. That would also work out of th ebox with
> package-quickstart.el generation.
>
> The only bigger work there would be to make package.el install
> directories.
>
> Alternatively, package.el could treat local directories slightly
> differently and just add their paths to load-path and generates
> autoloads, but that complicates package.el slightly more which maybe is
> unnecessary.

I just looked at package.el and realized that it is already possible to
install directories, I wasn't aware of that fact. So the only extra work
is to make it recognize local paths in a list package-archives list, in
principle.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Arthur Miller <arthur.miller@live.com> writes:

> Arthur Miller <arthur.miller@live.com> writes:
>
>> Philip Kaludercic <philipk@posteo.net> writes:
>>
>>> Just wanted to ping this message to check if there is any interest in
>>> doing something with my initial suggestion?
>>
>> I do something similar as you do, but I use it only for some loose
>> files I write myself, and for some I download from emacs wiki etc.
>>
>>>> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
>>>> directory where a user can clone any repository or create their own,
>>>> without having to manually add these to load-path, generate autoloads or
>>>> byte compile.
>>
>> I have a question: is it desirable to use a working git directory as
>> installed package? When I write my own files, I usually don't wish to
>> copy them over to my "lisp" directory which I autoload in Emacs, untill
>> I am done. Admittedly I started doing so before git has entered the
>> scene. Now I guess one can switch branches every time one works on a package
>> between some development branch and some stable, but isn't it a bit tedious?
>>
>> What you are suggesting is to effectively use "site-lisp" as another
>> package-user-dir (~/.emacs.d/elpa on my machine). You are also auto
>> recursing in all dirs, so if user wish to remove something they have to
>> remove that directory from the path?
>>
>> Why not hack pacakge.el to use "local archives", would work something like this:
>>
>> (add-to-list 'package-archives '("site-lisp" . "file://path/to/my/site-lisp"))
>>
>> Or maybe we can skip 'file://', and just use path, say like this:
>>
>> (add-to-list 'package-archives '("local" . "~/.emacs.d/lisp"))
>>
>> Package.el would need to be hacked to install a package either from
>> a single file, which it can already do, or from a directory, which would
>> need to be added. That would also work out of th ebox with
>> package-quickstart.el generation.
>>
>> The only bigger work there would be to make package.el install
>> directories.
>>
>> Alternatively, package.el could treat local directories slightly
>> differently and just add their paths to load-path and generates
>> autoloads, but that complicates package.el slightly more which maybe is
>> unnecessary.
>
> I just looked at package.el and realized that it is already possible to
> install directories, I wasn't aware of that fact. So the only extra work
> is to make it recognize local paths in a list package-archives list, in
> principle.
 And  I also realized that package-archives can already deal with local
 directories. So everything is there.

Users can already install from local repos.

Re: Easy configuration of a site-lisp directory

[Philip Kaludercic]

Arthur Miller <arthur.miller@live.com> writes:

> Arthur Miller <arthur.miller@live.com> writes:
>
>> Arthur Miller <arthur.miller@live.com> writes:
>>
>>> Philip Kaludercic <philipk@posteo.net> writes:
>>>
>>>> Just wanted to ping this message to check if there is any interest in
>>>> doing something with my initial suggestion?
>>>
>>> I do something similar as you do, but I use it only for some loose
>>> files I write myself, and for some I download from emacs wiki etc.
>>>
>>>>> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
>>>>> directory where a user can clone any repository or create their own,
>>>>> without having to manually add these to load-path, generate autoloads or
>>>>> byte compile.
>>>
>>> I have a question: is it desirable to use a working git directory as
>>> installed package? When I write my own files, I usually don't wish to
>>> copy them over to my "lisp" directory which I autoload in Emacs, untill
>>> I am done. Admittedly I started doing so before git has entered the
>>> scene. Now I guess one can switch branches every time one works on a package
>>> between some development branch and some stable, but isn't it a bit tedious?

I do think this is useful, because it prevents confusion with xref. When
I am working on my own packages/packages I am contributing to, I want
M-. to jump to the actual definition I can work on, not a copy that
might get lost.

>> I just looked at package.el and realized that it is already possible to
>> install directories, I wasn't aware of that fact. So the only extra work
>> is to make it recognize local paths in a list package-archives list, in
>> principle.

I assume you mean package-install-file?

>  And  I also realized that package-archives can already deal with local
>  directories. So everything is there.
>
> Users can already install from local repos.

The issue is that this is just a repository, that might be helpful in
some situations, but at the very least adds a redundant step (fetch the
code, install the code) and always makes it harder to work on local
repositories, because package-sources are unversioned.

-- 
	Philip Kaludercic

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Philip Kaludercic <philipk@posteo.net> writes:

> Arthur Miller <arthur.miller@live.com> writes:
>
>> Arthur Miller <arthur.miller@live.com> writes:
>>
>>> Arthur Miller <arthur.miller@live.com> writes:
>>>
>>>> Philip Kaludercic <philipk@posteo.net> writes:
>>>>
>>>>> Just wanted to ping this message to check if there is any interest in
>>>>> doing something with my initial suggestion?
>>>>
>>>> I do something similar as you do, but I use it only for some loose
>>>> files I write myself, and for some I download from emacs wiki etc.
>>>>
>>>>>> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
>>>>>> directory where a user can clone any repository or create their own,
>>>>>> without having to manually add these to load-path, generate autoloads or
>>>>>> byte compile.
>>>>
>>>> I have a question: is it desirable to use a working git directory as
>>>> installed package? When I write my own files, I usually don't wish to
>>>> copy them over to my "lisp" directory which I autoload in Emacs, untill
>>>> I am done. Admittedly I started doing so before git has entered the
>>>> scene. Now I guess one can switch branches every time one works on a package
>>>> between some development branch and some stable, but isn't it a bit tedious?
>
> I do think this is useful, because it prevents confusion with xref. When
> I am working on my own packages/packages I am contributing to, I want
> M-. to jump to the actual definition I can work on, not a copy that
> might get lost.
Yes, I am aware of that one. I think that is also the reason why people
prefer straight.el. Isn't it possible to advise something in xref to use
the working copy? How do you deal with incomplete code? When you are
working on something and it is not ready to be used in Emacs yet. Do you
switch branches or do you use some other strategy? 

>>> I just looked at package.el and realized that it is already possible to
>>> install directories, I wasn't aware of that fact. So the only extra work
>>> is to make it recognize local paths in a list package-archives list, in
>>> principle.
>
> I assume you mean package-install-file?

I goofed there, I wasn't aware package-archives can already be spciefied
as local paths, forgoett about that one. Sorry I was making noise there.

>>  And  I also realized that package-archives can already deal with local
>>  directories. So everything is there.
>>
>> Users can already install from local repos.
>
> The issue is that this is just a repository

I know, I am aware. It also duplicates the code; working and
installed. But it does offer better granularity what gets installed.

>                         the very least adds a redundant step (fetch the
> code, install the code) and always makes it harder to work on local
True. But we can automate that one. We still have to do fetch if the
source is not on local disk, and some kind of action is still needed, at
least to create autoloads, and maybe to update package-quickstart.el.

The only part we skip is making an extra copy to package-user-dir, all
the other parts are performed anyway. Also package-quickstart expects
everything in package-user-dir so it would have to be hacked.

What I thinking of is benefit of extra complexity a new procedure adds,
like to explain it in user manual etc, compared to if user installs
packages via already existing mechanism, add site-lisp to
package-archives. I have never seen anyone mention that local repos can
be used that way on any blog or anywwhere, I wasn't myself aware of that
one.

Re: Easy configuration of a site-lisp directory

[Augusto Stoffel]

On Thu, 19 Aug 2021 at 09:25, Philip Kaludercic <philipk@posteo.net> wrote:

> Just wanted to ping this message to check if there is any interest in
> doing something with my initial suggestion?

The discussion about installing packages from a cloned git repo is
interesting, but I would like to point out that your suggestion also
addresses a much more mundane task, namely: let the user autoload (and
maybe byte-compile) their own configuration files (the stuff one
typically puts under ~/.emacs.d/lisp) without having to worry about
updating autoload files manually.

Ideally, this should be straightforward to do, but I recall having to
delve into package.el to figure it out.  Your site-lisp.el would have
helped me at that point.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Augusto Stoffel <arstoffel@gmail.com> writes:

> On Thu, 19 Aug 2021 at 09:25, Philip Kaludercic <philipk@posteo.net> wrote:
>
>> Just wanted to ping this message to check if there is any interest in
>> doing something with my initial suggestion?
>
> The discussion about installing packages from a cloned git repo is
> interesting, but I would like to point out that your suggestion also
> addresses a much more mundane task, namely: let the user autoload (and
> maybe byte-compile) their own configuration files (the stuff one
> typically puts under ~/.emacs.d/lisp) without having to worry about
> updating autoload files manually.
>
> Ideally, this should be straightforward to do, but I recall having to

Adding directories to load-path is straightforward, and is easily done
when Emacs starts:

(let ((default-directory  "~/.emacs.d/lisp/"))
    (normal-top-level-add-subdirs-to-load-path))

https://www.gnu.org/software/emacs/manual/html_node/elisp/Autoload.html

> delve into package.el to figure it out.  Your site-lisp.el would have
> helped me at that point.

Generating autoloads is not that straightfoward, but have you checked
docs:
https://www.gnu.org/software/emacs/manual/html_node/elisp/Autoload.html
?

I personally am using (package-generate-autoloads) and I concat my
custom autoloads with autoloads produced from package-quickstart.el, I
do this as an offline procedure so I don't wait for Emacs to check all
this every time it starts up, but that is an implementation detail.

Maybe package-generate-autoloads form package.el should be rewritten and
exposed to users as an interactive command or at least mentioned in
Emacs manual so it gets more attention by Emacs users?

By the way, I got to think of another thing when it comes to local
repositories: couldn't package.el install a symlink to local repository
in package-user-dir, instead of copying over code. That would avoid
having two different copies of code, would let one use cloned repos from
git directly without modifiying anything but package-install function?

I haven't tested yet I just come to think of it; but hopefully xref, help &
co, would work? 

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

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

Arthur Miller <arthur.miller@live.com> writes:

> Philip Kaludercic <philipk@posteo.net> writes:
>
>> Arthur Miller <arthur.miller@live.com> writes:
>>
>>> Arthur Miller <arthur.miller@live.com> writes:
>>>
>>>> Arthur Miller <arthur.miller@live.com> writes:
>>>>
>>>>> Philip Kaludercic <philipk@posteo.net> writes:
>>>>>
>>>>>> Just wanted to ping this message to check if there is any interest in
>>>>>> doing something with my initial suggestion?
>>>>>
>>>>> I do something similar as you do, but I use it only for some loose
>>>>> files I write myself, and for some I download from emacs wiki etc.
>>>>>
>>>>>>> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
>>>>>>> directory where a user can clone any repository or create their own,
>>>>>>> without having to manually add these to load-path, generate autoloads or
>>>>>>> byte compile.
>>>>>
>>>>> I have a question: is it desirable to use a working git directory as
>>>>> installed package? When I write my own files, I usually don't wish to
>>>>> copy them over to my "lisp" directory which I autoload in Emacs, untill
>>>>> I am done. Admittedly I started doing so before git has entered the
>>>>> scene. Now I guess one can switch branches every time one works on a package
>>>>> between some development branch and some stable, but isn't it a bit tedious?
>>
>> I do think this is useful, because it prevents confusion with xref. When
>> I am working on my own packages/packages I am contributing to, I want
>> M-. to jump to the actual definition I can work on, not a copy that
>> might get lost.
> Yes, I am aware of that one. I think that is also the reason why people
> prefer straight.el. Isn't it possible to advise something in xref to use
> the working copy? How do you deal with incomplete code? When you are
> working on something and it is not ready to be used in Emacs yet. Do you
> switch branches or do you use some other strategy? 
>
>>>> I just looked at package.el and realized that it is already possible to
>>>> install directories, I wasn't aware of that fact. So the only extra work
>>>> is to make it recognize local paths in a list package-archives list, in
>>>> principle.
>>
>> I assume you mean package-install-file?
>
> I goofed there, I wasn't aware package-archives can already be spciefied
> as local paths, forgoett about that one. Sorry I was making noise there.
>
>>>  And  I also realized that package-archives can already deal with local
>>>  directories. So everything is there.
>>>
>>> Users can already install from local repos.
>>
>> The issue is that this is just a repository
>
> I know, I am aware. It also duplicates the code; working and
> installed. But it does offer better granularity what gets installed.
>
>>                         the very least adds a redundant step (fetch the
>> code, install the code) and always makes it harder to work on local
> True. But we can automate that one. We still have to do fetch if the
> source is not on local disk, and some kind of action is still needed, at
> least to create autoloads, and maybe to update package-quickstart.el.
>
> The only part we skip is making an extra copy to package-user-dir, all
> the other parts are performed anyway. Also package-quickstart expects
> everything in package-user-dir so it would have to be hacked.
>
> What I thinking of is benefit of extra complexity a new procedure adds,
> like to explain it in user manual etc, compared to if user installs
> packages via already existing mechanism, add site-lisp to
> package-archives. I have never seen anyone mention that local repos can
> be used that way on any blog or anywwhere, I wasn't myself aware of that
> one.

Would you and everybody else interested in this topic like to try a
small patch to test the idea with symlinks? It literally takes 3 lines
of code to make this happen in package-install-file function.

I did add a customize var to enable/disable the behaviour, so it is more
than 3 lines, but in principle, we can just create a symlink instead of
copying files. I have tested and it worked fine with help functions,
Emacs loaded everything nicely and lookup seems to work. Autoloads were
correctly generated and package-quickstart-refresh worked out of the box.

The only inconvenience is that one has to define version header in one (main)
file, for example only thing I needed to make my own helm-git-branch

https://github.com/amno1/helm-git-branch

install as package was to add the comment:

;; Version: 0.1

I attached both patch and patched package.el for the convenience. I would
really appreciate opinions. Would this be acceptable on Windows and MacOS
too? I have only tested on my Arch Linux. Any potential problems?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: local-repos-as-symlink.patch --]
[-- Type: text/x-patch, Size: 2535 bytes --]

--- emacs/lisp/emacs-lisp/package.el	2021-08-13 19:52:44.647493393 +0200
+++ package.el	2021-08-20 23:13:36.621235559 +0200
@@ -396,6 +396,15 @@
   :version "25.1"
   :type '(repeat symbol))
 
+(defcustom package-install-local-multifile-packages-symlinked t
+  "Non-nil means to place a symlink to original package directory location in
+`package-user-dir' reather then copy files to a subfolder of
+  `package-user-dir'.  This option is meant for pacakge developers rather than
+  ordinary users."
+  :type '(boolean)
+  :risky t
+  :version "28.1")
+
 (defcustom package-native-compile nil
   "Non-nil means to native compile packages on installation."
   :type '(boolean)
@@ -954,19 +963,22 @@
          (pkg-dir (expand-file-name dirname package-user-dir)))
     (pcase (package-desc-kind pkg-desc)
       ('dir
-       (make-directory pkg-dir t)
-       (let ((file-list
-              (directory-files
-               default-directory 'full "\\`[^.].*\\.el\\'" 'nosort)))
-         (dolist (source-file file-list)
-           (let ((target-el-file
-                  (expand-file-name (file-name-nondirectory source-file) pkg-dir)))
-             (copy-file source-file target-el-file t)))
-         ;; Now that the files have been installed, this package is
-         ;; indistinguishable from a `tar' or a `single'. Let's make
-         ;; things simple by ensuring we're one of them.
-         (setf (package-desc-kind pkg-desc)
-               (if (> (length file-list) 1) 'tar 'single))))
+       (if package-install-local-multifile-packages-symlinked
+           (make-symbolic-link (expand-file-name default-directory) pkg-dir t)
+         (progn
+           (make-directory pkg-dir t)
+           (let ((file-list
+                  (directory-files
+                   default-directory 'full "\\`[^.].*\\.el\\'" 'nosort)))
+             (dolist (source-file file-list)
+               (let ((target-el-file
+                      (expand-file-name (file-name-nondirectory source-file) pkg-dir)))
+                 (copy-file source-file target-el-file t)))
+             ;; Now that the files have been installed, this package is
+             ;; indistinguishable from a `tar' or a `single'. Let's make
+             ;; things simple by ensuring we're one of them.
+             (setf (package-desc-kind pkg-desc)
+                   (if (> (length file-list) 1) 'tar 'single))))))
       ('tar
        (make-directory package-user-dir t)
        (let* ((default-directory (file-name-as-directory package-user-dir)))

[-- Attachment #3: package.el --]
[-- Type: text/plain, Size: 186802 bytes --]

;;; package.el --- Simple package system for Emacs  -*- lexical-binding:t -*-

;; Copyright (C) 2007-2021 Free Software Foundation, Inc.

;; Author: Tom Tromey <tromey@redhat.com>
;;         Daniel Hackney <dan@haxney.org>
;; Created: 10 Mar 2007
;; Version: 1.1.0
;; Keywords: tools
;; Package-Requires: ((tabulated-list "1.0"))

;; This file is part of GNU Emacs.

;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.

;;; Commentary:

;; The idea behind package.el is to be able to download packages and
;; install them.  Packages are versioned and have versioned
;; dependencies.  Furthermore, this supports built-in packages which
;; may or may not be newer than user-specified packages.  This makes
;; it possible to upgrade Emacs and automatically disable packages
;; which have moved from external to core.  (Note though that we don't
;; currently register any of these, so this feature does not actually
;; work.)

;; A package is described by its name and version.  The distribution
;; format is either a tar file or a single .el file.

;; A tar file should be named "NAME-VERSION.tar".  The tar file must
;; unpack into a directory named after the package and version:
;; "NAME-VERSION".  It must contain a file named "PACKAGE-pkg.el"
;; which consists of a call to define-package.  It may also contain a
;; "dir" file and the info files it references.

;; A .el file is named "NAME-VERSION.el" in the remote archive, but is
;; installed as simply "NAME.el" in a directory named "NAME-VERSION".

;; The downloader downloads all dependent packages.  By default,
;; packages come from the official GNU sources, but others may be
;; added by customizing the `package-archives' alist.  Packages get
;; byte-compiled at install time.

;; At activation time we will set up the load-path and the info path,
;; and we will load the package's autoloads.  If a package's
;; dependencies are not available, we will not activate that package.

;; Conceptually a package has multiple state transitions:
;;
;; * Download.  Fetching the package from ELPA.
;; * Install.  Untar the package, or write the .el file, into
;;   ~/.emacs.d/elpa/ directory.
;; * Autoload generation.
;; * Byte compile.  Currently this phase is done during install,
;;   but we may change this.
;; * Activate.  Evaluate the autoloads for the package to make it
;;   available to the user.
;; * Load.  Actually load the package and run some code from it.

;; Other external functions you may want to use:
;;
;; M-x list-packages
;;    Enters a mode similar to buffer-menu which lets you manage
;;    packages.  You can choose packages for install (mark with "i",
;;    then "x" to execute) or deletion, and you can see what packages
;;    are available.  This will automatically fetch the latest list of
;;    packages from ELPA.
;;
;; M-x package-install-from-buffer
;;    Install a package consisting of a single .el file that appears
;;    in the current buffer.  This only works for packages which
;;    define a Version header properly; package.el also supports the
;;    extension headers Package-Version (in case Version is an RCS id
;;    or similar), and Package-Requires (if the package requires other
;;    packages).
;;
;; M-x package-install-file
;;    Install a package from the indicated file.  The package can be
;;    either a tar file or a .el file.  A tar file must contain an
;;    appropriately-named "-pkg.el" file; a .el file must be properly
;;    formatted as with `package-install-from-buffer'.

;;; Thanks:
;;; (sorted by sort-lines):

;; Jim Blandy <jimb@red-bean.com>
;; Karl Fogel <kfogel@red-bean.com>
;; Kevin Ryde <user42@zip.com.au>
;; Lawrence Mitchell
;; Michael Olson <mwolson@member.fsf.org>
;; Sebastian Tennant <sebyte@smolny.plus.com>
;; Stefan Monnier <monnier@iro.umontreal.ca>
;; Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
;; Phil Hagelberg <phil@hagelb.org>

;;; ToDo:

;; - putting info dirs at the start of the info path means
;;   users see a weird ordering of categories.  OTOH we want to
;;   override later entries.  maybe emacs needs to enforce
;;   the standard layout?
;; - put bytecode in a separate directory tree
;; - perhaps give users a way to recompile their bytecode
;;   or do it automatically when emacs changes
;; - give users a way to know whether a package is installed ok
;; - give users a way to view a package's documentation when it
;;   only appears in the .el
;; - use/extend checkdoc so people can tell if their package will work
;; - "installed" instead of a blank in the status column
;; - tramp needs its files to be compiled in a certain order.
;;   how to handle this?  fix tramp?
;; - maybe we need separate .elc directories for various emacs
;;   versions.  That way conditional compilation can work.  But would
;;   this break anything?
;; - William Xu suggests being able to open a package file without
;;   installing it
;; - Interface with desktop.el so that restarting after an install
;;   works properly
;; - Use hierarchical layout.  PKG/etc PKG/lisp PKG/info
;;   ... except maybe lisp?
;; - It may be nice to have a macro that expands to the package's
;;   private data dir, aka ".../etc".  Or, maybe data-directory
;;   needs to be a list (though this would be less nice)
;;   a few packages want this, eg sokoban
;; - Allow multiple versions on the server, so that if a user doesn't
;;   meet the requirements for the most recent version they can still
;;   install an older one.
;; - Allow optional package dependencies
;;   then if we require 'bbdb', bbdb-specific lisp in lisp/bbdb
;;   and just don't compile to add to load path ...?
;; - Our treatment of the info path is somewhat bogus

;;; Code:

(require 'cl-lib)
(eval-when-compile (require 'subr-x))
(eval-when-compile (require 'epg))      ;For setf accessors.
(require 'seq)

(require 'tabulated-list)
(require 'macroexp)
(require 'url-handlers)
(require 'browse-url)

(defgroup package nil
  "Manager for Emacs Lisp packages."
  :group 'applications
  :version "24.1")

\f
;;; Customization options

;;;###autoload
(defcustom package-enable-at-startup t
  "Whether to make installed packages available when Emacs starts.
If non-nil, packages are made available before reading the init
file (but after reading the early init file).  This means that if
you wish to set this variable, you must do so in the early init
file.  Regardless of the value of this variable, packages are not
made available if `user-init-file' is nil (e.g. Emacs was started
with \"-q\").

Even if the value is nil, you can type \\[package-initialize] to
make installed packages available at any time, or you can
call (package-activate-all) in your init-file."
  :type 'boolean
  :version "24.1")

(defcustom package-load-list '(all)
  "List of packages for `package-activate-all' to make available.
Each element in this list should be a list (NAME VERSION), or the
symbol `all'.  The symbol `all' says to make available the latest
installed versions of all packages not specified by other
elements.

For an element (NAME VERSION), NAME is a package name (a symbol).
VERSION should be t, a string, or nil.
If VERSION is t, the most recent version is made available.
If VERSION is a string, only that version is ever made available.
 Any other version, even if newer, is silently ignored.
 Hence, the package is \"held\" at that version.
If VERSION is nil, the package is not made available (it is \"disabled\")."
  :type '(repeat (choice (const all)
                         (list :tag "Specific package"
                               (symbol :tag "Package name")
                               (choice :tag "Version"
                                (const :tag "disable" nil)
                                (const :tag "most recent" t)
                                (string :tag "specific version")))))
  :risky t
  :version "24.1")

(defcustom package-archives `(("gnu" .
                               ,(format "http%s://elpa.gnu.org/packages/"
                                        (if (gnutls-available-p) "s" "")))
                              ("nongnu" .
                               ,(format "http%s://elpa.nongnu.org/nongnu/"
                                        (if (gnutls-available-p) "s" ""))))
  "An alist of archives from which to fetch.
The default value points to the GNU Emacs package repository.

Each element has the form (ID . LOCATION).
 ID is an archive name, as a string.
 LOCATION specifies the base location for the archive.
  If it starts with \"http(s):\", it is treated as an HTTP(S) URL;
  otherwise it should be an absolute directory name.
  (Other types of URL are currently not supported.)

Only add locations that you trust, since fetching and installing
a package can run arbitrary code.

HTTPS URLs should be used where possible, as they offer superior
security."
  :type '(alist :key-type (string :tag "Archive name")
                :value-type (string :tag "URL or directory name"))
  :risky t
  :version "28.1")

(defcustom package-menu-hide-low-priority 'archive
  "If non-nil, hide low priority packages from the packages menu.
A package is considered low priority if there's another version
of it available such that:
    (a) the archive of the other package is higher priority than
    this one, as per `package-archive-priorities';
  or
    (b) they both have the same archive priority but the other
    package has a higher version number.

This variable has three possible values:
    nil: no packages are hidden;
    `archive': only criterion (a) is used;
    t: both criteria are used.

This variable has no effect if `package-menu--hide-packages' is
nil, so it can be toggled with \\<package-menu-mode-map>\\[package-menu-toggle-hiding]."
  :type '(choice (const :tag "Don't hide anything" nil)
                 (const :tag "Hide per package-archive-priorities"
                        archive)
                 (const :tag "Hide per archive and version number" t))
  :version "25.1")

(defcustom package-archive-priorities nil
  "An alist of priorities for packages.

Each element has the form (ARCHIVE-ID . PRIORITY).

When installing packages, the package with the highest version
number from the archive with the highest priority is
selected.  When higher versions are available from archives with
lower priorities, the user has to select those manually.

Archives not in this list have the priority 0, as have packages
that are already installed.  If you use negative priorities for
the archives, they will not be upgraded automatically.

See also `package-menu-hide-low-priority'."
  :type '(alist :key-type (string :tag "Archive name")
                :value-type (integer :tag "Priority (default is 0)"))
  :risky t
  :version "25.1")

(defcustom package-pinned-packages nil
  "An alist of packages that are pinned to specific archives.
This can be useful if you have multiple package archives enabled,
and want to control which archive a given package gets installed from.

Each element of the alist has the form (PACKAGE . ARCHIVE), where:
 PACKAGE is a symbol representing a package
 ARCHIVE is a string representing an archive (it should be the car of
an element in `package-archives', e.g. \"gnu\").

Adding an entry to this variable means that only ARCHIVE will be
considered as a source for PACKAGE.  If other archives provide PACKAGE,
they are ignored (for this package).  If ARCHIVE does not contain PACKAGE,
the package will be unavailable."
  :type '(alist :key-type (symbol :tag "Package")
                :value-type (string :tag "Archive name"))
  ;; This could prevent you from receiving updates for a package,
  ;; via an entry (PACKAGE . NON-EXISTING).  Which could be an issue
  ;; if PACKAGE has a known vulnerability that is fixed in newer versions.
  :risky t
  :version "24.4")

;;;###autoload
(defcustom package-user-dir (locate-user-emacs-file "elpa")
  "Directory containing the user's Emacs Lisp packages.
The directory name should be absolute.
Apart from this directory, Emacs also looks for system-wide
packages in `package-directory-list'."
  :type 'directory
  :initialize #'custom-initialize-delay
  :risky t
  :version "24.1")

;;;###autoload
(defcustom package-directory-list
  ;; Defaults are subdirs named "elpa" in the site-lisp dirs.
  (let (result)
    (dolist (f load-path)
      (and (stringp f)
           (equal (file-name-nondirectory f) "site-lisp")
           (push (expand-file-name "elpa" f) result)))
    (nreverse result))
  "List of additional directories containing Emacs Lisp packages.
Each directory name should be absolute.

These directories contain packages intended for system-wide; in
contrast, `package-user-dir' contains packages for personal use."
  :type '(repeat directory)
  :initialize #'custom-initialize-delay
  :risky t
  :version "24.1")

(declare-function epg-find-configuration "epg-config"
                  (protocol &optional no-cache program-alist))

(defcustom package-gnupghome-dir (expand-file-name "gnupg" package-user-dir)
  "Directory containing GnuPG keyring or nil.
This variable specifies the GnuPG home directory used by package.
That directory is passed via the option \"--homedir\" to GnuPG.
If nil, do not use the option \"--homedir\", but stick with GnuPG's
default directory."
  :type `(choice
          (const
           :tag "Default Emacs package management GnuPG home directory"
           ,(expand-file-name "gnupg" package-user-dir))
          (const
           :tag "Default GnuPG directory (GnuPG option --homedir not used)"
           nil)
          (directory :tag "A specific GnuPG --homedir"))
  :risky t
  :version "26.1")

(defcustom package-check-signature 'allow-unsigned
  "Non-nil means to check package signatures when installing.
More specifically the value can be:
- nil: package signatures are ignored.
- `allow-unsigned': install a package even if it is unsigned, but
  if it is signed, we have the key for it, and OpenGPG is
  installed, verify the signature.
- t: accept a package only if it comes with at least one verified signature.
- `all': same as t, except when the package has several signatures,
  in which case we verify all the signatures.

This also applies to the \"archive-contents\" file that lists the
contents of the archive."
  :type '(choice (const nil :tag "Never")
                 (const allow-unsigned :tag "Allow unsigned")
                 (const t :tag "Check always")
                 (const all :tag "Check all signatures"))
  :risky t
  :version "27.1")

(defun package-check-signature ()
  "Check whether we have a usable OpenPGP configuration.
If so, and variable `package-check-signature' is
`allow-unsigned', return `allow-unsigned', otherwise return the
value of variable `package-check-signature'."
  (if (eq package-check-signature 'allow-unsigned)
      (progn
        (require 'epg-config)
        (and (epg-find-configuration 'OpenPGP)
             'allow-unsigned))
    package-check-signature))

(defcustom package-unsigned-archives nil
  "List of archives where we do not check for package signatures.
This should be a list of strings matching the names of package
archives in the variable `package-archives'."
  :type '(repeat (string :tag "Archive name"))
  :risky t
  :version "24.4")

(defcustom package-selected-packages nil
  "Store here packages installed explicitly by user.
This variable is fed automatically by Emacs when installing a new package.
This variable is used by `package-autoremove' to decide
which packages are no longer needed.
You can use it to (re)install packages on other machines
by running `package-install-selected-packages'.

To check if a package is contained in this list here, use
`package--user-selected-p', as it may populate the variable with
a sane initial value."
  :version "25.1"
  :type '(repeat symbol))

(defcustom package-install-local-multifile-packages-symlinked t
  "Non-nil means to place a symlink to original package directory location in
`package-user-dir' reather then copy files to a subfolder of
  `package-user-dir'.  This option is meant for pacakge developers rather than
  ordinary users."
  :type '(boolean)
  :risky t
  :version "28.1")

(defcustom package-native-compile nil
  "Non-nil means to native compile packages on installation."
  :type '(boolean)
  :risky t
  :version "28.1")

(defcustom package-menu-async t
  "If non-nil, package-menu will use async operations when possible.
Currently, only the refreshing of archive contents supports
asynchronous operations.  Package transactions are still done
synchronously."
  :type 'boolean
  :version "25.1")

(defcustom package-name-column-width 30
  "Column width for the Package name in the package menu."
  :type 'number
  :version "28.1")

(defcustom package-version-column-width 14
  "Column width for the Package version in the package menu."
  :type 'number
  :version "28.1")

(defcustom package-status-column-width 12
  "Column width for the Package status in the package menu."
  :type 'number
  :version "28.1")

(defcustom package-archive-column-width 8
  "Column width for the Package status in the package menu."
  :type 'number
  :version "28.1")

\f
;;; `package-desc' object definition
;; This is the struct used internally to represent packages.
;; Functions that deal with packages should generally take this object
;; as an argument.  In some situations (e.g. commands that query the
;; user) it makes sense to take the package name as a symbol instead,
;; but keep in mind there could be multiple `package-desc's with the
;; same name.

(defvar package--default-summary "No description available.")

(cl-defstruct (package-desc
               ;; Rename the default constructor from `make-package-desc'.
               (:constructor package-desc-create)
               ;; Has the same interface as the old `define-package',
               ;; which is still used in the "foo-pkg.el" files. Extra
               ;; options can be supported by adding additional keys.
               (:constructor
                package-desc-from-define
                (name-string version-string &optional summary requirements
                 &rest rest-plist
                 &aux
                 (name (intern name-string))
                 (version (version-to-list version-string))
                 (reqs (mapcar (lambda (elt)
                                 (list (car elt)
                                       (version-to-list (cadr elt))))
                               (if (eq 'quote (car requirements))
                                   (nth 1 requirements)
                                 requirements)))
                 (kind (plist-get rest-plist :kind))
                 (archive (plist-get rest-plist :archive))
                 (extras (let (alist)
                           (while rest-plist
                             (unless (memq (car rest-plist) '(:kind :archive))
                               (let ((value (cadr rest-plist)))
                                 (when value
                                   (push (cons (car rest-plist)
                                               (if (eq (car-safe value) 'quote)
                                                   (cadr value)
                                                 value))
                                         alist))))
                             (setq rest-plist (cddr rest-plist)))
                           alist)))))
  "Structure containing information about an individual package.
Slots:

`name'	Name of the package, as a symbol.

`version' Version of the package, as a version list.

`summary' Short description of the package, typically taken from
        the first line of the file.

`reqs'	Requirements of the package.  A list of (PACKAGE
        VERSION-LIST) naming the dependent package and the minimum
        required version.

`kind'	The distribution format of the package.  Currently, it is
        either `single' or `tar'.

`archive' The name of the archive (as a string) whence this
        package came.

`dir'	The directory where the package is installed (if installed),
        `builtin' if it is built-in, or nil otherwise.

`extras' Optional alist of additional keyword-value pairs.

`signed' Flag to indicate that the package is signed by provider."
  name
  version
  (summary package--default-summary)
  reqs
  kind
  archive
  dir
  extras
  signed)

(defun package--from-builtin (bi-desc)
  "Create a `package-desc' object from BI-DESC.
BI-DESC should be a `package--bi-desc' object."
  (package-desc-create :name (pop bi-desc)
                       :version (package--bi-desc-version bi-desc)
                       :summary (package--bi-desc-summary bi-desc)
                       :dir 'builtin))

;; Pseudo fields.
(defun package-version-join (vlist)
  "Return the version string corresponding to the list VLIST.
This is, approximately, the inverse of `version-to-list'.
\(Actually, it returns only one of the possible inverses, since
`version-to-list' is a many-to-one operation.)"
  (if (null vlist)
      ""
    (let ((str-list (list "." (int-to-string (car vlist)))))
      (dolist (num (cdr vlist))
        (cond
         ((>= num 0)
          (push (int-to-string num) str-list)
          (push "." str-list))
         ((< num -4)
          (error "Invalid version list `%s'" vlist))
         (t
          ;; pre, or beta, or alpha
          (cond ((equal "." (car str-list))
                 (pop str-list))
                ((not (string-match "[0-9]+" (car str-list)))
                 (error "Invalid version list `%s'" vlist)))
          (push (cond ((= num -1) "pre")
                      ((= num -2) "beta")
                      ((= num -3) "alpha")
                      ((= num -4) "snapshot"))
                str-list))))
      (if (equal "." (car str-list))
          (pop str-list))
      (apply #'concat (nreverse str-list)))))

(defun package-desc-full-name (pkg-desc)
  "Return full name of package-desc object PKG-DESC.
This is the name of the package with its version appended."
  (format "%s-%s"
          (package-desc-name pkg-desc)
          (package-version-join (package-desc-version pkg-desc))))

(defun package-desc-suffix (pkg-desc)
  "Return file-name extension of package-desc object PKG-DESC.
Depending on the `package-desc-kind' of PKG-DESC, this is one of:

   'single - \".el\"
   'tar    - \".tar\"
   'dir    - \"\"

Signal an error if the kind is none of the above."
  (pcase (package-desc-kind pkg-desc)
    ('single ".el")
    ('tar ".tar")
    ('dir "")
    (kind (error "Unknown package kind: %s" kind))))

(defun package-desc--keywords (pkg-desc)
  "Return keywords of package-desc object PKG-DESC.
These keywords come from the foo-pkg.el file, and in general
corresponds to the keywords in the \"Keywords\" header of the
package."
  (let ((keywords (cdr (assoc :keywords (package-desc-extras pkg-desc)))))
    (if (eq (car-safe keywords) 'quote)
        (nth 1 keywords)
      keywords)))

(defun package-desc-priority (pkg-desc)
  "Return the priority of the archive of package-desc object PKG-DESC."
  (package-archive-priority (package-desc-archive pkg-desc)))

(cl-defstruct (package--bi-desc
               (:constructor package-make-builtin (version summary))
               (:type vector))
  "Package descriptor format used in finder-inf.el and package--builtins."
  version
  reqs
  summary)

\f
;;; Installed packages
;; The following variables store information about packages present in
;; the system.  The most important of these is `package-alist'.  The
;; command `package-activate-all' is also closely related to this
;; section.

(defvar package--builtins nil
  "Alist of built-in packages.
The actual value is initialized by loading the library
`finder-inf'; this is not done until it is needed, e.g. by the
function `package-built-in-p'.

Each element has the form (PKG . PACKAGE-BI-DESC), where PKG is a package
name (a symbol) and DESC is a `package--bi-desc' structure.")
(put 'package--builtins 'risky-local-variable t)

(defvar package-alist nil
  "Alist of all packages available for activation.
Each element has the form (PKG . DESCS), where PKG is a package
name (a symbol) and DESCS is a non-empty list of `package-desc'
structures, sorted by decreasing versions.

This variable is set automatically by `package-load-descriptor',
called via `package-activate-all'.  To change which packages are
loaded and/or activated, customize `package-load-list'.")
(put 'package-alist 'risky-local-variable t)

(defvar package-activated-list nil
  ;; FIXME: This should implicitly include all builtin packages.
  "List of the names of currently activated packages.")
(put 'package-activated-list 'risky-local-variable t)

;;;; Populating `package-alist'.

;; The following functions are called on each installed package by
;; `package-load-all-descriptors', which ultimately populates the
;; `package-alist' variable.

(defun package-process-define-package (exp)
  "Process define-package expression EXP and push it to `package-alist'.
EXP should be a form read from a foo-pkg.el file.
Convert EXP into a `package-desc' object using the
`package-desc-from-define' constructor before pushing it to
`package-alist'.

If there already exists a package by the same name in
`package-alist', insert this object there such that the packages
are sorted with the highest version first."
  (when (eq (car-safe exp) 'define-package)
    (let* ((new-pkg-desc (apply #'package-desc-from-define (cdr exp)))
           (name (package-desc-name new-pkg-desc))
           (version (package-desc-version new-pkg-desc))
           (old-pkgs (assq name package-alist)))
      (if (null old-pkgs)
          ;; If there's no old package, just add this to `package-alist'.
          (push (list name new-pkg-desc) package-alist)
        ;; If there is, insert the new package at the right place in the list.
        (while
            (if (and (cdr old-pkgs)
                     (version-list-< version
                                     (package-desc-version (cadr old-pkgs))))
                (setq old-pkgs (cdr old-pkgs))
              (push new-pkg-desc (cdr old-pkgs))
              nil)))
      new-pkg-desc)))

(defun package-load-descriptor (pkg-dir)
  "Load the package description file in directory PKG-DIR.
Create a new `package-desc' object, add it to `package-alist' and
return it."
  (let ((pkg-file (expand-file-name (package--description-file pkg-dir)
                                    pkg-dir))
        (signed-file (concat pkg-dir ".signed")))
    (when (file-exists-p pkg-file)
      (with-temp-buffer
        (insert-file-contents pkg-file)
        (goto-char (point-min))
        (let ((pkg-desc (or (package-process-define-package
                             (read (current-buffer)))
                            (error "Can't find define-package in %s" pkg-file))))
          (setf (package-desc-dir pkg-desc) pkg-dir)
          (if (file-exists-p signed-file)
              (setf (package-desc-signed pkg-desc) t))
          pkg-desc)))))

(defun package-load-all-descriptors ()
  "Load descriptors for installed Emacs Lisp packages.
This looks for package subdirectories in `package-user-dir' and
`package-directory-list'.  The variable `package-load-list'
controls which package subdirectories may be loaded.

In each valid package subdirectory, this function loads the
description file containing a call to `define-package', which
updates `package-alist'."
  (dolist (dir (cons package-user-dir package-directory-list))
    (when (file-directory-p dir)
      (dolist (subdir (directory-files dir))
        (unless (equal subdir "..")
          (let ((pkg-dir (expand-file-name subdir dir)))
            (when (file-directory-p pkg-dir)
              (package-load-descriptor pkg-dir))))))))

(defun package--alist ()
  "Return `package-alist', after computing it if needed."
  (or package-alist
      (progn (package-load-all-descriptors)
             package-alist)))

(defun define-package ( _name-string _version-string
                        &optional _docstring _requirements
                        &rest _extra-properties)
  "Define a new package.
NAME-STRING is the name of the package, as a string.
VERSION-STRING is the version of the package, as a string.
DOCSTRING is a short description of the package, a string.
REQUIREMENTS is a list of dependencies on other packages.
 Each requirement is of the form (OTHER-PACKAGE OTHER-VERSION),
 where OTHER-VERSION is a string.

EXTRA-PROPERTIES is currently unused."
  ;; FIXME: Placeholder!  Should we keep it?
  (error "Don't call me!"))

\f
;;; Package activation
;; Section for functions used by `package-activate', which see.

(defun package-disabled-p (pkg-name version)
  "Return whether PKG-NAME at VERSION can be activated.
The decision is made according to `package-load-list'.
Return nil if the package can be activated.
Return t if the package is completely disabled.
Return the max version (as a string) if the package is held at a lower version."
  (let ((force (assq pkg-name package-load-list)))
    (cond ((null force) (not (memq 'all package-load-list)))
          ((null (setq force (cadr force))) t) ; disabled
          ((eq force t) nil)
          ((stringp force)              ; held
           (unless (version-list-= version (version-to-list force))
             force))
          (t (error "Invalid element in `package-load-list'")))))

(defun package-built-in-p (package &optional min-version)
  "Return non-nil if PACKAGE is built-in to Emacs.
Optional arg MIN-VERSION, if non-nil, should be a version list
specifying the minimum acceptable version."
  (if (package-desc-p package) ;; was built-in and then was converted
      (eq 'builtin (package-desc-dir package))
    (let ((bi (assq package package--builtin-versions)))
      (cond
       (bi (version-list-<= min-version (cdr bi)))
       ((remove 0 min-version) nil)
       (t
        (require 'finder-inf nil t) ; For `package--builtins'.
        (assq package package--builtins))))))

(defun package--autoloads-file-name (pkg-desc)
  "Return the absolute name of the autoloads file, sans extension.
PKG-DESC is a `package-desc' object."
  (expand-file-name
   (format "%s-autoloads" (package-desc-name pkg-desc))
   (package-desc-dir pkg-desc)))

(defun package--activate-autoloads-and-load-path (pkg-desc)
  "Load the autoloads file and add package dir to `load-path'.
PKG-DESC is a `package-desc' object."
  (let* ((old-lp load-path)
         (pkg-dir (package-desc-dir pkg-desc))
         (pkg-dir-dir (file-name-as-directory pkg-dir)))
    (with-demoted-errors "Error loading autoloads: %s"
      (load (package--autoloads-file-name pkg-desc) nil t))
    (when (and (eq old-lp load-path)
               (not (or (member pkg-dir load-path)
                        (member pkg-dir-dir load-path))))
      ;; Old packages don't add themselves to the `load-path', so we have to
      ;; do it ourselves.
      (push pkg-dir load-path))))

(defvar Info-directory-list)
(declare-function info-initialize "info" ())

(defvar package--quickstart-pkgs t
  "If set to a list, we're computing the set of pkgs to activate.")

(defun package--load-files-for-activation (pkg-desc reload)
  "Load files for activating a package given by PKG-DESC.
Load the autoloads file, and ensure `load-path' is setup.  If
RELOAD is non-nil, also load all files in the package that
correspond to previously loaded files."
  (let* ((loaded-files-list
          (when reload
            (package--list-loaded-files (package-desc-dir pkg-desc)))))
    ;; Add to load path, add autoloads, and activate the package.
    (package--activate-autoloads-and-load-path pkg-desc)
    ;; Call `load' on all files in `package-desc-dir' already present in
    ;; `load-history'.  This is done so that macros in these files are updated
    ;; to their new definitions.  If another package is being installed which
    ;; depends on this new definition, not doing this update would cause
    ;; compilation errors and break the installation.
    (with-demoted-errors "Error in package--load-files-for-activation: %s"
      (mapc (lambda (feature) (load feature nil t))
            ;; Skip autoloads file since we already evaluated it above.
            (remove (file-truename (package--autoloads-file-name pkg-desc))
                    loaded-files-list)))))

(defun package-activate-1 (pkg-desc &optional reload deps)
  "Activate package given by PKG-DESC, even if it was already active.
If DEPS is non-nil, also activate its dependencies (unless they
are already activated).
If RELOAD is non-nil, also `load' any files inside the package which
correspond to previously loaded files (those returned by
`package--list-loaded-files')."
  (let* ((name (package-desc-name pkg-desc))
         (pkg-dir (package-desc-dir pkg-desc)))
    (unless pkg-dir
      (error "Internal error: unable to find directory for `%s'"
             (package-desc-full-name pkg-desc)))
    (catch 'exit
      ;; Activate its dependencies recursively.
      ;; FIXME: This doesn't check whether the activated version is the
      ;; required version.
      (when deps
        (dolist (req (package-desc-reqs pkg-desc))
          (unless (package-activate (car req))
            (message "Unable to activate package `%s'.\nRequired package `%s-%s' is unavailable"
                     name (car req) (package-version-join (cadr req)))
            (throw 'exit nil))))
      (if (listp package--quickstart-pkgs)
          ;; We're only collecting the set of packages to activate!
          (push pkg-desc package--quickstart-pkgs)
        (package--load-files-for-activation pkg-desc reload))
      ;; Add info node.
      (when (file-exists-p (expand-file-name "dir" pkg-dir))
        ;; FIXME: not the friendliest, but simple.
        (require 'info)
        (info-initialize)
        (add-to-list 'Info-directory-list pkg-dir))
      (push name package-activated-list)
      ;; Don't return nil.
      t)))

(defun package--files-load-history ()
  (delq nil
        (mapcar (lambda (x)
                  (let ((f (car x)))
                    (and (stringp f)
                         (file-name-sans-extension (file-truename f)))))
                load-history)))

(defun package--list-of-conflicts (dir history)
  (require 'find-func)
  (declare-function find-library-name "find-func" (library))
  (delq
   nil
   (mapcar
    (lambda (x) (let* ((file (file-relative-name x dir))
                  ;; Previously loaded file, if any.
                  (previous
                   (ignore-error file-error ;"Can't find library"
                     (file-name-sans-extension
                      (file-truename (find-library-name file)))))
                  (pos (when previous (member previous history))))
             ;; Return (RELATIVE-FILENAME . HISTORY-POSITION)
             (when pos
               (cons (file-name-sans-extension file) (length pos)))))
    (directory-files-recursively dir "\\`[^\\.].*\\.el\\'"))))

(defun package--list-loaded-files (dir)
  "Recursively list all files in DIR which correspond to loaded features.
Returns the `file-name-sans-extension' of each file, relative to
DIR, sorted by most recently loaded last."
  (let* ((history (package--files-load-history))
         (dir (file-truename dir))
         ;; List all files that have already been loaded.
         (list-of-conflicts (package--list-of-conflicts dir history)))
    ;; Turn the list of (FILENAME . POS) back into a list of features.  Files in
    ;; subdirectories are returned relative to DIR (so not actually features).
    (let ((default-directory (file-name-as-directory dir)))
      (mapcar (lambda (x) (file-truename (car x)))
              (sort list-of-conflicts
                    ;; Sort the files by ascending HISTORY-POSITION.
                    (lambda (x y) (< (cdr x) (cdr y))))))))

;;;; `package-activate'

(defun package--get-activatable-pkg (pkg-name)
  ;; Is "activatable" a word?
  (let ((pkg-descs (cdr (assq pkg-name package-alist))))
    ;; Check if PACKAGE is available in `package-alist'.
    (while
        (when pkg-descs
          (let ((available-version (package-desc-version (car pkg-descs))))
            (or (package-disabled-p pkg-name available-version)
                ;; Prefer a builtin package.
                (package-built-in-p pkg-name available-version))))
      (setq pkg-descs (cdr pkg-descs)))
    (car pkg-descs)))

;; This function activates a newer version of a package if an older
;; one was already activated.  It also loads a features of this
;; package which were already loaded.
(defun package-activate (package &optional force)
  "Activate the package named PACKAGE.
If FORCE is true, (re-)activate it if it's already activated.
Newer versions are always activated, regardless of FORCE."
  (let ((pkg-desc (package--get-activatable-pkg package)))
    (cond
     ;; If no such package is found, maybe it's built-in.
     ((null pkg-desc)
      (package-built-in-p package))
     ;; If the package is already activated, just return t.
     ((and (memq package package-activated-list) (not force))
      t)
     ;; Otherwise, proceed with activation.
     (t (package-activate-1 pkg-desc nil 'deps)))))

\f
;;; Installation -- Local operations
;; This section contains a variety of features regarding installing a
;; package to/from disk.  This includes autoload generation,
;; unpacking, compiling, as well as defining a package from the
;; current buffer.

;;;; Unpacking
(defvar tar-parse-info)
(declare-function tar-untar-buffer "tar-mode" ())
(declare-function tar-header-name "tar-mode" (tar-header) t)
(declare-function tar-header-link-type "tar-mode" (tar-header) t)

(defun package-untar-buffer (dir)
  "Untar the current buffer.
This uses `tar-untar-buffer' from Tar mode.  All files should
untar into a directory named DIR; otherwise, signal an error."
  (require 'tar-mode)
  (tar-mode)
  ;; Make sure everything extracts into DIR.
  (let ((regexp (concat "\\`" (regexp-quote (expand-file-name dir)) "/"))
        (case-fold-search (file-name-case-insensitive-p dir)))
    (dolist (tar-data tar-parse-info)
      (let ((name (expand-file-name (tar-header-name tar-data))))
        (or (string-match regexp name)
            ;; Tarballs created by some utilities don't list
            ;; directories with a trailing slash (Bug#13136).
            (and (string-equal dir name)
                 (eq (tar-header-link-type tar-data) 5))
            (error "Package does not untar cleanly into directory %s/" dir)))))
  (tar-untar-buffer))

(defun package--alist-to-plist-args (alist)
  (mapcar #'macroexp-quote
          (apply #'nconc
                 (mapcar (lambda (pair) (list (car pair) (cdr pair))) alist))))

(defun package-unpack (pkg-desc)
  "Install the contents of the current buffer as a package."
  (let* ((name (package-desc-name pkg-desc))
         (dirname (package-desc-full-name pkg-desc))
         (pkg-dir (expand-file-name dirname package-user-dir)))
    (pcase (package-desc-kind pkg-desc)
      ('dir
       (if package-install-local-multifile-packages-symlinked
           (make-symbolic-link (expand-file-name default-directory) pkg-dir t)
         (progn
           (make-directory pkg-dir t)
           (let ((file-list
                  (directory-files
                   default-directory 'full "\\`[^.].*\\.el\\'" 'nosort)))
             (dolist (source-file file-list)
               (let ((target-el-file
                      (expand-file-name (file-name-nondirectory source-file) pkg-dir)))
                 (copy-file source-file target-el-file t)))
             ;; Now that the files have been installed, this package is
             ;; indistinguishable from a `tar' or a `single'. Let's make
             ;; things simple by ensuring we're one of them.
             (setf (package-desc-kind pkg-desc)
                   (if (> (length file-list) 1) 'tar 'single))))))
      ('tar
       (make-directory package-user-dir t)
       (let* ((default-directory (file-name-as-directory package-user-dir)))
         (package-untar-buffer dirname)))
      ('single
       (let ((el-file (expand-file-name (format "%s.el" name) pkg-dir)))
         (make-directory pkg-dir t)
         (package--write-file-no-coding el-file)))
      (kind (error "Unknown package kind: %S" kind)))
    (package--make-autoloads-and-stuff pkg-desc pkg-dir)
    ;; Update package-alist.
    (let ((new-desc (package-load-descriptor pkg-dir)))
      (unless (equal (package-desc-full-name new-desc)
                     (package-desc-full-name pkg-desc))
        (error "The retrieved package (`%s') doesn't match what the archive offered (`%s')"
               (package-desc-full-name new-desc) (package-desc-full-name pkg-desc)))
      ;; Activation has to be done before compilation, so that if we're
      ;; upgrading and macros have changed we load the new definitions
      ;; before compiling.
      (when (package-activate-1 new-desc :reload :deps)
        ;; FIXME: Compilation should be done as a separate, optional, step.
        ;; E.g. for multi-package installs, we should first install all packages
        ;; and then compile them.
        (package--compile new-desc)
        (when package-native-compile
          (package--native-compile-async new-desc))
        ;; After compilation, load again any files loaded by
        ;; `activate-1', so that we use the byte-compiled definitions.
        (package--load-files-for-activation new-desc :reload)))
    pkg-dir))

(defun package-generate-description-file (pkg-desc pkg-file)
  "Create the foo-pkg.el file PKG-FILE for single-file package PKG-DESC."
  (let* ((name (package-desc-name pkg-desc)))
    (let ((print-level nil)
          (print-quoted t)
          (print-length nil))
      (write-region
       (concat
        ";;; Generated package description from "
        (replace-regexp-in-string "-pkg\\.el\\'" ".el"
                                  (file-name-nondirectory pkg-file))
        "  -*- no-byte-compile: t -*-\n"
        (prin1-to-string
         (nconc
          (list 'define-package
                (symbol-name name)
                (package-version-join (package-desc-version pkg-desc))
                (package-desc-summary pkg-desc)
                (let ((requires (package-desc-reqs pkg-desc)))
                  (list 'quote
                        ;; Turn version lists into string form.
                        (mapcar
                         (lambda (elt)
                           (list (car elt)
                                 (package-version-join (cadr elt))))
                         requires))))
          (package--alist-to-plist-args
           (package-desc-extras pkg-desc))))
        "\n")
       nil pkg-file nil 'silent))))

;;;; Autoload
(declare-function autoload-rubric "autoload" (file &optional type feature))

(defun package-autoload-ensure-default-file (file)
  "Make sure that the autoload file FILE exists and if not create it."
  (unless (file-exists-p file)
    (require 'autoload)
    (write-region (autoload-rubric file "package" nil) nil file nil 'silent))
  file)

(defvar autoload-timestamps)
(defvar version-control)

(defun package-generate-autoloads (name pkg-dir)
  "Generate autoloads in PKG-DIR for package named NAME."
  (let* ((auto-name (format "%s-autoloads.el" name))
         ;;(ignore-name (concat name "-pkg.el"))
         (output-file (expand-file-name auto-name pkg-dir))
         ;; We don't need 'em, and this makes the output reproducible.
         (autoload-timestamps nil)
         (backup-inhibited t)
         (version-control 'never))
    (package-autoload-ensure-default-file output-file)
    (make-directory-autoloads pkg-dir output-file)
    (let ((buf (find-buffer-visiting output-file)))
      (when buf (kill-buffer buf)))
    auto-name))

(defun package--make-autoloads-and-stuff (pkg-desc pkg-dir)
  "Generate autoloads, description file, etc., for PKG-DESC installed at PKG-DIR."
  (package-generate-autoloads (package-desc-name pkg-desc) pkg-dir)
  (let ((desc-file (expand-file-name (package--description-file pkg-dir)
                                     pkg-dir)))
    (unless (file-exists-p desc-file)
      (package-generate-description-file pkg-desc desc-file)))
  ;; FIXME: Create foo.info and dir file from foo.texi?
  )

;;;; Compilation
(defvar warning-minimum-level)
(defun package--compile (pkg-desc)
  "Byte-compile installed package PKG-DESC.
This assumes that `pkg-desc' has already been activated with
`package-activate-1'."
  (let ((warning-minimum-level :error)
        (load-path load-path))
    (byte-recompile-directory (package-desc-dir pkg-desc) 0 t)))

(defun package--native-compile-async (pkg-desc)
  "Native compile installed package PKG-DESC asynchronously.
This assumes that `pkg-desc' has already been activated with
`package-activate-1'."
  (when (and (featurep 'native-compile)
             (native-comp-available-p))
    (let ((warning-minimum-level :error))
      (native-compile-async (package-desc-dir pkg-desc) t))))

;;;; Inferring package from current buffer
(defun package-read-from-string (str)
  "Read a Lisp expression from STR.
Signal an error if the entire string was not used."
  (pcase-let ((`(,expr . ,offset) (read-from-string str)))
    (condition-case ()
        ;; The call to `ignore' suppresses a compiler warning.
        (progn (ignore (read-from-string str offset))
               (error "Can't read whole string"))
      (end-of-file expr))))

(defun package--prepare-dependencies (deps)
  "Turn DEPS into an acceptable list of dependencies.

Any parts missing a version string get a default version string
of \"0\" (meaning any version) and an appropriate level of lists
is wrapped around any parts requiring it."
  (cond
   ((not (listp deps))
    (error "Invalid requirement specifier: %S" deps))
   (t (mapcar (lambda (dep)
                (cond
                 ((symbolp dep) `(,dep "0"))
                 ((stringp dep)
                  (error "Invalid requirement specifier: %S" dep))
                 ((and (listp dep) (null (cdr dep)))
                  (list (car dep) "0"))
                 (t dep)))
              deps))))

(declare-function lm-header "lisp-mnt" (header))
(declare-function lm-header-multiline "lisp-mnt" (header))
(declare-function lm-homepage "lisp-mnt" (&optional file))
(declare-function lm-keywords-list "lisp-mnt" (&optional file))
(declare-function lm-maintainers "lisp-mnt" (&optional file))
(declare-function lm-authors "lisp-mnt" (&optional file))

(defun package-buffer-info ()
  "Return a `package-desc' describing the package in the current buffer.

If the buffer does not contain a conforming package, signal an
error.  If there is a package, narrow the buffer to the file's
boundaries."
  (goto-char (point-min))
  (unless (re-search-forward "^;;; \\([^ ]*\\)\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$" nil t)
    (error "Package lacks a file header"))
  (let ((file-name (match-string-no-properties 1))
        (desc      (match-string-no-properties 2))
        (start     (line-beginning-position)))
    ;; This warning was added in Emacs 27.1, and should be removed at
    ;; the earliest in version 31.1.  The idea is to phase out the
    ;; requirement for a "footer line" without unduly impacting users
    ;; on earlier Emacs versions.  See Bug#26490 for more details.
    (unless (search-forward (concat ";;; " file-name ".el ends here"))
      (lwarn '(package package-format) :warning
             "Package lacks a terminating comment"))
    ;; Try to include a trailing newline.
    (forward-line)
    (narrow-to-region start (point))
    (require 'lisp-mnt)
    ;; Use some headers we've invented to drive the process.
    (let* (;; Prefer Package-Version; if defined, the package author
           ;; probably wants us to use it.  Otherwise try Version.
           (version-info
            (or (lm-header "package-version") (lm-header "version")))
           (pkg-version (package-strip-rcs-id version-info))
           (keywords (lm-keywords-list))
           (homepage (lm-homepage)))
      (unless pkg-version
         (if version-info
             (error "Unrecognized package version: %s" version-info)
           (error "Package lacks a \"Version\" or \"Package-Version\" header")))
      (package-desc-from-define
       file-name pkg-version desc
       (and-let* ((require-lines (lm-header-multiline "package-requires")))
         (package--prepare-dependencies
          (package-read-from-string (mapconcat #'identity require-lines " "))))
       :kind 'single
       :url homepage
       :keywords keywords
       :maintainer
       ;; For backward compatibility, use a single string if there's only
       ;; one maintainer (the most common case).
       (let ((maints (lm-maintainers))) (if (cdr maints) maints (car maints)))
       :authors (lm-authors)))))

(defun package--read-pkg-desc (kind)
  "Read a `define-package' form in current buffer.
Return the pkg-desc, with desc-kind set to KIND."
  (goto-char (point-min))
  (unwind-protect
      (let* ((pkg-def-parsed (read (current-buffer)))
             (pkg-desc
              (when (eq (car pkg-def-parsed) 'define-package)
                (apply #'package-desc-from-define
                  (append (cdr pkg-def-parsed))))))
        (when pkg-desc
          (setf (package-desc-kind pkg-desc) kind)
          pkg-desc))))

(declare-function tar-get-file-descriptor "tar-mode" (file))
(declare-function tar--extract "tar-mode" (descriptor))

(defun package-tar-file-info ()
  "Find package information for a tar file.
The return result is a `package-desc'."
  (cl-assert (derived-mode-p 'tar-mode))
  (let* ((dir-name (file-name-directory
                    (tar-header-name (car tar-parse-info))))
         (desc-file (package--description-file dir-name))
         (tar-desc (tar-get-file-descriptor (concat dir-name desc-file))))
    (unless tar-desc
      (error "No package descriptor file found"))
    (with-current-buffer (tar--extract tar-desc)
      (unwind-protect
          (or (package--read-pkg-desc 'tar)
              (error "Can't find define-package in %s"
                (tar-header-name tar-desc)))
        (kill-buffer (current-buffer))))))

(defun package-dir-info ()
  "Find package information for a directory.
The return result is a `package-desc'."
  (cl-assert (derived-mode-p 'dired-mode))
  (let* ((desc-file (package--description-file default-directory)))
    (if (file-readable-p desc-file)
        (with-temp-buffer
          (insert-file-contents desc-file)
          (package--read-pkg-desc 'dir))
      (let ((files (directory-files default-directory t "\\.el\\'" t))
            info)
        (while files
          (with-temp-buffer
            (insert-file-contents (pop files))
            ;; When we find the file with the data,
            (when (setq info (ignore-errors (package-buffer-info)))
              ;; stop looping,
              (setq files nil)
              ;; set the 'dir kind,
              (setf (package-desc-kind info) 'dir))))
        (unless info
          (error "No .el files with package headers in `%s'" default-directory))
        ;; and return the info.
        info))))

\f
;;; Communicating with Archives
;; Set of low-level functions for communicating with archives and
;; signature checking.

(defun package--write-file-no-coding (file-name)
  "Write file FILE-NAME without encoding using coding system."
  (let ((buffer-file-coding-system 'no-conversion))
    (write-region (point-min) (point-max) file-name nil 'silent)))

(declare-function url-http-file-exists-p "url-http" (url))

(defun package--archive-file-exists-p (location file)
  "Return t if FILE exists in remote LOCATION."
  (let ((http (string-match "\\`https?:" location)))
    (if http
        (progn
          (require 'url-http)
          (url-http-file-exists-p (concat location file)))
      (file-exists-p (expand-file-name file location)))))

(declare-function epg-make-context "epg"
                  (&optional protocol armor textmode include-certs
                             cipher-algorithm
                             digest-algorithm
                             compress-algorithm))
(declare-function epg-verify-string "epg" ( context signature
                                            &optional signed-text))
(declare-function epg-context-result-for "epg" (context name))
(declare-function epg-signature-status "epg" (signature) t)
(declare-function epg-signature-to-string "epg" (signature))

(defun package--display-verify-error (context sig-file)
  "Show error details with CONTEXT for failed verification of SIG-FILE.
The details are shown in a new buffer called \"*Error\"."
  (unless (equal (epg-context-error-output context) "")
    (with-output-to-temp-buffer "*Error*"
      (with-current-buffer standard-output
        (if (epg-context-result-for context 'verify)
            (insert (format "Failed to verify signature %s:\n" sig-file)
                    (mapconcat #'epg-signature-to-string
                               (epg-context-result-for context 'verify)
                               "\n"))
          (insert (format "Error while verifying signature %s:\n" sig-file)))
        (insert "\nCommand output:\n" (epg-context-error-output context))))))

(defmacro package--with-work-buffer (location file &rest body)
  "Run BODY in a buffer containing the contents of FILE at LOCATION.
LOCATION is the base location of a package archive, and should be
one of the URLs (or file names) specified in `package-archives'.
FILE is the name of a file relative to that base location.

This macro retrieves FILE from LOCATION into a temporary buffer,
and evaluates BODY while that buffer is current.  This work
buffer is killed afterwards.  Return the last value in BODY."
  (declare (indent 2) (debug t)
           (obsolete package--with-response-buffer "25.1"))
  `(with-temp-buffer
     (if (string-match-p "\\`https?:" ,location)
         (url-insert-file-contents (concat ,location ,file))
       (unless (file-name-absolute-p ,location)
         (error "Archive location %s is not an absolute file name"
           ,location))
       (insert-file-contents (expand-file-name ,file ,location)))
     ,@body))

(cl-defmacro package--with-response-buffer (url &rest body &key async file error-form noerror &allow-other-keys)
  "Access URL and run BODY in a buffer containing the response.
Point is after the headers when BODY runs.
FILE, if provided, is added to URL.
URL can be a local file name, which must be absolute.
ASYNC, if non-nil, runs the request asynchronously.
ERROR-FORM is run only if a connection error occurs.  If NOERROR
is non-nil, don't propagate connection errors (does not apply to
errors signaled by ERROR-FORM or by BODY).

\(fn URL &key ASYNC FILE ERROR-FORM NOERROR &rest BODY)"
  (declare (indent defun)
           ;; FIXME: This should be something like
           ;; `form def-body &rest form', but that doesn't work.
           (debug (form &rest sexp)))
  (while (keywordp (car body))
    (setq body (cdr (cdr body))))
  `(package--with-response-buffer-1 ,url (lambda () ,@body)
                                    :file ,file
                                    :async ,async
                                    :error-function (lambda () ,error-form)
                                    :noerror ,noerror))

(defmacro package--unless-error (body &rest before-body)
  (declare (debug t) (indent 1))
  (let ((err (make-symbol "err")))
    `(with-temp-buffer
       (set-buffer-multibyte nil)
       (when (condition-case ,err
                 (progn ,@before-body t)
               (error (funcall error-function)
                      (unless noerror
                        (signal (car ,err) (cdr ,err)))))
         (funcall ,body)))))

(cl-defun package--with-response-buffer-1 (url body &key async file error-function noerror &allow-other-keys)
  (if (string-match-p "\\`https?:" url)
        (let ((url (concat url file)))
          (if async
              (package--unless-error #'ignore
                (url-retrieve
                 url
                 (lambda (status)
                   (let ((b (current-buffer)))
                     (require 'url-handlers)
                     (package--unless-error body
                       (when-let* ((er (plist-get status :error)))
                         (error "Error retrieving: %s %S" url er))
                       (with-current-buffer b
                         (goto-char (point-min))
                         (unless (search-forward-regexp "^\r?\n\r?" nil t)
                           (error "Error retrieving: %s %S"
                                  url "incomprehensible buffer")))
                       (url-insert b)
                       (kill-buffer b)
                       (goto-char (point-min)))))
                 nil
                 'silent))
            (package--unless-error body
              ;; Copy&pasted from url-insert-file-contents,
              ;; except it calls `url-insert' because we want the contents
              ;; literally (but there's no url-insert-file-contents-literally).
              (let ((buffer (url-retrieve-synchronously url)))
                (unless buffer (signal 'file-error (list url "No Data")))
                (when (fboundp 'url-http--insert-file-helper)
                  ;; XXX: This is HTTP/S specific and should be moved
                  ;; to url-http instead.  See bug#17549.
                  (url-http--insert-file-helper buffer url))
                (url-insert buffer)
                (kill-buffer buffer)
                (goto-char (point-min))))))
      (package--unless-error body
        (unless (file-name-absolute-p url)
          (error "Location %s is not a url nor an absolute file name" url))
        (insert-file-contents-literally (expand-file-name file url)))))

(define-error 'bad-signature "Failed to verify signature")

(defun package--check-signature-content (content string &optional sig-file)
  "Check signature CONTENT against STRING.
SIG-FILE is the name of the signature file, used when signaling
errors."
  (let ((context (epg-make-context 'OpenPGP)))
    (when package-gnupghome-dir
      (setf (epg-context-home-directory context) package-gnupghome-dir))
    (condition-case error
        (epg-verify-string context content string)
      (error (package--display-verify-error context sig-file)
             (signal 'bad-signature error)))
    (let (good-signatures had-fatal-error)
      ;; The .sig file may contain multiple signatures.  Success if one
      ;; of the signatures is good.
      (dolist (sig (epg-context-result-for context 'verify))
        (if (eq (epg-signature-status sig) 'good)
            (push sig good-signatures)
          ;; If `package-check-signature' is allow-unsigned, don't
          ;; signal error when we can't verify signature because of
          ;; missing public key.  Other errors are still treated as
          ;; fatal (bug#17625).
          (unless (and (eq (package-check-signature) 'allow-unsigned)
                       (eq (epg-signature-status sig) 'no-pubkey))
            (setq had-fatal-error t))))
      (when (or (null good-signatures)
                (and (eq (package-check-signature) 'all)
                     had-fatal-error))
        (package--display-verify-error context sig-file)
        (signal 'bad-signature (list sig-file)))
      good-signatures)))

(defun package--check-signature (location file &optional string async callback unwind)
  "Check signature of the current buffer.
Download the signature file from LOCATION by appending \".sig\"
to FILE.
GnuPG keyring location depends on `package-gnupghome-dir'.
STRING is the string to verify, it defaults to `buffer-string'.
If ASYNC is non-nil, the download of the signature file is
done asynchronously.

If the signature does not verify, signal an error.
If the signature is verified and CALLBACK was provided, `funcall'
CALLBACK with the list of good signatures as argument (the list
can be empty).
If no signatures file is found, and `package-check-signature' is
`allow-unsigned', call CALLBACK with a nil argument.
Otherwise, an error is signaled.

UNWIND, if provided, is a function to be called after everything
else, even if an error is signaled."
  (let ((sig-file (concat file ".sig"))
        (string (or string (buffer-string))))
    (package--with-response-buffer location :file sig-file
      :async async :noerror t
      ;; Connection error is assumed to mean "no sig-file".
      :error-form (let ((allow-unsigned
                         (eq (package-check-signature) 'allow-unsigned)))
                    (when (and callback allow-unsigned)
                      (funcall callback nil))
                    (when unwind (funcall unwind))
                    (unless allow-unsigned
                      (error "Unsigned file `%s' at %s" file location)))
      ;; OTOH, an error here means "bad signature", which we never
      ;; suppress.  (Bug#22089)
      (unwind-protect
          (let ((sig (package--check-signature-content
                      (buffer-substring (point) (point-max))
                      string sig-file)))
            (when callback (funcall callback sig))
            sig)
        (when unwind (funcall unwind))))))
\f
;;; Packages on Archives
;; The following variables store information about packages available
;; from archives.  The most important of these is
;; `package-archive-contents' which is initially populated by the
;; function `package-read-all-archive-contents' from a cache on disk.
;; The `package-initialize' command is also closely related to this
;; section, but it has its own section.

(defconst package-archive-version 1
  "Version number of the package archive understood by package.el.
Lower version numbers than this will probably be understood as well.")

;; We don't prime the cache since it tends to get out of date.
(defvar package-archive-contents nil
  "Cache of the contents of all archives in `package-archives'.
This is an alist mapping package names (symbols) to
non-empty lists of `package-desc' structures.")
(put 'package-archive-contents 'risky-local-variable t)

(defvar package--compatibility-table nil
  "Hash table connecting package names to their compatibility.
Each key is a symbol, the name of a package.

The value is either nil, representing an incompatible package, or
a version list, representing the highest compatible version of
that package which is available.

A package is considered incompatible if it requires an Emacs
version higher than the one being used.  To check for package
\(in)compatibility, don't read this table directly, use
`package--incompatible-p' which also checks dependencies.")

(defun package--build-compatibility-table ()
  "Build `package--compatibility-table' with `package--mapc'."
  ;; Initialize the list of built-ins.
  (require 'finder-inf nil t)
  ;; Build compat table.
  (setq package--compatibility-table (make-hash-table :test 'eq))
  (package--mapc #'package--add-to-compatibility-table))

(defun package--add-to-compatibility-table (pkg)
  "If PKG is compatible (without dependencies), add to the compatibility table.
PKG is a package-desc object.
Only adds if its version is higher than what's already stored in
the table."
  (unless (package--incompatible-p pkg 'shallow)
    (let* ((name (package-desc-name pkg))
           (version (or (package-desc-version pkg) '(0)))
           (table-version (gethash name package--compatibility-table)))
      (when (or (not table-version)
                (version-list-< table-version version))
        (puthash name version package--compatibility-table)))))

;; Package descriptor objects used inside the "archive-contents" file.
;; Changing this defstruct implies changing the format of the
;; "archive-contents" files.
(cl-defstruct (package--ac-desc
               (:constructor package-make-ac-desc (version reqs summary kind extras))
               (:copier nil)
               (:type vector))
  version reqs summary kind extras)

(defun package--append-to-alist (pkg-desc alist)
  "Append an entry for PKG-DESC to the start of ALIST and return it.
This entry takes the form (`package-desc-name' PKG-DESC).

If ALIST already has an entry with this name, destructively add
PKG-DESC to the cdr of this entry instead, sorted by version
number."
  (let* ((name (package-desc-name pkg-desc))
         (priority-version (package-desc-priority-version pkg-desc))
         (existing-packages (assq name alist)))
    (if (not existing-packages)
        (cons (list name pkg-desc)
              alist)
      (while (if (and (cdr existing-packages)
                      (version-list-< priority-version
                                      (package-desc-priority-version
                                       (cadr existing-packages))))
                 (setq existing-packages (cdr existing-packages))
               (push pkg-desc (cdr existing-packages))
               nil))
      alist)))

(defun package--add-to-archive-contents (package archive)
  "Add the PACKAGE from the given ARCHIVE if necessary.
PACKAGE should have the form (NAME . PACKAGE--AC-DESC).
Also, add the originating archive to the `package-desc' structure."
  (let* ((name (car package))
         (version (package--ac-desc-version (cdr package)))
         (pkg-desc
          (package-desc-create
           :name name
           :version version
           :reqs (package--ac-desc-reqs (cdr package))
           :summary (package--ac-desc-summary (cdr package))
           :kind (package--ac-desc-kind (cdr package))
           :archive archive
           :extras (and (> (length (cdr package)) 4)
                        ;; Older archive-contents files have only 4
                        ;; elements here.
                        (package--ac-desc-extras (cdr package)))))
         (pinned-to-archive (assoc name package-pinned-packages)))
    ;; Skip entirely if pinned to another archive.
    (when (not (and pinned-to-archive
                    (not (equal (cdr pinned-to-archive) archive))))
      (setq package-archive-contents
            (package--append-to-alist pkg-desc package-archive-contents)))))

(defun package--read-archive-file (file)
  "Read cached archive FILE data, if it exists.
Return the data from the file, or nil if the file does not exist.
If the archive version is too new, signal an error."
  (let ((filename (expand-file-name file package-user-dir)))
    (when (file-exists-p filename)
      (with-temp-buffer
        (let ((coding-system-for-read 'utf-8))
          (insert-file-contents filename))
        (let ((contents (read (current-buffer))))
          (if (> (car contents) package-archive-version)
              (error "Package archive version %d is higher than %d"
                (car contents) package-archive-version))
          (cdr contents))))))

(defun package-read-archive-contents (archive)
  "Read cached archive file for ARCHIVE.
If successful, set or update the variable `package-archive-contents'.
ARCHIVE should be a string matching the name of a package archive
in the variable `package-archives'.
If the archive version is too new, signal an error."
  ;; Version 1 of 'archive-contents' is identical to our internal
  ;; representation.
  (let* ((contents-file (format "archives/%s/archive-contents" archive))
         (contents (package--read-archive-file contents-file)))
    (when contents
      (dolist (package contents)
        (if package
            (package--add-to-archive-contents package archive)
          (lwarn '(package refresh) :warning
                 "Ignoring `nil' package on `%s' package archive" archive))))))

(defvar package--old-archive-priorities nil
  "Store currently used `package-archive-priorities'.
This is the value of `package-archive-priorities' last time
`package-read-all-archive-contents' was called.  It can be used
by arbitrary functions to decide whether it is necessary to call
it again.")

(defun package-read-all-archive-contents ()
  "Read cached archive file for all archives in `package-archives'.
If successful, set or update `package-archive-contents'."
  (setq package-archive-contents nil)
  (setq package--old-archive-priorities package-archive-priorities)
  (dolist (archive package-archives)
    (package-read-archive-contents (car archive))))

\f
;;;; Package Initialize
;; A bit of a milestone.  This brings together some of the above
;; sections and populates all relevant lists of packages from contents
;; available on disk.

(defvar package--initialized nil
  "Non-nil if `package-initialize' has been run.")

;;;###autoload
(defvar package--activated nil
  "Non-nil if `package-activate-all' has been run.")

;;;###autoload
(defun package-initialize (&optional no-activate)
  "Load Emacs Lisp packages, and activate them.
The variable `package-load-list' controls which packages to load.
If optional arg NO-ACTIVATE is non-nil, don't activate packages.

It is not necessary to adjust `load-path' or `require' the
individual packages after calling `package-initialize' -- this is
taken care of by `package-initialize'.

If `package-initialize' is called twice during Emacs startup,
signal a warning, since this is a bad idea except in highly
advanced use cases.  To suppress the warning, remove the
superfluous call to `package-initialize' from your init-file.  If
you have code which must run before `package-initialize', put
that code in the early init-file."
  (interactive)
  (when (and package--initialized (not after-init-time))
    (lwarn '(package reinitialization) :warning
           "Unnecessary call to `package-initialize' in init file"))
  (setq package-alist nil)
  (package-load-all-descriptors)
  (package-read-all-archive-contents)
  (setq package--initialized t)
  (unless no-activate
    (package-activate-all))
  ;; This uses `package--mapc' so it must be called after
  ;; `package--initialized' is t.
  (package--build-compatibility-table))

;;;###autoload
(progn ;; Make the function usable without loading `package.el'.
(defun package-activate-all ()
  "Activate all installed packages.
The variable `package-load-list' controls which packages to load."
  (setq package--activated t)
  (let* ((elc (concat package-quickstart-file "c"))
         (qs (if (file-readable-p elc) elc
               (if (file-readable-p package-quickstart-file)
                   package-quickstart-file))))
    (if qs
        ;; Skip load-source-file-function which would slow us down by a factor
        ;; 2 when loading the .el file (this assumes we were careful to
        ;; save this file so it doesn't need any decoding).
        (let ((load-source-file-function nil))
          (unless (boundp 'package-activated-list)
            (setq package-activated-list nil))
          (load qs nil 'nomessage))
      (require 'package)
      (package--activate-all)))))

(defun package--activate-all ()
  (dolist (elt (package--alist))
    (condition-case err
        (package-activate (car elt))
      ;; Don't let failure of activation of a package arbitrarily stop
      ;; activation of further packages.
      (error (message "%s" (error-message-string err))))))
\f
;;;; Populating `package-archive-contents' from archives
;; This subsection populates the variables listed above from the
;; actual archives, instead of from a local cache.

(defvar package--downloads-in-progress nil
  "List of in-progress asynchronous downloads.")

(declare-function epg-import-keys-from-file "epg" (context keys))

;;;###autoload
(defun package-import-keyring (&optional file)
  "Import keys from FILE."
  (interactive "fFile: ")
  (setq file (expand-file-name file))
  (let ((context (epg-make-context 'OpenPGP)))
    (when package-gnupghome-dir
      (with-file-modes 448
        (make-directory package-gnupghome-dir t))
      (setf (epg-context-home-directory context) package-gnupghome-dir))
    (message "Importing %s..." (file-name-nondirectory file))
    (epg-import-keys-from-file context file)
    (message "Importing %s...done" (file-name-nondirectory file))))

(defvar package--post-download-archives-hook nil
  "Hook run after the archive contents are downloaded.
Don't run this hook directly.  It is meant to be run as part of
`package--update-downloads-in-progress'.")
(put 'package--post-download-archives-hook 'risky-local-variable t)

(defun package--update-downloads-in-progress (entry)
  "Remove ENTRY from `package--downloads-in-progress'.
Once it's empty, run `package--post-download-archives-hook'."
  ;; Keep track of the downloading progress.
  (setq package--downloads-in-progress
        (remove entry package--downloads-in-progress))
  ;; If this was the last download, run the hook.
  (unless package--downloads-in-progress
    (package-read-all-archive-contents)
    (package--build-compatibility-table)
    ;; We message before running the hook, so the hook can give
    ;; messages as well.
    (message "Package refresh done")
    (run-hooks 'package--post-download-archives-hook)))

(defun package--download-one-archive (archive file &optional async)
  "Retrieve an archive file FILE from ARCHIVE, and cache it.
ARCHIVE should be a cons cell of the form (NAME . LOCATION),
similar to an entry in `package-alist'.  Save the cached copy to
\"archives/NAME/FILE\" in `package-user-dir'."
  (package--with-response-buffer (cdr archive) :file file
    :async async
    :error-form (package--update-downloads-in-progress archive)
    (let* ((location (cdr archive))
           (name (car archive))
           (content (buffer-string))
           (dir (expand-file-name (concat "archives/" name) package-user-dir))
           (local-file (expand-file-name file dir)))
      (when (listp (read content))
        (make-directory dir t)
        (if (or (not (package-check-signature))
                (member name package-unsigned-archives))
            ;; If we don't care about the signature, save the file and
            ;; we're done.
            (progn
             (cl-assert (not enable-multibyte-characters))
             (let ((coding-system-for-write 'binary))
               (write-region content nil local-file nil 'silent))
             (package--update-downloads-in-progress archive))
          ;; If we care, check it (perhaps async) and *then* write the file.
          (package--check-signature
           location file content async
           ;; This function will be called after signature checking.
           (lambda (&optional good-sigs)
             (cl-assert (not enable-multibyte-characters))
             (let ((coding-system-for-write 'binary))
               (write-region content nil local-file nil 'silent))
             ;; Write out good signatures into archive-contents.signed file.
             (when good-sigs
               (write-region (mapconcat #'epg-signature-to-string good-sigs "\n")
                             nil (concat local-file ".signed") nil 'silent)))
           (lambda () (package--update-downloads-in-progress archive))))))))

(defun package--download-and-read-archives (&optional async)
  "Download descriptions of all `package-archives' and read them.
Populate `package-archive-contents' with the result.

If optional argument ASYNC is non-nil, perform the downloads
asynchronously."
  ;; The downloaded archive contents will be read as part of
  ;; `package--update-downloads-in-progress'.
  (dolist (archive package-archives)
    (cl-pushnew archive package--downloads-in-progress
                :test #'equal))
  (dolist (archive package-archives)
    (condition-case-unless-debug nil
        (package--download-one-archive archive "archive-contents" async)
      (error (message "Failed to download `%s' archive."
               (car archive))))))

;;;###autoload
(defun package-refresh-contents (&optional async)
  "Download descriptions of all configured ELPA packages.
For each archive configured in the variable `package-archives',
inform Emacs about the latest versions of all packages it offers,
and make them available for download.
Optional argument ASYNC specifies whether to perform the
downloads in the background."
  (interactive)
  (unless (file-exists-p package-user-dir)
    (make-directory package-user-dir t))
  (let ((default-keyring (expand-file-name "package-keyring.gpg"
                                           data-directory))
        (inhibit-message (or inhibit-message async)))
    (when (and (package-check-signature) (file-exists-p default-keyring))
      (condition-case-unless-debug error
          (package-import-keyring default-keyring)
        (error (message "Cannot import default keyring: %S" (cdr error))))))
  (package--download-and-read-archives async))

\f
;;; Dependency Management
;; Calculating the full transaction necessary for an installation,
;; keeping track of which packages were installed strictly as
;; dependencies, and determining which packages cannot be removed
;; because they are dependencies.

(defun package-compute-transaction (packages requirements &optional seen)
  "Return a list of packages to be installed, including PACKAGES.
PACKAGES should be a list of `package-desc'.

REQUIREMENTS should be a list of additional requirements; each
element in this list should have the form (PACKAGE VERSION-LIST),
where PACKAGE is a package name and VERSION-LIST is the required
version of that package.

This function recursively computes the requirements of the
packages in REQUIREMENTS, and returns a list of all the packages
that must be installed.  Packages that are already installed are
not included in this list.

SEEN is used internally to detect infinite recursion."
  ;; FIXME: We really should use backtracking to explore the whole
  ;; search space (e.g. if foo require bar-1.3, and bar-1.4 requires toto-1.1
  ;; whereas bar-1.3 requires toto-1.0 and the user has put a hold on toto-1.0:
  ;; the current code might fail to see that it could install foo by using the
  ;; older bar-1.3).
  (dolist (elt requirements)
    (let* ((next-pkg (car elt))
           (next-version (cadr elt))
           (already ()))
      (dolist (pkg packages)
        (if (eq next-pkg (package-desc-name pkg))
            (setq already pkg)))
      (when already
        (if (version-list-<= next-version (package-desc-version already))
            ;; `next-pkg' is already in `packages', but its position there
            ;; means it might be installed too late: remove it from there, so
            ;; we re-add it (along with its dependencies) at an earlier place
            ;; below (bug#16994).
            (if (memq already seen)     ;Avoid inf-loop on dependency cycles.
                (message "Dependency cycle going through %S"
                         (package-desc-full-name already))
              (setq packages (delq already packages))
              (setq already nil))
          (error "Need package `%s-%s', but only %s is being installed"
                 next-pkg (package-version-join next-version)
                 (package-version-join (package-desc-version already)))))
      (cond
       (already nil)
       ((package-installed-p next-pkg next-version) nil)

       (t
        ;; A package is required, but not installed.  It might also be
        ;; blocked via `package-load-list'.
        (let ((pkg-descs (cdr (assq next-pkg package-archive-contents)))
              (found nil)
              (found-something nil)
              (problem nil))
          (while (and pkg-descs (not found))
            (let* ((pkg-desc (pop pkg-descs))
                   (version (package-desc-version pkg-desc))
                   (disabled (package-disabled-p next-pkg version)))
              (cond
               ((version-list-< version next-version)
                ;; pkg-descs is sorted by priority, not version, so
                ;; don't error just yet.
                (unless found-something
                  (setq found-something (package-version-join version))))
               (disabled
                (unless problem
                  (setq problem
                        (if (stringp disabled)
                            (format-message
                             "Package `%s' held at version %s, but version %s required"
                             next-pkg disabled
                             (package-version-join next-version))
                          (format-message "Required package `%s' is disabled"
                                          next-pkg)))))
               (t (setq found pkg-desc)))))
          (unless found
            (cond
             (problem (error "%s" problem))
             (found-something
              (error "Need package `%s-%s', but only %s is available"
                     next-pkg (package-version-join next-version)
                     found-something))
             (t (error "Package `%s-%s' is unavailable"
                       next-pkg (package-version-join next-version)))))
          (setq packages
                (package-compute-transaction (cons found packages)
                                             (package-desc-reqs found)
                                             (cons found seen))))))))
  packages)

(defun package--find-non-dependencies ()
  "Return a list of installed packages which are not dependencies.
Finds all packages in `package-alist' which are not dependencies
of any other packages.
Used to populate `package-selected-packages'."
  (let ((dep-list
         (delete-dups
          (apply #'append
            (mapcar (lambda (p) (mapcar #'car (package-desc-reqs (cadr p))))
                    package-alist)))))
    (cl-loop for p in package-alist
             for name = (car p)
             unless (memq name dep-list)
             collect name)))

(defun package--save-selected-packages (&optional value)
  "Set and save `package-selected-packages' to VALUE."
  (when value
    (setq package-selected-packages value))
  (if after-init-time
      (customize-save-variable 'package-selected-packages package-selected-packages)
    (add-hook 'after-init-hook #'package--save-selected-packages)))

(defun package--user-selected-p (pkg)
  "Return non-nil if PKG is a package was installed by the user.
PKG is a package name.
This looks into `package-selected-packages', populating it first
if it is still empty."
  (unless (consp package-selected-packages)
    (package--save-selected-packages (package--find-non-dependencies)))
  (memq pkg package-selected-packages))

(defun package--get-deps (pkgs)
  (let ((seen '()))
    (while pkgs
      (let ((pkg (pop pkgs)))
        (if (memq pkg seen)
            nil ;; Done already!
          (let ((pkg-desc (cadr (assq pkg package-alist))))
            (when pkg-desc
              (push pkg seen)
              (setq pkgs (append (mapcar #'car (package-desc-reqs pkg-desc))
                                 pkgs)))))))
    seen))

(defun package--user-installed-p (package)
  "Return non-nil if PACKAGE is a user-installed package.
PACKAGE is the package name, a symbol.  Check whether the package
was installed into `package-user-dir' where we assume to have
control over."
  (let* ((pkg-desc (cadr (assq package package-alist)))
         (dir (package-desc-dir pkg-desc)))
    (file-in-directory-p dir package-user-dir)))

(defun package--removable-packages ()
  "Return a list of names of packages no longer needed.
These are packages which are neither contained in
`package-selected-packages' nor a dependency of one that is."
  (let ((needed (package--get-deps package-selected-packages)))
    (cl-loop for p in (mapcar #'car package-alist)
             unless (or (memq p needed)
                        ;; Do not auto-remove external packages.
                        (not (package--user-installed-p p)))
             collect p)))

(defun package--used-elsewhere-p (pkg-desc &optional pkg-list all)
  "Non-nil if PKG-DESC is a dependency of a package in PKG-LIST.
Return the first package found in PKG-LIST of which PKG is a
dependency.  If ALL is non-nil, return all such packages instead.

When not specified, PKG-LIST defaults to `package-alist'
with PKG-DESC entry removed."
  (unless (string= (package-desc-status pkg-desc) "obsolete")
    (let* ((pkg (package-desc-name pkg-desc))
           (alist (or pkg-list
                      (remove (assq pkg package-alist)
                              package-alist))))
      (if all
          (cl-loop for p in alist
                   if (assq pkg (package-desc-reqs (cadr p)))
                   collect (cadr p))
        (cl-loop for p in alist thereis
                 (and (assq pkg (package-desc-reqs (cadr p)))
                      (cadr p)))))))

(defun package--sort-deps-in-alist (package only)
  "Return a list of dependencies for PACKAGE sorted by dependency.
PACKAGE is included as the first element of the returned list.
ONLY is an alist associating package names to package objects.
Only these packages will be in the return value and their cdrs are
destructively set to nil in ONLY."
  (let ((out))
    (dolist (dep (package-desc-reqs package))
      (when-let* ((cell (assq (car dep) only))
                  (dep-package (cdr-safe cell)))
        (setcdr cell nil)
        (setq out (append (package--sort-deps-in-alist dep-package only)
                          out))))
    (cons package out)))

(defun package--sort-by-dependence (package-list)
  "Return PACKAGE-LIST sorted by dependence.
That is, any element of the returned list is guaranteed to not
directly depend on any elements that come before it.

PACKAGE-LIST is a list of `package-desc' objects.
Indirect dependencies are guaranteed to be returned in order only
if all the in-between dependencies are also in PACKAGE-LIST."
  (let ((alist (mapcar (lambda (p) (cons (package-desc-name p) p)) package-list))
        out-list)
    (dolist (cell alist out-list)
      ;; `package--sort-deps-in-alist' destructively changes alist, so
      ;; some cells might already be empty.  We check this here.
      (when-let* ((pkg-desc (cdr cell)))
        (setcdr cell nil)
        (setq out-list
              (append (package--sort-deps-in-alist pkg-desc alist)
                      out-list))))))

\f
;;; Installation Functions
;; As opposed to the previous section (which listed some underlying
;; functions necessary for installation), this one contains the actual
;; functions that install packages.  The package itself can be
;; installed in a variety of ways (archives, buffer, file), but
;; requirements (dependencies) are always satisfied by looking in
;; `package-archive-contents'.

(defun package-archive-base (desc)
  "Return the package described by DESC."
  (cdr (assoc (package-desc-archive desc) package-archives)))

(defun package-install-from-archive (pkg-desc)
  "Download and install a tar package defined by PKG-DESC."
  ;; This won't happen, unless the archive is doing something wrong.
  (when (eq (package-desc-kind pkg-desc) 'dir)
    (error "Can't install directory package from archive"))
  (let* ((location (package-archive-base pkg-desc))
         (file (concat (package-desc-full-name pkg-desc)
                       (package-desc-suffix pkg-desc))))
    (package--with-response-buffer location :file file
      (if (or (not (package-check-signature))
              (member (package-desc-archive pkg-desc)
                      package-unsigned-archives))
          ;; If we don't care about the signature, unpack and we're
          ;; done.
          (let ((save-silently t))
            (package-unpack pkg-desc))
        ;; If we care, check it and *then* write the file.
        (let ((content (buffer-string)))
          (package--check-signature
           location file content nil
           ;; This function will be called after signature checking.
           (lambda (&optional good-sigs)
             ;; Signature checked, unpack now.
             (with-temp-buffer ;FIXME: Just use the previous current-buffer.
               (set-buffer-multibyte nil)
               (cl-assert (not (multibyte-string-p content)))
               (insert content)
               (let ((save-silently t))
                 (package-unpack pkg-desc)))
             ;; Here the package has been installed successfully, mark it as
             ;; signed if appropriate.
             (when good-sigs
               ;; Write out good signatures into NAME-VERSION.signed file.
               (write-region (mapconcat #'epg-signature-to-string good-sigs "\n")
                             nil
                             (expand-file-name
                              (concat (package-desc-full-name pkg-desc) ".signed")
                              package-user-dir)
                             nil 'silent)
               ;; Update the old pkg-desc which will be shown on the description buffer.
               (setf (package-desc-signed pkg-desc) t)
               ;; Update the new (activated) pkg-desc as well.
               (when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc)
                                                 package-alist))))
                 (setf (package-desc-signed (car pkg-descs)) t))))))))))

(defun package-installed-p (package &optional min-version)
  "Return non-nil if PACKAGE, of MIN-VERSION or newer, is installed.
If PACKAGE is a symbol, it is the package name and MIN-VERSION
should be a version list.

If PACKAGE is a `package-desc' object, MIN-VERSION is ignored."
  (cond
   ((package-desc-p package)
    (let ((dir (package-desc-dir package)))
        (and (stringp dir)
             (file-exists-p dir))))
   ((and (not package--initialized)
         (null min-version)
         package-activated-list)
    ;; We used the quickstart: make it possible to use package-installed-p
    ;; even before package is fully initialized.
    (memq package package-activated-list))
   (t
    (or
     (let ((pkg-descs (cdr (assq package (package--alist)))))
       (and pkg-descs
            (version-list-<= min-version
                             (package-desc-version (car pkg-descs)))))
     ;; Also check built-in packages.
     (package-built-in-p package min-version)))))

(defun package-download-transaction (packages)
  "Download and install all the packages in PACKAGES.
PACKAGES should be a list of `package-desc'.
This function assumes that all package requirements in
PACKAGES are satisfied, i.e. that PACKAGES is computed
using `package-compute-transaction'."
  (mapc #'package-install-from-archive packages))

(defun package--archives-initialize ()
  "Make sure the list of installed and remote packages are initialized."
  (unless package--initialized
    (package-initialize t))
  (unless package-archive-contents
    (package-refresh-contents)))

;;;###autoload
(defun package-install (pkg &optional dont-select)
  "Install the package PKG.
PKG can be a `package-desc' or a symbol naming one of the
available packages in an archive in `package-archives'.  When
called interactively, prompt for the package name.

Mark the installed package as selected by adding it to
`package-selected-packages'.

When called from Lisp and optional argument DONT-SELECT is
non-nil, install the package but do not add it to
`package-selected-packages'.

If PKG is a `package-desc' and it is already installed, don't try
to install it but still mark it as selected."
  (interactive
   (progn
     ;; Initialize the package system to get the list of package
     ;; symbols for completion.
     (package--archives-initialize)
     (list (intern (completing-read
                    "Install package: "
                    (delq nil
                          (mapcar (lambda (elt)
                                    (unless (package-installed-p (car elt))
                                      (symbol-name (car elt))))
                                  package-archive-contents))
                    nil t))
           nil)))
  (package--archives-initialize)
  (add-hook 'post-command-hook #'package-menu--post-refresh)
  (let ((name (if (package-desc-p pkg)
                  (package-desc-name pkg)
                pkg)))
    (unless (or dont-select (package--user-selected-p name))
      (package--save-selected-packages
       (cons name package-selected-packages)))
    (if-let* ((transaction
               (if (package-desc-p pkg)
                   (unless (package-installed-p pkg)
                     (package-compute-transaction (list pkg)
                                                  (package-desc-reqs pkg)))
                 (package-compute-transaction () (list (list pkg))))))
        (progn
          (package-download-transaction transaction)
          (package--quickstart-maybe-refresh)
          (message  "Package `%s' installed." name))
      (message "`%s' is already installed" name))))

(defun package-strip-rcs-id (str)
  "Strip RCS version ID from the version string STR.
If the result looks like a dotted numeric version, return it.
Otherwise return nil."
  (when str
    (when (string-match "\\`[ \t]*[$]Revision:[ \t]+" str)
      (setq str (substring str (match-end 0))))
    (let ((l (version-to-list str)))
      ;; Don't return `str' but (package-version-join (version-to-list str))
      ;; to make sure we use a "canonical name"!
      (if l (package-version-join l)))))

(declare-function lm-homepage "lisp-mnt" (&optional file))

;;;###autoload
(defun package-install-from-buffer ()
  "Install a package from the current buffer.
The current buffer is assumed to be a single .el or .tar file or
a directory.  These must follow the packaging guidelines (see
info node `(elisp)Packaging').

Specially, if current buffer is a directory, the -pkg.el
description file is not mandatory, in which case the information
is derived from the main .el file in the directory.

Downloads and installs required packages as needed."
  (interactive)
  (let* ((pkg-desc
          (cond
            ((derived-mode-p 'dired-mode)
             ;; This is the only way a package-desc object with a `dir'
             ;; desc-kind can be created.  Such packages can't be
             ;; uploaded or installed from archives, they can only be
             ;; installed from local buffers or directories.
             (package-dir-info))
            ((derived-mode-p 'tar-mode)
             (package-tar-file-info))
            (t
             ;; Package headers should be parsed from decoded text
             ;; (see Bug#48137) where possible.
             (if (and (eq buffer-file-coding-system 'no-conversion)
                      buffer-file-name)
                 (let* ((package-buffer (current-buffer))
                        (decoding-system
                         (car (find-operation-coding-system
                               'insert-file-contents
                               (cons buffer-file-name
                                     package-buffer)))))
                   (with-temp-buffer
                     (insert-buffer-substring package-buffer)
                     (decode-coding-region (point-min) (point-max)
                                           decoding-system)
                     (package-buffer-info)))

               (save-excursion
                 (package-buffer-info))))))
         (name (package-desc-name pkg-desc)))
    ;; Download and install the dependencies.
    (let* ((requires (package-desc-reqs pkg-desc))
           (transaction (package-compute-transaction nil requires)))
      (package-download-transaction transaction))
    ;; Install the package itself.
    (package-unpack pkg-desc)
    (unless (package--user-selected-p name)
      (package--save-selected-packages
       (cons name package-selected-packages)))
    (package--quickstart-maybe-refresh)
    pkg-desc))

;;;###autoload
(defun package-install-file (file)
  "Install a package from FILE.
The file can either be a tar file, an Emacs Lisp file, or a
directory."
  (interactive "fPackage file name: ")
  (with-temp-buffer
    (if (file-directory-p file)
        (progn
          (setq default-directory file)
          (dired-mode))
      (insert-file-contents-literally file)
      (set-visited-file-name file)
      (when (string-match "\\.tar\\'" file) (tar-mode)))
    (package-install-from-buffer)))

;;;###autoload
(defun package-install-selected-packages (&optional noconfirm)
  "Ensure packages in `package-selected-packages' are installed.
If some packages are not installed, propose to install them.
If optional argument NOCONFIRM is non-nil, don't ask for
confirmation to install packages."
  (interactive)
  (package--archives-initialize)
  ;; We don't need to populate `package-selected-packages' before
  ;; using here, because the outcome is the same either way (nothing
  ;; gets installed).
  (if (not package-selected-packages)
      (message "`package-selected-packages' is empty, nothing to install")
    (let* ((not-installed (seq-remove #'package-installed-p package-selected-packages))
           (available (seq-filter (lambda (p) (assq p package-archive-contents)) not-installed))
           (difference (- (length not-installed) (length available))))
      (cond
       (available
        (when (or noconfirm
                  (y-or-n-p
                   (format "Packages to install: %d (%s), proceed? "
                           (length available)
                           (mapconcat #'symbol-name available " "))))
          (mapc (lambda (p) (package-install p 'dont-select)) available)))
       ((> difference 0)
        (message "Packages that are not available: %d (the rest is already installed), maybe you need to `M-x package-refresh-contents'"
                 difference))
       (t
        (message "All your packages are already installed"))))))

\f
;;; Package Deletion

(defun package--newest-p (pkg)
  "Return non-nil if PKG is the newest package with its name."
  (equal (cadr (assq (package-desc-name pkg) package-alist))
         pkg))

(declare-function comp-el-to-eln-filename "comp.c")
(defun package--delete-directory (dir)
  "Delete DIR recursively.
Clean-up the corresponding .eln files if Emacs is native
compiled."
  (when (featurep 'native-compile)
    (cl-loop
     for file in (directory-files-recursively dir "\\.el\\'")
     do (comp-clean-up-stale-eln (comp-el-to-eln-filename file))))
  (delete-directory dir t))

(defun package-delete (pkg-desc &optional force nosave)
  "Delete package PKG-DESC.

Argument PKG-DESC is a full description of package as vector.
Interactively, prompt the user for the package name and version.

When package is used elsewhere as dependency of another package,
refuse deleting it and return an error.
If prefix argument FORCE is non-nil, package will be deleted even
if it is used elsewhere.
If NOSAVE is non-nil, the package is not removed from
`package-selected-packages'."
  (interactive
   (progn
     (let* ((package-table
             (mapcar
              (lambda (p) (cons (package-desc-full-name p) p))
              (delq nil
                    (mapcar (lambda (p) (unless (package-built-in-p p) p))
                            (apply #'append (mapcar #'cdr (package--alist)))))))
            (package-name (completing-read "Delete package: "
                                           (mapcar #'car package-table)
                                           nil t)))
       (list (cdr (assoc package-name package-table))
             current-prefix-arg nil))))
  (let ((dir (package-desc-dir pkg-desc))
        (name (package-desc-name pkg-desc))
        pkg-used-elsewhere-by)
    ;; If the user is trying to delete this package, they definitely
    ;; don't want it marked as selected, so we remove it from
    ;; `package-selected-packages' even if it can't be deleted.
    (when (and (null nosave)
               (package--user-selected-p name)
               ;; Don't deselect if this is an older version of an
               ;; upgraded package.
               (package--newest-p pkg-desc))
      (package--save-selected-packages (remove name package-selected-packages)))
    (cond ((not (string-prefix-p (file-name-as-directory
                                  (expand-file-name package-user-dir))
                                 (expand-file-name dir)))
           ;; Don't delete "system" packages.
           (error "Package `%s' is a system package, not deleting"
                  (package-desc-full-name pkg-desc)))
          ((and (null force)
                (setq pkg-used-elsewhere-by
                      (package--used-elsewhere-p pkg-desc)))
           ;; Don't delete packages used as dependency elsewhere.
           (error "Package `%s' is used by `%s' as dependency, not deleting"
                  (package-desc-full-name pkg-desc)
                  (package-desc-name pkg-used-elsewhere-by)))
          (t
           (add-hook 'post-command-hook #'package-menu--post-refresh)
           (package--delete-directory dir)
           ;; Remove NAME-VERSION.signed and NAME-readme.txt files.
           ;;
           ;; NAME-readme.txt files are no longer created, but they
           ;; may be left around from an earlier install.
           (dolist (suffix '(".signed" "readme.txt"))
             (let* ((version (package-version-join (package-desc-version pkg-desc)))
                    (file (concat (if (string= suffix ".signed")
                                      dir
                                    (substring dir 0 (- (length version))))
                                  suffix)))
               (when (file-exists-p file)
                 (delete-file file))))
           ;; Update package-alist.
           (let ((pkgs (assq name package-alist)))
             (delete pkg-desc pkgs)
             (unless (cdr pkgs)
               (setq package-alist (delq pkgs package-alist))))
           (package--quickstart-maybe-refresh)
           (message "Package `%s' deleted."
                    (package-desc-full-name pkg-desc))))))

;;;###autoload
(defun package-reinstall (pkg)
  "Reinstall package PKG.
PKG should be either a symbol, the package name, or a `package-desc'
object."
  (interactive (list (intern (completing-read
                              "Reinstall package: "
                              (mapcar #'symbol-name
                                      (mapcar #'car package-alist))))))
  (package-delete
   (if (package-desc-p pkg) pkg (cadr (assq pkg package-alist)))
   'force 'nosave)
  (package-install pkg 'dont-select))

;;;###autoload
(defun package-autoremove ()
  "Remove packages that are no longer needed.

Packages that are no more needed by other packages in
`package-selected-packages' and their dependencies
will be deleted."
  (interactive)
  ;; If `package-selected-packages' is nil, it would make no sense to
  ;; try to populate it here, because then `package-autoremove' will
  ;; do absolutely nothing.
  (when (or package-selected-packages
            (yes-or-no-p
             (format-message
              "`package-selected-packages' is empty! Really remove ALL packages? ")))
    (let ((removable (package--removable-packages)))
      (if removable
          (when (y-or-n-p
                 (format "Packages to delete: %d (%s), proceed? "
                   (length removable)
                   (mapconcat #'symbol-name removable " ")))
            (mapc (lambda (p)
                    (package-delete (cadr (assq p package-alist)) t))
                  removable))
        (message "Nothing to autoremove")))))

\f
;;;; Package description buffer.

;;;###autoload
(defun describe-package (package)
  "Display the full documentation of PACKAGE (a symbol)."
  (interactive
   (let* ((guess (or (function-called-at-point)
                     (symbol-at-point))))
     (require 'finder-inf nil t)
     ;; Load the package list if necessary (but don't activate them).
     (unless package--initialized
       (package-initialize t))
     (let ((packages (append (mapcar #'car package-alist)
                             (mapcar #'car package-archive-contents)
                             (mapcar #'car package--builtins))))
       (unless (memq guess packages)
         (setq guess nil))
       (setq packages (mapcar #'symbol-name packages))
       (let ((val
              (completing-read (format-prompt "Describe package" guess)
                               packages nil t nil nil (when guess
                                                        (symbol-name guess)))))
         (list (and (> (length val) 0) (intern val)))))))
  (if (not (or (package-desc-p package) (and package (symbolp package))))
      (message "No package specified")
    (help-setup-xref (list #'describe-package package)
                     (called-interactively-p 'interactive))
    (with-help-window (help-buffer)
      (with-current-buffer standard-output
        (describe-package-1 package)))))

(defface package-help-section-name
  '((t :inherit (bold font-lock-function-name-face)))
  "Face used on section names in package description buffers."
  :version "25.1")

(defun package--print-help-section (name &rest strings)
  "Print \"NAME: \", right aligned to the 13th column.
If more STRINGS are provided, insert them followed by a newline.
Otherwise no newline is inserted."
  (declare (indent 1))
  (insert (make-string (max 0 (- 11 (string-width name))) ?\s)
          (propertize (concat name ": ") 'font-lock-face 'package-help-section-name))
  (when strings
    (apply #'insert strings)
    (insert "\n")))

(declare-function lm-commentary "lisp-mnt" (&optional file))

(defun package--get-description (desc)
  "Return a string containing the long description of the package DESC.
The description is read from the installed package files."
  ;; Installed packages have nil for kind, so we look for README
  ;; first, then fall back to the Commentary header.

  ;; We don’t include README.md here, because that is often the home
  ;; page on a site like github, and not suitable as the package long
  ;; description.
  (let ((files '("README-elpa" "README-elpa.md" "README" "README.rst" "README.org"))
        file
        (srcdir (package-desc-dir desc))
        result)
    (while (and files
                (not result))
      (setq file (pop files))
      (when (file-readable-p (expand-file-name file srcdir))
        ;; Found a README.
        (with-temp-buffer
          (insert-file-contents (expand-file-name file srcdir))
          (setq result (buffer-string)))))

    (or
     result

     ;; Look for Commentary header.
     (lm-commentary (expand-file-name
                     (format "%s.el" (package-desc-name desc)) srcdir))
     "")))

(defun describe-package-1 (pkg)
  "Insert the package description for PKG.
Helper function for `describe-package'."
  (require 'lisp-mnt)
  (let* ((desc (or
                (if (package-desc-p pkg) pkg)
                (cadr (assq pkg package-alist))
                (let ((built-in (assq pkg package--builtins)))
                  (if built-in
                      (package--from-builtin built-in)
                    (cadr (assq pkg package-archive-contents))))))
         (name (if desc (package-desc-name desc) pkg))
         (pkg-dir (if desc (package-desc-dir desc)))
         (reqs (if desc (package-desc-reqs desc)))
         (required-by (if desc (package--used-elsewhere-p desc nil 'all)))
         (version (if desc (package-desc-version desc)))
         (archive (if desc (package-desc-archive desc)))
         (extras (and desc (package-desc-extras desc)))
         (homepage (cdr (assoc :url extras)))
         (commit (cdr (assoc :commit extras)))
         (keywords (if desc (package-desc--keywords desc)))
         (built-in (eq pkg-dir 'builtin))
         (installable (and archive (not built-in)))
         (status (if desc (package-desc-status desc) "orphan"))
         (incompatible-reason (package--incompatible-p desc))
         (signed (if desc (package-desc-signed desc)))
         (maintainer (cdr (assoc :maintainer extras)))
         (authors (cdr (assoc :authors extras))))
    (when (string= status "avail-obso")
      (setq status "available obsolete"))
    (when incompatible-reason
      (setq status "incompatible"))
    (princ (format "Package %S is %s.\n\n" name status))

    ;; TODO: Remove the string decorations and reformat the strings
    ;; for future l10n.
    (package--print-help-section "Status")
    (cond (built-in
           (insert (propertize (capitalize status)
                               'font-lock-face 'package-status-built-in)
                   "."))
          (pkg-dir
           (insert (propertize (if (member status '("unsigned" "dependency"))
                                   "Installed"
                                 (capitalize status))
                               'font-lock-face 'package-status-built-in))
           (insert (substitute-command-keys " in `"))
           (let ((dir (abbreviate-file-name
                       (file-name-as-directory
                        (if (file-in-directory-p pkg-dir package-user-dir)
                            (file-relative-name pkg-dir package-user-dir)
                          pkg-dir)))))
             (help-insert-xref-button dir 'help-package-def pkg-dir))
           (if (and (package-built-in-p name)
                    (not (package-built-in-p name version)))
               (insert (substitute-command-keys
                        "',\n             shadowing a ")
                       (propertize "built-in package"
                                   'font-lock-face 'package-status-built-in))
             (insert (substitute-command-keys "'")))
           (if signed
               (insert ".")
             (insert " (unsigned)."))
           (when (and (package-desc-p desc)
                      (not required-by)
                      (member status '("unsigned" "installed")))
             (insert " ")
             (package-make-button "Delete"
                                  'action #'package-delete-button-action
                                  'package-desc desc)))
          (incompatible-reason
           (insert (propertize "Incompatible" 'font-lock-face font-lock-warning-face)
                   " because it depends on ")
           (if (stringp incompatible-reason)
               (insert "Emacs " incompatible-reason ".")
             (insert "uninstallable packages.")))
          (installable
           (insert (capitalize status))
           (insert " from " (format "%s" archive))
           (insert " -- ")
           (package-make-button
            "Install"
            'action 'package-install-button-action
            'package-desc desc))
          (t (insert (capitalize status) ".")))
    (insert "\n")
    (unless (and pkg-dir (not archive)) ; Installed pkgs don't have archive.
      (package--print-help-section "Archive"
        (or archive "n/a")))
    (and version
         (package--print-help-section "Version"
           (package-version-join version)))
    (when commit
      (package--print-help-section "Commit" commit))
    (when desc
      (package--print-help-section "Summary"
        (package-desc-summary desc)))

    (setq reqs (if desc (package-desc-reqs desc)))
    (when reqs
      (package--print-help-section "Requires")
      (let ((first t))
        (dolist (req reqs)
          (let* ((name (car req))
                 (vers (cadr req))
                 (text (format "%s-%s" (symbol-name name)
                               (package-version-join vers)))
                 (reason (if (and (listp incompatible-reason)
                                  (assq name incompatible-reason))
                             " (not available)" "")))
            (cond (first (setq first nil))
                  ((>= (+ 2 (current-column) (length text) (length reason))
                       (window-width))
                   (insert ",\n               "))
                  (t (insert ", ")))
            (help-insert-xref-button text 'help-package name)
            (insert reason)))
        (insert "\n")))
    (when required-by
      (package--print-help-section "Required by")
      (let ((first t))
        (dolist (pkg required-by)
          (let ((text (package-desc-full-name pkg)))
            (cond (first (setq first nil))
                  ((>= (+ 2 (current-column) (length text))
                       (window-width))
                   (insert ",\n               "))
                  (t (insert ", ")))
            (help-insert-xref-button text 'help-package
                                     (package-desc-name pkg))))
        (insert "\n")))
    (when homepage
      ;; Prefer https for the homepage of packages on gnu.org.
      (if (string-match-p "^http://\\(elpa\\|www\\)\\.gnu\\.org/" homepage)
          (let ((gnu (cdr (assoc "gnu" package-archives))))
            (and gnu (string-match-p "^https" gnu)
                 (setq homepage
                       (replace-regexp-in-string "^http" "https" homepage)))))
      (package--print-help-section "Homepage")
      (help-insert-xref-button homepage 'help-url homepage)
      (insert "\n"))
    (when keywords
      (package--print-help-section "Keywords")
      (dolist (k keywords)
        (package-make-button
         k
         'package-keyword k
         'action 'package-keyword-button-action)
        (insert " "))
      (insert "\n"))
    (when maintainer
      (package--print-help-section "Maintainer")
      (package--print-email-button maintainer))
    (when authors
      (package--print-help-section
          (if (= (length authors) 1)
              "Author"
            "Authors"))
      (package--print-email-button (pop authors))
      ;; If there's more than one author, indent the rest correctly.
      (dolist (name authors)
        (insert (make-string 13 ?\s))
        (package--print-email-button name)))
    (let* ((all-pkgs (append (cdr (assq name package-alist))
                             (cdr (assq name package-archive-contents))
                             (let ((bi (assq name package--builtins)))
                               (if bi (list (package--from-builtin bi))))))
           (other-pkgs (delete desc all-pkgs)))
      (when other-pkgs
        (package--print-help-section "Other versions"
          (mapconcat (lambda (opkg)
                       (let* ((ov (package-desc-version opkg))
                              (dir (package-desc-dir opkg))
                              (from (or (package-desc-archive opkg)
                                        (if (stringp dir) "installed" dir))))
                         (if (not ov) (format "%s" from)
                           (format "%s (%s)"
                                   (make-text-button (package-version-join ov) nil
                                                     'font-lock-face 'link
                                                     'follow-link t
                                                     'action
                                                     (lambda (_button)
                                                       (describe-package opkg)))
                                   from))))
                     other-pkgs ", ")
          ".")))

    (insert "\n")

    (let ((start-of-description (point)))
      (if built-in
          ;; For built-in packages, get the description from the
          ;; Commentary header.
          (insert (or (lm-commentary (locate-file (format "%s.el" name)
                                                  load-path
                                                  load-file-rep-suffixes))
                      ""))

        (if (package-installed-p desc)
            ;; For installed packages, get the description from the
            ;; installed files.
            (insert (package--get-description desc))

          ;; For non-built-in, non-installed packages, get description from
          ;; the archive.
          (let* ((basename (format "%s-readme.txt" name))
                 readme-string)

            (package--with-response-buffer (package-archive-base desc)
              :file basename :noerror t
              (save-excursion
                (goto-char (point-max))
                (unless (bolp)
                  (insert ?\n)))
              (cl-assert (not enable-multibyte-characters))
              (setq readme-string
                    ;; The readme.txt files are defined to contain utf-8 text.
                    (decode-coding-region (point-min) (point-max) 'utf-8 t))
              t)
            (insert (or readme-string
                        "This package does not provide a description.")))))
      ;; Make URLs in the description into links.
      (goto-char start-of-description)
      (browse-url-add-buttons))))

(defun package-install-button-action (button)
  "Run `package-install' on the package BUTTON points to.
Used for the `action' property of buttons in the buffer created by
`describe-package'."
  (let ((pkg-desc (button-get button 'package-desc)))
    (when (y-or-n-p (format-message "Install package `%s'? "
                                    (package-desc-full-name pkg-desc)))
      (package-install pkg-desc nil)
      (describe-package (package-desc-name pkg-desc)))))

(defun package-delete-button-action (button)
  "Run `package-delete' on the package BUTTON points to.
Used for the `action' property of buttons in the buffer created by
`describe-package'."
  (let ((pkg-desc (button-get button 'package-desc)))
    (when (y-or-n-p (format-message "Delete package `%s'? "
                                    (package-desc-full-name pkg-desc)))
      (package-delete pkg-desc)
      (describe-package (package-desc-name pkg-desc)))))

(defun package-keyword-button-action (button)
  "Show filtered \"*Packages*\" buffer for BUTTON.
The buffer is filtered by the `package-keyword' property of BUTTON.
Used for the `action' property of buttons in the buffer created by
`describe-package'."
  (let ((pkg-keyword (button-get button 'package-keyword)))
    (package-show-package-list t (list pkg-keyword))))

(defun package-make-button (text &rest properties)
  "Insert button labeled TEXT with button PROPERTIES at point.
PROPERTIES are passed to `insert-text-button', for which this
function is a convenience wrapper used by `describe-package-1'."
  (let ((button-text (if (display-graphic-p) text (concat "[" text "]")))
        (button-face (if (display-graphic-p)
                         (progn
                           (require 'cus-edit) ; for the custom-button face
                           'custom-button)
                       'link)))
    (apply #'insert-text-button button-text 'face button-face 'follow-link t
           properties)))

(defun package--print-email-button (recipient)
  "Insert a button whose action will send an email to RECIPIENT.
NAME should have the form (FULLNAME . EMAIL) where FULLNAME is
either a full name or nil, and EMAIL is a valid email address."
  (when (car recipient)
    (insert (car recipient)))
  (when (and (car recipient) (cdr recipient))
    (insert " "))
  (when (cdr recipient)
    (insert "<")
    (insert-text-button (cdr recipient)
                        'follow-link t
                        'action (lambda (_)
                                  (compose-mail
                                   (format "%s <%s>" (car recipient) (cdr recipient)))))
    (insert ">"))
  (insert "\n"))

\f
;;;; Package menu mode.

(defvar package-menu-mode-map
  (let ((map (make-sparse-keymap)))
    (set-keymap-parent map tabulated-list-mode-map)
    (define-key map "\C-m" 'package-menu-describe-package)
    (define-key map "u" 'package-menu-mark-unmark)
    (define-key map "\177" 'package-menu-backup-unmark)
    (define-key map "d" 'package-menu-mark-delete)
    (define-key map "i" 'package-menu-mark-install)
    (define-key map "U" 'package-menu-mark-upgrades)
    (define-key map "r" 'revert-buffer)
    (define-key map "~" 'package-menu-mark-obsolete-for-deletion)
    (define-key map "w" 'package-browse-url)
    (define-key map "x" 'package-menu-execute)
    (define-key map "h" 'package-menu-quick-help)
    (define-key map "H" #'package-menu-hide-package)
    (define-key map "?" 'package-menu-describe-package)
    (define-key map "(" #'package-menu-toggle-hiding)
    (define-key map (kbd "/ /") 'package-menu-clear-filter)
    (define-key map (kbd "/ a") 'package-menu-filter-by-archive)
    (define-key map (kbd "/ d") 'package-menu-filter-by-description)
    (define-key map (kbd "/ k") 'package-menu-filter-by-keyword)
    (define-key map (kbd "/ N") 'package-menu-filter-by-name-or-description)
    (define-key map (kbd "/ n") 'package-menu-filter-by-name)
    (define-key map (kbd "/ s") 'package-menu-filter-by-status)
    (define-key map (kbd "/ v") 'package-menu-filter-by-version)
    (define-key map (kbd "/ m") 'package-menu-filter-marked)
    (define-key map (kbd "/ u") 'package-menu-filter-upgradable)
    map)
  "Local keymap for `package-menu-mode' buffers.")

(easy-menu-define package-menu-mode-menu package-menu-mode-map
  "Menu for `package-menu-mode'."
  '("Package"
    ["Describe Package" package-menu-describe-package :help "Display information about this package"]
    ["Open Package Homepage" package-browse-url
     :help "Open the homepage of this package"]
    ["Help" package-menu-quick-help :help "Show short key binding help for package-menu-mode"]
    "--"
    ["Refresh Package List" revert-buffer
     :help "Redownload the package archive(s)"
     :active (not package--downloads-in-progress)]
    ["Execute Marked Actions" package-menu-execute :help "Perform all the marked actions"]

    "--"
    ["Mark All Available Upgrades" package-menu-mark-upgrades
     :help "Mark packages that have a newer version for upgrading"
     :active (not package--downloads-in-progress)]
    ["Mark All Obsolete for Deletion" package-menu-mark-obsolete-for-deletion :help "Mark all obsolete packages for deletion"]
    ["Mark for Install" package-menu-mark-install :help "Mark a package for installation and move to the next line"]
    ["Mark for Deletion" package-menu-mark-delete :help "Mark a package for deletion and move to the next line"]
    ["Unmark" package-menu-mark-unmark :help "Clear any marks on a package and move to the next line"]

    "--"
    ("Filter Packages"
     ["Filter by Archive" package-menu-filter-by-archive :help "Filter packages by archive"]
     ["Filter by Description" package-menu-filter-by-description :help "Filter packages by description"]
     ["Filter by Keyword" package-menu-filter-by-keyword :help "Filter packages by keyword"]
     ["Filter by Name" package-menu-filter-by-name :help "Filter packages by name"]
     ["Filter by Name or Description" package-menu-filter-by-name-or-description
      :help "Filter packages by name or description"]
     ["Filter by Status" package-menu-filter-by-status :help "Filter packages by status"]
     ["Filter by Version" package-menu-filter-by-version :help "Filter packages by version"]
     ["Filter Marked" package-menu-filter-marked :help "Filter packages marked for upgrade"]
     ["Clear Filter" package-menu-clear-filter :help "Clear package list filter"])

    ["Hide by Regexp" package-menu-hide-package :help "Hide all packages matching a regexp"]
    ["Display Older Versions" package-menu-toggle-hiding
     :style toggle :selected (not package-menu--hide-packages)
     :help "Display package even if a newer version is already installed"]

    "--"
    ["Quit" quit-window :help "Quit package selection"]
    ["Customize" (customize-group 'package)]))

(defvar package-menu--new-package-list nil
  "List of newly-available packages since `list-packages' was last called.")

(defvar package-menu--transaction-status nil
  "Mode-line status of ongoing package transaction.")

(define-derived-mode package-menu-mode tabulated-list-mode "Package Menu"
  "Major mode for browsing a list of packages.
Letters do not insert themselves; instead, they are commands.
\\<package-menu-mode-map>
\\{package-menu-mode-map}"
  :interactive nil
  (setq mode-line-process '((package--downloads-in-progress ":Loading")
                            (package-menu--transaction-status
                             package-menu--transaction-status)))
  (setq tabulated-list-format
        `[("Package" ,package-name-column-width package-menu--name-predicate)
          ("Version" ,package-version-column-width package-menu--version-predicate)
          ("Status"  ,package-status-column-width  package-menu--status-predicate)
          ,@(if (cdr package-archives)
                `(("Archive" ,package-archive-column-width package-menu--archive-predicate)))
          ("Description" 0 package-menu--description-predicate)])
  (setq tabulated-list-padding 2)
  (setq tabulated-list-sort-key (cons "Status" nil))
  (add-hook 'tabulated-list-revert-hook #'package-menu--refresh nil t)
  (tabulated-list-init-header)
  (setq revert-buffer-function 'package-menu--refresh-contents)
  (setf imenu-prev-index-position-function
        #'package--imenu-prev-index-position-function)
  (setf imenu-extract-index-name-function
        #'package--imenu-extract-index-name-function))

(defmacro package--push (pkg-desc status listname)
  "Convenience macro for `package-menu--generate'.
If the alist stored in the symbol LISTNAME lacks an entry for a
package PKG-DESC, add one.  The alist is keyed with PKG-DESC."
  (declare (obsolete nil "27.1"))
  `(unless (assoc ,pkg-desc ,listname)
     ;; FIXME: Should we move status into pkg-desc?
     (push (cons ,pkg-desc ,status) ,listname)))

(defvar package-list-unversioned nil
  "If non-nil, include packages that don't have a version in `list-packages'.")

(defvar package-list-unsigned nil
  "If non-nil, mention in the list which packages were installed w/o signature.")

(defvar package--emacs-version-list (version-to-list emacs-version)
  "The value of variable `emacs-version' as a list.")

(defun package--ensure-package-menu-mode ()
  "Signal a user-error if major mode is not `package-menu-mode'."
  (unless (derived-mode-p 'package-menu-mode)
    (user-error "The current buffer is not a Package Menu")))

(defun package--incompatible-p (pkg &optional shallow)
  "Return non-nil if PKG has no chance of being installable.
PKG is a `package-desc' object.

If SHALLOW is non-nil, this only checks if PKG depends on a
higher `emacs-version' than the one being used.  Otherwise, also
checks the viability of dependencies, according to
`package--compatibility-table'.

If PKG requires an incompatible Emacs version, the return value
is this version (as a string).
If PKG requires incompatible packages, the return value is a list
of these dependencies, similar to the list returned by
`package-desc-reqs'."
  (let* ((reqs    (package-desc-reqs pkg))
         (version (cadr (assq 'emacs reqs))))
    (if (and version (version-list-< package--emacs-version-list version))
        (package-version-join version)
      (unless shallow
        (let (out)
          (dolist (dep (package-desc-reqs pkg) out)
            (let ((dep-name (car dep)))
              (unless (eq 'emacs dep-name)
                (let ((cv (gethash dep-name package--compatibility-table)))
                  (when (version-list-< (or cv '(0)) (or (cadr dep) '(0)))
                    (push dep out)))))))))))

(defun package-desc-status (pkg-desc)
  "Return the status of `package-desc' object PKG-DESC."
  (let* ((name (package-desc-name pkg-desc))
         (dir (package-desc-dir pkg-desc))
         (lle (assq name package-load-list))
         (held (cadr lle))
         (version (package-desc-version pkg-desc))
         (signed (or (not package-list-unsigned)
                     (package-desc-signed pkg-desc))))
    (cond
     ((eq dir 'builtin) "built-in")
     ((and lle (null held)) "disabled")
     ((stringp held)
      (let ((hv (if (stringp held) (version-to-list held))))
        (cond
         ((version-list-= version hv) "held")
         ((version-list-< version hv) "obsolete")
         (t "disabled"))))
     (dir                               ;One of the installed packages.
      (cond
       ((not (file-exists-p dir)) "deleted")
       ;; Not inside `package-user-dir'.
       ((not (file-in-directory-p dir package-user-dir)) "external")
       ((eq pkg-desc (cadr (assq name package-alist)))
        (if (not signed) "unsigned"
          (if (package--user-selected-p name)
              "installed" "dependency")))
       (t "obsolete")))
     ((package--incompatible-p pkg-desc) "incompat")
     (t
      (let* ((ins (cadr (assq name package-alist)))
             (ins-v (if ins (package-desc-version ins))))
        (cond
         ;; Installed obsolete packages are handled in the `dir'
         ;; clause above.  Here we handle available obsolete, which
         ;; are displayed depending on `package-menu--hide-packages'.
         ((and ins (version-list-<= version ins-v)) "avail-obso")
         (t
          (if (memq name package-menu--new-package-list)
              "new" "available"))))))))

(defvar package-menu--hide-packages t
  "Whether available obsolete packages should be hidden.
Can be toggled with \\<package-menu-mode-map> \\[package-menu-toggle-hiding].
Installed obsolete packages are always displayed.")

(defun package-menu-toggle-hiding ()
  "In Package Menu, toggle visibility of obsolete available packages.

Also hide packages whose name matches a regexp in user option
`package-hidden-regexps' (a list).  To add regexps to this list,
use `package-menu-hide-package'."
  (interactive nil package-menu-mode)
  (package--ensure-package-menu-mode)
  (setq package-menu--hide-packages
        (not package-menu--hide-packages))
  (if package-menu--hide-packages
      (message "Hiding obsolete or unwanted packages")
    (message "Displaying all packages"))
  (revert-buffer nil 'no-confirm))

(defun package--remove-hidden (pkg-list)
  "Filter PKG-LIST according to `package-archive-priorities'.
PKG-LIST must be a list of `package-desc' objects, all with the
same name, sorted by decreasing `package-desc-priority-version'.
Return a list of packages tied for the highest priority according
to their archives."
  (when pkg-list
    ;; Variable toggled with `package-menu-toggle-hiding'.
    (if (not package-menu--hide-packages)
        pkg-list
      (let ((installed (cadr (assq (package-desc-name (car pkg-list))
                                   package-alist))))
        (when installed
          (setq pkg-list
                (let ((ins-version (package-desc-version installed)))
                  (cl-remove-if (lambda (p) (version-list-< (package-desc-version p)
                                                       ins-version))
                                pkg-list))))
        (let ((filtered-by-priority
               (cond
                ((not package-menu-hide-low-priority)
                 pkg-list)
                ((eq package-menu-hide-low-priority 'archive)
                 (let (max-priority out)
                   (while pkg-list
                     (let ((p (pop pkg-list)))
                       (let ((priority (package-desc-priority p)))
                         (if (and max-priority (< priority max-priority))
                             (setq pkg-list nil)
                           (push p out)
                           (setq max-priority priority)))))
                   (nreverse out)))
                (pkg-list
                 (list (car pkg-list))))))
          (if (not installed)
              filtered-by-priority
            (let ((ins-version (package-desc-version installed)))
              (cl-remove-if (lambda (p) (version-list-= (package-desc-version p)
                                                   ins-version))
                            filtered-by-priority))))))))

(defcustom package-hidden-regexps nil
  "List of regexps matching the name of packages to hide.
If the name of a package matches any of these regexps it is
omitted from the package menu.  To toggle this, type \\[package-menu-toggle-hiding].

Values can be interactively added to this list by typing
\\[package-menu-hide-package] on a package."
  :version "25.1"
  :type '(repeat (regexp :tag "Hide packages with name matching")))

(defun package-menu--refresh (&optional packages keywords)
  "Re-populate the `tabulated-list-entries'.
PACKAGES should be nil or t, which means to display all known packages.
KEYWORDS should be nil or a list of keywords."
  ;; Construct list of (PKG-DESC . STATUS).
  (unless packages (setq packages t))
  (let ((hidden-names (mapconcat #'identity package-hidden-regexps "\\|"))
        info-list)
    ;; Installed packages:
    (dolist (elt package-alist)
      (let ((name (car elt)))
        (when (or (eq packages t) (memq name packages))
          (dolist (pkg (cdr elt))
            (when (package--has-keyword-p pkg keywords)
              (push pkg info-list))))))

    ;; Built-in packages:
    (dolist (elt package--builtins)
      (let ((pkg  (package--from-builtin elt))
            (name (car elt)))
        (when (not (eq name 'emacs)) ; Hide the `emacs' package.
          (when (and (package--has-keyword-p pkg keywords)
                     (or package-list-unversioned
                         (package--bi-desc-version (cdr elt)))
                     (or (eq packages t) (memq name packages)))
            (push pkg info-list)))))

    ;; Available and disabled packages:
    (unless (equal package--old-archive-priorities package-archive-priorities)
      (package-read-all-archive-contents))
    (dolist (elt package-archive-contents)
      (let ((name (car elt)))
        ;; To be displayed it must be in PACKAGES;
        (when (and (or (eq packages t) (memq name packages))
                   ;; and we must either not be hiding anything,
                   (or (not package-menu--hide-packages)
                       (not package-hidden-regexps)
                       ;; or just not hiding this specific package.
                       (not (string-match hidden-names (symbol-name name)))))
          ;; Hide available-obsolete or low-priority packages.
          (dolist (pkg (package--remove-hidden (cdr elt)))
            (when (package--has-keyword-p pkg keywords)
              (push pkg info-list))))))

    ;; Print the result.
    (tabulated-list-init-header)
    (setq tabulated-list-entries
          (mapcar #'package-menu--print-info-simple info-list))))

(defun package-all-keywords ()
  "Collect all package keywords."
  (let ((key-list))
    (package--mapc (lambda (desc)
                     (setq key-list (append (package-desc--keywords desc)
                                            key-list))))
    key-list))

(defun package--mapc (function &optional packages)
  "Call FUNCTION for all known PACKAGES.
PACKAGES can be nil or t, which means to display all known
packages, or a list of packages.

Built-in packages are converted with `package--from-builtin'."
  (unless packages (setq packages t))
  (let (name)
    ;; Installed packages:
    (dolist (elt package-alist)
      (setq name (car elt))
      (when (or (eq packages t) (memq name packages))
        (mapc function (cdr elt))))

    ;; Built-in packages:
    (dolist (elt package--builtins)
      (setq name (car elt))
      (when (and (not (eq name 'emacs)) ; Hide the `emacs' package.
                 (or package-list-unversioned
                     (package--bi-desc-version (cdr elt)))
                 (or (eq packages t) (memq name packages)))
        (funcall function (package--from-builtin elt))))

    ;; Available and disabled packages:
    (dolist (elt package-archive-contents)
      (setq name (car elt))
      (when (or (eq packages t) (memq name packages))
        (dolist (pkg (cdr elt))
          ;; Hide obsolete packages.
          (unless (package-installed-p (package-desc-name pkg)
                                       (package-desc-version pkg))
        (funcall function pkg)))))))

(defun package--has-keyword-p (desc &optional keywords)
  "Test if package DESC has any of the given KEYWORDS.
When none are given, the package matches."
  (if keywords
      (let ((desc-keywords (and desc (package-desc--keywords desc)))
            found)
        (while (and (not found) keywords)
          (let ((k (pop keywords)))
            (setq found
                  (or (string= k (concat "arc:" (package-desc-archive desc)))
                      (string= k (concat "status:" (package-desc-status desc)))
                      (member k desc-keywords)))))
        found)
    t))

(defun package-menu--display (remember-pos suffix)
  "Display the Package Menu.
If REMEMBER-POS is non-nil, keep point on the same entry.

If SUFFIX is non-nil, append that to \"Package\" for the first
column in the header line."
  (setf (car (aref tabulated-list-format 0))
        (if suffix
            (concat "Package[" suffix "]")
          "Package"))
  (tabulated-list-init-header)
  (tabulated-list-print remember-pos))

(defun package-menu--generate (remember-pos &optional packages keywords)
  "Populate and display the Package Menu.
If REMEMBER-POS is non-nil, keep point on the same entry.
PACKAGES should be t, which means to display all known packages,
or a list of package names (symbols) to display.

With KEYWORDS given, only packages with those keywords are
shown."
  (package-menu--refresh packages keywords)
  (package-menu--display remember-pos
                  (when keywords
                    (let ((filters (mapconcat #'identity keywords ",")))
                      (concat "Package[" filters "]")))))

(defun package-menu--print-info (pkg)
  "Return a package entry suitable for `tabulated-list-entries'.
PKG has the form (PKG-DESC . STATUS).
Return (PKG-DESC [NAME VERSION STATUS DOC])."
  (package-menu--print-info-simple (car pkg)))
(make-obsolete 'package-menu--print-info
               'package-menu--print-info-simple "25.1")

\f
;;; Package menu faces

(defface package-name
  '((t :inherit link))
  "Face used on package names in the package menu."
  :version "25.1")

(defface package-description
  '((t :inherit default))
  "Face used on package description summaries in the package menu."
  :version "25.1")

;; Shame this hyphenates "built-in", when "font-lock-builtin-face" doesn't.
(defface package-status-built-in
  '((t :inherit font-lock-builtin-face))
  "Face used on the status and version of built-in packages."
  :version "25.1")

(defface package-status-external
  '((t :inherit package-status-built-in))
  "Face used on the status and version of external packages."
  :version "25.1")

(defface package-status-available
  '((t :inherit default))
  "Face used on the status and version of available packages."
  :version "25.1")

(defface package-status-new
  '((t :inherit (bold package-status-available)))
  "Face used on the status and version of new packages."
  :version "25.1")

(defface package-status-held
  '((t :inherit font-lock-constant-face))
  "Face used on the status and version of held packages."
  :version "25.1")

(defface package-status-disabled
  '((t :inherit font-lock-warning-face))
  "Face used on the status and version of disabled packages."
  :version "25.1")

(defface package-status-installed
  '((t :inherit font-lock-comment-face))
  "Face used on the status and version of installed packages."
  :version "25.1")

(defface package-status-dependency
  '((t :inherit package-status-installed))
  "Face used on the status and version of dependency packages."
  :version "25.1")

(defface package-status-unsigned
  '((t :inherit font-lock-warning-face))
  "Face used on the status and version of unsigned packages."
  :version "25.1")

(defface package-status-incompat
  '((t :inherit error))
  "Face used on the status and version of incompat packages."
  :version "25.1")

(defface package-status-avail-obso
  '((t :inherit package-status-incompat))
  "Face used on the status and version of avail-obso packages."
  :version "25.1")

\f
;;; Package menu printing

(defun package-menu--print-info-simple (pkg)
  "Return a package entry suitable for `tabulated-list-entries'.
PKG is a `package-desc' object.
Return (PKG-DESC [NAME VERSION STATUS DOC])."
  (let* ((status  (package-desc-status pkg))
         (face (pcase status
                 ("built-in"  'package-status-built-in)
                 ("external"  'package-status-external)
                 ("available" 'package-status-available)
                 ("avail-obso" 'package-status-avail-obso)
                 ("new"       'package-status-new)
                 ("held"      'package-status-held)
                 ("disabled"  'package-status-disabled)
                 ("installed" 'package-status-installed)
                 ("dependency" 'package-status-dependency)
                 ("unsigned"  'package-status-unsigned)
                 ("incompat"  'package-status-incompat)
                 (_            'font-lock-warning-face)))) ; obsolete.
    (list pkg
          `[(,(symbol-name (package-desc-name pkg))
             face package-name
             font-lock-face package-name
             follow-link t
             package-desc ,pkg
             action package-menu-describe-package)
            ,(propertize (package-version-join
                          (package-desc-version pkg))
                         'font-lock-face face)
            ,(propertize status 'font-lock-face face)
            ,@(if (cdr package-archives)
                  (list (propertize (or (package-desc-archive pkg) "")
                                    'font-lock-face face)))
            ,(propertize (package-desc-summary pkg)
                         'font-lock-face 'package-description)])))

(defvar package-menu--old-archive-contents nil
  "`package-archive-contents' before the latest refresh.")

(defun package-menu--refresh-contents (&optional _arg _noconfirm)
  "In Package Menu, download the Emacs Lisp package archive.
Fetch the contents of each archive specified in
`package-archives', and then refresh the package menu.

`package-menu-mode' sets `revert-buffer-function' to this
function.  The args ARG and NOCONFIRM, passed from
`revert-buffer', are ignored."
  (package--ensure-package-menu-mode)
  (setq package-menu--old-archive-contents package-archive-contents)
  (setq package-menu--new-package-list nil)
  (package-refresh-contents package-menu-async))
(define-obsolete-function-alias 'package-menu-refresh 'revert-buffer "27.1")

(defun package-menu-hide-package ()
  "Hide in Package Menu packages that match a regexp.
Prompt for the regexp to match against package names.
The default regexp will hide only the package whose name is at point.

The regexp is added to the list in the user option
`package-hidden-regexps' and saved for future sessions.

To unhide a package, type
`\\[customize-variable] RET package-hidden-regexps'.

Type \\[package-menu-toggle-hiding] to toggle package hiding."
  (declare (interactive-only "change `package-hidden-regexps' instead."))
  (interactive nil package-menu-mode)
  (package--ensure-package-menu-mode)
  (let* ((name (when (derived-mode-p 'package-menu-mode)
                 (concat "\\`" (regexp-quote (symbol-name (package-desc-name
                                                           (tabulated-list-get-id))))
                         "\\'")))
         (re (read-string "Hide packages matching regexp: " name)))
    ;; Test if it is valid.
    (string-match re "")
    (push re package-hidden-regexps)
    (customize-save-variable 'package-hidden-regexps package-hidden-regexps)
    (package-menu--post-refresh)
    (let ((hidden
           (cl-remove-if-not (lambda (e) (string-match re (symbol-name (car e))))
                             package-archive-contents)))
      (message "Packages to hide: %d.  Type `%s' to toggle or `%s' to customize"
               (length hidden)
               (substitute-command-keys "\\[package-menu-toggle-hiding]")
               (substitute-command-keys "\\[customize-variable] RET package-hidden-regexps")))))


(defun package-menu-describe-package (&optional button)
  "Describe the current package.
If optional arg BUTTON is non-nil, describe its associated package."
  (interactive nil package-menu-mode)
  (let ((pkg-desc (if button (button-get button 'package-desc)
                    (tabulated-list-get-id))))
    (if pkg-desc
        (describe-package pkg-desc)
      (user-error "No package here"))))

;; fixme numeric argument
(defun package-menu-mark-delete (&optional _num)
  "Mark a package for deletion and move to the next line."
  (interactive "p" package-menu-mode)
  (package--ensure-package-menu-mode)
  (if (member (package-menu-get-status)
              '("installed" "dependency" "obsolete" "unsigned"))
      (tabulated-list-put-tag "D" t)
    (forward-line)))

(defun package-menu-mark-install (&optional _num)
  "Mark a package for installation and move to the next line."
  (interactive "p" package-menu-mode)
  (package--ensure-package-menu-mode)
  (if (member (package-menu-get-status) '("available" "avail-obso" "new" "dependency"))
      (tabulated-list-put-tag "I" t)
    (forward-line)))

(defun package-menu-mark-unmark (&optional _num)
  "Clear any marks on a package and move to the next line."
  (interactive "p" package-menu-mode)
  (package--ensure-package-menu-mode)
  (tabulated-list-put-tag " " t))

(defun package-menu-backup-unmark ()
  "Back up one line and clear any marks on that package."
  (interactive nil package-menu-mode)
  (package--ensure-package-menu-mode)
  (forward-line -1)
  (tabulated-list-put-tag " "))

(defun package-menu-mark-obsolete-for-deletion ()
  "Mark all obsolete packages for deletion."
  (interactive nil package-menu-mode)
  (package--ensure-package-menu-mode)
  (save-excursion
    (goto-char (point-min))
    (while (not (eobp))
      (if (equal (package-menu-get-status) "obsolete")
          (tabulated-list-put-tag "D" t)
        (forward-line 1)))))

(defvar package--quick-help-keys
  '((("mark for installation," . 9)
     ("mark for deletion," . 9) "unmark," ("execute marked actions" . 1))
    ("next," "previous")
    ("Hide-package," "(-toggle-hidden")
    ("g-refresh-contents," "/-filter," "help")))

(defun package--prettify-quick-help-key (desc)
  "Prettify DESC to be displayed as a help menu."
  (if (listp desc)
      (if (listp (cdr desc))
          (mapconcat #'package--prettify-quick-help-key desc "   ")
        (let ((place (cdr desc))
              (out (copy-sequence (car desc))))
          (add-text-properties place (1+ place)
                               '(face (bold font-lock-warning-face))
                               out)
          out))
    (package--prettify-quick-help-key (cons desc 0))))

(defun package-menu-quick-help ()
  "Show short key binding help for `package-menu-mode'.
The full list of keys can be viewed with \\[describe-mode]."
  (interactive nil package-menu-mode)
  (package--ensure-package-menu-mode)
  (message (mapconcat #'package--prettify-quick-help-key
                      package--quick-help-keys "\n")))

(define-obsolete-function-alias
  'package-menu-view-commentary 'package-menu-describe-package "24.1")

(defun package-menu-get-status ()
  "Return status text of package at point in Package Menu."
  (package--ensure-package-menu-mode)
  (let* ((id (tabulated-list-get-id))
         (entry (and id (assoc id tabulated-list-entries))))
    (if entry
        (aref (cadr entry) 2)
      "")))

(defun package-archive-priority (archive)
  "Return the priority of ARCHIVE.

The archive priorities are specified in
`package-archive-priorities'.  If not given there, the priority
defaults to 0."
  (or (cdr (assoc archive package-archive-priorities))
      0))

(defun package-desc-priority-version (pkg-desc)
  "Return the version PKG-DESC with the archive priority prepended.

This allows for easy comparison of package versions from
different archives if archive priorities are meant to be taken in
consideration."
  (cons (package-desc-priority pkg-desc)
        (package-desc-version pkg-desc)))

(defun package-menu--find-upgrades ()
  "In Package Menu, return an alist of packages that can be upgraded.
The alist has the same form as `package-alist', namely a list
of (PKG . DESCS), but where DESCS is the `package-desc' object
corresponding to the newer version."
  (let (installed available upgrades)
    ;; Build list of installed/available packages in this buffer.
    (dolist (entry tabulated-list-entries)
      ;; ENTRY is (PKG-DESC [NAME VERSION STATUS DOC])
      (let ((pkg-desc (car entry))
            (status (aref (cadr entry) 2)))
        (cond ((member status '("installed" "dependency" "unsigned"))
               (push pkg-desc installed))
              ((member status '("available" "new"))
               (setq available (package--append-to-alist pkg-desc available))))))
    ;; Loop through list of installed packages, finding upgrades.
    (dolist (pkg-desc installed)
      (let* ((name (package-desc-name pkg-desc))
             (avail-pkg (cadr (assq name available))))
        (and avail-pkg
             (version-list-< (package-desc-priority-version pkg-desc)
                             (package-desc-priority-version avail-pkg))
             (push (cons name avail-pkg) upgrades))))
    upgrades))

(defvar package-menu--mark-upgrades-pending nil
  "Whether mark-upgrades is waiting for a refresh to finish.")

(defun package-menu--mark-upgrades-1 ()
  "Mark all upgradable packages in the Package Menu.
Implementation of `package-menu-mark-upgrades'."
  (setq package-menu--mark-upgrades-pending nil)
  (let ((upgrades (package-menu--find-upgrades)))
    (if (null upgrades)
        (message "No packages to upgrade")
      (widen)
      (save-excursion
        (goto-char (point-min))
        (while (not (eobp))
          (let* ((pkg-desc (tabulated-list-get-id))
                 (upgrade (cdr (assq (package-desc-name pkg-desc) upgrades))))
            (cond ((null upgrade)
                   (forward-line 1))
                  ((equal pkg-desc upgrade)
                   (package-menu-mark-install))
                  (t
                   (package-menu-mark-delete))))))
      (message "Packages marked for upgrading: %d"
               (length upgrades)))))


(defun package-menu-mark-upgrades ()
  "Mark all upgradable packages in the Package Menu.
For each installed package with a newer version available, place
an (I)nstall flag on the available version and a (D)elete flag on
the installed version.  A subsequent \\[package-menu-execute]
call will upgrade the package.

If there's an async refresh operation in progress, the flags will
be placed as part of `package-menu--post-refresh' instead of
immediately."
  (interactive nil package-menu-mode)
  (package--ensure-package-menu-mode)
  (if (not package--downloads-in-progress)
      (package-menu--mark-upgrades-1)
    (setq package-menu--mark-upgrades-pending t)
    (message "Waiting for refresh to finish...")))

(defun package-menu--list-to-prompt (packages)
  "Return a string listing PACKAGES that's usable in a prompt.
PACKAGES is a list of `package-desc' objects.
Formats the returned string to be usable in a minibuffer
prompt (see `package-menu--prompt-transaction-p')."
  ;; The case where `package' is empty is handled in
  ;; `package-menu--prompt-transaction-p' below.
  (format "%d (%s)"
          (length packages)
          (mapconcat #'package-desc-full-name packages " ")))


(defun package-menu--prompt-transaction-p (delete install upgrade)
  "Prompt the user about DELETE, INSTALL, and UPGRADE.
DELETE, INSTALL, and UPGRADE are lists of `package-desc' objects.
Either may be nil, but not all."
  (y-or-n-p
   (concat
    (when delete
      (format "Packages to delete: %s.  " (package-menu--list-to-prompt delete)))
    (when install
      (format "Packages to install: %s.  " (package-menu--list-to-prompt install)))
    (when upgrade
      (format "Packages to upgrade: %s.  " (package-menu--list-to-prompt upgrade)))
    "Proceed? ")))


(defun package-menu--partition-transaction (install delete)
  "Return an alist describing an INSTALL DELETE transaction.
Alist contains three entries, upgrade, delete, and install, each
with a list of package names.

The upgrade entry contains any `package-desc' objects in INSTALL
whose name coincides with an object in DELETE.  The delete and
the install entries are the same as DELETE and INSTALL with such
objects removed."
  (let* ((upg (cl-intersection install delete :key #'package-desc-name))
         (ins (cl-set-difference install upg :key #'package-desc-name))
         (del (cl-set-difference delete upg :key #'package-desc-name)))
    `((delete . ,del) (install . ,ins) (upgrade . ,upg))))

(defun package-menu--perform-transaction (install-list delete-list)
  "Install packages in INSTALL-LIST and delete DELETE-LIST."
  (if install-list
      (let ((status-format (format ":Installing %%d/%d"
                             (length install-list)))
            (i 0)
            (package-menu--transaction-status))
        (dolist (pkg install-list)
          (setq package-menu--transaction-status
                (format status-format (cl-incf i)))
          (force-mode-line-update)
          (redisplay 'force)
          ;; Don't mark as selected, `package-menu-execute' already
          ;; does that.
          (package-install pkg 'dont-select))))
  (let ((package-menu--transaction-status ":Deleting"))
    (force-mode-line-update)
    (redisplay 'force)
    (dolist (elt (package--sort-by-dependence delete-list))
      (condition-case-unless-debug err
          (let ((inhibit-message (or inhibit-message package-menu-async)))
            (package-delete elt nil 'nosave))
        (error (message "Error trying to delete `%s': %S"
                 (package-desc-full-name elt)
                 err))))))

(defun package--update-selected-packages (add remove)
  "Update the `package-selected-packages' list according to ADD and REMOVE.
ADD and REMOVE must be disjoint lists of package names (or
`package-desc' objects) to be added and removed to the selected
packages list, respectively."
  (dolist (p add)
    (cl-pushnew (if (package-desc-p p) (package-desc-name p) p)
                package-selected-packages))
  (dolist (p remove)
    (setq package-selected-packages
          (remove (if (package-desc-p p) (package-desc-name p) p)
                  package-selected-packages)))
  (when (or add remove)
    (package--save-selected-packages package-selected-packages)))

(defun package-menu-execute (&optional noquery)
  "Perform marked Package Menu actions.
Packages marked for installation are downloaded and installed;
packages marked for deletion are removed.
Optional argument NOQUERY non-nil means do not ask the user to confirm."
  (interactive nil package-menu-mode)
  (package--ensure-package-menu-mode)
  (let (install-list delete-list cmd pkg-desc)
    (save-excursion
      (goto-char (point-min))
      (while (not (eobp))
        (setq cmd (char-after))
        (unless (eq cmd ?\s)
          ;; This is the key PKG-DESC.
          (setq pkg-desc (tabulated-list-get-id))
          (cond ((eq cmd ?D)
                 (push pkg-desc delete-list))
                ((eq cmd ?I)
                 (push pkg-desc install-list))))
        (forward-line)))
    (unless (or delete-list install-list)
      (user-error "No operations specified"))
    (let-alist (package-menu--partition-transaction install-list delete-list)
      (when (or noquery
                (package-menu--prompt-transaction-p .delete .install .upgrade))
        (let ((message-template
               (concat "[ "
                       (when .delete
                         (format "Delete %d " (length .delete)))
                       (when .install
                         (format "Install %d " (length .install)))
                       (when .upgrade
                         (format "Upgrade %d " (length .upgrade)))
                       "]")))
          (message "Operation %s started" message-template)
          ;; Packages being upgraded are not marked as selected.
          (package--update-selected-packages .install .delete)
          (package-menu--perform-transaction install-list delete-list)
          (when package-selected-packages
            (if-let* ((removable (package--removable-packages)))
                (message "Operation finished.  Packages that are no longer needed: %d.  Type `%s' to remove them"
                         (length removable)
                         (substitute-command-keys "\\[package-autoremove]"))
              (message "Operation %s finished" message-template))))))))

(defun package-menu--version-predicate (A B)
  "Predicate to sort \"*Packages*\" buffer by the version column.
This is used for `tabulated-list-format' in `package-menu-mode'."
  (let ((vA (or (version-to-list (aref (cadr A) 1)) '(0)))
        (vB (or (version-to-list (aref (cadr B) 1)) '(0))))
    (if (version-list-= vA vB)
        (package-menu--name-predicate A B)
      (version-list-< vA vB))))

(defun package-menu--status-predicate (A B)
  "Predicate to sort \"*Packages*\" buffer by the status column.
This is used for `tabulated-list-format' in `package-menu-mode'."
  (let ((sA (aref (cadr A) 2))
        (sB (aref (cadr B) 2)))
    (cond ((string= sA sB)
           (package-menu--name-predicate A B))
          ((string= sA "new") t)
          ((string= sB "new") nil)
          ((string-prefix-p "avail" sA)
           (if (string-prefix-p "avail" sB)
               (package-menu--name-predicate A B)
             t))
          ((string-prefix-p "avail" sB) nil)
          ((string= sA "installed") t)
          ((string= sB "installed") nil)
          ((string= sA "dependency") t)
          ((string= sB "dependency") nil)
          ((string= sA "unsigned") t)
          ((string= sB "unsigned") nil)
          ((string= sA "held") t)
          ((string= sB "held") nil)
          ((string= sA "external") t)
          ((string= sB "external") nil)
          ((string= sA "built-in") t)
          ((string= sB "built-in") nil)
          ((string= sA "obsolete") t)
          ((string= sB "obsolete") nil)
          ((string= sA "incompat") t)
          ((string= sB "incompat") nil)
          (t (string< sA sB)))))

(defun package-menu--description-predicate (A B)
  "Predicate to sort \"*Packages*\" buffer by the description column.
This is used for `tabulated-list-format' in `package-menu-mode'."
  (let ((dA (aref (cadr A) (if (cdr package-archives) 4 3)))
        (dB (aref (cadr B) (if (cdr package-archives) 4 3))))
    (if (string= dA dB)
        (package-menu--name-predicate A B)
      (string< dA dB))))

(defun package-menu--name-predicate (A B)
  "Predicate to sort \"*Packages*\" buffer by the name column.
This is used for `tabulated-list-format' in `package-menu-mode'."
  (string< (symbol-name (package-desc-name (car A)))
           (symbol-name (package-desc-name (car B)))))

(defun package-menu--archive-predicate (A B)
  "Predicate to sort \"*Packages*\" buffer by the archive column.
This is used for `tabulated-list-format' in `package-menu-mode'."
  (let ((a (or (package-desc-archive (car A)) ""))
        (b (or (package-desc-archive (car B)) "")))
    (if (string= a b)
        (package-menu--name-predicate A B)
      (string< a b))))

(defun package-menu--populate-new-package-list ()
  "Decide which packages are new in `package-archive-contents'.
Store this list in `package-menu--new-package-list'."
  ;; Find which packages are new.
  (when package-menu--old-archive-contents
    (dolist (elt package-archive-contents)
      (unless (assq (car elt) package-menu--old-archive-contents)
        (push (car elt) package-menu--new-package-list)))
    (setq package-menu--old-archive-contents nil)))

(defun package-menu--find-and-notify-upgrades ()
  "Notify the user of upgradable packages."
  (when-let* ((upgrades (package-menu--find-upgrades)))
    (message "Packages that can be upgraded: %d; type `%s' to mark for upgrading."
             (length upgrades)
             (substitute-command-keys "\\[package-menu-mark-upgrades]"))))


(defun package-menu--post-refresh ()
  "Revert \"*Packages*\" buffer and check for new packages and upgrades.
Do nothing if there's no *Packages* buffer.

This function is called after `package-refresh-contents' and it
is added to `post-command-hook' by any function which alters the
package database (`package-install' and `package-delete').  When
run, it removes itself from `post-command-hook'."
  (remove-hook 'post-command-hook #'package-menu--post-refresh)
  (let ((buf (get-buffer "*Packages*")))
    (when (buffer-live-p buf)
      (with-current-buffer buf
        (package-menu--populate-new-package-list)
        (run-hooks 'tabulated-list-revert-hook)
        (tabulated-list-print 'remember 'update)))))

(defun package-menu--mark-or-notify-upgrades ()
  "If there's a *Packages* buffer, check for upgrades and possibly mark them.
Do nothing if there's no *Packages* buffer.  If there are
upgrades, mark them if `package-menu--mark-upgrades-pending' is
non-nil, otherwise just notify the user that there are upgrades.
This function is called after `package-refresh-contents'."
  (let ((buf (get-buffer "*Packages*")))
    (when (buffer-live-p buf)
      (with-current-buffer buf
        (if package-menu--mark-upgrades-pending
            (package-menu--mark-upgrades-1)
          (package-menu--find-and-notify-upgrades))))))

;;;###autoload
(defun list-packages (&optional no-fetch)
  "Display a list of packages.
This first fetches the updated list of packages before
displaying, unless a prefix argument NO-FETCH is specified.
The list is displayed in a buffer named `*Packages*', and
includes the package's version, availability status, and a
short description."
  (interactive "P")
  (require 'finder-inf nil t)
  ;; Initialize the package system if necessary.
  (unless package--initialized
    (package-initialize t))
  ;; Integrate the package-menu with updating the archives.
  (add-hook 'package--post-download-archives-hook
            #'package-menu--post-refresh)
  (add-hook 'package--post-download-archives-hook
            #'package-menu--mark-or-notify-upgrades 'append)

  ;; Generate the Package Menu.
  (let ((buf (get-buffer-create "*Packages*")))
    (with-current-buffer buf
      ;; Since some packages have their descriptions include non-ASCII
      ;; characters...
      (setq buffer-file-coding-system 'utf-8)
      (package-menu-mode)

      ;; Fetch the remote list of packages.
      (unless no-fetch (package-menu--refresh-contents))

      ;; If we're not async, this would be redundant.
      (when package-menu-async
        (package-menu--generate nil t)))
    ;; The package menu buffer has keybindings.  If the user types
    ;; `M-x list-packages', that suggests it should become current.
    (pop-to-buffer-same-window buf)))

;;;###autoload
(defalias 'package-list-packages 'list-packages)

;; Used in finder.el
(defun package-show-package-list (&optional packages keywords)
  "Display PACKAGES in a *Packages* buffer.
This is similar to `list-packages', but it does not fetch the
updated list of packages, and it only displays packages with
names in PACKAGES (which should be a list of symbols).

When KEYWORDS are given, only packages with those KEYWORDS are
shown."
  (interactive)
  (require 'finder-inf nil t)
  (let* ((buf (get-buffer-create "*Packages*"))
         (win (get-buffer-window buf)))
    (with-current-buffer buf
      (package-menu-mode)
      (package-menu--generate nil packages keywords))
    (if win
        (select-window win)
      (switch-to-buffer buf))))

(defun package-menu--filter-by (predicate suffix)
  "Filter \"*Packages*\" buffer by PREDICATE and add SUFFIX to header.
PREDICATE is a function which will be called with one argument, a
`package-desc' object, and returns t if that object should be
listed in the Package Menu.

SUFFIX is passed on to `package-menu--display' and is added to
the header line of the first column."
  ;; Update `tabulated-list-entries' so that it contains all
  ;; packages before searching.
  (package-menu--refresh t nil)
  (let (found-entries)
    (dolist (entry tabulated-list-entries)
      (when (funcall predicate (car entry))
        (push entry found-entries)))
    (if found-entries
        (progn
          (setq tabulated-list-entries found-entries)
          (package-menu--display t suffix))
      (user-error "No packages found"))))

(defun package-menu-filter-by-archive (archive)
  "Filter the \"*Packages*\" buffer by ARCHIVE.
Display only packages from package archive ARCHIVE.

When called interactively, prompt for ARCHIVE, which can be a
comma-separated string.  If ARCHIVE is empty, show all packages.

When called from Lisp, ARCHIVE can be a string or a list of
strings.  If ARCHIVE is nil or the empty string, show all
packages."
  (interactive (list (completing-read-multiple
                      "Filter by archive (comma separated): "
                      (mapcar #'car package-archives)))
               package-menu-mode)
  (package--ensure-package-menu-mode)
  (let ((re (if (listp archive)
                (regexp-opt archive)
              archive)))
    (package-menu--filter-by (lambda (pkg-desc)
                        (let ((pkg-archive (package-desc-archive pkg-desc)))
                          (and pkg-archive
                               (string-match-p re pkg-archive))))
                      (concat "archive:" (if (listp archive)
                                             (string-join archive ",")
                                           archive)))))

(defun package-menu-filter-by-description (description)
  "Filter the \"*Packages*\" buffer by DESCRIPTION regexp.
Display only packages with a description that matches regexp
DESCRIPTION.

When called interactively, prompt for DESCRIPTION.

If DESCRIPTION is nil or the empty string, show all packages."
  (interactive (list (read-regexp "Filter by description (regexp)"))
               package-menu-mode)
  (package--ensure-package-menu-mode)
  (if (or (not description) (string-empty-p description))
      (package-menu--generate t t)
    (package-menu--filter-by (lambda (pkg-desc)
                        (string-match description
                                      (package-desc-summary pkg-desc)))
                      (format "desc:%s" description))))

(defun package-menu-filter-by-keyword (keyword)
  "Filter the \"*Packages*\" buffer by KEYWORD.
Display only packages with specified KEYWORD.

When called interactively, prompt for KEYWORD, which can be a
comma-separated string.  If KEYWORD is empty, show all packages.

When called from Lisp, KEYWORD can be a string or a list of
strings.  If KEYWORD is nil or the empty string, show all
packages."
  (interactive (list (completing-read-multiple
                      "Keywords (comma separated): "
                      (package-all-keywords)))
               package-menu-mode)
  (package--ensure-package-menu-mode)
  (when (stringp keyword)
    (setq keyword (list keyword)))
  (if (not keyword)
      (package-menu--generate t t)
    (package-menu--filter-by (lambda (pkg-desc)
                        (package--has-keyword-p pkg-desc keyword))
                      (concat "keyword:" (string-join keyword ",")))))

(define-obsolete-function-alias
  'package-menu-filter #'package-menu-filter-by-keyword "27.1")

(defun package-menu-filter-by-name-or-description (name-or-description)
  "Filter the \"*Packages*\" buffer by NAME-OR-DESCRIPTION regexp.
Display only packages with a name-or-description that matches regexp
NAME-OR-DESCRIPTION.

When called interactively, prompt for NAME-OR-DESCRIPTION.

If NAME-OR-DESCRIPTION is nil or the empty string, show all
packages."
  (interactive (list (read-regexp "Filter by name or description (regexp)"))
               package-menu-mode)
  (package--ensure-package-menu-mode)
  (if (or (not name-or-description) (string-empty-p name-or-description))
      (package-menu--generate t t)
    (package-menu--filter-by (lambda (pkg-desc)
                        (or (string-match name-or-description
                                          (package-desc-summary pkg-desc))
                            (string-match name-or-description
                                          (symbol-name
                                           (package-desc-name pkg-desc)))))
                      (format "name-or-desc:%s" name-or-description))))

(defun package-menu-filter-by-name (name)
  "Filter the \"*Packages*\" buffer by NAME regexp.
Display only packages with name that matches regexp NAME.

When called interactively, prompt for NAME.

If NAME is nil or the empty string, show all packages."
  (interactive (list (read-regexp "Filter by name (regexp)"))
               package-menu-mode)
  (package--ensure-package-menu-mode)
  (if (or (not name) (string-empty-p name))
      (package-menu--generate t t)
    (package-menu--filter-by (lambda (pkg-desc)
                        (string-match-p name (symbol-name
                                              (package-desc-name pkg-desc))))
                      (format "name:%s" name))))

(defun package-menu-filter-by-status (status)
  "Filter the \"*Packages*\" buffer by STATUS.
Display only packages with specified STATUS.

When called interactively, prompt for STATUS, which can be a
comma-separated string.  If STATUS is empty, show all packages.

When called from Lisp, STATUS can be a string or a list of
strings.  If STATUS is nil or the empty string, show all
packages."
  (interactive (list (completing-read "Filter by status: "
                                      '("avail-obso"
                                        "available"
                                        "built-in"
                                        "dependency"
                                        "disabled"
                                        "external"
                                        "held"
                                        "incompat"
                                        "installed"
                                        "new"
                                        "unsigned")))
               package-menu-mode)
  (package--ensure-package-menu-mode)
  (if (or (not status) (string-empty-p status))
      (package-menu--generate t t)
    (let ((status-list
           (if (listp status)
               status
             (split-string status ","))))
      (package-menu--filter-by
       (lambda (pkg-desc)
         (member (package-desc-status pkg-desc) status-list))
       (format "status:%s" (string-join status-list ","))))))

(defun package-menu-filter-by-version (version predicate)
  "Filter the \"*Packages*\" buffer by VERSION and PREDICATE.
Display only packages with a matching version.

When called interactively, prompt for one of the qualifiers `<',
`>' or `=', and a package version.  Show only packages that has a
lower (`<'), equal (`=') or higher (`>') version than the
specified one.

When called from Lisp, VERSION should be a version string and
PREDICATE should be the symbol `=', `<' or `>'.

If VERSION is nil or the empty string, show all packages."
  (interactive (let ((choice (intern
                              (char-to-string
                               (read-char-choice
                                "Filter by version? [Type =, <, > or q] "
                                '(?< ?> ?= ?q))))))
                 (if (eq choice 'q)
                     '(quit nil)
                   (list (read-from-minibuffer
                          (concat "Filter by version ("
                                  (pcase choice
                                    ('= "= equal to")
                                    ('< "< less than")
                                    ('> "> greater than"))
                                  "): "))
                         choice)))
               package-menu-mode)
  (package--ensure-package-menu-mode)
  (unless (equal predicate 'quit)
    (if (or (not version) (string-empty-p version))
        (package-menu--generate t t)
      (package-menu--filter-by
       (let ((fun (pcase predicate
                    ('= #'version-list-=)
                    ('< #'version-list-<)
                    ('> (lambda (a b) (not (version-list-<= a b))))
                    (_ (error "Unknown predicate: %s" predicate))))
             (ver (version-to-list version)))
         (lambda (pkg-desc)
           (funcall fun (package-desc-version pkg-desc) ver)))
       (format "versions:%s%s" predicate version)))))

(defun package-menu-filter-marked ()
  "Filter \"*Packages*\" buffer by non-empty upgrade mark.
Unlike other filters, this leaves the marks intact."
  (interactive nil package-menu-mode)
  (package--ensure-package-menu-mode)
  (widen)
  (let (found-entries mark pkg-id entry marks)
    (save-excursion
      (goto-char (point-min))
      (while (not (eobp))
        (setq mark (char-after))
        (unless (eq mark ?\s)
	  (setq pkg-id (tabulated-list-get-id))
          (setq entry (package-menu--print-info-simple pkg-id))
	  (push entry found-entries)
	  ;; remember the mark
	  (push (cons pkg-id mark) marks))
        (forward-line))
      (if found-entries
          (progn
            (setq tabulated-list-entries found-entries)
            (package-menu--display t nil)
	    ;; redo the marks, but we must remember the marks!!
	    (goto-char (point-min))
	    (while (not (eobp))
	      (setq mark (cdr (assq (tabulated-list-get-id) marks)))
	      (tabulated-list-put-tag (char-to-string mark) t)))
	(user-error "No packages found")))))

(defun package-menu-filter-upgradable ()
  "Filter \"*Packages*\" buffer to show only upgradable packages."
  (interactive nil package-menu-mode)
  (let ((pkgs (mapcar #'car (package-menu--find-upgrades))))
    (package-menu--filter-by
     (lambda (pkg)
       (memql (package-desc-name pkg) pkgs))
     "upgradable")))

(defun package-menu-clear-filter ()
  "Clear any filter currently applied to the \"*Packages*\" buffer."
  (interactive nil package-menu-mode)
  (package--ensure-package-menu-mode)
  (package-menu--generate t t))

(defun package-list-packages-no-fetch ()
  "Display a list of packages.
Does not fetch the updated list of packages before displaying.
The list is displayed in a buffer named `*Packages*'."
  (interactive)
  (list-packages t))

;;;###autoload
(defun package-get-version ()
  "Return the version number of the package in which this is used.
Assumes it is used from an Elisp file placed inside the top-level directory
of an installed ELPA package.
The return value is a string (or nil in case we can't find it)."
  ;; In a sense, this is a lie, but it does just what we want: precompute
  ;; the version at compile time and hardcodes it into the .elc file!
  (declare (pure t))
  ;; Hack alert!
  (let ((file (or (macroexp-file-name) buffer-file-name)))
    (cond
     ((null file) nil)
     ;; Packages are normally installed into directories named "<pkg>-<vers>",
     ;; so get the version number from there.
     ((string-match "/[^/]+-\\([0-9]\\(?:[0-9.]\\|pre\\|beta\\|alpha\\|snapshot\\)+\\)/[^/]+\\'" file)
      (match-string 1 file))
     ;; For packages run straight from the an elpa.git clone, there's no
     ;; "-<vers>" in the directory name, so we have to fetch the version
     ;; the hard way.
     (t
      (let* ((pkgdir (file-name-directory file))
             (pkgname (file-name-nondirectory (directory-file-name pkgdir)))
             (mainfile (expand-file-name (concat pkgname ".el") pkgdir)))
        (when (file-readable-p mainfile)
          (require 'lisp-mnt)
          (with-temp-buffer
            (insert-file-contents mainfile)
            (or (lm-header "package-version")
                (lm-header "version")))))))))

\f
;;;; Quickstart: precompute activation actions for faster start up.

;; Activating packages via `package-initialize' is costly: for N installed
;; packages, it needs to read all N <pkg>-pkg.el files first to decide
;; which packages to activate, and then again N <pkg>-autoloads.el files.
;; To speed this up, we precompute a mega-autoloads file which is the
;; concatenation of all those <pkg>-autoloads.el, so we can activate
;; all packages by loading this one file (and hence without initializing
;; package.el).

;; Other than speeding things up, this also offers a bootstrap feature:
;; it lets us activate packages according to `package-load-list' and
;; `package-user-dir' even before those vars are set.

(defcustom package-quickstart nil
  "Precompute activation actions to speed up startup.
This requires the use of `package-quickstart-refresh' every time the
activations need to be changed, such as when `package-load-list' is modified."
  :type 'boolean
  :version "27.1")

;;;###autoload
(defcustom package-quickstart-file
  (locate-user-emacs-file "package-quickstart.el")
  "Location of the file used to speed up activation of packages at startup."
  :type 'file
  :initialize #'custom-initialize-delay
  :version "27.1")

(defun package--quickstart-maybe-refresh ()
  (if package-quickstart
      ;; FIXME: Delay refresh in case we're installing/deleting
      ;; several packages!
      (package-quickstart-refresh)
    (delete-file (concat package-quickstart-file "c"))
    (delete-file package-quickstart-file)))

(defun package-quickstart-refresh ()
  "(Re)Generate the `package-quickstart-file'."
  (interactive)
  (package-initialize 'no-activate)
  (require 'info)
  (let ((package--quickstart-pkgs ())
        ;; Pretend we haven't activated anything yet!
        (package-activated-list ())
        ;; Make sure we can load this file without load-source-file-function.
        (coding-system-for-write 'emacs-internal)
        ;; Ensure that `pp' and `prin1-to-string' calls further down
        ;; aren't truncated.
        (print-length nil)
        (print-level nil)
        (Info-directory-list '("")))
    (dolist (elt package-alist)
      (condition-case err
          (package-activate (car elt))
        ;; Don't let failure of activation of a package arbitrarily stop
        ;; activation of further packages.
        (error (message "%s" (error-message-string err)))))
    (setq package--quickstart-pkgs (nreverse package--quickstart-pkgs))
    (with-temp-file package-quickstart-file
      (emacs-lisp-mode)                 ;For `syntax-ppss'.
      (insert ";;; Quickstart file to activate all packages at startup  -*- lexical-binding:t -*-\n")
      (insert ";; ¡¡ This file is autogenerated by `package-quickstart-refresh', DO NOT EDIT !!\n\n")
      (dolist (pkg package--quickstart-pkgs)
        (let* ((file
                ;; Prefer uncompiled files (and don't accept .so files).
                (let ((load-suffixes '(".el" ".elc")))
                  (locate-library (package--autoloads-file-name pkg))))
               (pfile (prin1-to-string file)))
          (insert "(let ((load-true-file-name " pfile ")\
(load-file-name " pfile "))\n")
          (insert-file-contents file)
          ;; Fixup the special #$ reader form and throw away comments.
          (while (re-search-forward "#\\$\\|^;\\(.*\n\\)" nil 'move)
            (unless (nth 8 (syntax-ppss))
              (replace-match (if (match-end 1) "" pfile) t t)))
          (unless (bolp) (insert "\n"))
          (insert ")\n")))
      (pp `(setq package-activated-list
                 (append ',(mapcar #'package-desc-name package--quickstart-pkgs)
                         package-activated-list))
          (current-buffer))
      (let ((info-dirs (butlast Info-directory-list)))
        (when info-dirs
          (pp `(progn (require 'info)
                      (info-initialize)
                      (setq Info-directory-list
                            (append ',info-dirs Info-directory-list)))
              (current-buffer))))
      ;; Use `\s' instead of a space character, so this code chunk is not
      ;; mistaken for an actual file-local section of package.el.
      (insert "\f
;; Local\sVariables:
;; version-control: never
;; no-update-autoloads: t
;; End:
"))
    ;; FIXME: Do it asynchronously in an Emacs subprocess, and
    ;; don't show the byte-compiler warnings.
    (byte-compile-file package-quickstart-file)))

(defun package--imenu-prev-index-position-function ()
  "Move point to previous line in package-menu buffer.
This function is used as a value for
`imenu-prev-index-position-function'."
  (unless (bobp)
    (forward-line -1)))

(defun package--imenu-extract-index-name-function ()
  "Return imenu name for line at point.
This function is used as a value for
`imenu-extract-index-name-function'.  Point should be at the
beginning of the line."
  (let ((package-desc (tabulated-list-get-id)))
    (format "%s (%s): %s"
            (package-desc-name package-desc)
            (package-version-join (package-desc-version package-desc))
            (package-desc-summary package-desc))))

(defun package-browse-url (desc &optional secondary)
  "Open the home page of the package under point in a browser.
`browse-url' is used to determine the browser to be used.
If SECONDARY (interactively, the prefix), use the secondary browser."
  (interactive (list (tabulated-list-get-id)
                     current-prefix-arg)
               package-menu-mode)
  (unless desc
    (user-error "No package here"))
  (let ((url (cdr (assoc :url (package-desc-extras desc)))))
    (unless url
      (user-error "No home page for %s" (package-desc-name desc)))
    (if secondary
	(funcall browse-url-secondary-browser-function url)
      (browse-url url))))

;;;; Introspection

(defun package-get-descriptor (pkg-name)
  "Return the `package-desc' of PKG-NAME."
  (unless package--initialized (package-initialize 'no-activate))
  (or (package--get-activatable-pkg pkg-name)
      (cadr (assq pkg-name package-alist))
      (cadr (assq pkg-name package-archive-contents))))

(provide 'package)

;;; package.el ends here

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

> Would you and everybody else interested in this topic like to try a
> small patch to test the idea with symlinks? It literally takes 3 lines

It seems hackish compared to using an approach like that used by
elpa-admin.el (not to mention that symlinks aren't really usable under
w32).


        Stefan

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> Would you and everybody else interested in this topic like to try a
>> small patch to test the idea with symlinks? It literally takes 3 lines
>
> It seems hackish compared to using an approach like that used by
> elpa-admin.el (not to mention that symlinks aren't really usable under
> w32).

What does elpa-admin.el uses? Is it part of Emacs?

I have no idea what it even is, so I don't what it does. Symblink is a
hack, but one that makes all the features of project.el work out of the
box (autoloads, quickstart, etc) and is almost cost-free in terms of
wrok needed to add :). My only consideration was if it works on Windows/Mac.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Arthur Miller <arthur.miller@live.com> writes:

> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>>> Would you and everybody else interested in this topic like to try a
>>> small patch to test the idea with symlinks? It literally takes 3 lines
>>
>> It seems hackish compared to using an approach like that used by
>> elpa-admin.el (not to mention that symlinks aren't really usable under
>> w32).
>
> What does elpa-admin.el uses? Is it part of Emacs?
>
> I have no idea what it even is, so I don't what it does. Symblink is a
> hack, but one that makes all the features of project.el work out of the
> box (autoloads, quickstart, etc) and is almost cost-free in terms of
> wrok needed to add :). My only consideration was if it works on Windows/Mac.

After some search, yes seems like symlinks are not so great on Windows:

https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/

Don't udnerstand why are symlinks such a big deal for them.

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Arthur Miller <arthur.miller@live.com>
> Date: Sat, 21 Aug 2021 05:12:25 +0200
> Cc: Philip Kaludercic <philipk@posteo.net>, emacs-devel@gnu.org
> 
> After some search, yes seems like symlinks are not so great on Windows:
> 
> https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/
> 
> Don't udnerstand why are symlinks such a big deal for them.

They are deemed to be a security vulnerability in some quarters,
because they can potentially circumvent access rights.

Re: Easy configuration of a site-lisp directory

[tomas]

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

On Sat, Aug 21, 2021 at 09:39:37AM +0300, Eli Zaretskii wrote:
> > From: Arthur Miller <arthur.miller@live.com>

[...]

> > Don't udnerstand why are symlinks such a big deal for them.
> 
> They are deemed to be a security vulnerability in some quarters,
> because they can potentially circumvent access rights.

That's because DOS got all confused between direntries and inodes,
and Microsoft never recovered from that (despite having hired a pro
to do NT for them, but I disgress ;-P

Cheers
 - t

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> Date: Sat, 21 Aug 2021 08:48:29 +0200
> From: <tomas@tuxteam.de>
> 
> That's because DOS got all confused between direntries and inodes,
> and Microsoft never recovered from that (despite having hired a pro
> to do NT for them, but I disgress ;-P

I don't see how inodes are relevant to this, and NTFS does have their
equivalent internally.

Symlinks redirect a reference to a file, so they can be used to trick
an application to access a file in a completely different place in the
filesystem.  Whether this does or doesn't present a vulnerability is a
matter of expert opinion, and I'm not an expert, but I think the
important factor here is the very different security models between
Posix and Windows, and that has nothing to do with inodes (AFAIU).

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Arthur Miller <arthur.miller@live.com>
>> Date: Sat, 21 Aug 2021 05:12:25 +0200
>> Cc: Philip Kaludercic <philipk@posteo.net>, emacs-devel@gnu.org
>> 
>> After some search, yes seems like symlinks are not so great on Windows:
>> 
>> https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/
>> 
>> Don't udnerstand why are symlinks such a big deal for them.
>
> They are deemed to be a security vulnerability in some quarters,
> because they can potentially circumvent access rights.

I understand they consider it a security issue, but I don't understand
why. Couldn't they apply same rules to symlinked file access as if the
access was direct? Bit I guess Microsoft has acquired quite clever
people so they have their reasons. I don't think they removed symlinks
just because, for no good reason.

I would rather be interesting what elpa-admin.el does. As I looked it up
today, there is a 2k lines file in elpa sources, I guess Stefan means
that one?

Is it going to become part of Emacs, or he just means that
developers should use it develop packages, or why do you bring it up? I
sincerely have never used it, so I wonder how does it relate to normal
users who wish to manage their site-lisp with pacakge.el. Obviously from
what Philip posted, and from what I see on Reddit and elsewhere, there
is appeal in just cloning a git repo and bringing it into Emacs. I am
not sure if it is the best practice, but I do understand the appeal and
that is obviously what makes people prefer some other package
managers. So is this elpa-admin.el soemthing that addresses that
convenience/workflow or do you plan something else for package.el?

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Arthur Miller <arthur.miller@live.com>
> Cc: monnier@iro.umontreal.ca,  philipk@posteo.net,  emacs-devel@gnu.org
> Date: Sat, 21 Aug 2021 16:34:34 +0200
> 
> I understand they consider it a security issue, but I don't understand
> why. Couldn't they apply same rules to symlinked file access as if the
> access was direct?

If the symlink resolution is done below the level where access rights
are checked, you cannot do that.

Also, the ACL system on Windows is very complex, and there are a lot
of access rights inherited indirectly, so maybe there's more to it
than meets the eye.  Like I said, I'm not an expert on this stuff.

> Bit I guess Microsoft has acquired quite clever
> people so they have their reasons. I don't think they removed symlinks
> just because, for no good reason.

Symlinks are not removed from Windows, they are present (and Emacs on
Windows supports them).

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Arthur Miller <arthur.miller@live.com>
>> Cc: monnier@iro.umontreal.ca,  philipk@posteo.net,  emacs-devel@gnu.org
>> Date: Sat, 21 Aug 2021 16:34:34 +0200
>> 
>> I understand they consider it a security issue, but I don't understand
>> why. Couldn't they apply same rules to symlinked file access as if the
>> access was direct?
>
> If the symlink resolution is done below the level where access rights
> are checked, you cannot do that.

Which means we can leak access rights if we symlink from priviledged
ring into lesser access right ring, or how they call it? Or I missunderstand.

> Also, the ACL system on Windows is very complex, and there are a lot
> of access rights inherited indirectly, so maybe there's more to it
> than meets the eye.  Like I said, I'm not an expert on this stuff.
>> Bit I guess Microsoft has acquired quite clever
>> people so they have their reasons. I don't think they removed symlinks
>> just because, for no good reason.
>
> Symlinks are not removed from Windows, they are present (and Emacs on
> Windows supports them).
Oh sorry for the last, my brain was on the vacation, "removed" I meant
from original design ... back in VMS/VAX time I was still in thoughts of
another replay. As I understand they added symlinks "relatively"
recently (in Vista), but I maybe missunderstood there.

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Arthur Miller <arthur.miller@live.com>
> Cc: monnier@iro.umontreal.ca,  philipk@posteo.net,  emacs-devel@gnu.org
> Date: Sat, 21 Aug 2021 21:10:22 +0200
> 
> > If the symlink resolution is done below the level where access rights
> > are checked, you cannot do that.
> 
> Which means we can leak access rights if we symlink from priviledged
> ring into lesser access right ring, or how they call it?

Something like that, yes.  I think the problem is actually in knowing
which inheritable access right to apply, because a symlink can point
to a completely different directory hierarchy.

> > Symlinks are not removed from Windows, they are present (and Emacs on
> > Windows supports them).
> Oh sorry for the last, my brain was on the vacation, "removed" I meant
> from original design ... back in VMS/VAX time I was still in thoughts of
> another replay. As I understand they added symlinks "relatively"
> recently (in Vista), but I maybe missunderstood there.

Yes, NTFS support for symlinks is around Vista, although filesystem
reparse points were supported before that.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Arthur Miller <arthur.miller@live.com>
>> Cc: monnier@iro.umontreal.ca,  philipk@posteo.net,  emacs-devel@gnu.org
>> Date: Sat, 21 Aug 2021 21:10:22 +0200
>> 
>> > If the symlink resolution is done below the level where access rights
>> > are checked, you cannot do that.
>> 
>> Which means we can leak access rights if we symlink from priviledged
>> ring into lesser access right ring, or how they call it?
>
> Something like that, yes.  I think the problem is actually in knowing
> which inheritable access right to apply, because a symlink can point
> to a completely different directory hierarchy.
>
>> > Symlinks are not removed from Windows, they are present (and Emacs on
>> > Windows supports them).
>> Oh sorry for the last, my brain was on the vacation, "removed" I meant
>> from original design ... back in VMS/VAX time I was still in thoughts of
>> another replay. As I understand they added symlinks "relatively"
>> recently (in Vista), but I maybe missunderstood there.
>
> Yes, NTFS support for symlinks is around Vista, although filesystem
> reparse points were supported before that.

Thank you.

As always I am amazed with all the (technical) knowledge you poses. We should
definitely pay you to write a book; for the greater good of human race!

Re: Easy configuration of a site-lisp directory

[Eli Zaretskii]

> From: Arthur Miller <arthur.miller@live.com>
> Cc: monnier@iro.umontreal.ca,  philipk@posteo.net,  emacs-devel@gnu.org
> Date: Sat, 21 Aug 2021 22:25:11 +0200
> 
> As always I am amazed with all the (technical) knowledge you poses. We should
> definitely pay you to write a book; for the greater good of human race!

Thanks.  But I'm quite sure everything I know (or think I know) is
already described in some book ;-)

Re: Easy configuration of a site-lisp directory

[Max Brieiev]

So is there any conclusion in this long thread about preferable setup
for the case described in the original post? And making local git
repositeries be package.el aware.

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

Max Brieiev [2021-08-23 12:14:46] wrote:
> So is there any conclusion in this long thread about preferable setup
> for the case described in the original post?  And making local git
> repositeries be package.el aware.

From my point of view, the "preferable setup" is for someone to spice up
`elpa-admin.el` to make it more user-friendly for that use-case.


        Stefan

Re: Easy configuration of a site-lisp directory

[Philip Kaludercic]

Arthur Miller <arthur.miller@live.com> writes:

> Philip Kaludercic <philipk@posteo.net> writes:
>
>> Just wanted to ping this message to check if there is any interest in
>> doing something with my initial suggestion?
>
> I do something similar as you do, but I use it only for some loose
> files I write myself, and for some I download from emacs wiki etc.
>
>>> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
>>> directory where a user can clone any repository or create their own,
>>> without having to manually add these to load-path, generate autoloads or
>>> byte compile.
>
> I have a question: is it desirable to use a working git directory as
> installed package? When I write my own files, I usually don't wish to
> copy them over to my "lisp" directory which I autoload in Emacs, untill
> I am done. Admittedly I started doing so before git has entered the
> scene. Now I guess one can switch branches every time one works on a package
> between some development branch and some stable, but isn't it a bit tedious?

Usually I don't store them in my site-lisp directory, but just symlink
what I want to use from my source code directory. If something isn't
functional or ready, there shouldn't be any reason I would want it
byte-compiled, autoloaded and ready to use by default.

If there is some critical change or something that isn't ready yet, I'd
just use "git stash".

> What you are suggesting is to effectively use "site-lisp" as another
> package-user-dir (~/.emacs.d/elpa on my machine). You are also auto
> recursing in all dirs, so if user wish to remove something they have to
> remove that directory from the path?

Yes, but I hesitate to compare it to package-user-dir, as to me packages
stand in relation to some package manager, while site-lisp.el only
implements the bare minimum.

> Why not hack pacakge.el to use "local archives", would work something like this:

It could be done, but as you say it is a hack.

-- 
	Philip Kaludercic

Re: Easy configuration of a site-lisp directory

[Philip Kaludercic]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Max Brieiev [2021-08-23 12:14:46] wrote:
>> So is there any conclusion in this long thread about preferable setup
>> for the case described in the original post?  And making local git
>> repositeries be package.el aware.
>
> From my point of view, the "preferable setup" is for someone to spice up
> `elpa-admin.el` to make it more user-friendly for that use-case.

I could look into this, because I was intending to work on elpa-admin.el
a bit anyway. But this would mean that it wouldn't work OOTB, right?

-- 
	Philip Kaludercic

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

Philip Kaludercic [2021-08-25 11:13:49] wrote:
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> Max Brieiev [2021-08-23 12:14:46] wrote:
>>> So is there any conclusion in this long thread about preferable setup
>>> for the case described in the original post?  And making local git
>>> repositeries be package.el aware.
>>
>> From my point of view, the "preferable setup" is for someone to spice up
>> `elpa-admin.el` to make it more user-friendly for that use-case.
>
> I could look into this, because I was intending to work on elpa-admin.el
> a bit anyway.  But this would mean that it wouldn't work OOTB, right?

Not sure what you mean by that, but I'm pretty sure the answer is no.
My suggestion is quite vague, includes things like extracting the
*ideas* but rewrite them differently or copying the few relevant parts
of the code, ...


        Stefan

Re: Easy configuration of a site-lisp directory

[Philip Kaludercic]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Philip Kaludercic [2021-08-25 11:13:49] wrote:
>> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>> Max Brieiev [2021-08-23 12:14:46] wrote:
>>>> So is there any conclusion in this long thread about preferable setup
>>>> for the case described in the original post?  And making local git
>>>> repositeries be package.el aware.
>>>
>>> From my point of view, the "preferable setup" is for someone to spice up
>>> `elpa-admin.el` to make it more user-friendly for that use-case.
>>
>> I could look into this, because I was intending to work on elpa-admin.el
>> a bit anyway.  But this would mean that it wouldn't work OOTB, right?
>
> Not sure what you mean by that, but I'm pretty sure the answer is no.

My suggestion to add something like site-lisp.el to Emacs itself was to
allow anyone to use unpackaged elisp code on their local system, without
having to manually bother with updating load-path and autoloading.

> My suggestion is quite vague, includes things like extracting the
> *ideas* but rewrite them differently or copying the few relevant parts
> of the code, ...
>
>
>         Stefan
>

-- 
	Philip Kaludercic

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

Philip Kaludercic [2021-08-25 14:55:20] wrote:
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> Philip Kaludercic [2021-08-25 11:13:49] wrote:
>>> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>>> Max Brieiev [2021-08-23 12:14:46] wrote:
>>>>> So is there any conclusion in this long thread about preferable setup
>>>>> for the case described in the original post?  And making local git
>>>>> repositeries be package.el aware.
>>>>
>>>> From my point of view, the "preferable setup" is for someone to spice up
>>>> `elpa-admin.el` to make it more user-friendly for that use-case.
>>>
>>> I could look into this, because I was intending to work on elpa-admin.el
>>> a bit anyway.  But this would mean that it wouldn't work OOTB, right?
>>
>> Not sure what you mean by that, but I'm pretty sure the answer is no.
>
> My suggestion to add something like site-lisp.el to Emacs itself was to
> allow anyone to use unpackaged elisp code on their local system, without
> having to manually bother with updating load-path and autoloading.

Right, and the approach I use in elpa-admin.el indeed allows that.
To recap, here's what it does:

- Git clone <foo> from upstream into .../somewhere/<foo>.
- In that directory, create a <foo>-pkg.el and a <foo>-autoloads.el.
- Byte-compile the .el files.
- Add `.../somewhere` to `package-directory-list`.

The last step is only done once and forall rather than once per package.

IOW it acts as an alternative package installer: package.el could/should
be split into a part that deals with using (activating) the packages
currently installed (i.e. basically `package-activate-all` and the code
it uses) and a part that deals with ELPA repositories and installs
packages into (and remove froms) `package-user-dir`.
[ Side note: the byte-compilation should be moved out of the
  installation step, not only so it can be shared between different UIs
  and installers, but also so we can re-compile upon request.  ]

Then of course you'll want to add further features:

- commands to update packages, i.e. do a `git pull` and recreate/refresh
  the two files.
- support for creating Info docs out of Texinfo.
- support for packages where the Elisp code is not at the root of the
  clone but in some subdirectory.
- allow the user to choose to select an actual *release* rather than the
  bleeding edge.

The above listed features are those that `elpa-admin.el` currently
supports (to some extent, in one form or another), but of course, there
could be more.

Currently, for many packages all you need is the URL of the upstream
repository, but for others we need extra information in the "package
spec", such as where to find the Texinfo source.  In the context of
`elpa-admin.el` the extra info for this "package spec" are provided in
the `elpa-packages` file but I think it would make sense to make it
possible for the package to provide this info directly (e.g. via
additional pseudo-headers in the <foo>.el file).


        Stefan


PS: Note also that `elpa-admin.el` includes a fair bit of code that does
other things, not relevant to this discussion, such as creating tarballs
for ELPA repositories, creating HTML pages, etc...

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Philip Kaludercic <philipk@posteo.net> writes:

> Arthur Miller <arthur.miller@live.com> writes:
>
>> Philip Kaludercic <philipk@posteo.net> writes:
>>
>>> Just wanted to ping this message to check if there is any interest in
>>> doing something with my initial suggestion?
>>
>> I do something similar as you do, but I use it only for some loose
>> files I write myself, and for some I download from emacs wiki etc.
>>
>>>> The fundamental idea is to have an easy-to-use ~/.emacs.d/site-lisp/
>>>> directory where a user can clone any repository or create their own,
>>>> without having to manually add these to load-path, generate autoloads or
>>>> byte compile.
>>
>> I have a question: is it desirable to use a working git directory as
>> installed package? When I write my own files, I usually don't wish to
>> copy them over to my "lisp" directory which I autoload in Emacs, untill
>> I am done. Admittedly I started doing so before git has entered the
>> scene. Now I guess one can switch branches every time one works on a package
>> between some development branch and some stable, but isn't it a bit tedious?
>
> Usually I don't store them in my site-lisp directory, but just symlink
> what I want to use from my source code directory. If something isn't
> functional or ready, there shouldn't be any reason I would want it
> byte-compiled, autoloaded and ready to use by default.

That is what I thought, and that means you are in the same situation as
without auto importing some "site-lisp" dir when it comes to xref & co? 

So what you proposed comes mostly in play when there is bunch of code installed
manually outisde of package.el. If there was only few files, I don't think it
would be intresseting to automate it either, so I guess there is more than few
files, probably a bunch of git cloned repos.

I think that something like what you propose is OK for you who are developer and
know what you do. But if you put something like this on auto in Emacs, I think
that lots of people with get troubles which can lead to even more frequent mailing
list :).

> If there is some critical change or something that isn't ready yet, I'd
> just use "git stash".
>
>> What you are suggesting is to effectively use "site-lisp" as another
>> package-user-dir (~/.emacs.d/elpa on my machine). You are also auto
>> recursing in all dirs, so if user wish to remove something they have to
>> remove that directory from the path?
>
> Yes, but I hesitate to compare it to package-user-dir, as to me packages
> stand in relation to some package manager, while site-lisp.el only
> implements the bare minimum.

Exactly. I am not sure if it is even the bare miniumum. 

Bringing in paths and code in Emacs, is just but one part of package
management. Installling dependencies and also uninstalling everything correctly,
not leaving orphaned pacakges behind or removing something still needed is as
important as well. For that reason I think that going through package.el would
be a better idea.

Everyone's setup is of course private, but I don't think that is a 
good idea and good alternative to proper package management. For the same reason
why we don't install packages manually in our gnu/linux distributions but use
some sort of package management system. Doing manually ./configure - make dance
is nowdays considered a bad practice.

Anyway, I understand your attempt, and I responded, because I was lately
looking for myself what to do, becuase I also would prefer to have easy hackable
packages, with same consideration as you said, to have emacs help system and
xref bring me to correct spot. I am not sure myself what I am gonna use.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Philip Kaludercic <philipk@posteo.net> writes:

> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>> Philip Kaludercic [2021-08-25 11:13:49] wrote:
>>> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>>> Max Brieiev [2021-08-23 12:14:46] wrote:
>>>>> So is there any conclusion in this long thread about preferable setup
>>>>> for the case described in the original post?  And making local git
>>>>> repositeries be package.el aware.
>>>>
>>>> From my point of view, the "preferable setup" is for someone to spice up
>>>> `elpa-admin.el` to make it more user-friendly for that use-case.
>>>
>>> I could look into this, because I was intending to work on elpa-admin.el
>>> a bit anyway.  But this would mean that it wouldn't work OOTB, right?
>>
>> Not sure what you mean by that, but I'm pretty sure the answer is no.
>
> My suggestion to add something like site-lisp.el to Emacs itself was to
> allow anyone to use unpackaged elisp code on their local system, without
> having to manually bother with updating load-path and autoloading.

If I continue from previous response to you: yes, it was clear what you
meant and problem is as I described there. Your proposal is good for you who are
experienced with working with Emacs Lisp, but lot's of people aren't and that
could potentially lead to other problems for them.

But what about attacking the problem from the other side: requirement for a
package to be installable seems to be very minimal. Only thing I needed to add
to my own was to put a comment with a version number. We could hack package.el
to remove that requirement, or to add a version number automatically, that would
made pretty much any code package installable.

The problem which can't be solved automatically is to figure out all the possible
requirements. Somebody has to manually add a comment with requirements in the
code, that in proper format. Which isn't hard to do but still has to be done. I
don't know what is best practice there, but I don't think it is possible to do
much than to simply warn the user that dependencies are potentially missing.

Best would be if package authors were aware of this themselves and added version
number and requirements in proper format. Then their code would be auto
installable via package manager even if it is not in some official repository.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Philip Kaludercic [2021-08-25 14:55:20] wrote:
>> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>> Philip Kaludercic [2021-08-25 11:13:49] wrote:
>>>> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>>>> Max Brieiev [2021-08-23 12:14:46] wrote:
>>>>>> So is there any conclusion in this long thread about preferable setup
>>>>>> for the case described in the original post?  And making local git
>>>>>> repositeries be package.el aware.
>>>>>
>>>>> From my point of view, the "preferable setup" is for someone to spice up
>>>>> `elpa-admin.el` to make it more user-friendly for that use-case.
>>>>
>>>> I could look into this, because I was intending to work on elpa-admin.el
>>>> a bit anyway.  But this would mean that it wouldn't work OOTB, right?
>>>
>>> Not sure what you mean by that, but I'm pretty sure the answer is no.
>>
>> My suggestion to add something like site-lisp.el to Emacs itself was to
>> allow anyone to use unpackaged elisp code on their local system, without
>> having to manually bother with updating load-path and autoloading.
>
> Right, and the approach I use in elpa-admin.el indeed allows that.
> To recap, here's what it does:
>
> - Git clone <foo> from upstream into .../somewhere/<foo>.
If I may interfere, jere is probably good to create a branch (automated) for the
installed version. Update can later checkout to back ot main or release branch,
do a pull, and than do a new installed version.

> - In that directory, create a <foo>-pkg.el and a <foo>-autoloads.el.
> - Byte-compile the .el files.
> - Add `.../somewhere` to `package-directory-list`.
>
> The last step is only done once and forall rather than once per package.
>
> IOW it acts as an alternative package installer: package.el could/should
> be split into a part that deals with using (activating) the packages
> currently installed (i.e. basically `package-activate-all` and the code
> it uses) and a part that deals with ELPA repositories and installs
> packages into (and remove froms) `package-user-dir`.
> [ Side note: the byte-compilation should be moved out of the
>   installation step, not only so it can be shared between different UIs
>   and installers, but also so we can re-compile upon request.  ]
>
> Then of course you'll want to add further features:
>
> - commands to update packages, i.e. do a `git pull` and recreate/refresh
>   the two files.
> - support for creating Info docs out of Texinfo.
> - support for packages where the Elisp code is not at the root of the
>   clone but in some subdirectory.
> - allow the user to choose to select an actual *release* rather than the
>   bleeding edge.
>
> The above listed features are those that `elpa-admin.el` currently
> supports (to some extent, in one form or another), but of course, there
> could be more.
>
> Currently, for many packages all you need is the URL of the upstream
> repository, but for others we need extra information in the "package
> spec", such as where to find the Texinfo source.  In the context of
> `elpa-admin.el` the extra info for this "package spec" are provided in
> the `elpa-packages` file but I think it would make sense to make it
> possible for the package to provide this info directly (e.g. via
> additional pseudo-headers in the <foo>.el file).

But you only do this for packages in elpa/nelpa? That does not handle random git
repos from www? This does not manage dependencies for gir repos whithout spec.

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

> But you only do this for packages in elpa/nelpa?

Yes, I do use `elpa-admin.el` for other packages.
It requires a fair bit manual fiddling currently, because I haven't
tried to provide a clean UI, but that can be done.

> That does not handle random git repos from www?

It will handle some random git packages, but not all, no.
If the tool becomes popular enough, the pressure for packages to follow
the required convention should be enough to make sure most packages can
be handled (assuming that convention is sufficiently flexible).

> This does not manage dependencies for git repos whithout spec.

It partly does since the dependencies are (or can be) listed inside the
<pkg>.el file.

And it partly doesn't because those dependencies are specified as
package names rather than URLs, so it lacks a way to find the URL
corresponding to a given package name.  But those dependencies can be
fetched from ELPA archives as well (you can mix and match, some packages
installed from ELPA and some installed from Git).


        Stefan

Re: Easy configuration of a site-lisp directory

[Philip Kaludercic]

Arthur Miller <arthur.miller@live.com> writes:

> I think that something like what you propose is OK for you who are developer and
> know what you do. But if you put something like this on auto in Emacs, I think
> that lots of people with get troubles which can lead to even more frequent mailing
> list :).

I guess this depends on whether or not this would be enabled by default
or not. My suggestion uses ~/.emacs.d/site-lisp by default if it
exists. I get what you mean that this might be an issue, so it something
like this could (and probably should) be disabled by default, but easy
to activate.

>> If there is some critical change or something that isn't ready yet, I'd
>> just use "git stash".
>>
>>> What you are suggesting is to effectively use "site-lisp" as another
>>> package-user-dir (~/.emacs.d/elpa on my machine). You are also auto
>>> recursing in all dirs, so if user wish to remove something they have to
>>> remove that directory from the path?
>>
>> Yes, but I hesitate to compare it to package-user-dir, as to me packages
>> stand in relation to some package manager, while site-lisp.el only
>> implements the bare minimum.
>
> Exactly. I am not sure if it is even the bare miniumum. 
>
> Bringing in paths and code in Emacs, is just but one part of package
> management. Installling dependencies and also uninstalling everything correctly,
> not leaving orphaned pacakges behind or removing something still needed is as
> important as well. For that reason I think that going through package.el would
> be a better idea.

I think I agree. package-list-packages already lists different
package states (available, installed, built-in, ...) so it might also
make sense to have a "local" package as well.

> Everyone's setup is of course private, but I don't think that is a 
> good idea and good alternative to proper package management. For the same reason
> why we don't install packages manually in our gnu/linux distributions but use
> some sort of package management system. Doing manually ./configure - make dance
> is nowdays considered a bad practice.

I'm not sure, it depends on what you are doing. package managers usually
don't expect the user to change the software that has been
installed. You usually only get a binary version and any modification
will be overridden. If you want to work on some software, and actually
use your software freedom, you have to do the ./configure-make-dance.

> Anyway, I understand your attempt, and I responded, because I was lately
> looking for myself what to do, becuase I also would prefer to have easy hackable
> packages, with same consideration as you said, to have emacs help system and
> xref bring me to correct spot. I am not sure myself what I am gonna use.

-- 
	Philip Kaludercic

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> But you only do this for packages in elpa/nelpa?
>
> Yes, I do use `elpa-admin.el` for other packages.
> It requires a fair bit manual fiddling currently, because I haven't
> tried to provide a clean UI, but that can be done.
>
>> That does not handle random git repos from www?
>
> It will handle some random git packages, but not all, no.
> If the tool becomes popular enough, the pressure for packages to follow
> the required convention should be enough to make sure most packages can
> be handled (assuming that convention is sufficiently flexible).
>
>> This does not manage dependencies for git repos whithout spec.
>
> It partly does since the dependencies are (or can be) listed inside the
> <pkg>.el file.
>
> And it partly doesn't because those dependencies are specified as
> package names rather than URLs, so it lacks a way to find the URL
> corresponding to a given package name.  But those dependencies can be
> fetched from ELPA archives as well (you can mix and match, some packages
> installed from ELPA and some installed from Git).
>
>
>         Stefan

Yes, sounds as predicted.  Thanks for the anser.

Any thoughts of enabling non gnu elpa, and package.el to deal with packages in a
similar fashon as AUR and I guess similar solutions from other distros. What I
think of is that people could submit just build recipes into gnu elpa, without
tar-ed sources. Just the URLs or sources and the way to fetch/build and install
a package. Isn't it what el-get already does?

That could open for 3rd party "maintainers" to contribute a script to install a
package without the burden on package authors.

I guess anyone can clone "nelpa" and add someone elses package, but I am not sure
how polite that would be considered. Maybe I am wrong, maybe it is just me, but
I have a feeling that it is a custom practice for elpa/nelpa/melpa that authors
themselves sumbit packages.

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Philip Kaludercic <philipk@posteo.net> writes:

> Arthur Miller <arthur.miller@live.com> writes:
>
>> I think that something like what you propose is OK for you who are developer and
>> know what you do. But if you put something like this on auto in Emacs, I think
>> that lots of people with get troubles which can lead to even more frequent mailing
>> list :).
>
> I guess this depends on whether or not this would be enabled by default
> or not. My suggestion uses ~/.emacs.d/site-lisp by default if it
> exists. I get what you mean that this might be an issue, so it something
> like this could (and probably should) be disabled by default, but easy
> to activate.
>
>>> If there is some critical change or something that isn't ready yet, I'd
>>> just use "git stash".
>>>
>>>> What you are suggesting is to effectively use "site-lisp" as another
>>>> package-user-dir (~/.emacs.d/elpa on my machine). You are also auto
>>>> recursing in all dirs, so if user wish to remove something they have to
>>>> remove that directory from the path?
>>>
>>> Yes, but I hesitate to compare it to package-user-dir, as to me packages
>>> stand in relation to some package manager, while site-lisp.el only
>>> implements the bare minimum.
>>
>> Exactly. I am not sure if it is even the bare miniumum. 
>>
>> Bringing in paths and code in Emacs, is just but one part of package
>> management. Installling dependencies and also uninstalling everything correctly,
>> not leaving orphaned pacakges behind or removing something still needed is as
>> important as well. For that reason I think that going through package.el would
>> be a better idea.
>
> I think I agree. package-list-packages already lists different
> package states (available, installed, built-in, ...) so it might also
> make sense to have a "local" package as well.
>
>> Everyone's setup is of course private, but I don't think that is a 
>> good idea and good alternative to proper package management. For the same reason
>> why we don't install packages manually in our gnu/linux distributions but use
>> some sort of package management system. Doing manually ./configure - make dance
>> is nowdays considered a bad practice.
>
> I'm not sure, it depends on what you are doing. package managers usually
> don't expect the user to change the software that has been
> installed. You usually only get a binary version and any modification
> will be overridden. If you want to work on some software, and actually
> use your software freedom, you have to do the ./configure-make-dance.

Of course, but usually number of packages one works on and number of installed
packages is not as nearly as same. I do run Emacs form the source dir. But Emacs
and few others are excpetion.

> I'm not sure, it depends on what you are doing. package managers usually
> don't expect the user to change the software that has been
> installed. You usually only get a binary version and any modification
> will be overridden. 

Yes, so it is, and that does not really suit package development in Emacs.
So we would probably need something that goes well with development. 

I think that times have have changed, git and web service indeed has
revolutinionized the way people, share and contrubute with each other. Also
hackability of Emacs and lisp are a bit unique. So we probably need something
that works well with git, at least for now (nothign says git is given for all
times).

What about having something like 'package-install-dev' which will install dev
sources, git repo and do what Stefan suggested he does in elpa-adming.el?

Of course could be options to install all packages as 'dev', or have a list of
'dev' or some other way to controll this automatically.

Re: Easy configuration of a site-lisp directory

[Stefan Monnier]

> Any thoughts of enabling non gnu elpa, and package.el to deal with packages in a
> similar fashon as AUR and I guess similar solutions from other distros. What I
> think of is that people could submit just build recipes into gnu elpa, without
> tar-ed sources. Just the URLs or sources and the way to fetch/build and install
> a package. Isn't it what el-get already does?

I think you're describing what we're already doing with NonGNU ELPA.
But there are enough weird assumptions above that I'm not
completely sure.  E.g. you talk about "tar-ed sources", but none of GNU
ELPA nor NonGNU ELPA have worked from "tar-ed sources", except maybe for
the very first few months of GNU ELPA.

> I guess anyone can clone "nelpa" and add someone elses package, but I am not sure
> how polite that would be considered. Maybe I am wrong, maybe it is just me, but
> I have a feeling that it is a custom practice for elpa/nelpa/melpa that authors
> themselves sumbit packages.

Philip Kaludercic and I both added various packages for which we're not
the author/maintainer.  This is fine.  The maintainers need to be
involved, tho, for all kinds of reasons, including to avoid that they
break the package's spec.


        Stefan

Re: Easy configuration of a site-lisp directory

[Arthur Miller]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> Any thoughts of enabling non gnu elpa, and package.el to deal with packages in a
>> similar fashon as AUR and I guess similar solutions from other distros. What I
>> think of is that people could submit just build recipes into gnu elpa, without
>> tar-ed sources. Just the URLs or sources and the way to fetch/build and install
>> a package. Isn't it what el-get already does?
>
> I think you're describing what we're already doing with NonGNU ELPA.
> But there are enough weird assumptions above that I'm not
> completely sure.  E.g. you talk about "tar-ed sources", but none of GNU
> ELPA nor NonGNU ELPA have worked from "tar-ed sources", except maybe for
> the very first few months of GNU ELPA.

I was fast writing and not so clear. I ment something like this:

could I commit just a recipe where to download the sources, how to build the
package and how to install it. So when user actually installs the package,
sources are pulled from the original repository or a web page or whatever,
instead of elpa/nelpa server. Also without uploading sources themselves to the
gnu server. That would mean that packages are automatically up to date.

>> I guess anyone can clone "nelpa" and add someone elses package, but I am not sure
>> how polite that would be considered. Maybe I am wrong, maybe it is just me, but
>> I have a feeling that it is a custom practice for elpa/nelpa/melpa that authors
>> themselves sumbit packages.
>
> Philip Kaludercic and I both added various packages for which we're not
> the author/maintainer.  This is fine.  The maintainers need to be
> involved, tho, for all kinds of reasons, including to avoid that they
> break the package's spec.
>
Ok, I understand. It was just me then :-).