branch: externals/org
commit 0f0f9629c296e874a2807093de5f27d6a03ef2dd
Merge: e49a31ced2 dd3876dbda
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
Makefile | 12 ++++-----
lisp/org-capture.el | 2 +-
lisp/org.el | 8 +++---
lisp/ox.el | 70 ++++++++++++++++++++++++++---------------------------
4 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/Makefile b/Makefile
index 66b513b152..c97e3061a4 100644
--- a/Makefile
+++ b/Makefile
@@ -23,18 +23,18 @@ help helpall::
$(info )
$(info Build and Check)
$(info ===============)
- $(info make - build Org ELisp and all documentation)
+ $(info make - build Org Elisp and all documentation)
$(info make all - ditto)
- $(info make compile - build Org ELisp files)
- $(info make single - build Org ELisp files, single Emacs per
source)
+ $(info make compile - build Org Elisp files)
+ $(info make single - build Org Elisp files, single Emacs per
source)
$(info make native - build Org natively compiled Elisp files)
$(info make autoloads - create org-loaddefs.el to load Org
in-place)
- $(info make test - build Org ELisp files and run test suite)
+ $(info make test - build Org Elisp files and run test suite)
$(info make vanilla - run Emacs with this Org-mode and no
personal config)
$(info make repro - like vanilla, but refresh compilation and
enable debugging [use this to reproduce bugs])
helpall::
$(info make test-dirty - check without building first)
- $(info make compile-dirty - build only stale Org ELisp files)
+ $(info make compile-dirty - build only stale Org Elisp files)
$(info )
$(info Compatibility)
$(info =============)
@@ -42,7 +42,7 @@ helpall::
$(info )
$(info Cleaning)
$(info ========)
- $(info make clean - remove built Org ELisp files and
documentation)
+ $(info make clean - remove built Org Elisp files and
documentation)
$(info make cleanall - remove everything that can be built and
all remnants)
$(info make clean-install - remove previous Org installation)
$(info )
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index d44ccceadb..b36c1c1166 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -681,7 +681,7 @@ When called with a `C-0' (zero) prefix, insert a template
at point.
When called with a `C-1' (one) prefix, force prompting for a date when
a datetree entry is made.
-ELisp programs can set KEYS to a string associated with a template
+Elisp programs can set KEYS to a string associated with a template
in `org-capture-templates'. In this case, interactive selection
will be bypassed.
diff --git a/lisp/org.el b/lisp/org.el
index bc61a7c462..8b989a47cc 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3201,16 +3201,16 @@ There are multiple ways to set the category. One way
is to set
it in the document property drawer. For example:
:PROPERTIES:
-:CATEGORY: ELisp
+:CATEGORY: Elisp
:END:
Other ways to define it is as an Emacs file variable, for example
-# -*- mode: org; org-category: \"ELisp\"
+# -*- mode: org; org-category: \"Elisp\"
or for the file to contain a special line:
-#+CATEGORY: ELisp
+#+CATEGORY: Elisp
If the file does not specify a category, then file's base name
is used instead.")
@@ -9492,7 +9492,7 @@ With numeric prefix arg, switch to the Nth state.
With a numeric prefix arg of 0, inhibit note taking for the change.
With a numeric prefix arg of -1, cancel repeater to allow marking as DONE.
-When called through ELisp, arg is also interpreted in the following way:
+When called through Elisp, arg is also interpreted in the following way:
`none' -> empty state
\"\" -> switch to empty state
`done' -> switch to DONE
diff --git a/lisp/ox.el b/lisp/ox.el
index 7d44c3d702..7e8ffc715d 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6292,25 +6292,25 @@ them."
("Figure %d:"
("ar" :default "شكل %d:")
("cs" :default "Obrázek %d:")
- ("da" :default "Figur %d")
+ ("da" :default "Figur %d:")
("de" :default "Abbildung %d:")
("es" :default "Figura %d:")
("et" :default "Joonis %d:")
("fa" :default "شکل %d:")
- ("fr" :default "Figure %d :" :html "Figure %d :")
- ("is" :default "Mynd %d")
+ ("fr" :default "Figure %d:" :html "Figure %d :")
+ ("is" :default "Mynd %d:")
("it" :default "Figura %d:")
- ("ja" :default "図%d: " :html "図%d: ")
+ ("ja" :default "図%d:" :html "図%d:")
("nl" :default "Figuur %d:" :html "Figuur %d:")
- ("no" :default "Illustrasjon %d")
- ("nb" :default "Illustrasjon %d")
- ("nn" :default "Illustrasjon %d")
- ("pl" :default "Obrazek %d") ; alternatively "Rysunek %d"
+ ("no" :default "Illustrasjon %d:")
+ ("nb" :default "Illustrasjon %d:")
+ ("nn" :default "Illustrasjon %d:")
+ ("pl" :default "Obrazek %d:") ; alternatively "Rysunek %d"
("pt_BR" :default "Figura %d:")
("ro" :default "Imaginea %d:")
("ru" :html "Рис. %d.:" :utf-8 "Рис. %d.:")
- ("sl" :default "Slika %d")
- ("sv" :default "Illustration %d")
+ ("sl" :default "Slika %d:")
+ ("sv" :default "Illustration %d:")
("tr" :default "Şekil %d:")
("zh-CN" :html "图%d " :utf-8 "图%d "))
("Footnotes"
@@ -6418,24 +6418,24 @@ them."
("Listing %d:"
("ar" :default "برنامج %d:")
("cs" :default "Program %d:")
- ("da" :default "Program %d")
- ("de" :default "Programmlisting %d")
- ("es" :default "Listado de programa %d")
- ("et" :default "Loend %d")
+ ("da" :default "Program %d:")
+ ("de" :default "Programmlisting %d:")
+ ("es" :default "Listado de programa %d:")
+ ("et" :default "Loend %d:")
("fa" :default "برنامهریزی %d:")
- ("fr" :default "Programme %d :" :html "Programme %d :")
- ("it" :default "Listato %d :")
+ ("fr" :default "Programme %d:" :html "Programme %d :")
+ ("it" :default "Listato %d:")
("ja" :default "ソースコード%d:")
("nl" :default "Programma %d:" :html "Programma %d:")
("nn" :default "Program %d:")
- ("no" :default "Dataprogram %d")
- ("nb" :default "Dataprogram %d")
- ("ro" :default "Lista %d")
+ ("no" :default "Dataprogram %d:")
+ ("nb" :default "Dataprogram %d:")
+ ("ro" :default "Lista %d:")
("pl" :default "Indeks %d:")
("pt_BR" :default "Listagem %d:")
("ru" :html
"Распечатка %d.:"
:utf-8 "Распечатка %d.:")
- ("sl" :default "Izpis programa %d")
+ ("sl" :default "Izpis programa %d:")
("sv" :default "Programlistning %d:")
("tr" :default "Program %d:")
("zh-CN" :html "代码%d " :utf-8 "代码%d "))
@@ -6554,27 +6554,27 @@ them."
("Table %d:"
("ar" :default "جدول %d:")
("cs" :default "Tabulka %d:")
- ("da" :default "Tabel %d")
- ("de" :default "Tabelle %d")
- ("es" :default "Tabla %d")
- ("et" :default "Tabel %d")
- ("fa" :default "جدول %d")
- ("fr" :default "Tableau %d :")
- ("is" :default "Tafla %d")
+ ("da" :default "Tabel %d:")
+ ("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:")
("ja" :default "表%d:" :html "表%d:")
("nl" :default "Tabel %d:" :html "Tabel %d:")
- ("no" :default "Tabell %d")
- ("nb" :default "Tabell %d")
- ("nn" :default "Tabell %d")
- ("pl" :default "Tabela %d")
+ ("no" :default "Tabell %d:")
+ ("nb" :default "Tabell %d:")
+ ("nn" :default "Tabell %d:")
+ ("pl" :default "Tabela %d:")
("pt_BR" :default "Tabela %d:")
- ("ro" :default "Tabel %d")
+ ("ro" :default "Tabel %d:")
("ru" :html "Таблица %d.:"
:utf-8 "Таблица %d.:")
- ("sl" :default "Tabela %d")
+ ("sl" :default "Tabela %d:")
("sv" :default "Tabell %d:")
- ("tr" :default "Tablo %d")
+ ("tr" :default "Tablo %d:")
("zh-CN" :html "表%d " :utf-8 "表%d "))
("Table of Contents"
("ar" :default "قائمة المحتويات")
@@ -6688,7 +6688,7 @@ to `:default' encoding. If it fails, return S."
"Call function FUN on the results returned by BODY evaluation.
FUN is an anonymous function of one argument. BODY should be a valid
-ELisp source expression. BODY evaluation happens in an asynchronous process,
+Elisp source expression. BODY evaluation happens in an asynchronous process,
from a buffer which is an exact copy of the current one.
Use `org-export-add-to-stack' in FUN in order to register results
