From 29c0c09bef6a9193f8ecc6f4e08a9152294e7587 Mon Sep 17 00:00:00 2001 From: TEC Date: Sat, 10 Dec 2022 21:38:21 +0800 Subject: org: Use buffer-base-buffer in safe resource fns * lisp/org.el (org--confirm-resource-safe, org--safe-remote-resource-p): Replace instances of buffer-file-name with (buffer-file-name (buffer-base-buffer)) so these functions work in indirect buffers. (cherry picked from Org-mode commit 88329143c86b34195af68a8e5d5fd3d00a5dcae6) --- lisp/org/org.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/org/org.el b/lisp/org/org.el index 70f5d09adcc..f8485b0a312 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -4775,8 +4775,8 @@ org--safe-remote-resource-p This checks every pattern in `org-safe-remote-resources', and returns non-nil if any of them match." (let ((uri-patterns org-safe-remote-resources) - (file-uri (and buffer-file-name - (concat "file://" (file-truename buffer-file-name)))) + (file-uri (and (buffer-file-name (buffer-base-buffer)) + (concat "file://" (file-truename (buffer-file-name (buffer-base-buffer)))))) match-p) (while (and (not match-p) uri-patterns) (setq match-p (or (string-match-p (car uri-patterns) uri) @@ -4787,7 +4787,8 @@ org--safe-remote-resource-p (defun org--confirm-resource-safe (uri) "Ask the user if URI should be considered safe, returning non-nil if so." (unless noninteractive - (let ((current-file (and buffer-file-name (file-truename buffer-file-name))) + (let ((current-file (and (buffer-file-name (buffer-base-buffer)) + (file-truename (buffer-file-name (buffer-base-buffer))))) (domain (and (string-match (rx (seq "http" (? "s") "://") (optional (+ (not (any "@/\n"))) "@")