From bf22d98f9949492fc10c7cc753082f6abd373462 Mon Sep 17 00:00:00 2001 From: Marco Wahl Date: Sat, 25 Sep 2021 20:55:34 +0200 Subject: [PATCH 1/3] CONTRIBUTE: Update to follow the new structure of doc/ --- CONTRIBUTE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTE b/CONTRIBUTE index e73f0063a..fcbf3c0e5 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -38,7 +38,7 @@ development. applies are: - all *.el files in the lisp directory of the repository - - org.texi, orgcard.tex in the doc/ directory + - orgcard.tex and all *.org files in the doc/ directory - Before making any significant changes, please explain and discuss them on the mailing list [[mailto:emacs-orgmode@gnu.org][emacs-orgmode@gnu.org]]. From d8b9bd05ba8da2ced6dfda4777169f68d7caa430 Mon Sep 17 00:00:00 2001 From: Nicholas Vollmer Date: Sat, 25 Sep 2021 15:05:08 -0400 Subject: [PATCH 2/3] Fix byte-comp function warnings * (org.el, org-table.el org-keys.el) Declare functions for byte compiler. --- lisp/org-keys.el | 3 ++- lisp/org-table.el | 1 + lisp/org.el | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/org-keys.el b/lisp/org-keys.el index 726d54210..1c1785cb7 100644 --- a/lisp/org-keys.el +++ b/lisp/org-keys.el @@ -56,7 +56,6 @@ (declare-function org-clone-subtree-with-time-shift "org" (n &optional shift)) (declare-function org-columns "org" (&optional global columns-fmt-string)) (declare-function org-comment-dwim "org" (arg)) -(declare-function org-refile-copy "org" ()) (declare-function org-copy-special "org" ()) (declare-function org-copy-visible "org" (beg end)) (declare-function org-ctrl-c-ctrl-c "org" (&optional arg)) @@ -143,6 +142,8 @@ (declare-function org-promote-subtree "org" ()) (declare-function org-redisplay-inline-images "org" ()) (declare-function org-refile "org" (&optional arg1 default-buffer rfloc msg)) +(declare-function org-refile-copy "org" ()) +(declare-function org-refile-reverse "org-refile" (&optional arg default-buffer rfloc msg)) (declare-function org-reftex-citation "org" ()) (declare-function org-reload "org" (&optional arg1)) (declare-function org-remove-file "org" (&optional file)) diff --git a/lisp/org-table.el b/lisp/org-table.el index cbed2f02b..87d6b2f16 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -66,6 +66,7 @@ (declare-function org-export-install-filters "ox" (info)) (declare-function org-export-table-has-special-column-p "ox" (table)) (declare-function org-export-table-row-is-special-p "ox" (table-row info)) +(declare-function org-forward-paragraph "org" (&optional arg)) (declare-function org-id-find "org-id" (id &optional markerp)) (declare-function org-indent-line "org" ()) (declare-function org-load-modules-maybe "org" (&optional force)) diff --git a/lisp/org.el b/lisp/org.el index 467485b2c..3f0a5005e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -157,13 +157,18 @@ Stars are put in group 1 and the trimmed body in group 2.") (declare-function org-element-context "org-element" (&optional element)) (declare-function org-element-copy "org-element" (datum)) (declare-function org-element-create "org-element" (type &optional props &rest children)) +(declare-function org-element-extract-element "org-element" (element)) +(declare-function org-element-insert-before "org-element" (element location)) (declare-function org-element-interpret-data "org-element" (data)) (declare-function org-element-lineage "org-element" (blob &optional types with-self)) (declare-function org-element-link-parser "org-element" ()) +(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion with-affiliated)) (declare-function org-element-nested-p "org-element" (elem-a elem-b)) (declare-function org-element-parse-buffer "org-element" (&optional granularity visible-only)) +(declare-function org-element-parse-secondary-string "org-element" (string restriction &optional parent)) (declare-function org-element-property "org-element" (property element)) (declare-function org-element-put-property "org-element" (element property value)) +(declare-function org-element-restriction "org-element" (element)) (declare-function org-element-swap-A-B "org-element" (elem-a elem-b)) (declare-function org-element-timestamp-parser "org-element" ()) (declare-function org-element-type "org-element" (element)) From 97de19f65994c6302b6a8f67db4f8acd039a0c1c Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Fri, 30 Jul 2021 22:16:02 +0800 Subject: [PATCH 3/3] Fix not updating org-clock-marker after refiling from indirect buffer * lisp/org.el (org-check-and-save-marker): Save markers in base buffer of indirect buffer in addition to markers in current buffer. Fixes bug reported in https://orgmode.org/list/CABa5=g4bvYQoTbBn96tFi9K827u_A+MweqYWWpib_tyFLBdG3g@mail.gmail.com/T/#t --- lisp/org.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 3f0a5005e..051987e0c 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7811,7 +7811,8 @@ called immediately, to move the markers with the entries." "Check if MARKER is between BEG and END. If yes, remember the marker and the distance to BEG." (when (and (marker-buffer marker) - (equal (marker-buffer marker) (current-buffer)) + (or (equal (marker-buffer marker) (current-buffer)) + (equal (marker-buffer marker) (buffer-base-buffer (current-buffer)))) (>= marker beg) (< marker end)) (push (cons marker (- marker beg)) org-markers-to-move)))