aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2002-10-12 22:08:20 +0000
committerStefan Monnier2002-10-12 22:08:20 +0000
commit4a9f0faea66f0bf6f6523c00041da84e0ba43531 (patch)
tree315887dea8b0657154cb8deadb07a769ee4dcde4 /src
parenta9338083f52b706be9d967f7cb4d3fa71b99b007 (diff)
downloademacs-4a9f0faea66f0bf6f6523c00041da84e0ba43531.tar.gz
emacs-4a9f0faea66f0bf6f6523c00041da84e0ba43531.zip
(Fread_file_name): Use empty_string. Use if-expr to simplify.
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/fileio.c b/src/fileio.c
index e48776b18a4..2e83159ef86 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6023,12 +6023,9 @@ provides a file dialog box. */)
6023 if (NILP (dir)) 6023 if (NILP (dir))
6024 dir = current_buffer->directory; 6024 dir = current_buffer->directory;
6025 if (NILP (default_filename)) 6025 if (NILP (default_filename))
6026 { 6026 default_filename = !NILP (initial)
6027 if (! NILP (initial)) 6027 ? Fexpand_file_name (initial, dir)
6028 default_filename = Fexpand_file_name (initial, dir); 6028 : current_buffer->filename;
6029 else
6030 default_filename = current_buffer->filename;
6031 }
6032 6029
6033 /* If dir starts with user's homedir, change that to ~. */ 6030 /* If dir starts with user's homedir, change that to ~. */
6034 homedir = (char *) egetenv ("HOME"); 6031 homedir = (char *) egetenv ("HOME");
@@ -6154,7 +6151,7 @@ provides a file dialog box. */)
6154 if (! replace_in_history) 6151 if (! replace_in_history)
6155 add_to_history = 1; 6152 add_to_history = 1;
6156 6153
6157 val = build_string (""); 6154 val = empty_string;
6158 } 6155 }
6159 6156
6160 unbind_to (count, Qnil); 6157 unbind_to (count, Qnil);