tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'km/from-emacs-master'

This commit is contained in:
Kyle Meyer 2022-10-29 15:15:03 -04:00
parent 5a358b3a35 4f0a4e07fd
commit 27bc5c9a28
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-agenda.el
View File

@ -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.") "Hook run when the fancy diary buffer is cleaned up.")
(defun org-agenda-cleanup-fancy-diary () (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 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 dummy entry installed by Org mode to ensure non-empty diary for
each date. It also removes lines that contain only whitespace." each date. It also removes lines that contain only whitespace."

2
lisp/ox-ascii.el
View File

@ -462,7 +462,7 @@ Optional argument JUSTIFY can specify any type of justification
among `left', `center', `right' or `full'. A nil value is among `left', `center', `right' or `full'. A nil value is
equivalent to `left'. For a justification that doesn't also fill equivalent to `left'. For a justification that doesn't also fill
string, see `org-ascii--justify-lines' and string, see `org-ascii--justify-lines' and
`org-ascii--justify-block'. `org-ascii--justify-element'.
Return nil if S isn't a string." Return nil if S isn't a string."
(when (stringp s) (when (stringp s)