[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org aeb934b598 41/50: Merge branch 'km/from-emacs-28'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org aeb934b598 41/50: Merge branch 'km/from-emacs-28' |
Date: |
Tue, 4 Oct 2022 21:58:02 -0400 (EDT) |
branch: externals/org
commit aeb934b5989d47a45740034dcb469774ef9fa5b0
Merge: 631d4eb6af e7572fa86c
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Merge branch 'km/from-emacs-28'
---
doc/org-manual.org | 9 +++++----
lisp/ox.el | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index a5fec8cf90..2f70871184 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -10674,9 +10674,10 @@ See the docstring of the variable for more information.
If you are away from your computer, it can be very useful to have a
printed version of some agenda views to carry around. Org mode can
export custom agenda views as plain text, HTML[fn:: For HTML you need
-to install Hrvoje Nikšić's =htmlize.el= as an Emacs package from MELPA
-or from [[https://github.com/hniksic/emacs-htmlize][Hrvoje Nikšić's
-repository]].], Postscript, PDF[fn:35], and iCalendar files. If you
+to install Hrvoje Nikšić's =htmlize.el= as an Emacs package from
+[[https://elpa.nongnu.org/][NonGNU ELPA]] or from
+[[https://github.com/hniksic/emacs-htmlize][Hrvoje Nikšić's repository]].],
+Postscript, PDF[fn:35], and iCalendar files. If you
want to do this only occasionally, use the following command:
- {{{kbd(C-x C-w)}}} (~org-agenda-write~) ::
@@ -11195,7 +11196,7 @@ a major LaTeX mode like AUCTeX in order to speed-up
insertion of
environments and math templates. Inside Org mode, you can make use of
some of the features of CDLaTeX mode. You need to install
=cdlatex.el= and =texmathp.el= (the latter comes also with AUCTeX)
-using [[https://melpa.org/][MELPA]] with the
[[https://www.gnu.org/software/emacs/manual/html_node/emacs/Package-Installation.html][Emacs
packaging system]] or alternatively from
+from [[https://elpa.nongnu.org/][NonGNU ELPA]] with the
[[https://www.gnu.org/software/emacs/manual/html_node/emacs/Package-Installation.html][Emacs
packaging system]] or alternatively from
[[https://staff.fnwi.uva.nl/c.dominik/Tools/cdlatex/]]. Do not use
CDLaTeX mode itself under Org mode, but use the special version Org
CDLaTeX minor mode that comes as part of Org. Turn it on for the
diff --git a/lisp/ox.el b/lisp/ox.el
index 51145acaa5..4941533120 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -4705,7 +4705,7 @@ from the export back-end."
;; a given element, excluded. Note: "-n" switches reset that count.
;;
;; `org-export-unravel-code' extracts source code (along with a code
-;; references alist) from an `element-block' or `src-block' type
+;; references alist) from an `example-block' or `src-block' type
;; element.
;;
;; `org-export-format-code' applies a formatting function to each line
- [elpa] externals/org e7059f7dbe 28/50: Backport commit 22a5f0223 from Emacs, (continued)
- [elpa] externals/org e7059f7dbe 28/50: Backport commit 22a5f0223 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org e9df837d8a 30/50: Backport commit 0a6e2b3bf from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 883f87c3e7 32/50: Backport commit 4d64c39fa from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 2ac8c44f04 33/50: Backport commit b335e1a04 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 631d4eb6af 40/50: org-macs: Move org-current-text-indentation to silence byte-compiler, ELPA Syncer, 2022/10/04
- [elpa] externals/org 07c5d066aa 17/50: Backport commit 3236dedc2 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 9b62bcc9c6 39/50: Backport commit 8dacd8cd9 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 0e0fe76ae4 45/50: ox-icalendar: Fix time zone construct from recently ported commit, ELPA Syncer, 2022/10/04
- [elpa] externals/org 07b6a0e044 48/50: compat: Use org- wrapper for string-equal-ignore-case compatibility, ELPA Syncer, 2022/10/04
- [elpa] externals/org 1adbaca75a 26/50: Backport commit 563bf2fae from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org aeb934b598 41/50: Merge branch 'km/from-emacs-28',
ELPA Syncer <=
- [elpa] externals/org abc34b458f 43/50: org-mouse: Make recently ported change compatible with Emacs < 29, ELPA Syncer, 2022/10/04
- [elpa] externals/org 1f8cc85542 50/50: org-agenda: Replace 29.1 version keywords with package-version, ELPA Syncer, 2022/10/04
- [elpa] externals/org 42c418693f 42/50: Merge branch 'km/from-emacs-master', ELPA Syncer, 2022/10/04
- [elpa] externals/org 8ac9203d5c 20/50: Backport commit 979308b4c from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 4f8ea50604 18/50: Backport commit d21412df0 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org e614a763ca 27/50: Backport commit 70341cab3 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 19c3969e75 29/50: Backport commit 2682ea1b3 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 25e638f726 34/50: Backport commit 1137219c9 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 9c2bc2877f 37/50: Backport commit 06d716147 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org c2c8e66e5d 38/50: Backport commit b7e867b84 from Emacs, ELPA Syncer, 2022/10/04