mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-27 19:31:38 +00:00
(Fread_file_name): Do the right thing when insert-default-directory is nil.
Allow for doubled dollar signs in dir when computing pos.
This commit is contained in:
parent
4e665715b9
commit
351bd676ba
@ -3704,7 +3704,6 @@ DIR defaults to current buffer's directory default.")
|
||||
if (insert_default_directory)
|
||||
{
|
||||
insdef = dir;
|
||||
insdef1 = dir;
|
||||
if (!NILP (initial))
|
||||
{
|
||||
Lisp_Object args[2], pos;
|
||||
@ -3712,12 +3711,17 @@ DIR defaults to current buffer's directory default.")
|
||||
args[0] = insdef;
|
||||
args[1] = initial;
|
||||
insdef = Fconcat (2, args);
|
||||
pos = make_number (XSTRING (dir)->size);
|
||||
pos = make_number (XSTRING (double_dollars (dir))->size);
|
||||
insdef1 = Fcons (double_dollars (insdef), pos);
|
||||
}
|
||||
else
|
||||
insdef1 = double_dollars (insdef);
|
||||
}
|
||||
else if (!NILP (initial))
|
||||
{
|
||||
insdef = initial;
|
||||
insdef1 = Fcons (double_dollars (insdef), 0);
|
||||
}
|
||||
else
|
||||
insdef = Qnil, insdef1 = Qnil;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user