update packages

lisp/org-contrib/README-elpa

@@ -1,7 +1,7 @@
 This repository contains add-ons to Org.
 
 You can use them by installing the `org-contrib' NonGNU ELPA package
-from [https://elpa.nongnu.org/nongnu/].
+from <https://elpa.nongnu.org/nongnu/>.
 
 
 1 Please help maintaining these add-ons
@@ -21,11 +21,13 @@ from [https://elpa.nongnu.org/nongnu/].
   user, please carefully track the new URL where the add-on is now
   maintained.
 
-  If you want to maintain some of these add-ons, please send me an email
-  at `bzg@gnu.org' once you set up a separate repository for them.
+  If you want to maintain some of these add-ons, please send an email to
+  <mailto:emacs-orgmode@gnu.org> or to <mailto:yantar92@posteo.net>
+  (privately) once you set up a separate repository for them.
 
 
-[the Worg repository] https://code.orgmode.org/bzg/worg/src/master/code
+[the Worg repository]
+<https://code.orgmode.org/bzg/worg/src/master/code>
 
 
 2 License
@@ -36,16 +38,16 @@ from [https://elpa.nongnu.org/nongnu/].
   later version.  See [COPYING].
 
 
-[COPYING] file:COPYING
+[COPYING] <file:COPYING>
 
 
 3 Contribute
 ════════════
 
-  You can send patches to `~bzg/dev@lists.sr.ht' and configure your
-  local copy of the repository like this:
+  You can send patches to `emacs-orgmode@gnu.org'.
 
-  `git config format.subjectPrefix 'PATCH org-contrib''
+  See <https://orgmode.org/worg/org-contribute.html> for advice on how
+  to contribute efficiently.
 
 
 4 Files to remove from the next release
@@ -54,7 +56,7 @@ from [https://elpa.nongnu.org/nongnu/].
   If a file has a "Homepage:" keyword, it will be removed from the next
   minor or major release.
 
-  • `ox-taskjuggler.el'
+  `ob-csharp.el'
 
 
 5 Other files
@@ -158,8 +160,6 @@ from [https://elpa.nongnu.org/nongnu/].
 
   ob-abc.el
         Org-mode Babel Functions for ABC
-  ob-csharp.el
-        Org-mode Babel Functions for csharp evaluation
   ob-ebnf.el
         Org-mode Babel Functions for EBNF
   ob-eukleides.el

lisp/org-contrib/README.org

@@ -17,8 +17,9 @@ repository are in transition: they are maintained and will be removed
 from the next minor or major release of this repository.  As a user,
 please carefully track the new URL where the add-on is now maintained.
 
-If you want to maintain some of these add-ons, please send me an email
-at =bzg@gnu.org= once you set up a separate repository for them.
+If you want to maintain some of these add-ons, please send an email to
+mailto:emacs-orgmode@gnu.org or to mailto:yantar92@posteo.net
+(privately) once you set up a separate repository for them.
 
 ** License
 
@@ -28,17 +29,17 @@ later version.  See [[file:COPYING][COPYING]].
   
 ** Contribute
 
-You can send patches to =~bzg/dev@lists.sr.ht= and configure your local
-copy of the repository like this:
+You can send patches to =emacs-orgmode@gnu.org=.
 
-=git config format.subjectPrefix 'PATCH org-contrib'=
+See https://orgmode.org/worg/org-contribute.html for advice on how to
+contribute efficiently.
 
 ** Files to remove from the next release
 
 If a file has a "Homepage:" keyword, it will be removed from the next
 minor or major release.
 
-- ~ox-taskjuggler.el~
+~ob-csharp.el~
 
 ** Other files
 *** Org utils
@@ -92,7 +93,6 @@ minor or major release.
 *** Org Babel languages
 
 - ob-abc.el :: Org-mode Babel Functions for ABC
-- ob-csharp.el :: Org-mode Babel Functions for csharp evaluation
 - ob-ebnf.el :: Org-mode Babel Functions for EBNF
 - ob-eukleides.el :: Org-mode Babel Functions for eukleides evaluation
 - ob-fomus.el :: Org-mode Babel Functions for fomus evaluation

lisp/org-contrib/ob-csharp.el

@@ -4,7 +4,7 @@
 
 ;; Author: thomas "at" friendlyvillagers.com based on ob-java.el by Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: https://git.sr.ht/~bzg/org-contrib
+;; Homepage: https://cgit.git.savannah.gnu.org/cgit/emacs/org-mode.git/tree/lisp/ob-csharp.el
 
 ;; This file is not part of GNU Emacs.
 

lisp/org-contrib/org-collector.el

@@ -122,6 +122,7 @@ preceding the dblock, then update the contents of the dblock."
 	    (noquote (plist-get params :noquote))
 	    (colnames (plist-get params :colnames))
 	    (defaultval (plist-get params :defaultval))
+	    (tblfm (plist-get params :tblfm))
 	    (content-lines (org-split-string (plist-get params :content) "\n"))
 	    id table line pos idpos stringformat)
 	(save-excursion
@@ -147,7 +148,13 @@ preceding the dblock, then update the contents of the dblock."
 	(message (format "point-%d" pos))
 	(while (setq line (pop content-lines))
 	  (when (string-match "^#" line)
-	    (insert "\n" line)))
+	    (unless (and tblfm
+			 (string-match "^#\\+TBLFM:" line))
+	      (insert "\n" line))))
+	(when tblfm
+	  (unless (eq (char-before) ?\n)
+	    (insert "\n"))
+	  (insert (concat "#+TBLFM:" tblfm)))
 	(goto-char pos)
 	(org-table-recalculate 'all))
     (org-collector-error (widen) (error "%s" er))

lisp/org-contrib/org-contrib-autoloads.el

@@ -183,7 +183,7 @@ Set up org-eldoc documentation function." t)
 
 ;;; Generated autoloads from org-expiry.el
 
-(register-definition-prefixes "org-expiry" '("org-"))
+(register-definition-prefixes "org-expiry" '("org-expiry-"))
 
 
 ;;; Generated autoloads from org-interactive-query.el
@@ -380,89 +380,6 @@ Return output file's name.
 ;;; Generated autoloads from ox-s5.el
 
 (register-definition-prefixes "ox-s5" '("org-s5-"))
-
-
-;;; Generated autoloads from ox-taskjuggler.el
-
-(autoload 'org-taskjuggler-export "ox-taskjuggler" "\
-Export current buffer to a TaskJuggler file.
-
-The exporter looks for a tree with tag that matches
-`org-taskjuggler-project-tag' and takes this as the tasks for
-this project.  The first node of this tree defines the project
-properties such as project name and project period.
-
-If there is a tree with tag that matches
-`org-taskjuggler-resource-tag' this tree is taken as resources
-for the project.  If no resources are specified, a default
-resource is created and allocated to the project.
-
-Also the TaskJuggler project will be created with default reports
-as defined in `org-taskjuggler-default-reports'.
-
-If narrowing is active in the current buffer, only export its
-narrowed part.
-
-If a region is active, export that region.
-
-A non-nil optional argument ASYNC means the process should happen
-asynchronously.  The resulting file should be accessible through
-the `org-export-stack' interface.
-
-When optional argument SUBTREEP is non-nil, export the sub-tree
-at point, extracting information from the headline properties
-first.
-
-When optional argument VISIBLE-ONLY is non-nil, don't export
-contents of hidden elements.
-
-Return output file's name.
-
-(fn &optional ASYNC SUBTREEP VISIBLE-ONLY)" t)
-(autoload 'org-taskjuggler-export-and-process "ox-taskjuggler" "\
-Export current buffer to a TaskJuggler file and process it.
-
-The exporter looks for a tree with tag that matches
-`org-taskjuggler-project-tag' and takes this as the tasks for
-this project.  The first node of this tree defines the project
-properties such as project name and project period.
-
-If there is a tree with tag that matches
-`org-taskjuggler-resource-tag' this tree is taken as resources
-for the project.  If no resources are specified, a default
-resource is created and allocated to the project.
-
-Also the TaskJuggler project will be created with default reports
-as defined in `org-taskjuggler-default-reports'.
-
-If narrowing is active in the current buffer, only export its
-narrowed part.
-
-If a region is active, export that region.
-
-When optional argument SUBTREEP is non-nil, export the sub-tree
-at point, extracting information from the headline properties
-first.
-
-When optional argument VISIBLE-ONLY is non-nil, don't export
-contents of hidden elements.
-
-Return a list of reports.
-
-(fn &optional SUBTREEP VISIBLE-ONLY)" t)
-(autoload 'org-taskjuggler-export-process-and-open "ox-taskjuggler" "\
-Export current buffer to a TaskJuggler file, process and open it.
-
-Export and process the file using
-`org-taskjuggler-export-and-process' and open the generated
-reports with a browser.
-
-If you are targeting TaskJuggler 2.4 (see
-`org-taskjuggler-target-version') the processing and display of
-the reports is done using the TaskJuggler GUI.
-
-(fn &optional SUBTREEP VISIBLE-ONLY)" t)
-(register-definition-prefixes "ox-taskjuggler" '("org-taskjuggler-"))
 
 ;;; End of scraped data
 

lisp/org-contrib/org-contrib-pkg.el

@@ -1,2 +1,2 @@
 ;; Generated package description from org-contrib.el  -*- no-byte-compile: t -*-
-(define-package "org-contrib" "0.6" "Unmaintained add-ons for Org-mode" '((emacs "25.1") (org "9.4.6")) :commit "0e65be83e4b41c17a5b9096c9055c1601b26a23d" :authors '(("Bastien Guerry" . "bzg@gnu.org")) :maintainer '("Bastien Guerry" . "bzg@gnu.org") :keywords '("org") :url "https://git.sr.ht/~bzg/org-contrib")
+(define-package "org-contrib" "0.7" "Unmaintained add-ons for Org-mode" '((emacs "25.1") (org "9.4.6")) :commit "90e1d6bd6288615233dae273f0525a43a9d8779d" :authors '(("Bastien Guerry" . "bzg@gnu.org")) :maintainer '("Bastien Guerry" . "bzg@gnu.org") :keywords '("org") :url "https://git.sr.ht/~bzg/org-contrib")

lisp/org-contrib/org-contrib.el

@@ -5,7 +5,7 @@
 ;; Author: Bastien Guerry <bzg@gnu.org>
 ;; Homepage: https://git.sr.ht/~bzg/org-contrib
 ;; Package-Requires: ((emacs "25.1") (org "9.4.6"))
-;; Version: 0.6
+;; Version: 0.7
 ;; Keywords: org
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 

lisp/org-contrib/org-expiry.el

@@ -159,16 +159,10 @@ functions.  `org-expiry-deinsinuate' will deactivate them."
 
 ;;; Advices and insinuation:
 
-(define-advice org-schedule (:after (&rest _) org-schedule-update-created)
-  "Update the creation-date property when calling `org-schedule'."
-  (org-expiry-insert-created))
+(defun org-expiry--update-created (&rest _)
+  "Update the creation-date property for the current heading.
 
-(define-advice org-deadline (:after (&rest _) org-deadline-update-created)
-  "Update the creation-date property when calling `org-deadline'."
-  (org-expiry-insert-created))
-
-(define-advice org-time-stamp (:after (&rest _) org-time-stamp-update-created)
-  "Update the creation-date property when calling `org-time-stamp'."
+Used as an :after advice."
   (org-expiry-insert-created))
 
 (defun org-expiry-insinuate (&optional arg)
@@ -176,9 +170,8 @@ functions.  `org-expiry-deinsinuate' will deactivate them."
 If ARG, also add a hook to `before-save-hook' in `org-mode' and
 restart `org-mode' if necessary."
   (interactive "P")
-  (ad-activate 'org-schedule)
-  (ad-activate 'org-time-stamp)
-  (ad-activate 'org-deadline)
+  (dolist (f org-expiry-advised-functions)
+    (advice-add f :after #'org-expiry--update-created))
   (add-hook 'org-insert-heading-hook 'org-expiry-insert-created)
   (add-hook 'org-after-todo-state-change-hook 'org-expiry-insert-created)
   (add-hook 'org-after-tags-change-hook 'org-expiry-insert-created)
@@ -197,9 +190,8 @@ restart `org-mode' if necessary."
 If ARG, also remove org-expiry hook in Org's `before-save-hook'
 and restart `org-mode' if necessary."
   (interactive "P")
-  (advice-remove 'org-schedule #'org-schedule@org-schedule-update-created)
-  (advice-remove 'org-time-stamp #'org-time-stamp@org-time-stamp-update-created)
-  (advice-remove 'org-deadline #'org-deadline@org-deadline-update-created)
+  (dolist (f org-expiry-advised-functions)
+    (advice-remove f #'org-expiry--update-created))
   (remove-hook 'org-insert-heading-hook 'org-expiry-insert-created)
   (remove-hook 'org-after-todo-state-change-hook 'org-expiry-insert-created)
   (remove-hook 'org-after-tags-change-hook 'org-expiry-insert-created)

lisp/org-contrib/org-registry.el

@@ -6,7 +6,6 @@
 ;; Filename: org-registry.el
 ;; Version: 0.1a
 ;; Author: Bastien Guerry <bzg@gnu.org>
-;; Maintainer: Bastien Guerry <bzg@gnu.org>
 ;; Keywords: org, wp, registry
 ;; Description: Shows Org files where the current buffer is linked
 ;; Homepage: https://git.sr.ht/~bzg/org-contrib

lisp/org-contrib/org-secretary.el

@@ -3,7 +3,11 @@
 ;;
 ;; Author: Juan Reyero <juan _at_ juanreyero _dot_ com>
 ;; Keywords: outlines, tasks, team, management
-;; Homepage: http://juanreyero.com/article/emacs/org-teams.html
+;; Homepage: https://git.sr.ht/~bzg/org-contrib
+;;
+;; See http://juanreyero.com/article/emacs/org-teams.html for more info on how
+;; to use this package.
+;;
 ;; Version: 0.02
 ;;
 ;; This file is not part of GNU Emacs.