From: Ken Brown <kbrown@cornell.edu>
To: Eli Zaretskii <eliz@gnu.org>
Cc: "dan@dpsutton.com" <dan@dpsutton.com>,
"npostavs@gmail.com" <npostavs@gmail.com>,
"36502@debbugs.gnu.org" <36502@debbugs.gnu.org>,
Andreas Schwab <schwab@suse.de>
Subject: bug#36502: Fwd: bug#36502: 27.0.50; infinite loop in file-name-case-insensitive-p
Date: Mon, 8 Jul 2019 16:44:23 +0000 [thread overview]
Message-ID: <2f15cf80-feba-3e71-4cbf-a7fa25b43797@cornell.edu> (raw)
In-Reply-To: <2f71c7a3-423c-4a36-a0c2-5c1833905a28@cornell.edu>
On 7/8/2019 11:17 AM, Ken Brown wrote:
> On 7/8/2019 9:59 AM, Eli Zaretskii wrote:
>> I'm asking why not do this instead:
>>
>> if (NILP (default_directory))
>> {
>> default_directory = BVAR (current_buffer, directory);
>> if (NILP (Ffile_name_absolute_p (default_directory)))
>> default_directory = Fexpand_file_name (default_directory,
>> Vinvocation_directory);
>> }
>
> Oh, I see. I misunderstood what you were suggesting.
>
>> Or will the above not work for some reason?
>
> I think something like this should work, with some care. First,
> invocation-directory might be nil, so we have to avoid an infinite loop in that
> case. Second, the code in emacs.c that sets Vinvocation_directory calls
> Fexpand_file_name in some cases, so there's another potential infinite loop
> resulting from that.
>
> I'll see what I can come up with, also taking Andreas's comment into account.
New attempt:
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -804,7 +804,22 @@ DEFUN ("expand-file-name", Fexpand_file_name,
Sexpand_file_name, 1, 2, 0,
/* Use the buffer's default-directory if DEFAULT_DIRECTORY is omitted. */
if (NILP (default_directory))
- default_directory = BVAR (current_buffer, directory);
+ {
+ Lisp_Object dir = BVAR (current_buffer, directory);
+ /* The buffer's default-directory should be absolute. If it
+ isn't, try to expand it relative to invocation-directory.
+ But we have to be careful to avoid an infinite loop, because
+ the code in emacs.c that sets Vinvocation_directory might
+ call Fexpand_file_name. */
+ if (STRINGP (dir))
+ {
+ if (!NILP (Ffile_name_absolute_p (dir)))
+ default_directory = dir;
+ else if (STRINGP (Vinvocation_directory)
+ && !NILP (Ffile_name_absolute_p (Vinvocation_directory)))
+ default_directory = Fexpand_file_name (dir, Vinvocation_directory);
+ }
+ }
if (! STRINGP (default_directory))
{
#ifdef DOS_NT
next prev parent reply other threads:[~2019-07-08 16:44 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 16:48 bug#36502: 27.0.50; infinite loop in file-name-case-insensitive-p Daniel Sutton
2019-07-04 18:08 ` Ken Brown
[not found] ` <CAMfzp7bhcmeY7QP4-ALfmBE4OojJthcYEVLR79zj-FrGx5s+WA@mail.gmail.com>
2019-07-05 1:32 ` Ken Brown
[not found] ` <CAMfzp7brsFLdpi04pDAL+O_yVuF7=EERzinVBKoQyTaLUtgwDA@mail.gmail.com>
[not found] ` <CAMfzp7Y=wA8_V=Tvm1iOtyXM-kqKZyx41Q4phJfnwmygHhJWLA@mail.gmail.com>
2019-07-05 3:05 ` bug#36502: Fwd: " Daniel Sutton
2019-07-06 12:49 ` Ken Brown
2019-07-06 13:27 ` Noam Postavsky
2019-07-06 15:38 ` Ken Brown
2019-07-06 16:14 ` Eli Zaretskii
2019-07-07 14:09 ` Ken Brown
2019-07-07 14:37 ` Eli Zaretskii
2019-07-07 19:30 ` Ken Brown
2019-07-08 12:25 ` Eli Zaretskii
2019-07-08 13:36 ` Ken Brown
2019-07-08 13:59 ` Eli Zaretskii
2019-07-08 15:17 ` Ken Brown
2019-07-08 16:44 ` Ken Brown [this message]
2019-07-08 17:23 ` Eli Zaretskii
2019-07-10 21:57 ` Ken Brown
2019-07-11 23:36 ` Richard Stallman
2019-07-12 6:41 ` Eli Zaretskii
2019-07-12 20:18 ` Ken Brown
2019-07-15 13:39 ` Ken Brown
2019-07-19 7:00 ` Eli Zaretskii
2019-07-20 9:19 ` Eli Zaretskii
2019-07-20 14:27 ` Ken Brown
2019-07-20 15:52 ` Eli Zaretskii
2019-07-21 2:32 ` Paul Eggert
2019-07-21 14:21 ` Eli Zaretskii
2019-07-21 14:30 ` Ken Brown
2019-07-22 2:16 ` Ken Brown
2019-07-24 21:36 ` Paul Eggert
2019-07-24 22:47 ` Ken Brown
2019-07-26 11:04 ` Andy Moreton
2019-07-08 14:37 ` Andreas Schwab
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.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2f15cf80-feba-3e71-4cbf-a7fa25b43797@cornell.edu \
--to=kbrown@cornell.edu \
--cc=36502@debbugs.gnu.org \
--cc=dan@dpsutton.com \
--cc=eliz@gnu.org \
--cc=npostavs@gmail.com \
--cc=schwab@suse.de \
/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.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).