procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Org 9.5.1-31-ga18849

Browse source
This commit is contained in:
Kyle Meyer 2021-12-18 13:50:40 -05:00
parent 1e578267fb
commit 5f25852e91
5 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/org/ob-tangle.el
View file

@ -179,15 +179,14 @@ source code blocks by languages matching a regular expression.
Return a list whose CAR is the tangled file name." Return a list whose CAR is the tangled file name."
(interactive "fFile to tangle: \nP") (interactive "fFile to tangle: \nP")
(let ((visited-p (find-buffer-visiting (expand-file-name file))) (let* ((visited (find-buffer-visiting file))
to-be-removed) (buffer (or visited (find-file-noselect file))))
(prog1 (prog1
(save-window-excursion (with-current-buffer buffer
(find-file file) (org-with-wide-buffer
(setq to-be-removed (current-buffer)) (mapcar #'expand-file-name
(mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re))) (org-babel-tangle nil target-file lang-re))))
(unless visited-p (unless visited (kill-buffer buffer)))))
(kill-buffer to-be-removed)))))
(defun org-babel-tangle-publish (_ filename pub-dir) (defun org-babel-tangle-publish (_ filename pub-dir)
"Tangle FILENAME and place the results in PUB-DIR." "Tangle FILENAME and place the results in PUB-DIR."

2
lisp/org/org-agenda.el
View file

@ -6765,7 +6765,7 @@ Any match of REMOVE-RE will be removed from TXT."
(setq duration (- (org-duration-to-minutes s2) (setq duration (- (org-duration-to-minutes s2)
(org-duration-to-minutes s1)))) (org-duration-to-minutes s1))))
;; Format S1 and S2 for display. ;; 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 s2 (setq s2 (org-get-time-of-day s2 'overtime))))
(when (string-match org-tag-group-re txt) (when (string-match org-tag-group-re txt)
;; Tags are in the string ;; Tags are in the string

10
lisp/org/org-habit.el
View file

@ -428,7 +428,8 @@ current time."
(save-excursion (save-excursion
(goto-char (if line (point-at-bol) (point-min))) (goto-char (if line (point-at-bol) (point-min)))
(while (not (eobp)) (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 (when habit
(move-to-column org-habit-graph-column t) (move-to-column org-habit-graph-column t)
(delete-char (min (+ 1 org-habit-preceding-days (delete-char (min (+ 1 org-habit-preceding-days
@ -439,7 +440,12 @@ current time."
habit habit
(time-subtract moment (days-to-time org-habit-preceding-days)) (time-subtract moment (days-to-time org-habit-preceding-days))
moment 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))))) (forward-line)))))
(defun org-habit-toggle-habits () (defun org-habit-toggle-habits ()

2
lisp/org/org-version.el
View file

@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
(defun org-git-version () (defun org-git-version ()
"The Git version of Org mode. "The Git version of Org mode.
Inserted by installing Org or when a release is made." 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)) org-git-version))
(provide 'org-version) (provide 'org-version)

2
lisp/org/org.el
View file

@ -6905,7 +6905,7 @@ frame is not changed."
(setq beg (point) (setq beg (point)
heading (org-get-heading 'no-tags)) heading (org-get-heading 'no-tags))
(org-end-of-subtree t t) (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))) (setq end (point)))
(when (and (buffer-live-p org-last-indirect-buffer) (when (and (buffer-live-p org-last-indirect-buffer)
(not (eq org-indirect-buffer-display 'new-frame)) (not (eq org-indirect-buffer-display 'new-frame))