[elpa] main 58907c4: * elpa-packages (org): Revert spurious last change (there are no .elc)

[Stefan Monnier]

branch: main
commit 58907c4bc0b16a044f57d7dfa9764c3fa22a12e1
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (org): Revert spurious last change (there are no .elc)
---
 elpa-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index 353c031..c23b74a 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -212,7 +212,7 @@
   :ignored-files ("etc/schema" "contrib" "mk" "testing" "lisp/org-install.el")
   :renames (("lisp/" ""))
   :news "etc/ORG-NEWS"
-  :shell-command "make autoloads info; rm -f lisp/*.elc; mv doc/org org.info; 
mv doc/orgguide orgguide.info"
+  :shell-command "make autoloads info; mv doc/org org.info; mv doc/orgguide 
orgguide.info"
   :doc ("org.info" "orgguide.info")
   :auto-sync t)
  ("org-translate"  :url nil)

[elpa] main 0531659: * elpa-packages (org): Exclude generated .elc files

[Stefan Monnier]

branch: main
commit 05316595ed81712e7e951278fdae21733bf95252
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (org): Exclude generated .elc files
---
 elpa-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index c23b74a..353c031 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -212,7 +212,7 @@
   :ignored-files ("etc/schema" "contrib" "mk" "testing" "lisp/org-install.el")
   :renames (("lisp/" ""))
   :news "etc/ORG-NEWS"
-  :shell-command "make autoloads info; mv doc/org org.info; mv doc/orgguide 
orgguide.info"
+  :shell-command "make autoloads info; rm -f lisp/*.elc; mv doc/org org.info; 
mv doc/orgguide orgguide.info"
   :doc ("org.info" "orgguide.info")
   :auto-sync t)
  ("org-translate"  :url nil)

[elpa] elpa-admin 802b866: * GNUmakefile (sync-some): New target

[Stefan Monnier]

branch: elpa-admin
commit 802b866b7cddebe0a11ad9b565d77421ff210d92
Author: Stefan Monnier 
Commit: Stefan Monnier 

* GNUmakefile (sync-some): New target

* elpa-admin.el (elpaa--batch-fetch-and): Allow iterating over subset
---
 GNUmakefile   |  9 +++--
 elpa-admin.el | 11 ++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 9dda824..291b0ec 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -269,7 +269,7 @@ fetch/%:
 
 .PHONY: fetch-all
 fetch-all:
-   $(EMACS) -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "-"
+   $(EMACS) -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show :
 
 .PHONY: sync/%
 sync/%:
@@ -277,7 +277,12 @@ sync/%:
 
 .PHONY: sync-all
 sync-all:
-   $(EMACS) -l admin/elpa-admin.el -f elpaa-batch-fetch-and-push "-"
+   $(EMACS) -l admin/elpa-admin.el -f elpaa-batch-fetch-and-push :
+
+# Only sync those packages which enable the `:auto-sync` property.
+.PHONY: sync-some
+sync-some:
+   $(EMACS) -l admin/elpa-admin.el -f elpaa-batch-fetch-and-push :auto-sync
 
 
 
diff --git a/elpa-admin.el b/elpa-admin.el
index 53ecc99..551134b 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1584,16 +1584,17 @@ More at " (elpaa--default-url pkgname))
 (defun elpaa--batch-fetch-and (k)
   (let ((specs (elpaa--get-specs))
 (pkgs command-line-args-left)
-(clal command-line-args-left))
+(condition ':))
 (setq command-line-args-left nil)
-(if (member pkgs '(("-") ("?"))) (setq pkgs (mapcar #'car specs)))
+(when (and (null (cdr pkgs)) (string-match "\\`:" (car pkgs)))
+  (setq condition (intern (car pkgs)))
+  (setq pkgs (mapcar #'car specs)))
 (dolist (pkg pkgs)
   (let* ((pkg-spec (assoc pkg specs)))
 (cond
  ((not pkg-spec) (message "Unknown package: %s" pkg))
- ((and (equal clal '("?")) (not (elpaa--spec-get pkg-spec :auto-sync)))
-  nil)
- (t
+ ((or (eq condition ':)
+  (elpaa--spec-get pkg-spec condition))
   ;; (unless (file-directory-p (expand-file-name pkg "packages"))
   ;;   (elpaa--worktree-sync pkg-spec))
   (elpaa--fetch pkg-spec k)))

[elpa] externals-release/org abedf38 2/4: lisp/org.el: Bump version to 9.4.4

[Stefan Monnier]

branch: externals-release/org
commit abedf386b3f13af2769728755d00c4698ac5d3b0
Author: Bastien 
Commit: Bastien 

lisp/org.el: Bump version to 9.4.4
---
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 1f7e434..06e5165 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8,7 +8,7 @@
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 
-;; Version: 9.4.3
+;; Version: 9.4.4
 
 ;; This file is part of GNU Emacs.
 ;;

[elpa] externals/org d7270a2 7/8: Merge branch 'maint'

[Stefan Monnier]

branch: externals/org
commit d7270a2bbb996eb328e6815cc5d26c5925b699a3
Merge: f58c800 97f1d8e
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

Merge branch 'maint'
---
 lisp/org-element.el | 33 ++---
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index 49a5952..de29c3e 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3950,26 +3950,37 @@ element it has to parse."
 ((or (looking-at "[ \t]*|")
  ;; There is no strict definition of a table.el
  ;; table.  Try to prevent false positive while being
- ;; quick.  Hence, we consider a table.el table is at
- ;; least one rule, any number of data lines
- ;; (starting with a vertical bar), and another rule.
+ ;; quick.
  (let ((rule-regexp
 (rx (zero-or-more (any " \t"))
 "+"
 (one-or-more (one-or-more "-") "+")
 (zero-or-more (any " \t"))
 eol))
-   (non-table.el-data-line
+   (non-table.el-line
 (rx bol
 (zero-or-more (any " \t"))
-(or eol (not (any "| \t")
+(or eol (not (any "+| \t")
(next (line-beginning-position 2)))
-   (and (looking-at rule-regexp)
-(save-excursion
-  (end-of-line)
-  (re-search-forward non-table.el-data-line limit t)
-  (and (> (line-beginning-position) next)
-   (org-match-line rule-regexp))
+   ;; Start with a full rule.
+   (and
+(looking-at rule-regexp)
+(< next limit) ;no room for a table.el table
+(save-excursion
+  (end-of-line)
+  (cond
+   ;; Must end with a full rule.
+   ((not (re-search-forward non-table.el-line limit 'move))
+(beginning-of-line)
+(looking-at rule-regexp))
+   ;; Ignore pseudo-tables with a single
+   ;; rule.
+   ((= next (line-beginning-position))
+nil)
+   ;; Must end with a full rule.
+   (t
+(forward-line -1)
+(looking-at rule-regexp)))
  (org-element-table-parser limit affiliated))
 ;; List.
 ((looking-at (org-item-re))

[elpa] externals/org b6e5ca2 1/8: lint: Remove unnecessary call to `tabulated-list-print'

[Stefan Monnier]

branch: externals/org
commit b6e5ca28ef30c1a9c49937e5af49da75bbf68bb8
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

lint: Remove unnecessary call to `tabulated-list-print'

* lisp/org-lint.el (org-lint--display-reports): Remove
`tabulated-list-print' call.  This is already taken care of by
`org-lint--refresh-reports' above.
---
 lisp/org-lint.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index e4e0ef7..06c6791 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -1191,7 +1191,6 @@ CHECKERS is the list of checkers used."
   (setf org-lint--source-buffer source)
   (setf org-lint--local-checkers checkers)
   (org-lint--refresh-reports)
-  (tabulated-list-print)
   (add-hook 'tabulated-list-revert-hook #'org-lint--refresh-reports nil t))
 (pop-to-buffer buffer)))
 

[elpa] externals/org updated (6b83c6e -> 9140a71)

[Stefan Monnier]

monnier pushed a change to branch externals/org.

  from  6b83c6e   org-contacts.el: Add support for org-id generated link.
   new  b6e5ca2   lint: Remove unnecessary call to `tabulated-list-print'
   new  713b3bf   org-contacts.el: Inherit face from org-link
   new  1f4ea53   Document changes of headline fontification introduced in 
979e82fc3
   new  5e7c09e   org-agenda.el and org-capture.el: Remove 
`generated-autoload-file'
   new  bb54a95   Merge branch 'maint'
   new  abedf38   lisp/org.el: Bump version to 9.4.4
   new  0517b73   Merge branch 'maint'
   new  118da7d   element: Fix table.el tables parsing
   new  f58c800   Merge branch 'maint'
   new  97f1d8e   element: Improve table.el tables dectection
   new  d7270a2   Merge branch 'maint'
   new  9140a71   etc/ORG-NEWS: Add example for new startup option


Summary of changes:
 contrib/lisp/org-contacts.el |  2 +-
 etc/ORG-NEWS | 33 +
 lisp/org-agenda.el   |  4 
 lisp/org-capture.el  |  4 
 lisp/org-element.el  | 36 +---
 lisp/org-lint.el |  1 -
 6 files changed, 63 insertions(+), 17 deletions(-)

[elpa] externals-release/org updated (6ec2bb0 -> 97f1d8e)

[Stefan Monnier]

monnier pushed a change to branch externals-release/org.

  from  6ec2bb0   org-macs: Improve navigation in org-mks window
   new  5e7c09e   org-agenda.el and org-capture.el: Remove 
`generated-autoload-file'
   new  abedf38   lisp/org.el: Bump version to 9.4.4
   new  118da7d   element: Fix table.el tables parsing
   new  97f1d8e   element: Improve table.el tables dectection


Summary of changes:
 lisp/org-agenda.el  |  4 
 lisp/org-capture.el |  4 
 lisp/org-element.el | 36 +---
 lisp/org.el |  2 +-
 4 files changed, 30 insertions(+), 16 deletions(-)

[elpa] externals-release/org 97f1d8e 4/4: element: Improve table.el tables dectection

[Stefan Monnier]

branch: externals-release/org
commit 97f1d8e34012c4181f587657a0c9cb39477ad997
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

element: Improve table.el tables dectection

* lisp/org-element.el (org-element--current-element): Limit possible
false positives.
---
 lisp/org-element.el | 33 ++---
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index 8e09e32..0830423 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3950,26 +3950,37 @@ element it has to parse."
 ((or (looking-at "[ \t]*|")
  ;; There is no strict definition of a table.el
  ;; table.  Try to prevent false positive while being
- ;; quick.  Hence, we consider a table.el table is at
- ;; least one rule, any number of data lines
- ;; (starting with a vertical bar), and another rule.
+ ;; quick.
  (let ((rule-regexp
 (rx (zero-or-more (any " \t"))
 "+"
 (one-or-more (one-or-more "-") "+")
 (zero-or-more (any " \t"))
 eol))
-   (non-table.el-data-line
+   (non-table.el-line
 (rx bol
 (zero-or-more (any " \t"))
-(or eol (not (any "| \t")
+(or eol (not (any "+| \t")
(next (line-beginning-position 2)))
-   (and (looking-at rule-regexp)
-(save-excursion
-  (end-of-line)
-  (re-search-forward non-table.el-data-line limit t)
-  (and (> (line-beginning-position) next)
-   (org-match-line rule-regexp))
+   ;; Start with a full rule.
+   (and
+(looking-at rule-regexp)
+(< next limit) ;no room for a table.el table
+(save-excursion
+  (end-of-line)
+  (cond
+   ;; Must end with a full rule.
+   ((not (re-search-forward non-table.el-line limit 'move))
+(beginning-of-line)
+(looking-at rule-regexp))
+   ;; Ignore pseudo-tables with a single
+   ;; rule.
+   ((= next (line-beginning-position))
+nil)
+   ;; Must end with a full rule.
+   (t
+(forward-line -1)
+(looking-at rule-regexp)))
  (org-element-table-parser limit affiliated))
 ;; List.
 ((looking-at (org-item-re))

[elpa] externals/org f58c800 6/8: Merge branch 'maint'

[Stefan Monnier]

branch: externals/org
commit f58c8003c3c2d432f5619ea94bb50e5b91b72e3a
Merge: 0517b73 118da7d
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

Merge branch 'maint'
---
 lisp/org-element.el | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index a2582b8..49a5952 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3950,13 +3950,24 @@ element it has to parse."
 ((or (looking-at "[ \t]*|")
  ;; There is no strict definition of a table.el
  ;; table.  Try to prevent false positive while being
- ;; quick.
- (let ((rule-regexp "[ \t]*\\+\\(-+\\+\\)+[ \t]*$")
+ ;; quick.  Hence, we consider a table.el table is at
+ ;; least one rule, any number of data lines
+ ;; (starting with a vertical bar), and another rule.
+ (let ((rule-regexp
+(rx (zero-or-more (any " \t"))
+"+"
+(one-or-more (one-or-more "-") "+")
+(zero-or-more (any " \t"))
+eol))
+   (non-table.el-data-line
+(rx bol
+(zero-or-more (any " \t"))
+(or eol (not (any "| \t")
(next (line-beginning-position 2)))
(and (looking-at rule-regexp)
 (save-excursion
-  (forward-line)
-  (re-search-forward "^[ \t]*\\($\\|[^|]\\)" limit t)
+  (end-of-line)
+  (re-search-forward non-table.el-data-line limit t)
   (and (> (line-beginning-position) next)
(org-match-line rule-regexp))
  (org-element-table-parser limit affiliated))

[elpa] externals/org 9140a71 8/8: etc/ORG-NEWS: Add example for new startup option

[Stefan Monnier]

branch: externals/org
commit 9140a712fb1546ecb52ddda6e607f0bcecd436d8
Author: Gustav Wikström 
Commit: Gustav Wikström 

etc/ORG-NEWS: Add example for new startup option

* etc/ORG-NEWS (New startup options =#+startup: showlevels=): Add
example, per request in mailing list.
---
 etc/ORG-NEWS | 4 
 1 file changed, 4 insertions(+)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index fd19b2f..65098d8 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -140,6 +140,10 @@ These startup options complement the existing =overview=, 
=content=,
 =showall=, =showeverything= with a way to start the document with n
 levels shown, where n goes from 2 to 5.
 
+Example:
+
+: #+startup: show3levels
+
 *** New =u= table formula flag to enable Calc units simplification mode
 
 A new =u= mode flag for Calc formulas in Org tables has been added to

[elpa] externals/org bb54a95 4/8: Merge branch 'maint'

[Stefan Monnier]

branch: externals/org
commit bb54a9583c4c76518f53c1868ee67760a40c1812
Merge: 1f4ea53 5e7c09e
Author: Bastien 
Commit: Bastien 

Merge branch 'maint'
---
 lisp/org-agenda.el  | 4 
 lisp/org-capture.el | 4 
 2 files changed, 8 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 83f30bf..2da6451 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -10751,8 +10751,4 @@ when defining today."
 
 (provide 'org-agenda)
 
-;; Local variables:
-;; generated-autoload-file: "org-loaddefs.el"
-;; End:
-
 ;;; org-agenda.el ends here
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 8bd233d..e6f95b4 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1955,8 +1955,4 @@ Assume sexps have been marked with
 
 (provide 'org-capture)
 
-;; Local variables:
-;; generated-autoload-file: "org-loaddefs.el"
-;; End:
-
 ;;; org-capture.el ends here

[elpa] externals/org 713b3bf 2/8: org-contacts.el: Inherit face from org-link

[Stefan Monnier]

branch: externals/org
commit 713b3bf7a091b262fdfd77e35fdc290173e2dfdc
Author: stardiviner 
Commit: stardiviner 

org-contacts.el: Inherit face from org-link

* contrib/lisp/org-contacts.el (org-contacts-link-face): Don't use a
color for org-contacts line, inherit from face org-link directly.
---
 contrib/lisp/org-contacts.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el
index fa62cd8..0b7a7f8 100644
--- a/contrib/lisp/org-contacts.el
+++ b/contrib/lisp/org-contacts.el
@@ -1222,7 +1222,7 @@ are effectively trimmed).  If nil, all zero-length 
substrings are retained."
   (cond
((string-match "/.*/" path)
 '(:background "sky blue" :overline t :slant 'italic))
-   (t '(:background "green yellow" :underline t
+   (t '(:inherit 'org-link
 
 (provide 'org-contacts)
 

[elpa] externals/org 1f4ea53 3/8: Document changes of headline fontification introduced in 979e82fc3

[Stefan Monnier]

branch: externals/org
commit 1f4ea532a4ad67e25389b79b87cd12026375934a
Author: Ihor Radchenko 
Commit: Bastien 

Document changes of headline fontification introduced in 979e82fc3

* etc/ORG-NEWS (=org-goto-first-child= now works before first
heading): Document that all the headline components inherit the
headline face instead of default face.  Provide example how to restore
the old behaviour.
---
 etc/ORG-NEWS | 29 +
 1 file changed, 29 insertions(+)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index d685f30..fd19b2f 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -157,6 +157,35 @@ headings in the buffer.
 Previously =org-goto-first-child= would do nothing before first
 heading, except return nil.
 
+*** Faces of all the heading text elements now conform to the headline face
+
+In the past, faces of todo keywords, emphasised text, tags, and
+priority cookies inherited =default= face.  The resulting headline
+fontification was not always consistent, as discussed in 
[[https://lists.gnu.org/archive/html/emacs-orgmode/2020-09/msg00331.html][this 
bug
+report]].  Now, the relevant faces adapt to face used to fontify the
+current headline level.
+
+Users who prefer to keep the old behaviour should change their face
+customisation explicitly stating that =default= face is inherited.
+
+Example of old face customisation:
+
+#+begin_src emacs-lisp
+(setq org-todo-keyword-faces '(("TODO"
+:background "chocolate"
+:height 0.75)))
+#+end_src
+
+To preserve the old behaviour the above customisation should be
+changed to
+
+#+begin_src emacs-lisp
+(setq org-todo-keyword-faces '(("TODO"
+:inherit default
+:background "chocolate"
+:height 0.75)))
+#+end_src
+
 * Version 9.4
 ** Incompatible changes
 *** Possibly broken internal file links: please check and fix

[elpa] externals-release/org 118da7d 3/4: element: Fix table.el tables parsing

[Stefan Monnier]

branch: externals-release/org
commit 118da7d280a5fe474fc2b5a4e2d48ce5f910a29b
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

element: Fix table.el tables parsing

* lisp/org-element.el (org-element--current-element): Fix regexp
matching a non-data-line.  Use rx.

Reported-by: Nick Dokos 

---
 lisp/org-element.el | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index 2ad557d..8e09e32 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3950,13 +3950,24 @@ element it has to parse."
 ((or (looking-at "[ \t]*|")
  ;; There is no strict definition of a table.el
  ;; table.  Try to prevent false positive while being
- ;; quick.
- (let ((rule-regexp "[ \t]*\\+\\(-+\\+\\)+[ \t]*$")
+ ;; quick.  Hence, we consider a table.el table is at
+ ;; least one rule, any number of data lines
+ ;; (starting with a vertical bar), and another rule.
+ (let ((rule-regexp
+(rx (zero-or-more (any " \t"))
+"+"
+(one-or-more (one-or-more "-") "+")
+(zero-or-more (any " \t"))
+eol))
+   (non-table.el-data-line
+(rx bol
+(zero-or-more (any " \t"))
+(or eol (not (any "| \t")
(next (line-beginning-position 2)))
(and (looking-at rule-regexp)
 (save-excursion
-  (forward-line)
-  (re-search-forward "^[ \t]*\\($\\|[^|]\\)" limit t)
+  (end-of-line)
+  (re-search-forward non-table.el-data-line limit t)
   (and (> (line-beginning-position) next)
(org-match-line rule-regexp))
  (org-element-table-parser limit affiliated))

[elpa] externals/org 0517b73 5/8: Merge branch 'maint'

[Stefan Monnier]

branch: externals/org
commit 0517b73b91497c105d4ae572e28d79158e94239a
Merge: bb54a95 abedf38
Author: Bastien 
Commit: Bastien 

Merge branch 'maint'

[elpa] externals-release/org 5e7c09e 1/4: org-agenda.el and org-capture.el: Remove `generated-autoload-file'

[Stefan Monnier]

branch: externals-release/org
commit 5e7c09e2775d04322b22e635222b464386dcf41b
Author: Bastien 
Commit: Bastien 

org-agenda.el and org-capture.el: Remove `generated-autoload-file'

* lisp/org-agenda.el: Remove `generated-autoload-file' local
variable.

* lisp/org-capture.el: Ditto.

This is a continuation of a4e6a6fa7 which fixes fae16ed8f.
Reported-by: Andrii Kolomoiets 
---
 lisp/org-agenda.el  | 4 
 lisp/org-capture.el | 4 
 2 files changed, 8 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 83f30bf..2da6451 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -10751,8 +10751,4 @@ when defining today."
 
 (provide 'org-agenda)
 
-;; Local variables:
-;; generated-autoload-file: "org-loaddefs.el"
-;; End:
-
 ;;; org-agenda.el ends here
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index a9a1181..d3dc0ab 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1947,8 +1947,4 @@ Assume sexps have been marked with
 
 (provide 'org-capture)
 
-;; Local variables:
-;; generated-autoload-file: "org-loaddefs.el"
-;; End:
-
 ;;; org-capture.el ends here

[elpa] main 195a4bc 2/2: Merge branch 'main' of git.sv.gnu.org:/srv/git/emacs/elpa into main

[Michael Albinus]

branch: main
commit 195a4bc516fc132e3397ff986f919d57ac1ddb5d
Merge: 67ab116 401b5df
Author: Michael Albinus 
Commit: Michael Albinus 

Merge branch 'main' of git.sv.gnu.org:/srv/git/emacs/elpa into main
---
 elpa-packages | 20 
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index a14ae2e..c23b74a 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -2,11 +2,12 @@
 
 ;; List of packages that are maintained externally.
 ;; The list is made of elements of the form (NAME KIND URL OPTS...).
+;; See `admin/README' for further documentation about the format.
 ;;
 ;; Where NAME is the name of the package;
 ;;
 ;; KIND can be one of:
-;;  :url = kept in a separate `externals/' branch.
+;;  :url  = kept in a separate `externals/' branch.
 ;;  :core = part of GNU Emacs repository.
 ;;
 
@@ -211,8 +212,9 @@
   :ignored-files ("etc/schema" "contrib" "mk" "testing" "lisp/org-install.el")
   :renames (("lisp/" ""))
   :news "etc/ORG-NEWS"
-  :make ("lisp/org-loaddefs.el" "doc/org.texi")
-  :doc "doc/org.texi")
+  :shell-command "make autoloads info; mv doc/org org.info; mv doc/orgguide 
orgguide.info"
+  :doc ("org.info" "orgguide.info")
+  :auto-sync t)
  ("org-translate"  :url nil)
  ("orgalist":url nil)
  ("org-edna"   :url 
"https://savannah.nongnu.org/projects/org-edna-el;) ;URL?
@@ -302,15 +304,9 @@
  ("transcribe" :url nil)
  ("transient"  :url "https://github.com/magit/transient;
   :main-file "lisp/transient.el"
-  :renames (("docs/CHANGELOG" "CHANGELOG")
-   ("docs/transient.org" "transient.org")
-   ("lisp/transient.el" "transient.el"))
-  :ignored-files (".mailmap" "default.mk" "Makefile"
- "docs/htmlxref.cnf"
- "docs/Makefile"
- "docs/transient.texi"
- "lisp/Makefile")
-  :doc "docs/transient.texi")
+  :renames (("docs/" "") ("lisp/" ""))
+  :news "docs/CHANGELOG"
+  :doc "docs/transient.org")
  ("trie"   :url "http://www.dr-qubit.org/git/predictive.git;)
  ("undo-tree"  :url "http://www.dr-qubit.org/git/undo-tree.git;)
  ("uni-confusables":url nil)

[elpa] main 67ab116 1/2: * elpa-packages ("debbugs"): Add :doc tag.

[Michael Albinus]

branch: main
commit 67ab11637b07dd11708a0f93eb88a484e0e37c2a
Author: Michael Albinus 
Commit: Michael Albinus 

* elpa-packages ("debbugs"): Add :doc tag.
---
 elpa-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index 7975ef9..a14ae2e 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -97,7 +97,7 @@
  ("darkroom":url "https://github.com/capitaomorte/darkroom.git;)
  ("dash":url "https://github.com/magnars/dash.el.git;)
  ("dbus-codegen"   :url "https://github.com/ueno/dbus-codegen-el.git;)
- ("debbugs":url nil)
+ ("debbugs":url nil :doc ("debbugs.texi" "debbugs-ug.texi"))
  ("delight":url "https://git.savannah.gnu.org/r/delight.git;)
  ("dict-tree"  :url "http://www.dr-qubit.org/git/predictive.git;)
  ("diffview":url "https://github.com/mgalgs/diffview-mode.git;)

[elpa] main b80f766 1/2: * elpa-packages (org): Try to finally make it work

[Stefan Monnier]

branch: main
commit b80f766150fcad3bb7b437907025fae491996ee0
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (org): Try to finally make it work

(transient): Add `:news`, and remove `:ignored-files` now covered by
`.elapignore` instead.
---
 elpa-packages | 20 
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index 01e7ca7..93967e1 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -2,11 +2,12 @@
 
 ;; List of packages that are maintained externally.
 ;; The list is made of elements of the form (NAME KIND URL OPTS...).
+;; See `admin/README' for further documentation about the format.
 ;;
 ;; Where NAME is the name of the package;
 ;;
 ;; KIND can be one of:
-;;  :url = kept in a separate `externals/' branch.
+;;  :url  = kept in a separate `externals/' branch.
 ;;  :core = part of GNU Emacs repository.
 ;;
 
@@ -211,8 +212,9 @@
   :ignored-files ("etc/schema" "contrib" "mk" "testing" "lisp/org-install.el")
   :renames (("lisp/" ""))
   :news "etc/ORG-NEWS"
-  :make ("lisp/org-loaddefs.el" "doc/org.texi")
-  :doc "doc/org.texi")
+  :shell-command "make autoloads info; mv doc/org org.info; mv doc/orgguide 
orgguide.info"
+  :doc ("org.info" "orgguide.info")
+  :auto-sync t)
  ("org-translate"  :url nil)
  ("orgalist":url nil)
  ("org-edna"   :url 
"https://savannah.nongnu.org/projects/org-edna-el;) ;URL?
@@ -298,15 +300,9 @@
  ("transcribe" :url nil)
  ("transient"  :url "https://github.com/magit/transient;
   :main-file "lisp/transient.el"
-  :renames (("docs/CHANGELOG" "CHANGELOG")
-   ("docs/transient.org" "transient.org")
-   ("lisp/transient.el" "transient.el"))
-  :ignored-files (".mailmap" "default.mk" "Makefile"
- "docs/htmlxref.cnf"
- "docs/Makefile"
- "docs/transient.texi"
- "lisp/Makefile")
-  :doc "docs/transient.texi")
+  :renames (("docs/" "") ("lisp/" ""))
+  :news "docs/CHANGELOG"
+  :doc "docs/transient.org")
  ("trie"   :url "http://www.dr-qubit.org/git/predictive.git;)
  ("undo-tree"  :url "http://www.dr-qubit.org/git/undo-tree.git;)
  ("uni-confusables":url nil)

[elpa] main 401b5df 2/2: Merge remote-tracking branch 'refs/remotes/origin/main' into main

[Stefan Monnier]

branch: main
commit 401b5df341093eac8e0a58b4846f11a03c0ee278
Merge: b80f766 37f7e91
Author: Stefan Monnier 
Commit: Stefan Monnier 

Merge remote-tracking branch 'refs/remotes/origin/main' into main
---
 elpa-packages | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index 93967e1..876e727 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -295,7 +295,11 @@
  ("timerfunctions" :url nil)
  ("tiny"   :url "https://github.com/abo-abo/tiny;)
  ("tNFA"   :url "http://www.dr-qubit.org/git/predictive.git;)
- ("tramp"  :url "git://git.sv.gnu.org/tramp.git" :branch "elpa")
+ ("tramp"  :url "git://git.sv.gnu.org/tramp.git"
+  :branch "externals/tramp"
+  :main-file "trampver.el"
+  :make ("autoloads" "info")
+  :doc "tramp.info")
  ("tramp-theme":url nil)
  ("transcribe" :url nil)
  ("transient"  :url "https://github.com/magit/transient;

[elpa] elpa-admin d1d1dbd: * elpa-admin.el (elpaa--build-Info): Fix last change

[Stefan Monnier]

branch: elpa-admin
commit d1d1dbd0c0f7d709b8806bf654d2e427acbcfcc2
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--build-Info): Fix last change
---
 README| 1 +
 elpa-admin.el | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 85110c7..1f5ddef 100644
--- a/README
+++ b/README
@@ -109,6 +109,7 @@ in the main file.
 ** =:doc FILE=
 Name of the documentation file for the package.
 It can be either an Info file, a Texinfo file, or an Org file.
+FILE can also be a list of those.
 
 ** =:make TARGET=
 Indicates that we should run ~make TARGET~ in order to build some files.
diff --git a/elpa-admin.el b/elpa-admin.el
index b0c4f90..53ecc99 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1421,7 +1421,7 @@ More at " (elpaa--default-url pkgname))
 (defun elpaa--build-Info (pkg-spec dir)
   (let ((docfile (elpaa--spec-get pkg-spec :doc)))
 (dolist (f (if (listp docfile) docfile (list docfile)))
-  (elpaa--build-Info f dir
+  (elpaa--build-Info-1 f dir
 
 (defun elpaa--build-Info-1 (docfile dir)
   (let* ((default-directory (elpaa--dirname dir)))

[elpa] elpa-admin c26df96: * elpa-admin.el: Allow `:doc` to specify several doc files

[Stefan Monnier]

branch: elpa-admin
commit c26df965f32ae02dcbdb5d64e55f4d884ea28c60
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el: Allow `:doc` to specify several doc files

(elpaa--build-Info-1): Rename from elpaa--build-Info, change first arg.
(elpaa--build-Info): New function.
---
 elpa-admin.el | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 619d6ab..b0c4f90 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1419,8 +1419,12 @@ More at " (elpaa--default-url pkgname))
 ;;; Build Info files from Texinfo
 
 (defun elpaa--build-Info (pkg-spec dir)
-  (let* ((default-directory (elpaa--dirname dir))
- (docfile (elpaa--spec-get pkg-spec :doc)))
+  (let ((docfile (elpaa--spec-get pkg-spec :doc)))
+(dolist (f (if (listp docfile) docfile (list docfile)))
+  (elpaa--build-Info f dir
+
+(defun elpaa--build-Info-1 (docfile dir)
+  (let* ((default-directory (elpaa--dirname dir)))
 (when (and docfile (file-readable-p docfile)
(string-match "\\.org\\'" docfile))
   (with-temp-buffer

[elpa] externals/debbugs f9a09a9: Remove debbugs.info

[Michael Albinus]

branch: externals/debbugs
commit f9a09a95554dad326a62a9186c780031285eabb8
Author: Michael Albinus 
Commit: Michael Albinus 

Remove debbugs.info
---
 debbugs.info | 739 ---
 1 file changed, 739 deletions(-)

diff --git a/debbugs.info b/debbugs.info
deleted file mode 100644
index 5780294..000
--- a/debbugs.info
+++ /dev/null
@@ -1,739 +0,0 @@
-This is debbugs.info, produced by makeinfo version 6.6 from
-debbugs.texi.
-
-Copyright (C) 2011-2020 Free Software Foundation, Inc.
-
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation License,
- Version 1.2 or any later version published by the Free Software
- Foundation; with no Invariant Sections, with the Front-Cover, or
- Back-Cover Texts.  A copy of the license is included in the
- section entitled "GNU Free Documentation License" in the Emacs
- manual.
-
- This document is part of a collection distributed under the GNU
- Free Documentation License.  If you want to distribute this
- document separately from the collection, you can do so by adding
- a copy of the license to the document, as described in section 6
- of the license.
-
- All Emacs Lisp code contained in this document may be used,
- distributed, and modified without restriction.
-INFO-DIR-SECTION Emacs
-START-INFO-DIR-ENTRY
-* Debbugs: (debbugs).  A library for communication with Debbugs.
-END-INFO-DIR-ENTRY
-
-
-File: debbugs.info,  Node: Top,  Next: Installation,  Up: (dir)
-
-Debbugs Programmer's Manual
-***
-
-Debbugs is a bugtracking system (BTS) that was initially written for
-the Debian project but currently used also by the GNU project.  The
-main distinctive feature of Debbugs is that it's mostly email-based.
-All actions on bug reports: opening, closing, changing the status,
-commenting, forwarding are performed via email by sending specially
-composed letters to the particular mail addresses.  However, searching
-the bug reports, querying bug report status and viewing comments have
-been web-based for a long time.  To overcome this inconvenience the
-Debbugs/SOAP service was introduced.
-
-   The Debbugs/SOAP service provides the means for developers to write
-client applications that can send the queries with certain search
-criteria to the Debbugs server and retrieve a set of bug reports that
-match them.  The developer may also ask the Debbugs server for
-additional information about every bug report (e.g.  subject, date,
-originator, tags and etc.)  and get all comments and attachments.
-
-   'debbugs', described in this document, is the Emacs library that
-exposes to developers the available functions provided by the Debbugs
-server.  'debbugs' uses Emacs' SOAP client library for communication
-with the Debbugs server.  In tandem with Emacs' email facilities,
-'debbugs' provides a solution for building applications that interact
-with the Debbugs BTS directly from Emacs without addressing Debbugs'
-web interface.
-
-   The user interface for accessing the Debbugs server for GNU
-projects is described in *note Debbugs User Guide: (debbugs-ug)Top.
-
-* Menu:
-
-* Installation::Getting and installing 'debbugs'.
-* Configuration::   Configuring 'debbugs'.
-* Requesting bug numbers::  How to request bug report numbers.
-* Requesting bugs statuses::How to request the status of bug reports.
-* Searching bugs::  How to search for bugs.
-* Requesting messages:: How to get messages from bug reports.
-* Requesting user tags::How to request tags set by users.
-
-
-File: debbugs.info,  Node: Installation,  Next: Configuration,  Prev: Top,  
Up: Top
-
-1 Installation
-**
-
-Installation on Emacs 24 or later
--
-
-Install 'debbugs' from the *note ELPA repository: (elisp)Packaging.
-
-Installation on Emacs 22 and Emacs 23
--
-
-If you want to install 'debbugs' on Emacs 22/23, you will need to
-install the 'soap-client' library first.  It can be downloaded from
-the Emacs SOAP client project page
-(https://code.google.com/p/emacs-soap-client/).
-
-   Compile the library and add it into your 'load-path':
-
- (add-to-list 'load-path "/path/to/emacs-soap-client/")
-
-   'debbugs' library can be downloaded from the ELPA repository
-(https://elpa.gnu.org/packages/).  Compile it and set the 'load-path':
-
- (add-to-list 'load-path "/path/to/debbugs/")
-
-Installation on Emacs 21
-
-
-We have not tried yet to install 'debbugs' on Emacs 21.  We would
-definitely say that the installation will require even more additional
-libraries than needed for installation on Emacs 22/23.
-
-
-File: debbugs.info,  Node: Configuration,  Next: Requesting bug numbers,  
Prev: Installation,  Up: Top
-
-2 Configuration
-***
-

[elpa] elpa-admin 26d341c: * elpa-admin.el (elpaa--make): Add support for non-make command

[Stefan Monnier]

branch: elpa-admin
commit 26d341c3cdd624846f3c2550b118bce0dd094126
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--make): Add support for non-make command
---
 elpa-admin.el | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 5776521..619d6ab 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1474,14 +1474,20 @@ More at " (elpaa--default-url pkgname))
   (message "%s" (buffer-string)))
 
 (defun elpaa--make (pkg-spec dir)
-  (let ((target (elpaa--spec-get pkg-spec :make)))
-(when target
+  (let ((target (elpaa--spec-get pkg-spec :make))
+(cmd (elpaa--spec-get pkg-spec :shell-command)))
+(when (or cmd target)
   (with-temp-buffer
 (let ((elpaa--sandboxed-ro-binds
(cons default-directory elpaa--sandboxed-ro-binds))
   (default-directory (elpaa--dirname dir)))
-  (apply #'elpaa--call-sandboxed t "make"
- (if (consp target) target (list target)))
+  (when cmd
+(elpaa--call-sandboxed t shell-file-name
+   shell-command-switch
+   cmd))
+  (when target
+(apply #'elpaa--call-sandboxed t "make"
+   (if (consp target) target (list target
   (elpaa--message "%s" (buffer-string)))
 
 ;;; Fetch updates from upstream

[elpa] externals/debbugs 22cd832: Remove debbugs-ug.info

[Michael Albinus]

branch: externals/debbugs
commit 22cd83249d0851a50bc2ab6ec66916fe37e8f741
Author: Michael Albinus 
Commit: Michael Albinus 

Remove debbugs-ug.info
---
 debbugs-ug.info | 1249 ---
 1 file changed, 1249 deletions(-)

diff --git a/debbugs-ug.info b/debbugs-ug.info
deleted file mode 100644
index eb3c36f..000
--- a/debbugs-ug.info
+++ /dev/null
@@ -1,1249 +0,0 @@
-This is debbugs-ug.info, produced by makeinfo version 6.7 from
-debbugs-ug.texi.
-
-Copyright (C) 2015-2020 Free Software Foundation, Inc.
-
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation License,
- Version 1.2 or any later version published by the Free Software
- Foundation; with no Invariant Sections, with the Front-Cover, or
- Back-Cover Texts.  A copy of the license is included in the
- section entitled "GNU Free Documentation License" in the Emacs
- manual.
-
- This document is part of a collection distributed under the GNU
- Free Documentation License.  If you want to distribute this
- document separately from the collection, you can do so by adding
- a copy of the license to the document, as described in section 6
- of the license.
-
- All Emacs Lisp code contained in this document may be used,
- distributed, and modified without restriction.
-INFO-DIR-SECTION Emacs
-START-INFO-DIR-ENTRY
-* Debbugs UG: (debbugs-ug).  Debbugs User Interface in Emacs.
-END-INFO-DIR-ENTRY
-
-
-File: debbugs-ug.info,  Node: Top,  Next: Retrieving Bugs,  Up: (dir)
-
-Debbugs User Guide
-**
-
-Debbugs is a bugtracking system (BTS) that was initially written for
-the Debian project but currently used also by the GNU project.  The
-main distinctive feature of Debbugs is that it's mostly email-based.
-All actions on bug reports: opening, closing, changing the status,
-commenting, forwarding are performed via email by sending specially
-composed letters to the particular email addresses.  However,
-searching the bug reports, querying bug report status and viewing
-comments have been web-based for a long time.  To overcome this
-inconvenience the Debbugs/SOAP service was introduced.
-
-   Based on the Debbugs/SOAP service, frontends are written which
-offer handling of bugs inside Emacs.  These frontends are restricted
-to the GNU Debbugs server.  Bugs are presented either as tabulated
-list ('debbugs-gnu') or as 'org-mode' TODO list ('debbugs-org', *note
-Org Mode: (org)Top.).  As backend they use the 'debbugs' Emacs library
-(*note Debbugs Programmer's Manual: (debbugs)Top.).
-
-* Menu:
-
-* Retrieving Bugs:: How to retrieve bugs.
-* Searching Bugs::  How to search in the debbugs database.
-* Presenting Bugs:: How the results are presented.
-* Minor Mode::  How to use browse bug URLs.
-
-* Command Index::   Debbugs commands.
-* Variable Index::  User options and variables.
-* Key Index::   Keyboard strokes on bug report buffers.
-* Mail Command Index::  Debbugs control mailserver commands.
-
-
-File: debbugs-ug.info,  Node: Retrieving Bugs,  Next: Searching Bugs,  Prev: 
Top,  Up: Top
-
-1 Retrieving Bugs
-*
-
-Bugs are retrieved by the 'debbugs-gnu' or 'debbugs-org' commands.  In
-their simple version, they retrieve just bugs for the '"emacs"'
-package on the GNU Debbugs server, filtered by bug severities.
-Further filtering is possible when the commands are called with a
-prefix.
-
-   When the bug numbers to be retrieved are known, the commands
-'debbugs-gnu-bugs' or 'debbugs-org-bugs' are applicable.
-
-   The commands 'debbugs-gnu-patches' / 'debbugs-org-patches',
-'debbugs-gnu-tagged' / 'debbugs-org-tagged' and
-'debbugs-gnu-emacs-release-blocking-reports' /
-'debbugs-org-emacs-release-blocking-reports' retrieve bugs with a
-predefined filter.
-
- -- Command: debbugs-gnu severities  packages archivedp
-  suppress tags
- -- Command: debbugs-org severities  packages archivedp
-  suppress tags
-
- These commands retrieve bug reports from the GNU Debbugs server.
- 'debbugs-gnu' returns a tabulated list, and 'debbugs-org' returns
- a list of TODO items in 'org-mode'.  In order not to stress the
- GNU Debbugs server, the bugs are retrieved in chunks of 500 bugs.
- However, the bug report buffer shows all retrieved bugs then, in
- reverse bug number order.
-
- SEVERITIES is a list of strings which filter for the severities
- of the bugs to be retrieved.  Valid severities are '"serious"',
- '"important"', '"normal"', '"minor"' and '"wishlist"' (see also
- the constant 'debbugs-gnu-all-severities').  If the list is
- empty, there is no filtering with respect to severities.  The
- keyword '"tagged"', which is also possible, is not a severity in
- the GNU Debbugs server but allows 

[elpa] elpa-admin ceb7580: * elpa-admin.el (elpaa--sandboxed-ro-binds): Add `/bin`

[Stefan Monnier]

branch: elpa-admin
commit ceb7580266c028d4297c1668039b6a4479848a47
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--sandboxed-ro-binds): Add `/bin`
---
 elpa-admin.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 4581333..5776521 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -565,7 +565,7 @@ The INFILE and DISPLAY arguments are fixed as nil."
 "--tmpfs" "/tmp"))
 
 (defvar elpaa--sandboxed-ro-binds
-  '("/lib" "/lib64" "/usr" "/etc/alternatives" "/etc/emacs"))
+  '("/lib" "/lib64" "/bin" "/usr" "/etc/alternatives" "/etc/emacs"))
 
 (defun elpaa--call-sandboxed (destination  args)
   "Like ‘elpaa--call’ but sandboxed.

[elpa] elpa-admin 922d625: * GNUmakefile (EMACS): Split out EMACSBIN for convenience

[Mattias Engdeg�rd]

branch: elpa-admin
commit 922d625d447c87952734d174476ccc50374085ed
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

* GNUmakefile (EMACS): Split out EMACSBIN for convenience
---
 GNUmakefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index c5d5a12..9dda824 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,7 +1,8 @@
 # Makefile for GNU Emacs Lisp Package Archive.
 #
 
-EMACS=emacs --batch
+EMACSBIN=emacs
+EMACS=$(EMACSBIN) --batch
 RM=rm -f
 
 PKG_DESCS_MK=.pkg-descs.mk

[elpa] elpa-admin 48e4ccf: * elpa-admin.el: Don't pass non-existing dirs to `bwrap`

[Stefan Monnier]

branch: elpa-admin
commit 48e4ccf3b6de1f23f67c7373d72164b0b0956331
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el: Don't pass non-existing dirs to `bwrap`

(elpaa--bwrap-args): Remove ro-binds.
(elpaa--sandboxed-ro-binds): Rename from `elpaa--sandboxed-extra-ro-dirs`.
Add dirs removed from `elpaa--bwrap-args`.
(elpaa--call-sandboxed): Pass `elpaa--sandboxed-ro-binds` in reverse order
and `expand-file-name` them.
(elpaa--make): Adjust accordingly.
(elpaa--batch-fetch-and): Preliminary support for syncing only
some packages.
---
 elpa-admin.el | 41 ++---
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index be43f54..4581333 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -560,32 +560,31 @@ The INFILE and DISPLAY arguments are fixed as nil."
 
 (defconst elpaa--bwrap-args
   '("--unshare-all"
-"--ro-bind" "/lib" "/lib"
-"--ro-bind" "/lib64" "/lib64"
-"--ro-bind" "/usr" "/usr"
-"--ro-bind" "/etc/alternatives" "/etc/alternatives"
-"--ro-bind" "/etc/emacs" "/etc/emacs"
 "--dev" "/dev"
 "--proc" "/proc"
 "--tmpfs" "/tmp"))
 
-(defvar elpaa--sandboxed-extra-ro-dirs nil)
+(defvar elpaa--sandboxed-ro-binds
+  '("/lib" "/lib64" "/usr" "/etc/alternatives" "/etc/emacs"))
 
 (defun elpaa--call-sandboxed (destination  args)
   "Like ‘elpaa--call’ but sandboxed.
 More specifically, uses Bubblewrap such that the command is
-confined to write to the  is writable.
+confined to only have write access to the `default-directory'.
 Signal an error if the command did not finish with exit code 0."
   (if (not elpaa--sandbox)
   (apply #'elpaa--call destination args)
 (elpaa--message "call-sandboxed %S" args)
+(let ((dd (expand-file-name default-directory))) ;No `~' allowed!
+  (setq args (nconc `("--bind" ,dd ,dd) args)))
+;; Add read-only dirs in reverse order.
+(dolist (b elpaa--sandboxed-ro-binds)
+  (when (file-exists-p b) ;`brwap' burps on binds that don't exist!
+(setq b (expand-file-name b))
+(setq args (nconc `("--ro-bind" ,b ,b) args
 (let ((exitcode
(apply #'elpaa--call destination "bwrap"
-  (append elpaa--bwrap-args
-  (cl-mapcan (lambda (d) `("--ro-bind" ,d ,d))
- elpaa--sandboxed-extra-ro-dirs)
-  `("--bind" ,default-directory ,default-directory)
-  args
+  (append elpaa--bwrap-args args
   (unless (eq exitcode 0)
 (if (eq destination t)
 (error "Error-indicating exit code in elpaa--call-sandboxed:\n%s"
@@ -1478,9 +1477,8 @@ More at " (elpaa--default-url pkgname))
   (let ((target (elpaa--spec-get pkg-spec :make)))
 (when target
   (with-temp-buffer
-(let ((elpaa--sandboxed-extra-ro-dirs
-   (cons (expand-file-name default-directory)
- elpaa--sandboxed-extra-ro-dirs))
+(let ((elpaa--sandboxed-ro-binds
+   (cons default-directory elpaa--sandboxed-ro-binds))
   (default-directory (elpaa--dirname dir)))
   (apply #'elpaa--call-sandboxed t "make"
  (if (consp target) target (list target)))
@@ -1575,15 +1573,20 @@ More at " (elpaa--default-url pkgname))
 
 (defun elpaa--batch-fetch-and (k)
   (let ((specs (elpaa--get-specs))
-(pkgs command-line-args-left))
+(pkgs command-line-args-left)
+(clal command-line-args-left))
 (setq command-line-args-left nil)
-(if (equal pkgs '("-")) (setq pkgs (mapcar #'car specs)))
+(if (member pkgs '(("-") ("?"))) (setq pkgs (mapcar #'car specs)))
 (dolist (pkg pkgs)
   (let* ((pkg-spec (assoc pkg specs)))
-(if (not pkg-spec) (message "Unknown package: %s" pkg)
+(cond
+ ((not pkg-spec) (message "Unknown package: %s" pkg))
+ ((and (equal clal '("?")) (not (elpaa--spec-get pkg-spec :auto-sync)))
+  nil)
+ (t
   ;; (unless (file-directory-p (expand-file-name pkg "packages"))
   ;;   (elpaa--worktree-sync pkg-spec))
-  (elpaa--fetch pkg-spec k))
+  (elpaa--fetch pkg-spec k)))
 
 (defun elpaa-batch-fetch-and-show ( _)
   (elpaa--batch-fetch-and #'ignore))

[elpa] main 37f7e91: * elpa-packages: Adapt tramp entry.

[Michael Albinus]

branch: main
commit 37f7e9171c0c05d41a296da6e4104a9f34d8d473
Author: Michael Albinus 
Commit: Michael Albinus 

* elpa-packages: Adapt tramp entry.
---
 elpa-packages | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index 01e7ca7..7975ef9 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -293,7 +293,11 @@
  ("timerfunctions" :url nil)
  ("tiny"   :url "https://github.com/abo-abo/tiny;)
  ("tNFA"   :url "http://www.dr-qubit.org/git/predictive.git;)
- ("tramp"  :url "git://git.sv.gnu.org/tramp.git" :branch "elpa")
+ ("tramp"  :url "git://git.sv.gnu.org/tramp.git"
+  :branch "externals/tramp"
+  :main-file "trampver.el"
+  :make ("autoloads" "info")
+  :doc "tramp.info")
  ("tramp-theme":url nil)
  ("transcribe" :url nil)
  ("transient"  :url "https://github.com/magit/transient;