[elpa] externals/org ebbc2ffaab 8/8: Merge remote-tracking branch 'github/main'

[ELPA Syncer]

branch: externals/org
commit ebbc2ffaab6df93ac44ca5141d53c2690293ef10
Merge: 3e9f98c691 0d8440f55d
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

    Merge remote-tracking branch 'github/main'
---
 README                    |  5 -----
 README_ELPA               | 38 --------------------------------------
 lisp/org-macs.el          |  5 +++--
 lisp/ox.el                | 34 ++++++++++++++++++++++++++++++++++
 mk/targets.mk             |  2 +-
 request-assign-future.txt | 44 --------------------------------------------
 6 files changed, 38 insertions(+), 90 deletions(-)

diff --git a/README b/README
index f78cbebe62..bb0a0c5825 100644
--- a/README
+++ b/README
@@ -28,11 +28,6 @@ instructions at https://orgmode.org/org.html#Installation.
 
 - testing/ :: Testing suite for Org.
 
-- request-assign-future.txt :: The form that contributors have to sign
-  and get processed with the FSF before contributed changes can be
-  integrated into the Org core.  All files in this distribution have
-  copyright assigned to the FSF.
-
 * Join the GNU Project
 
 Org is part of GNU Emacs and GNU Emacs is part of the GNU Operating
diff --git a/README_ELPA b/README_ELPA
deleted file mode 100644
index c916fbe75b..0000000000
--- a/README_ELPA
+++ /dev/null
@@ -1,38 +0,0 @@
-This is the Emacs Org project, an Emacs library for organizing your life.
-
-The Org website is at:
-  https://orgmode.org
-
-Installations instructions are at:
-  https://orgmode.org/org.html#Installation
-
-This distribution contains an ELPA packaged version of Org.
-"ELPA" stands for the "Emacs Lisp Package Archive".
-
-The GNU ELPA is at:
-  https://elpa.gnu.org
-
-It contains the org-*.tar package, containing only the org files
-that are also part of GNU Emacs.
-
-There are other ELPA online, offering more packages.
-
-All ELPA packages of Org contain:
-
-README_ELPA
-    This file.
-
-*.el
-    Elisp files.
-
-org
-    The Org info manual.
-
-orgcard.pdf
-    The Org reference card.
-
-etc/
-    Libraries for the ODT exporter.
-
-org-*-pkg.el
-    The name of the package, requested GNU Emacs packaging system.
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index e7e6b0e009..987afe5ed6 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -37,17 +37,18 @@
 ;;; Org version verification.
 
 (defmacro org-assert-version ()
-  "Assert compile time and runtime verstion match."
+  "Assert compile time and runtime version match."
   `(unless (equal (org-git-version) ,(org-git-version))
      (warn "Org version mismatch.  Make sure that correct `load-path' is set 
early in init.el
 This warning usually appears when a built-in Org version is loaded
 prior to the more recent Org version.
 
 Version mismatch is commonly encountered in the following situations:
+
 1. Emacs is loaded using literate Org config and more recent Org
    version is loaded inside the file loaded by `org-babel-load-file'.
    `org-babel-load-file' triggers the built-in Org version clashing
-   the newer Org version attempted to be loaded later.
+   the newer Org version attempt to be loaded later.
 
    It is recommended to move the Org loading code before the
    `org-babel-load-file' call.
diff --git a/lisp/ox.el b/lisp/ox.el
index 3ef65cde8c..cf50722184 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -5568,6 +5568,18 @@ transcoding it."
      (secondary-opening :utf-8 "“" :html "&ldquo;" :latex "``" :texinfo "``")
      (secondary-closing :utf-8 "”" :html "&rdquo;" :latex "''" :texinfo "''")
      (apostrophe :utf-8 "’" :html "&rsquo;"))
+    ("fa"
+     (primary-opening
+      :utf-8 "«" :html "&laquo;" :latex "\\guillemotleft{}"
+      :texinfo "@guillemetleft{}")
+     (primary-closing
+      :utf-8 "»" :html "&raquo;" :latex "\\guillemotright{}"
+      :texinfo "@guillemetright{}")
+     (secondary-opening :utf-8 "‹" :html "&lsaquo;" :latex "\\guilsinglleft{}"
+                       :texinfo "@guilsinglleft{}")
+     (secondary-closing :utf-8 "›" :html "&rsaquo;" :latex "\\guilsinglright{}"
+                       :texinfo "@guilsinglright{}")
+     (apostrophe :utf-8 "’" :html "&rsquo;"))
     ("fr"
      (primary-opening
       :utf-8 "« " :html "&laquo;&nbsp;" :latex "\\og "
@@ -5889,6 +5901,7 @@ them."
      ("eo" :html "A&#365;toro")
      ("es" :default "Autor")
      ("et" :default "Autor")
+     ("fa" :default "نویسنده")
      ("fi" :html "Tekij&auml;")
      ("fr" :default "Auteur")
      ("hu" :default "Szerz&otilde;")
@@ -5914,6 +5927,7 @@ them."
      ("cs" :default "Pokračování z předchozí strany")
      ("de" :default "Fortsetzung von vorheriger Seite")
      ("es" :html "Contin&uacute;a de la p&aacute;gina anterior" :ascii 
"Continua de la pagina anterior" :default "Continúa de la página anterior")
+     ("fa" :default "ادامه از صفحهٔ قبل")
      ("fr" :default "Suite de la page précédente")
      ("it" :default "Continua da pagina precedente")
      ("ja" :default "前ページからの続き")
@@ -5931,6 +5945,7 @@ them."
      ("cs" :default "Pokračuje na další stránce")
      ("de" :default "Fortsetzung nächste Seite")
      ("es" :html "Contin&uacute;a en la siguiente p&aacute;gina" :ascii 
"Continua en la siguiente pagina" :default "Continúa en la siguiente página")
+     ("fa" :default "ادامه در صفحهٔ بعد")
      ("fr" :default "Suite page suivante")
      ("it" :default "Continua alla pagina successiva")
      ("ja" :default "次ページに続く")
@@ -5945,6 +5960,7 @@ them."
      ("tr" :default "Devamı sonraki sayfada"))
     ("Created"
      ("cs" :default "Vytvořeno")
+     ("fa" :default "ساخته شده")
      ("nl" :default "Gemaakt op")  ;; must be followed by a date or date+time
      ("pt_BR" :default "Criado em")
      ("ro" :default "Creat")
@@ -5959,6 +5975,7 @@ them."
      ("eo" :default "Dato")
      ("es" :default "Fecha")
      ("et" :html "Kuup&#228;ev" :utf-8 "Kuupäev")
+     ("fa" :default "تاریخ")
      ("fi" :html "P&auml;iv&auml;m&auml;&auml;r&auml;")
      ("hu" :html "D&aacute;tum")
      ("is" :default "Dagsetning")
@@ -5985,6 +6002,7 @@ them."
      ("de" :default "Gleichung")
      ("es" :ascii "Ecuacion" :html "Ecuaci&oacute;n" :default "Ecuación")
      ("et" :html "V&#245;rrand" :utf-8 "Võrrand")
+     ("fa" :default "معادله")
      ("fr" :ascii "Equation" :default "Équation")
      ("is" :default "Jafna")
      ("ja" :default "方程式")
@@ -6007,6 +6025,7 @@ them."
      ("de" :default "Abbildung")
      ("es" :default "Figura")
      ("et" :default "Joonis")
+     ("fa" :default "شکل")
      ("is" :default "Mynd")
      ("it" :default "Figura")
      ("ja" :default "図" :html "&#22259;")
@@ -6027,6 +6046,7 @@ them."
      ("de" :default "Abbildung %d:")
      ("es" :default "Figura %d:")
      ("et" :default "Joonis %d:")
+     ("fa" :default "شکل %d:")
      ("fr" :default "Figure %d :" :html "Figure&nbsp;%d&nbsp;:")
      ("is" :default "Mynd %d")
      ("it" :default "Figura %d:")
@@ -6051,6 +6071,7 @@ them."
      ("eo" :default "Piednotoj")
      ("es" :ascii "Notas al pie de pagina" :html "Notas al pie de 
p&aacute;gina" :default "Notas al pie de página")
      ("et" :html "Allm&#228;rkused" :utf-8 "Allmärkused")
+     ("fa" :default "پانوشت‌ها")
      ("fi" :default "Alaviitteet")
      ("fr" :default "Notes de bas de page")
      ("hu" :html "L&aacute;bjegyzet")
@@ -6079,6 +6100,7 @@ them."
      ("de" :default "Programmauflistungsverzeichnis")
      ("es" :ascii "Indice de Listados de programas" :html "&Iacute;ndice de 
Listados de programas" :default "Índice de Listados de programas")
      ("et" :default "Loendite nimekiri")
+     ("fa" :default "فهرست برنامه‌ریزی‌ها")
      ("fr" :default "Liste des programmes")
      ("ja" :default "ソースコード目次")
      ("nl" :default "Lijst van programma's")
@@ -6097,6 +6119,7 @@ them."
      ("de" :default "Tabellenverzeichnis")
      ("es" :ascii "Indice de tablas" :html "&Iacute;ndice de tablas" :default 
"Índice de tablas")
      ("et" :default "Tabelite nimekiri")
+     ("fa" :default "فهرست جدول‌ها")
      ("fr" :default "Liste des tableaux")
      ("is" :default "Töfluskrá" :html "T&ouml;fluskr&aacute;")
      ("it" :default "Indice delle tabelle")
@@ -6120,6 +6143,7 @@ them."
      ("de" :default "Programmlisting")
      ("es" :default "Listado de programa")
      ("et" :default "Loend")
+     ("fa" :default "برنامه‌ریزی")
      ("fr" :default "Programme" :html "Programme")
      ("it" :default "Listato")
      ("ja" :default "ソースコード")
@@ -6140,6 +6164,7 @@ them."
      ("de" :default "Programmlisting %d")
      ("es" :default "Listado de programa %d")
      ("et" :default "Loend %d")
+     ("fa" :default "برنامه‌ریزی %d:")
      ("fr" :default "Programme %d :" :html "Programme&nbsp;%d&nbsp;:")
      ("it" :default "Listato %d :")
      ("ja" :default "ソースコード%d:")
@@ -6158,6 +6183,7 @@ them."
      ("cs" :default "Reference")
      ("de" :default "Quellen")
      ("es" :default "Referencias")
+     ("fa" :default "منابع")
      ("fr" :ascii "References" :default "Références")
      ("it" :default "Riferimenti")
      ("nl" :default "Bronverwijzingen")
@@ -6167,6 +6193,7 @@ them."
      ("tr" :default "Referanslar"))
     ("See figure %s"
      ("cs" :default "Viz obrázek %s")
+     ("fa" :default "نمایش شکل %s")
      ("fr" :default "cf. figure %s"
       :html "cf.&nbsp;figure&nbsp;%s" :latex "cf.~figure~%s")
      ("it" :default "Vedi figura %s")
@@ -6178,6 +6205,7 @@ them."
      ("tr" :default "bkz. şekil %s"))
     ("See listing %s"
      ("cs" :default "Viz program %s")
+     ("fa" :default "نمایش برنامه‌ریزی %s")
      ("fr" :default "cf. programme %s"
       :html "cf.&nbsp;programme&nbsp;%s" :latex "cf.~programme~%s")
      ("nl" :default "Zie programma %s"
@@ -6193,6 +6221,7 @@ them."
      ("de" :default "siehe Abschnitt %s")
      ("es" :ascii "Vea seccion %s" :html "Vea secci&oacute;n %s" :default "Vea 
sección %s")
      ("et" :html "Vaata peat&#252;kki %s" :utf-8 "Vaata peatükki %s")
+     ("fa" :default "نمایش بخش %s")
      ("fr" :default "cf. section %s")
      ("it" :default "Vedi sezione %s")
      ("ja" :default "セクション %s を参照")
@@ -6208,6 +6237,7 @@ them."
      ("zh-CN" :html "&#21442;&#35265;&#31532;%s&#33410;" :utf-8 "参见第%s节"))
     ("See table %s"
      ("cs" :default "Viz tabulka %s")
+     ("fa" :default "نمایش جدول %s")
      ("fr" :default "cf. tableau %s"
       :html "cf.&nbsp;tableau&nbsp;%s" :latex "cf.~tableau~%s")
      ("it" :default "Vedi tabella %s")
@@ -6223,6 +6253,7 @@ them."
      ("de" :default "Tabelle")
      ("es" :default "Tabla")
      ("et" :default "Tabel")
+     ("fa" :default "جدول")
      ("fr" :default "Tableau")
      ("is" :default "Tafla")
      ("it" :default "Tabella")
@@ -6241,6 +6272,7 @@ them."
      ("de" :default "Tabelle %d")
      ("es" :default "Tabla %d")
      ("et" :default "Tabel %d")
+     ("fa" :default "جدول %d")
      ("fr" :default "Tableau %d :")
      ("is" :default "Tafla %d")
      ("it" :default "Tabella %d:")
@@ -6266,6 +6298,7 @@ them."
      ("eo" :default "Enhavo")
      ("es" :ascii "Indice" :html "&Iacute;ndice" :default "Índice")
      ("et" :default "Sisukord")
+     ("fa" :default "فهرست")
      ("fi" :html "Sis&auml;llysluettelo")
      ("fr" :ascii "Sommaire" :default "Table des matières")
      ("hu" :html "Tartalomjegyz&eacute;k")
@@ -6293,6 +6326,7 @@ them."
      ("de" :default "Unbekannter Verweis")
      ("es" :default "Referencia desconocida")
      ("et" :default "Tundmatu viide")
+     ("fa" :default "منبع ناشناس")
      ("fr" :ascii "Destination inconnue" :default "Référence inconnue")
      ("it" :default "Riferimento sconosciuto")
      ("ja" :default "不明な参照先")
diff --git a/mk/targets.mk b/mk/targets.mk
index 5cba63e216..e99506a215 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -1,7 +1,7 @@
 .EXPORT_ALL_VARIABLES:
 .NOTPARALLEL: .PHONY
 # Additional distribution files
-DISTFILES_extra=  Makefile request-assign-future.txt etc
+DISTFILES_extra=  Makefile etc
 
 LISPDIRS      = lisp
 OTHERDIRS     = doc etc
diff --git a/request-assign-future.txt b/request-assign-future.txt
deleted file mode 100644
index f0133bdca4..0000000000
--- a/request-assign-future.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Please email the following information to assign@gnu.org, and we
-will send you the assignment form for your past and future changes.
-
-Please use your full legal name (in ASCII characters) as the subject
-line of the message.
-----------------------------------------------------------------------
-REQUEST: SEND FORM FOR PAST AND FUTURE CHANGES
-
-[What is the name of the program or package you're contributing to?]
-
-  Emacs
-
-[Did you copy any files or text written by someone else in these changes?
-Even if that material is free software, we need to know about it.]
-
-
-[Do you have an employer who might have a basis to claim to own
-your changes?  Do you attend a school which might make such a claim?]
-
-
-[For the copyright registration, what country are you a citizen of?]
-
-
-[What year were you born?]
-
-
-[Please write your email address here.]
-
-
-[Please write your postal address here.]
-
-
-
-
-
-[Which files have you changed so far, and which new files have you written
-so far?]
-
-
-
-
-
-
-