emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Al Haji-Ali <abdo.haji.ali@gmail.com>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: emacs-orgmode@gnu.org
Subject: Re: [BUG] org-refile-get-location a symlinked file [9.7-pre (release_9.6.29-1443-gb4d17c)]
Date: Thu, 20 Jun 2024 09:00:12 +0100	[thread overview]
Message-ID: <m2tthoniwj.fsf@gmail.com> (raw)
In-Reply-To: <87v8259fh7.fsf@localhost>

[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]


On 19/06/2024, Ihor Radchenko wrote:

> Al Haji-Ali <abdo.haji.ali@gmail.com> writes:
>
>> On 18/06/2024, Ihor Radchenko wrote:
>>> Hmm. Thanks, but the patch does not apply on my side.
>>> May you instead create a patch as a separate file, add the commit
>>> message, and attach that patch file in the email reply?
>>
>> See attached.
>
> Thanks. Although this is a different kind of patch. And it is doing too
> much - we do not want to expand all the names via `file-truename'
> because you may have a situation like
>
> /path/to/file1.org
> /path/to/symlinks/name-is-completely-different.org
>
> Then, using `file-truename' may be confusing for people who expect the
> symlink name to be displayed.

I am not sure what would be the correct approach. Perhaps the true-name expansion should be conditioned on the value of `find-file-visit-truename`.

> I am thus attaching an alternative patch.
> May you please test if it fixes the problem on your side?
I think it's missing calling `file-truename` call on `filename`, see attached patch.

Best regards,
-- Al

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: org-refile-targets.patch --]
[-- Type: text/x-patch, Size: 1295 bytes --]

From 9b44f737a44945723a9cf35dfa92e19d27a1135b Mon Sep 17 00:00:00 2001
From: Al Haji-Ali <a.hajiali@hw.ac.uk>
Date: Tue, 18 Jun 2024 19:27:56 +0100
Subject: [PATCH] org-refile-get-location: Fix outline path to a symlink of
 current buffer

* lisp/org-refile.el (org-refile-get-location): When current buffer
file is a symlink to refile location, do not append the file name to
the outline path, just as we do when current buffer is the same as
refile location file.
---
 lisp/org-refile.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-refile.el b/lisp/org-refile.el
index 20b5fbd02..c8e64903c 100644
--- a/lisp/org-refile.el
+++ b/lisp/org-refile.el
@@ -666,12 +666,12 @@ this function appends the default value from
 		  #'completing-read))
 	 (extra (if org-refile-use-outline-path "/" ""))
 	 (cbnex (concat (buffer-name) extra))
-	 (filename (and cfn (expand-file-name cfn)))
+	 (filename (and cfn (file-truename cfn)))
 	 (tbl (mapcar
 	       (lambda (x)
 		 (if (and (not (member org-refile-use-outline-path
 				       '(file full-file-path title)))
-			  (not (equal filename (nth 1 x))))
+			  (not (equal filename (file-truename (nth 1 x)))))
 		     (cons (concat (car x) extra " ("
 				   (file-name-nondirectory (nth 1 x)) ")")
 			   (cdr x))

  reply	other threads:[~2024-06-20  8:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-17 15:51 [BUG] org-refile-get-location a symlinked file [9.7-pre (release_9.6.29-1443-gb4d17c)] Al Haji-Ali
2024-06-17 17:26 ` Ihor Radchenko
2024-06-17 21:52   ` Al Haji-Ali
2024-06-18 12:56     ` Ihor Radchenko
2024-06-18 18:53       ` Al Haji-Ali
2024-06-19 14:25         ` Ihor Radchenko
2024-06-20  8:00           ` Al Haji-Ali [this message]
2024-06-20 14:56             ` Ihor Radchenko
2024-06-20 15:13               ` Al Haji-Ali
2024-06-20 15:26                 ` Ihor Radchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m2tthoniwj.fsf@gmail.com \
    --to=abdo.haji.ali@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=yantar92@posteo.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).