From af9100382c35d6c2db9366108de4f0eeb6b8ac2f Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Sun, 25 Feb 2024 13:15:04 +0300 Subject: [PATCH] Never pass error message verbatim as the first argument for `message'/`error' * lisp/org-capture.el (org-capture-store-last-position): * lisp/org-crypt.el (org-encrypt-entry): * lisp/org.el (org-open-file): Avoid (error string) code pattern. Instead use (error "%s" string). (error string) is erroneous when STRING contains %-specs. Reported-by: Corwin Kerr Link: https://orgmode.org/list/beceaf05-ae15-487b-864b-2e23a33a3884@app.fastmail.com --- lisp/org-capture.el | 2 +- lisp/org-crypt.el | 2 +- lisp/org.el | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index cd4fcbf37..648031169 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1508,7 +1508,7 @@ Of course, if exact position has been required, just put it there." (condition-case err (bookmark-set bookmark) (error - (message (format "Bookmark set error: %S" err))))))) + (message "Bookmark set error: %S" err)))))) (move-marker org-capture-last-stored-marker (point)))))) (defun org-capture-narrow (beg end) diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index 170532788..797f8a991 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -246,7 +246,7 @@ Assume `epg-context' is set." ;; contents in the buffer. (error (insert contents) - (error (error-message-string err))))) + (error "%s" (error-message-string err))))) (when folded-heading (goto-char folded-heading) (org-fold-subtree t)) diff --git a/lisp/org.el b/lisp/org.el index a21bf8188..5df847125 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8494,7 +8494,7 @@ If the file does not exist, throw an error." ;; Save position before error-ing out so user ;; can easily move back to the original buffer. (error (funcall save-position-maybe) - (error (nth 1 err))))))) + (error "%s" (error-message-string err))))))) ((functionp cmd) (save-match-data (set-match-data link-match-data)