mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-25 18:32:51 +00:00
Merge branch 'maint'
This commit is contained in:
commit
b913f5c7ef
|
@ -16217,6 +16217,7 @@ days in order to avoid rounding problems."
|
||||||
(apply 'format fmt (nreverse l))))
|
(apply 'format fmt (nreverse l))))
|
||||||
|
|
||||||
(defun org-time-string-to-time (s &optional buffer pos)
|
(defun org-time-string-to-time (s &optional buffer pos)
|
||||||
|
"Convert a timestamp string into internal time."
|
||||||
(condition-case errdata
|
(condition-case errdata
|
||||||
(apply 'encode-time (org-parse-time-string s))
|
(apply 'encode-time (org-parse-time-string s))
|
||||||
(error (error "Bad timestamp `%s'%s\nError was: %s"
|
(error (error "Bad timestamp `%s'%s\nError was: %s"
|
||||||
|
@ -16226,6 +16227,7 @@ days in order to avoid rounding problems."
|
||||||
(cdr errdata)))))
|
(cdr errdata)))))
|
||||||
|
|
||||||
(defun org-time-string-to-seconds (s)
|
(defun org-time-string-to-seconds (s)
|
||||||
|
"Convert a timestamp string to a number of seconds."
|
||||||
(org-float-time (org-time-string-to-time s)))
|
(org-float-time (org-time-string-to-time s)))
|
||||||
|
|
||||||
(defun org-time-string-to-absolute (s &optional daynr prefer show-all buffer pos)
|
(defun org-time-string-to-absolute (s &optional daynr prefer show-all buffer pos)
|
||||||
|
@ -22049,15 +22051,16 @@ If there is no such heading, return nil."
|
||||||
nil
|
nil
|
||||||
(point)))))
|
(point)))))
|
||||||
|
|
||||||
(defun org-end-of-subtree (&optional invisible-OK to-heading)
|
(defun org-end-of-subtree (&optional invisible-ok to-heading)
|
||||||
|
"Goto to the end of a subtree."
|
||||||
;; This contains an exact copy of the original function, but it uses
|
;; This contains an exact copy of the original function, but it uses
|
||||||
;; `org-back-to-heading', to make it work also in invisible
|
;; `org-back-to-heading', to make it work also in invisible
|
||||||
;; trees. And is uses an invisible-OK argument.
|
;; trees. And is uses an invisible-ok argument.
|
||||||
;; Under Emacs this is not needed, but the old outline.el needs this fix.
|
;; Under Emacs this is not needed, but the old outline.el needs this fix.
|
||||||
;; Furthermore, when used inside Org, finding the end of a large subtree
|
;; Furthermore, when used inside Org, finding the end of a large subtree
|
||||||
;; with many children and grandchildren etc, this can be much faster
|
;; with many children and grandchildren etc, this can be much faster
|
||||||
;; than the outline version.
|
;; than the outline version.
|
||||||
(org-back-to-heading invisible-OK)
|
(org-back-to-heading invisible-ok)
|
||||||
(let ((first t)
|
(let ((first t)
|
||||||
(level (funcall outline-level)))
|
(level (funcall outline-level)))
|
||||||
(if (and (derived-mode-p 'org-mode) (< level 1000))
|
(if (and (derived-mode-p 'org-mode) (< level 1000))
|
||||||
|
|
Loading…
Reference in a new issue