From 5f25852e91f167f99988fbe8d1944fe92d70b903 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 18 Dec 2021 13:50:40 -0500 Subject: Update to Org 9.5.1-31-ga18849 --- lisp/org/ob-tangle.el | 15 +++++++-------- lisp/org/org-agenda.el | 2 +- lisp/org/org-habit.el | 10 ++++++++-- lisp/org/org-version.el | 2 +- lisp/org/org.el | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el index 2dd1d031cb2..8ed7002ef65 100644 --- a/lisp/org/ob-tangle.el +++ b/lisp/org/ob-tangle.el @@ -179,15 +179,14 @@ source code blocks by languages matching a regular expression. Return a list whose CAR is the tangled file name." (interactive "fFile to tangle: \nP") - (let ((visited-p (find-buffer-visiting (expand-file-name file))) - to-be-removed) + (let* ((visited (find-buffer-visiting file)) + (buffer (or visited (find-file-noselect file)))) (prog1 - (save-window-excursion - (find-file file) - (setq to-be-removed (current-buffer)) - (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re))) - (unless visited-p - (kill-buffer to-be-removed))))) + (with-current-buffer buffer + (org-with-wide-buffer + (mapcar #'expand-file-name + (org-babel-tangle nil target-file lang-re)))) + (unless visited (kill-buffer buffer))))) (defun org-babel-tangle-publish (_ filename pub-dir) "Tangle FILENAME and place the results in PUB-DIR." diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 354f408679c..59bdd5b0edb 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -6765,7 +6765,7 @@ Any match of REMOVE-RE will be removed from TXT." (setq duration (- (org-duration-to-minutes s2) (org-duration-to-minutes s1)))) ;; Format S1 and S2 for display. - (when s1 (setq s1 (org-get-time-of-day s1 'overtime))) + (when s1 (setq s1 (format "%5s" (org-get-time-of-day s1 'overtime)))) (when s2 (setq s2 (org-get-time-of-day s2 'overtime)))) (when (string-match org-tag-group-re txt) ;; Tags are in the string diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el index a355d8e5faf..3ce806855c5 100644 --- a/lisp/org/org-habit.el +++ b/lisp/org/org-habit.el @@ -428,7 +428,8 @@ current time." (save-excursion (goto-char (if line (point-at-bol) (point-min))) (while (not (eobp)) - (let ((habit (get-text-property (point) 'org-habit-p))) + (let ((habit (get-text-property (point) 'org-habit-p)) + (invisible-prop (get-text-property (point) 'invisible))) (when habit (move-to-column org-habit-graph-column t) (delete-char (min (+ 1 org-habit-preceding-days @@ -439,7 +440,12 @@ current time." habit (time-subtract moment (days-to-time org-habit-preceding-days)) moment - (time-add moment (days-to-time org-habit-following-days)))))) + (time-add moment (days-to-time org-habit-following-days)))) + ;; Inherit invisible state of hidden entries. + (when invisible-prop + (put-text-property + (- (point) org-habit-graph-column) (point) + 'invisible invisible-prop)))) (forward-line))))) (defun org-habit-toggle-habits () diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index b009b9691fd..514f82ea4a5 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made." (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "release_9.5.1-25-g9ca3bc")) + (let ((org-git-version "release_9.5.1-31-ga18849")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index 00bbc076881..f784369f95f 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -6905,7 +6905,7 @@ frame is not changed." (setq beg (point) heading (org-get-heading 'no-tags)) (org-end-of-subtree t t) - (when (org-at-heading-p) (backward-char 1)) + (when (and (not (eobp)) (org-at-heading-p)) (backward-char 1)) (setq end (point))) (when (and (buffer-live-p org-last-indirect-buffer) (not (eq org-indirect-buffer-display 'new-frame)) -- cgit v1.2.3