mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-06-14 12:31:25 +00:00
Update to Org 9.8.5
This commit is contained in:
parent
aac5e0457a
commit
0bfbe06090
11 changed files with 23 additions and 19 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
% Reference Card for Org Mode
|
% Reference Card for Org Mode
|
||||||
\def\orgversionnumber{9.8.3}
|
\def\orgversionnumber{9.8.5}
|
||||||
\def\versionyear{2026} % latest update
|
\def\versionyear{2026} % latest update
|
||||||
\input emacsver.tex
|
\input emacsver.tex
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7875,7 +7875,7 @@ in the agenda."
|
||||||
"Rebuild possibly ALL agenda view(s) in the current buffer."
|
"Rebuild possibly ALL agenda view(s) in the current buffer."
|
||||||
(interactive "P")
|
(interactive "P")
|
||||||
(defvar org-agenda-tag-filter-while-redo) ;FIXME: Where is this var used?
|
(defvar org-agenda-tag-filter-while-redo) ;FIXME: Where is this var used?
|
||||||
(let* ((p (or (and (looking-at "\\'") (1- (point))) (point)))
|
(let* ((p (or (and (/= 1 (point)) (looking-at "\\'") (1- (point))) (point)))
|
||||||
(cpa (unless (eq all t) current-prefix-arg))
|
(cpa (unless (eq all t) current-prefix-arg))
|
||||||
(org-agenda-doing-sticky-redo org-agenda-sticky)
|
(org-agenda-doing-sticky-redo org-agenda-sticky)
|
||||||
(org-agenda-sticky nil)
|
(org-agenda-sticky nil)
|
||||||
|
|
|
||||||
|
|
@ -1991,13 +1991,15 @@ Optional argument N tells to change by that many units."
|
||||||
(user-error "No active clock"))
|
(user-error "No active clock"))
|
||||||
(save-excursion ; Do not replace this with `with-current-buffer'.
|
(save-excursion ; Do not replace this with `with-current-buffer'.
|
||||||
(with-no-warnings (set-buffer (org-clocking-buffer)))
|
(with-no-warnings (set-buffer (org-clocking-buffer)))
|
||||||
(goto-char org-clock-marker)
|
(save-restriction
|
||||||
(if (looking-back (concat "^[ \t]*" org-clock-string ".*")
|
(widen)
|
||||||
(line-beginning-position))
|
(goto-char org-clock-marker)
|
||||||
(progn (delete-region (1- (line-beginning-position)) (line-end-position))
|
(if (looking-back (concat "^[ \t]*" org-clock-string ".*")
|
||||||
(org-remove-empty-drawer-at (point)))
|
(line-beginning-position))
|
||||||
(message "Clock gone, cancel the timer anyway")
|
(progn (delete-region (1- (line-beginning-position)) (line-end-position))
|
||||||
(sit-for 2)))
|
(org-remove-empty-drawer-at (point)))
|
||||||
|
(message "Clock gone, cancel the timer anyway")
|
||||||
|
(sit-for 2))))
|
||||||
(move-marker org-clock-marker nil)
|
(move-marker org-clock-marker nil)
|
||||||
(move-marker org-clock-hd-marker nil)
|
(move-marker org-clock-hd-marker nil)
|
||||||
(setq org-clock-current-task nil)
|
(setq org-clock-current-task nil)
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
;; Copyright (C) 2004-2026 Free Software Foundation, Inc.
|
;; Copyright (C) 2004-2026 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
|
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
|
||||||
|
;; Maintainer: Slawomir Grochowski <slawomir.grochowski@gmail.com>
|
||||||
;; Keywords: outlines, hypermedia, calendar, text
|
;; Keywords: outlines, hypermedia, calendar, text
|
||||||
;; URL: https://orgmode.org
|
;; URL: https://orgmode.org
|
||||||
;;
|
;;
|
||||||
|
|
|
||||||
|
|
@ -2953,6 +2953,8 @@ known that the table will be realigned a little later anyway."
|
||||||
(log-first-time (current-time))
|
(log-first-time (current-time))
|
||||||
(log-last-time log-first-time)
|
(log-last-time log-first-time)
|
||||||
(cnt 0)
|
(cnt 0)
|
||||||
|
(table-beg org-table-current-begin-pos)
|
||||||
|
(table-end (org-table-end))
|
||||||
beg end eqlcol eqlfield)
|
beg end eqlcol eqlfield)
|
||||||
;; Insert constants in all formulas.
|
;; Insert constants in all formulas.
|
||||||
(when eqlist
|
(when eqlist
|
||||||
|
|
@ -2989,8 +2991,8 @@ existing formula for column %s"
|
||||||
;; Get the correct line range to process.
|
;; Get the correct line range to process.
|
||||||
(if all
|
(if all
|
||||||
(progn
|
(progn
|
||||||
(setq end (copy-marker (org-table-end)))
|
(setq end (copy-marker table-end))
|
||||||
(goto-char (setq beg org-table-current-begin-pos))
|
(goto-char (setq beg table-beg))
|
||||||
(cond
|
(cond
|
||||||
((re-search-forward org-table-calculate-mark-regexp end t)
|
((re-search-forward org-table-calculate-mark-regexp end t)
|
||||||
;; This is a table with marked lines, compute selected
|
;; This is a table with marked lines, compute selected
|
||||||
|
|
@ -3005,7 +3007,7 @@ existing formula for column %s"
|
||||||
(t nil)))
|
(t nil)))
|
||||||
(setq beg (line-beginning-position)
|
(setq beg (line-beginning-position)
|
||||||
end (copy-marker (line-beginning-position 2))))
|
end (copy-marker (line-beginning-position 2))))
|
||||||
(org-combine-change-calls beg end
|
(org-combine-change-calls table-beg table-end
|
||||||
(goto-char beg)
|
(goto-char beg)
|
||||||
;; Mark named fields untouchable. Also check if several
|
;; Mark named fields untouchable. Also check if several
|
||||||
;; field/range formulas try to set the same field.
|
;; field/range formulas try to set the same field.
|
||||||
|
|
|
||||||
|
|
@ -436,7 +436,7 @@ using three \\[universal-argument] prefix arguments."
|
||||||
(and (not (equal opt '(64)))
|
(and (not (equal opt '(64)))
|
||||||
effort-minutes
|
effort-minutes
|
||||||
(number-to-string effort-minutes))
|
(number-to-string effort-minutes))
|
||||||
(and (consp opt) default-timer)
|
(and (consp opt) (not (equal opt '(64))) default-timer)
|
||||||
(and (stringp opt) opt)
|
(and (stringp opt) opt)
|
||||||
(read-from-minibuffer
|
(read-from-minibuffer
|
||||||
"How much time left? (minutes or h:mm:ss) "
|
"How much time left? (minutes or h:mm:ss) "
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,13 @@
|
||||||
(defun org-release ()
|
(defun org-release ()
|
||||||
"The release version of Org.
|
"The release version of Org.
|
||||||
Inserted by installing Org mode or when a release is made."
|
Inserted by installing Org mode or when a release is made."
|
||||||
(let ((org-release "9.8.3"))
|
(let ((org-release "9.8.5"))
|
||||||
org-release))
|
org-release))
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(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.8.3"))
|
(let ((org-git-version "release_9.8.5"))
|
||||||
org-git-version))
|
org-git-version))
|
||||||
|
|
||||||
(provide 'org-version)
|
(provide 'org-version)
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
;; URL: https://orgmode.org
|
;; URL: https://orgmode.org
|
||||||
;; Package-Requires: ((emacs "28.2"))
|
;; Package-Requires: ((emacs "28.2"))
|
||||||
|
|
||||||
;; Version: 9.8.3
|
;; Version: 9.8.5
|
||||||
|
|
||||||
;; This file is part of GNU Emacs.
|
;; This file is part of GNU Emacs.
|
||||||
;;
|
;;
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
;; Alan Schmitt <alan.schmitt AT polytechnique DOT org>
|
;; Alan Schmitt <alan.schmitt AT polytechnique DOT org>
|
||||||
;; Viktor Rosenfeld <listuser36 AT gmail DOT com>
|
;; Viktor Rosenfeld <listuser36 AT gmail DOT com>
|
||||||
;; Rasmus Pank Roulund <emacs AT pank DOT eu>
|
;; Rasmus Pank Roulund <emacs AT pank DOT eu>
|
||||||
;; Maintainer: Marco Wahl <marcowahlsoft@gmail.com>
|
|
||||||
;; Keywords: org, text, tex
|
;; Keywords: org, text, tex
|
||||||
|
|
||||||
;; This file is part of GNU Emacs.
|
;; This file is part of GNU Emacs.
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
|
;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
|
;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
|
||||||
;; Maintainer: Daniel Fleischer <danflscr@gmail.com>
|
;; Maintainer: Pedro A. Aranda<paaguti aT gmail DoT com>
|
||||||
;; Keywords: outlines, hypermedia, calendar, text
|
;; Keywords: outlines, hypermedia, calendar, text
|
||||||
|
|
||||||
;; This file is part of GNU Emacs.
|
;; This file is part of GNU Emacs.
|
||||||
|
|
|
||||||
|
|
@ -2869,7 +2869,7 @@ Style is a symbol among `quoted', `centered' and nil."
|
||||||
(org-element-lineage
|
(org-element-lineage
|
||||||
paragraph
|
paragraph
|
||||||
'(center-block quote-block section)))
|
'(center-block quote-block section)))
|
||||||
(center-block 'center)
|
(center-block 'centered)
|
||||||
(quote-block 'quoted)))
|
(quote-block 'quoted)))
|
||||||
|
|
||||||
(defun org-odt--format-paragraph (paragraph contents info default center quote)
|
(defun org-odt--format-paragraph (paragraph contents info default center quote)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue