diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/org/org.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/org/org.el')
-rw-r--r-- | lisp/org/org.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index e6a5cca9391..f560c65dc4f 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -4757,8 +4757,8 @@ This is for getting out of special buffers like capture.") ;; Other stuff we need. (require 'time-date) (unless (fboundp 'time-subtract) (defalias 'time-subtract 'subtract-time)) -(require 'easymenu) -(require 'overlay) +(when (< emacs-major-version 28) ; preloaded in Emacs 28 + (require 'easymenu)) (require 'org-entities) (require 'org-faces) @@ -15584,7 +15584,7 @@ When a buffer is unmodified, it is just killed. When modified, it is saved This mode supports entering LaTeX environment and math in LaTeX fragments in Org mode. \\{org-cdlatex-mode-map}" - nil " OCDL" nil + :lighter " OCDL" (when org-cdlatex-mode (require 'cdlatex) (run-hooks 'cdlatex-mode-hook) @@ -20318,7 +20318,7 @@ unless optional argument NO-INHERITANCE is non-nil." (defun org-point-at-end-of-empty-headline () "If point is at the end of an empty headline, return t, else nil. -If the heading only contains a TODO keyword, it is still still considered +If the heading only contains a TODO keyword, it is still considered empty." (let ((case-fold-search nil)) (and (looking-at "[ \t]*$") |