branch: externals/org
commit 5561260692dc7605654343cc35b9aa2e8d7c987b
Merge: a9455543df 87c71e6290
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
lisp/org-agenda.el | 20 ++++++++++----------
lisp/org-clock.el | 2 +-
lisp/org-refile.el | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 93f32ff1e3..87a9a462a4 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1637,16 +1637,16 @@ symbols are recognized:
time-up Put entries with time-of-day indications first, early first.
time-down Put entries with time-of-day indications first, late first.
-timestamp-up Sort by any timestamp, early first.
-timestamp-down Sort by any timestamp, late first.
-scheduled-up Sort by scheduled timestamp, early first.
-scheduled-down Sort by scheduled timestamp, late first.
-deadline-up Sort by deadline timestamp, early first.
-deadline-down Sort by deadline timestamp, late first.
-ts-up Sort by active timestamp, early first.
-ts-down Sort by active timestamp, late first.
-tsia-up Sort by inactive timestamp, early first.
-tsia-down Sort by inactive timestamp, late first.
+timestamp-up Sort by any timestamp date, early first.
+timestamp-down Sort by any timestamp date, late first.
+scheduled-up Sort by scheduled timestamp date, early first.
+scheduled-down Sort by scheduled timestamp date, late first.
+deadline-up Sort by deadline timestamp date, early first.
+deadline-down Sort by deadline timestamp date, late first.
+ts-up Sort by active timestamp date, early first.
+ts-down Sort by active timestamp date, late first.
+tsia-up Sort by inactive timestamp date, early first.
+tsia-down Sort by inactive timestamp date, late first.
category-keep Keep the default order of categories, corresponding to the
sequence in `org-agenda-files'.
category-up Sort alphabetically by category, A-Z.
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index d72ef4e293..a4b37ce59e 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -3251,7 +3251,7 @@ The details of what will be saved are regulated by the
variable
org-clock-has-been-used
(not (file-exists-p org-clock-persist-file))))
(with-temp-file org-clock-persist-file
- (insert (format ";; %s - %s at %s\n"
+ (insert (format ";; %s - %s at %s -*- lexical-binding: t; -*-\n"
(file-name-nondirectory org-clock-persist-file)
(system-name)
(format-time-string (org-time-stamp-format t))))
diff --git a/lisp/org-refile.el b/lisp/org-refile.el
index 5e9cecd746..e15ba41349 100644
--- a/lisp/org-refile.el
+++ b/lisp/org-refile.el
@@ -104,7 +104,7 @@ are used, equivalent to the value `((nil . (:level . 1)))'."
(choice :value org-agenda-files
(const :tag "All agenda files" org-agenda-files)
(const :tag "Current buffer" nil)
- (function) (variable) (file))
+ (function) (variable) (file) (repeat (file)))
(choice :tag "Identify target headline by"
(cons :tag "Specific tag" (const :value :tag) (string))
(cons :tag "TODO keyword" (const :value :todo) (string))
