diff options
| author | Kyle Meyer | 2024-07-26 23:58:01 -0400 |
|---|---|---|
| committer | Kyle Meyer | 2024-07-26 23:58:01 -0400 |
| commit | 88e1ec22f271b127d961896b7dddcd58df289c42 (patch) | |
| tree | d71f3910049daf0fb3b763766034d9ced265bc26 | |
| parent | 1ae2f004473c1cc26ab654481716c9efb4ecd8de (diff) | |
| download | emacs-88e1ec22f271b127d961896b7dddcd58df289c42.tar.gz emacs-88e1ec22f271b127d961896b7dddcd58df289c42.zip | |
Update to Org 9.7.9
| -rw-r--r-- | etc/refcards/orgcard.tex | 2 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 4 | ||||
| -rw-r--r-- | lisp/org/org.el | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index b924aed8df5..b112e957d1d 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | % Reference Card for Org Mode | 1 | % Reference Card for Org Mode |
| 2 | \def\orgversionnumber{9.7.8} | 2 | \def\orgversionnumber{9.7.9} |
| 3 | \def\versionyear{2024} % latest update | 3 | \def\versionyear{2024} % latest update |
| 4 | \input emacsver.tex | 4 | \input emacsver.tex |
| 5 | 5 | ||
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 993e021f82e..d5a434e805d 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el | |||
| @@ -5,13 +5,13 @@ | |||
| 5 | (defun org-release () | 5 | (defun org-release () |
| 6 | "The release version of Org. | 6 | "The release version of Org. |
| 7 | Inserted by installing Org mode or when a release is made." | 7 | Inserted by installing Org mode or when a release is made." |
| 8 | (let ((org-release "9.7.8")) | 8 | (let ((org-release "9.7.9")) |
| 9 | org-release)) | 9 | org-release)) |
| 10 | ;;;###autoload | 10 | ;;;###autoload |
| 11 | (defun org-git-version () | 11 | (defun org-git-version () |
| 12 | "The Git version of Org mode. | 12 | "The Git version of Org mode. |
| 13 | Inserted by installing Org or when a release is made." | 13 | Inserted by installing Org or when a release is made." |
| 14 | (let ((org-git-version "release_9.7.8-5-gfdf0e0")) | 14 | (let ((org-git-version "release_9.7.9")) |
| 15 | org-git-version)) | 15 | org-git-version)) |
| 16 | 16 | ||
| 17 | (provide 'org-version) | 17 | (provide 'org-version) |
diff --git a/lisp/org/org.el b/lisp/org/org.el index 8ca9a4b716b..0b3566121d9 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | ;; URL: https://orgmode.org | 9 | ;; URL: https://orgmode.org |
| 10 | ;; Package-Requires: ((emacs "26.1")) | 10 | ;; Package-Requires: ((emacs "26.1")) |
| 11 | 11 | ||
| 12 | ;; Version: 9.7.8 | 12 | ;; Version: 9.7.9 |
| 13 | 13 | ||
| 14 | ;; This file is part of GNU Emacs. | 14 | ;; This file is part of GNU Emacs. |
| 15 | ;; | 15 | ;; |
| @@ -20818,8 +20818,11 @@ end." | |||
| 20818 | (when (and (not (eq org-yank-image-save-method 'attach)) | 20818 | (when (and (not (eq org-yank-image-save-method 'attach)) |
| 20819 | (not (file-directory-p org-yank-image-save-method))) | 20819 | (not (file-directory-p org-yank-image-save-method))) |
| 20820 | (make-directory org-yank-image-save-method t)) | 20820 | (make-directory org-yank-image-save-method t)) |
| 20821 | (with-temp-file absname | 20821 | ;; DATA is a raw image. Tell Emacs to write it raw, without |
| 20822 | (insert data)) | 20822 | ;; trying to auto-detect the coding system. |
| 20823 | (let ((coding-system-for-write 'emacs-internal)) | ||
| 20824 | (with-temp-file absname | ||
| 20825 | (insert data))) | ||
| 20823 | (if (null (eq org-yank-image-save-method 'attach)) | 20826 | (if (null (eq org-yank-image-save-method 'attach)) |
| 20824 | (setq link (org-link-make-string (concat "file:" (file-relative-name absname)))) | 20827 | (setq link (org-link-make-string (concat "file:" (file-relative-name absname)))) |
| 20825 | (require 'org-attach) | 20828 | (require 'org-attach) |