diff options
author | Eli Zaretskii <eliz@gnu.org> | 2023-05-02 08:50:09 -0400 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2023-05-02 08:50:09 -0400 |
commit | daf602a5c8ec9e5d94f5e1e412182760a02c2505 (patch) | |
tree | 84b0c694f5ed9a911011078e8b0f1df18bc9ca71 /lisp/org | |
parent | 4f44c56c867b99bc7b813d8b104b9939479f86f2 (diff) | |
parent | 46392c1623bc3f9764b8c7df293a89fcd47ab0ad (diff) |
Merge from origin/emacs-29
46392c1623b Fix vertical-motion when tab-line is displayed in a window
0e52beeacea Update to Org 9.6.5-3-g2993f4
dd21003878d Prevent generating empty autoload files
2bcf11d0efe * lisp/org/org-macs.el (org--inhibit-version-check): Fix ...
ca43435816b Fix redisplay of mode line after its format changes from nil
610a7657e0a Fix c-ts-mode--emacs-c-range-query
7f94558b775 Improve documentation of warnings
5a3f0e2c558 ; Doc fix in c-ts-mode.el
21361d05635 Fix FOR_EACH_TAIL fontification (bug#62951)
d0df3404fde ; * etc/EGLOT-NEWS: chsharp-le -> csharp-ls
c229e83c3ce ; * etc/EGLOT-NEWS (https): Elglot -> Eglot.
b4f2f499783 Fix documentation of libxml-parse-* functions
5dd784961d1 ; * src/treesit.c (syms_of_treesit): Fix error messages.
ddfa0d8da9a ; Remove some leftover text
Diffstat (limited to 'lisp/org')
-rw-r--r-- | lisp/org/org-macs.el | 11 | ||||
-rw-r--r-- | lisp/org/org-version.el | 4 | ||||
-rw-r--r-- | lisp/org/org.el | 6 | ||||
-rw-r--r-- | lisp/org/ox-odt.el | 37 |
4 files changed, 35 insertions, 23 deletions
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el index b8e026553b3..1552675f8a8 100644 --- a/lisp/org/org-macs.el +++ b/lisp/org/org-macs.el @@ -37,9 +37,16 @@ ;;; Org version verification. (defvar org--inhibit-version-check nil - "When non-nil, assume that Org is a part of Emacs source. + "When non-nil, skip the detection of mixed-versions situations. For internal use only. See Emacs bug #62762. -This variable is only supposed to be changed by Emacs build scripts.") +This variable is only supposed to be changed by Emacs build scripts. +When nil, Org tries to detect when Org source files were compiled with +a different version of Org (which tends to lead to incorrect `.elc' files), +or when the current Emacs session has loaded a mix of files from different +Org versions (typically the one bundled with Emacs and another one installed +from GNU ELPA), which can happen if some parts of Org were loaded before +`load-path' was changed (e.g. before the GNU-ELPA-installed Org is activated +by `package-activate-all').") (defmacro org-assert-version () "Assert compile time and runtime version match." ;; We intentionally use a more permissive `org-release' instead of diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index b82e915ecd1..ef61dc9cbd6 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.6.4")) + (let ((org-release "9.6.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.6.4-9-g8eb209")) + (let ((org-git-version "release_9.6.5-3-g2993f4")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index 61862b3d63b..f4aa28cc486 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -9,7 +9,7 @@ ;; URL: https://orgmode.org ;; Package-Requires: ((emacs "26.1")) -;; Version: 9.6.4 +;; Version: 9.6.5 ;; This file is part of GNU Emacs. ;; @@ -18602,6 +18602,10 @@ block from point." (throw 'exit n))))) nil))) +;; Defined in org-agenda.el +(defvar org-agenda-restrict) +(defvar org-agenda-restrict-begin) +(defvar org-agenda-restrict-end) (defun org-occur-in-agenda-files (regexp &optional _nlines) "Call `multi-occur' with buffers for all agenda files." (interactive "sOrg-files matching: ") diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el index 03c909f78ed..dd96ed8e064 100644 --- a/lisp/org/ox-odt.el +++ b/lisp/org/ox-odt.el @@ -2926,24 +2926,25 @@ contextual information." ;; FIXME: The unnecessary spacing may still remain when a newline ;; is at a boundary between Org objects (e.g. italics markup ;; followed by newline). - (setq output - (with-temp-buffer - (save-match-data - (let ((leading (and (string-match (rx bos (1+ blank)) output) - (match-string 0 output))) - (trailing (and (string-match (rx (1+ blank) eos) output) - (match-string 0 output)))) - (insert - (substring - output - (length leading) - (pcase (length trailing) - (0 nil) - (n (- n))))) - ;; Unfill, retaining leading/trailing space. - (let ((fill-column most-positive-fixnum)) - (fill-region (point-min) (point-max))) - (concat leading (buffer-string) trailing)))))) + (when (org-string-nw-p output) ; blank string needs not to be re-filled + (setq output + (with-temp-buffer + (save-match-data + (let ((leading (and (string-match (rx bos (1+ blank)) output) + (match-string 0 output))) + (trailing (and (string-match (rx (1+ blank) eos) output) + (match-string 0 output)))) + (insert + (substring + output + (length leading) + (pcase (length trailing) + (0 nil) + (n (- n))))) + ;; Unfill, retaining leading/trailing space. + (let ((fill-column most-positive-fixnum)) + (fill-region (point-min) (point-max))) + (concat leading (buffer-string) trailing))))))) ;; Return value. output)) |