[elpa] main b23b06a27f 4/4: Resolve conflict, finish merge

[Stephen Leake]

branch: main
commit b23b06a27f4360938f2ae8c9b7a3970ad9fe6140
Merge: 23f072d431 84becd1e3d
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    Resolve conflict, finish merge
---
 README          | 34 +++++++++++++++++++---------------
 elpa-packages   | 36 ++++++++++++++++++++++++++++--------
 html/layout.css | 22 +++++++++++++++++++++-
 3 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/README b/README
index 0616a3a760..2ac0eedde8 100644
--- a/README
+++ b/README
@@ -39,28 +39,26 @@ The layout of the =elpa.git= repository is as follows:
 
 * Getting the source
 
-Start with source that is cloned directly from Savannah.  See 
[[https://savannah.gnu.org/git/?group=emacs][the
-Savannah page]] and look for "GNU ELPA".  Using a clone of a clone does
-not work.
+Start with source that is cloned directly from Savannah
+(See [[https://savannah.gnu.org/git/?group=emacs][the Savannah page]] and look 
for "ELPA").
+Using a clone of a clone might not work.
 
-The =Makefile= in =main= will automatically pull the =elpa-admin=
-branch to populate the =admin= subdirectory.  This is done by:
+The repository is large because it contains all the packages, so you
+will usually want to clone with =--single-branch= to avoid downloading
+a large amount of irrelevant data.  More specifically, here is how you
+can get the source and setup the general infrastructure:
 
 #+begin_src shell
-   make setup
+  git clone --single-branch git://git.savannah.gnu.org/emacs/elpa.git
+  cd elpa
+  make
 #+end_src
 
-This will checkout the =elpa-admin= branch to the subdirectory
-=admin=.
+Where the =Makefile= in the =main= branch is used to automatically
+pull the =elpa-admin= branch to populate the =admin= subdirectory.
 
 However, it leaves the =packages= directory empty; you must check out
-the ones you want.  The =Makefile= in the =admin= subdirectory is
-responsible for populating the =packages= subdirectories from the
-relevant sources.
-
-Note that this =Makefile= is symlinked to the root of the repository
-by the above =make setup= command.  This means that you can run
-targets directly from
+the ones you want.
 
 ** Check out all packages
 
@@ -80,6 +78,12 @@ directory with this command:
    make packages/<pkgname>
 #+end_src
 
+The first time you run this command, it just populates that directory.
+After that, it will (re)"build" the package for use in-place, i.e. it will
+create (or refresh) the =<pkgname>-pkg.el= and  =<pkgname>-autoloads.el= files
+and (re)compile the ELisp files under the assumption that you have put
+=.../elpa/packages/= into your =package-directory-list=.
+
 ** Updating a package directory
 
 If you already have a =packages/<pkgname>= directory with a previous
diff --git a/elpa-packages b/elpa-packages
index cdce87a142..13d0facb99 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -87,7 +87,9 @@
  ("beacon"             :url "https://github.com/Malabarba/beacon";
   :auto-sync t)
  ("bind-key"         :url "https://github.com/jwiegley/use-package";
-  :ignored-files ("LICENSE" "doc" "Makefile*" "bind-chords.el" "use-package*")
+  :ignored-files ("LICENSE" "doc" "Makefile*" "bind-chords.el" "use-package*"
+                  "README.md" "NEWS.md") ;; These two are for use-package.
+  :news "/dev/null"           ;l Don't use use-package' s `NEWS.md`.
   :auto-sync t)
  ("blist"              :url "https://gitlab.com/mmemmew/blist";
   :doc "blist.texinfo"
@@ -235,7 +237,7 @@
  ("dismal"             :url nil)
  ("djvu"               :url nil)
  ("doc-toc"            :url "https://github.com/dalanicolai/doc-tools-toc";
-  :ignore-files ("LICENSE")
+  :ignored-files ("LICENSE")
   :auto-sync t)
  ("docbook"            :url nil)
  ;; `dtache' was renamed to `detached' in May 2022.
@@ -269,7 +271,7 @@
  ("eldoc-eval"         :url 
"https://github.com/thierryvolpiatto/eldoc-eval.git";)
  ("electric-spacing"   :url nil)
  ("elisp-benchmarks"   :url nil)
- ;; FIXME: Waiting for Sean Allred's copyright paperwork.
+ ;; FIXME: Work in progress.  The copyright paperwork is ready.
  ;;("elsa"             :url "https://github.com/emacs-elsa/Elsa";
  ;; :auto-sync t)
  ;;("emacspeak"                :url "https://github.com/tvraman/emacspeak";
@@ -284,6 +286,7 @@
   :ignored-files ("embark.el" "embark.texi" "avy-embark-collect.el")
   :auto-sync t)
  ("ement"              :url "https://github.com/alphapapa/ement.el.git";
+  :release-branch "stable"
   :doc "README.org"
   :auto-sync t)
  ("emms"               :url "https://git.savannah.gnu.org/git/emms.git";
@@ -345,9 +348,9 @@
  ("gnugo"              :url nil)
  ("gnus-mock"          :url nil)
  ("gpastel"            :url "https://gitlab.petton.fr/DamienCassou/gpastel";)
- ;; FIXME: Waiting for copyright assignment.
- ;;("graphql"          :url "https://github.com/vermiculus/graphql.el";
- ;; :auto-sync t)
+ ("graphql"            :url "https://github.com/vermiculus/graphql.el";
+  :readme "README.md"
+  :auto-sync t)
  ("gpr-query"  :url nil
   :branch "gpr-query"
   :release-branch "gpr-query.release"
@@ -373,6 +376,8 @@
   ;; problem on their end, see bug#52902 as well as
   ;; https://github.com/abo-abo/hydra/pull/408.
   :merge t
+  :ignored-files ("lv.el")
+  :news "doc/Changelog.org"
   :auto-sync t)
  ("hyperbole"           :url "https://git.savannah.gnu.org/r/hyperbole.git";
   :make ("kotl/kotl-autoloads.el")
@@ -388,7 +393,7 @@
  ;; ("inspector"               :url 
"https://github.com/mmontone/emacs-inspector";
  ;;  :auto-sync t)
  ("inspector"          :url "https://github.com/mmontone/emacs-inspector";
-  :ignore-files ("LICENSE")
+  :ignored-files ("LICENSE")
   :auto-sync t)
  ("ioccur"             :url "https://github.com/thierryvolpiatto/ioccur.git";
   :auto-sync t)
@@ -445,6 +450,9 @@
  ("luwak"              :url "https://g.ypei.me/luwak.git";
   :auto-sync t
   :readme "README.org")
+ ("lv"                 :url "https://github.com/abo-abo/hydra";
+  :ignored-files ("hydra*" "README.md" "doc" "targets")
+  :auto-sync t)
  ("m-buffer"           :url "https://github.com/phillord/m-buffer-el";
   :doc "m-buffer-doc.org"
   :auto-sync t)
@@ -468,6 +476,7 @@
  ("minibuffer-line"    :url nil)
  ("minimap"            :url nil)
  ("mmm-mode"           :url "https://github.com/purcell/mmm-mode.git";
+  :doc "mmm.texi"
   :auto-sync t)
  ("modus-themes"       :core ("etc/themes/modus-themes.el"
                                "etc/themes/modus-operandi-theme.el"
@@ -583,7 +592,7 @@
   :auto-sync t)
  ("poker"              :url nil)
  ("polymode"           :url "https://github.com/polymode/polymode";
-  :ignore-files ("targets" "template" "tests")
+  :ignored-files ("targets" "template" "tests")
   :readme "readme.md"
   :auto-sync t)
  ("posframe"           :url "https://github.com/tumashu/posframe";
@@ -743,6 +752,9 @@
   :doc "docs/transient.texi")
  ("transient-cycles"    :url nil)
  ("trie"               :url "http://www.dr-qubit.org/git/predictive.git";)
+ ;; FIXME: Depends on `emacsql` which is on its way to NonGNU ELPA.
+ ;;("triples"          :url "https://github.com/ahyatt/triples";
+ ;; :auto-sync t)
  ;; FIXME: Waiting for copyright cleanups.
  ;;("trinary"          :url "https://github.com/emacs-elsa/trinary-logic";
  ;; :auto-sync t)
@@ -755,8 +767,12 @@
   :readme "README.md")
  ("uniquify-files"     :url nil)
  ("url-http-ntlm"      :url nil)
+ ("url-scgi"           :url "https://github.com/skangas/url-scgi";
+  :readme "README.org"
+  :auto-sync t)
  ("use-package"                :url "https://github.com/jwiegley/use-package";
   :ignored-files ("LICENSE" "bind-*" "use-package-chords.el")
+  :readme "README.md"
   :doc "use-package.texi"
   :news "NEWS.md"
   :auto-sync t)
@@ -824,3 +840,7 @@
   :readme "README.md"
   :auto-sync t)
  )
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
diff --git a/html/layout.css b/html/layout.css
index 807cf1b4e6..ba046883fb 100644
--- a/html/layout.css
+++ b/html/layout.css
@@ -112,6 +112,11 @@ a:hover {
   text-decoration: underline;
 }
 
+/* FIXME: This is meant for inline `code` but also matches block `code` :-(
+   I tried to use `:not(pre) code` so that it applies to all `code`
+   except those immediately within a `pre` but AFAICT it then did not match
+   anything at all.  So instead I use a separate rule for `pre code` which
+   overrides some of these settings.  */
 tt, code {
   font-family: "Fira Mono", monospace;
   background-color: rgb(238, 238, 238);
@@ -121,13 +126,24 @@ tt, code {
   white-space: nowrap;
 }
 
+/* FIXME: This overrides the above settings for the non-inline multiline
+   code blocks.  Important for Markdown rendered files which use
+   <pre><code>...</code></pre> for multiline code blocks.  */
+pre code {
+  background: #fafafa;
+  border: 0px solid;
+  white-space: pre;
+  padding: 0px;
+}
+
 pre {
   font-family: "Fira Mono", monospace;
   font-size: 14px;
   background: #fafafa;
   padding: 1em;
-  border: 1px solid #dadada;
+  border: 0px solid;
   overflow-y: auto;
+  white-space: pre;
 }
 
 pre .kw {
@@ -135,6 +151,10 @@ pre .kw {
   color: #4f0f71;
 }
 
+/* Apparently the big "reset" at the beginning makes this necessary.  */
+strong { font-weight: bold; }
+em { font-style: oblique; }
+
 p {
   margin: 1em 0 1em 0;
 }