From b4ce4d6d82f987635aece03885051b819e7a23ba Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 14 Sep 2021 07:55:56 +0200 Subject: [PATCH 1/2] Backport commit 25ebb9374 from Emacs ; More minor docfixes found by checkdoc 25ebb9374bdadf66153727831fc7ff131c8cf299 Stefan Kangas Tue Sep 14 07:57:14 2021 +0200 --- lisp/ol.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ol.el b/lisp/ol.el index 38e2dd6a0..4b7f2081a 100644 --- a/lisp/ol.el +++ b/lisp/ol.el @@ -444,7 +444,7 @@ negates this setting for the duration of the command." :safe (lambda (val) (or (booleanp val) (integerp val)))) (defcustom org-link-email-description-format "Email %c: %s" - "Format of the description part of a link to an email or usenet message. + "Format of the description part of a link to an email or Usenet message. The following %-escapes will be replaced by corresponding information: %F full \"From\" field From 7aeadf2504e352eaa19439b211867e7698707d37 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 16 Sep 2021 20:05:48 +0200 Subject: [PATCH 2/2] Backport commit 3f9f3ba43 from Emacs * lisp/org-timer.el (org-timer-set-timer): * lisp/ox.el (org-export-dispatch-last-position): Use command substitution for 'universal-argument' instead of raw "C-u". Docfix: use command substitution for 'universal-argument' 3f9f3ba4370bd4d0f33392befb35328327d73b1e Stefan Kangas Thu Sep 16 20:05:48 2021 +0200 --- lisp/org-timer.el | 6 +++--- lisp/ox.el | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 852d18579..e2116be70 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -400,16 +400,16 @@ prompt the user if she wants to replace it. Called with a numeric prefix argument, use this numeric value as the duration of the timer in minutes. -Called with a `C-u' prefix arguments, use `org-timer-default-timer' +Called with a \\[universal-argument] prefix arguments, use `org-timer-default-timer' without prompting the user for a duration. -With two `C-u' prefix arguments, use `org-timer-default-timer' +With two \\[universal-argument] prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer. By default, the timer duration will be set to the number of minutes in the Effort property, if any. You can ignore this by -using three `C-u' prefix arguments." +using three \\[universal-argument] prefix arguments." (interactive "P") (when (and org-timer-start-time (not org-timer-countdown-timer)) diff --git a/lisp/ox.el b/lisp/ox.el index 36ecf0148..d412f5736 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -294,7 +294,7 @@ and its CDR is a list of export options.") (defvar org-export-dispatch-last-position (make-marker) "The position where the last export command was created using the dispatcher. -This marker will be used with `C-u C-c C-e' to make sure export repetition +This marker will be used with `\\[universal-argument] C-c C-e' to make sure export repetition uses the same subtree if the previous command was restricted to a subtree.") ;; For compatibility with Org < 8