diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-09-05 15:17:49 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-09-05 15:17:49 +0300 |
| commit | 3f1efe33d68b4a09246e0d2d6e5fb0e3def26060 (patch) | |
| tree | 332fd6bdc9ccb214fdcfdde2b8512c525dd5c561 | |
| parent | 0773d1a03a181ef0912b1c83720adabf0395d46b (diff) | |
| parent | 5c8b76fc873676457810817958c119542ffe16f6 (diff) | |
| download | emacs-3f1efe33d68b4a09246e0d2d6e5fb0e3def26060.tar.gz | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
| -rw-r--r-- | etc/refcards/orgcard.tex | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 7 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 4 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index bb4bc5b25df..9462df8574c 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{9.5.4} +\def\orgversionnumber{9.5.5} \def\versionyear{2021} % latest update \input emacsver.tex diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 306ec918b1a..a9087313b18 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -3935,8 +3935,11 @@ display a message." when (or native-comp-always-compile load ; Always compile when the compilation is ; commanded for late load. - (file-newer-than-file-p - source-file (comp-el-to-eln-filename source-file))) + ;; Skip compilation if `comp-el-to-eln-filename' fails + ;; to find a writable directory. + (with-demoted-errors "Async compilation :%S" + (file-newer-than-file-p + source-file (comp-el-to-eln-filename source-file)))) do (let* ((expr `((require 'comp) (setq comp-async-compilation t) (setq warning-fill-column most-positive-fixnum) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 353d533c06c..3273d8707d6 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.5.4")) + (let ((org-release "9.5.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.5.4-19-g4dff42")) + (let ((org-git-version "release_9.5.5")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index 9facbed04de..6f92cdeab5b 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -9,7 +9,7 @@ ;; Homepage: https://orgmode.org ;; Package-Requires: ((emacs "25.1")) -;; Version: 9.5.4 +;; Version: 9.5.5 ;; This file is part of GNU Emacs. ;; |