branch: externals/org
commit 27bc5c9a2889decaf74afe45e9937d156b0003e5
Merge: 5a358b3a35 4f0a4e07fd
Author: Kyle Meyer <[email protected]>
Commit: Kyle Meyer <[email protected]>
Merge branch 'km/from-emacs-master'
---
lisp/org-agenda.el | 2 +-
lisp/ox-ascii.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 6c0be68ac6..5a22d6a8f5 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -5393,7 +5393,7 @@ of what a project is and how to check if it stuck,
customize the variable
"Hook run when the fancy diary buffer is cleaned up.")
(defun org-agenda-cleanup-fancy-diary ()
- "Remove unwanted stuff in buffer created by `fancy-diary-display'.
+ "Remove unwanted stuff in buffer created by `diary-fancy-display'.
This gets rid of the date, the underline under the date, and the
dummy entry installed by Org mode to ensure non-empty diary for
each date. It also removes lines that contain only whitespace."
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index 02a83fc3aa..7e5ba104ff 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -462,7 +462,7 @@ Optional argument JUSTIFY can specify any type of
justification
among `left', `center', `right' or `full'. A nil value is
equivalent to `left'. For a justification that doesn't also fill
string, see `org-ascii--justify-lines' and
-`org-ascii--justify-block'.
+`org-ascii--justify-element'.
Return nil if S isn't a string."
(when (stringp s)
