branch: externals/org
commit 52a0ef94c9b1882e027d6604b3918c8bd8dd8d4e
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Backport contributed commits
---
lisp/org-cycle.el | 2 +-
lisp/org-fold-core.el | 2 +-
lisp/org-keys.el | 4 ++--
lisp/org.el | 6 ++----
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/lisp/org-cycle.el b/lisp/org-cycle.el
index df0a3761a1..d2fcc356cd 100644
--- a/lisp/org-cycle.el
+++ b/lisp/org-cycle.el
@@ -811,7 +811,7 @@ STATE should be one of the symbols listed in the docstring
of
(org-get-tags nil 'local)))
(message "%s" (substitute-command-keys
"Subtree is archived and stays closed. Use \
-`\\[org-cycle-force-archived]' to cycle it anyway."))))))
+`\\[org-force-cycle-archived]' to cycle it anyway."))))))
(provide 'org-cycle)
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 121c6b5c48..6ea374498d 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -592,7 +592,7 @@ unless RETURN-ONLY is non-nil."
(org-fold-core-cycle-over-indirect-buffers
(push (current-buffer) bufs))
(push buf bufs)
- (delete-dups bufs)))))
+ (delete-duplicates bufs)))))
;; Copy all the old folding properties to preserve the folding
state
(with-silent-modifications
(dolist (old-prop (cdr (assq 'invisible
char-property-alias-alist)))
diff --git a/lisp/org-keys.el b/lisp/org-keys.el
index 782ffa8710..e6b8ff4591 100644
--- a/lisp/org-keys.el
+++ b/lisp/org-keys.el
@@ -94,7 +94,7 @@
(declare-function org-fill-paragraph "org" (&optional justify region))
(declare-function org-find-file-at-mouse "org" (ev))
(declare-function org-footnote-action "org" (&optional special))
-(declare-function org-cycle-force-archived "org-cycle" ())
+(declare-function org-force-cycle-archived "org-cycle" ())
(declare-function org-force-self-insert "org" (n))
(declare-function org-forward-element "org" ())
(declare-function org-forward-heading-same-level "org" (arg &optional
invisible-ok))
@@ -444,7 +444,7 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command
names."
;;;; TAB key with modifiers
(org-defkey org-mode-map (kbd "TAB") #'org-cycle)
-(org-defkey org-mode-map (kbd "C-c C-<tab>") #'org-cycle-force-archived)
+(org-defkey org-mode-map (kbd "C-c C-<tab>") #'org-force-cycle-archived)
;; Override text-mode binding to expose `complete-symbol' for
;; pcomplete functionality.
(org-defkey org-mode-map (kbd "M-TAB") nil)
diff --git a/lisp/org.el b/lisp/org.el
index 1fd9be370a..e361d41539 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -106,7 +106,6 @@
(defalias 'org-overview #'org-cycle-overview)
(defalias 'org-content #'org-cycle-content)
(defalias 'org-reveal #'org-fold-reveal)
-(defalias 'org-force-cycle-archived #'org-cycle-force-archived)
;; `org-outline-regexp' ought to be a defconst but is let-bound in
;; some places -- e.g. see the macro `org-with-limited-levels'.
@@ -6169,8 +6168,7 @@ Return nil before first heading."
(looking-at org-complex-heading-regexp)
;; When using `org-fold-core--optimise-for-huge-buffers',
;; returned text may be invisible. Clear it up.
- (save-match-data
- (org-fold-core-remove-optimisation (match-beginning 0) (match-end
0)))
+ (org-fold-core-remove-optimisation (match-beginning 0) (match-end 0))
(let ((todo (and (not no-todo) (match-string 2)))
(priority (and (not no-priority) (match-string 3)))
(headline (pcase (match-string 4)
@@ -11699,7 +11697,7 @@ Assume point is at the beginning of the headline."
(let* ((cached (and (org-element--cache-active-p) (org-element-at-point nil
'cached)))
(cached-tags (org-element-property :tags cached)))
(if cached
- ;; If we do explicitly copy the result, reference would
+ ;; If we do not explicitly copy the result, reference would
;; be returned and cache element might be modified directly.
(mapcar #'copy-sequence cached-tags)
;; Parse tags manually.
