summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/refcards/orgcard.tex2
-rw-r--r--lisp/org/org-agenda.el2
-rw-r--r--lisp/org/org-clock.el16
-rw-r--r--lisp/org/org-colview.el1
-rw-r--r--lisp/org/org-table.el8
-rw-r--r--lisp/org/org-timer.el2
-rw-r--r--lisp/org/org-version.el4
-rw-r--r--lisp/org/org.el2
-rw-r--r--lisp/org/ox-koma-letter.el1
-rw-r--r--lisp/org/ox-latex.el2
-rw-r--r--lisp/org/ox-odt.el2
11 files changed, 23 insertions, 19 deletions
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index dcd3208d132..8b38b98897e 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
% Reference Card for Org Mode
-\def\orgversionnumber{9.8.3}
+\def\orgversionnumber{9.8.5}
\def\versionyear{2026} % latest update
\input emacsver.tex
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index dd86a716ac7..481eba50313 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -7875,7 +7875,7 @@ in the agenda."
"Rebuild possibly ALL agenda view(s) in the current buffer."
(interactive "P")
(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))
(org-agenda-doing-sticky-redo org-agenda-sticky)
(org-agenda-sticky nil)
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index ce2d23a9b97..b803d0fe874 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1991,13 +1991,15 @@ Optional argument N tells to change by that many units."
(user-error "No active clock"))
(save-excursion ; Do not replace this with `with-current-buffer'.
(with-no-warnings (set-buffer (org-clocking-buffer)))
- (goto-char org-clock-marker)
- (if (looking-back (concat "^[ \t]*" org-clock-string ".*")
- (line-beginning-position))
- (progn (delete-region (1- (line-beginning-position)) (line-end-position))
- (org-remove-empty-drawer-at (point)))
- (message "Clock gone, cancel the timer anyway")
- (sit-for 2)))
+ (save-restriction
+ (widen)
+ (goto-char org-clock-marker)
+ (if (looking-back (concat "^[ \t]*" org-clock-string ".*")
+ (line-beginning-position))
+ (progn (delete-region (1- (line-beginning-position)) (line-end-position))
+ (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-hd-marker nil)
(setq org-clock-current-task nil)
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 8b97aa2ad01..6eed2351ceb 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -3,6 +3,7 @@
;; Copyright (C) 2004-2026 Free Software Foundation, Inc.
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
+;; Maintainer: Slawomir Grochowski <slawomir.grochowski@gmail.com>
;; Keywords: outlines, hypermedia, calendar, text
;; URL: https://orgmode.org
;;
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index ba33f6724a0..32cea3e4b0b 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -2953,6 +2953,8 @@ known that the table will be realigned a little later anyway."
(log-first-time (current-time))
(log-last-time log-first-time)
(cnt 0)
+ (table-beg org-table-current-begin-pos)
+ (table-end (org-table-end))
beg end eqlcol eqlfield)
;; Insert constants in all formulas.
(when eqlist
@@ -2989,8 +2991,8 @@ existing formula for column %s"
;; Get the correct line range to process.
(if all
(progn
- (setq end (copy-marker (org-table-end)))
- (goto-char (setq beg org-table-current-begin-pos))
+ (setq end (copy-marker table-end))
+ (goto-char (setq beg table-beg))
(cond
((re-search-forward org-table-calculate-mark-regexp end t)
;; This is a table with marked lines, compute selected
@@ -3005,7 +3007,7 @@ existing formula for column %s"
(t nil)))
(setq beg (line-beginning-position)
end (copy-marker (line-beginning-position 2))))
- (org-combine-change-calls beg end
+ (org-combine-change-calls table-beg table-end
(goto-char beg)
;; Mark named fields untouchable. Also check if several
;; field/range formulas try to set the same field.
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index 8c9df9d379f..d6d7cfaa43b 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -436,7 +436,7 @@ using three \\[universal-argument] prefix arguments."
(and (not (equal opt '(64)))
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)
(read-from-minibuffer
"How much time left? (minutes or h:mm:ss) "
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index b6a6d1d4eec..f0a212f2ef0 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
(defun org-release ()
"The release version of Org.
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))
;;;###autoload
(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.8.3"))
+ (let ((org-git-version "release_9.8.5"))
org-git-version))
(provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 84b4f245f8e..ba31ad67bd1 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
;; URL: https://orgmode.org
;; Package-Requires: ((emacs "28.2"))
-;; Version: 9.8.3
+;; Version: 9.8.5
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org/ox-koma-letter.el b/lisp/org/ox-koma-letter.el
index 61b624e870d..3a17dceb2fb 100644
--- a/lisp/org/ox-koma-letter.el
+++ b/lisp/org/ox-koma-letter.el
@@ -6,7 +6,6 @@
;; Alan Schmitt <alan.schmitt AT polytechnique DOT org>
;; Viktor Rosenfeld <listuser36 AT gmail DOT com>
;; Rasmus Pank Roulund <emacs AT pank DOT eu>
-;; Maintainer: Marco Wahl <marcowahlsoft@gmail.com>
;; Keywords: org, text, tex
;; This file is part of GNU Emacs.
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index b4d1ada8d5e..1feddac37cd 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2011-2026 Free Software Foundation, Inc.
;; 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
;; This file is part of GNU Emacs.
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index 232a643738f..03a47c86995 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -2869,7 +2869,7 @@ Style is a symbol among `quoted', `centered' and nil."
(org-element-lineage
paragraph
'(center-block quote-block section)))
- (center-block 'center)
+ (center-block 'centered)
(quote-block 'quoted)))
(defun org-odt--format-paragraph (paragraph contents info default center quote)
generated by cgit v1.3 (git 2.53.0) at 2026-06-30 18:24:01 +0000