diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-09-11 14:24:03 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-09-11 14:24:29 -0700 |
| commit | ef926ce3b6a078039303ae210e599dc4d3faa13b (patch) | |
| tree | 95f314fd20fb8f65c4160c648934524b47338e12 /src | |
| parent | 5fafa40d076ee24baf880e97d4290b6196cf838a (diff) | |
| download | emacs-ef926ce3b6a078039303ae210e599dc4d3faa13b.tar.gz emacs-ef926ce3b6a078039303ae210e599dc4d3faa13b.tar.bz2 emacs-ef926ce3b6a078039303ae210e599dc4d3faa13b.zip | |
Omit duplicate test of current directory
* src/callproc.c (encode_current_directory): Remove redundant
call to Ffile_accessible_directory_p. The code checks the
encoded name with file_accessible_directory_p anyway.
Diffstat (limited to 'src')
| -rw-r--r-- | src/callproc.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/callproc.c b/src/callproc.c index b296bdb088b..4473b19a297 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -108,11 +108,8 @@ static Lisp_Object call_process (ptrdiff_t, Lisp_Object *, int, ptrdiff_t); Lisp_Object encode_current_directory (void) { - Lisp_Object dir; - - dir = BVAR (current_buffer, directory); - - dir = Funhandled_file_name_directory (dir); + Lisp_Object curdir = BVAR (current_buffer, directory); + Lisp_Object dir = Funhandled_file_name_directory (curdir); /* If the file name handler says that dir is unreachable, use a sensible default. */ @@ -120,17 +117,10 @@ encode_current_directory (void) dir = build_string ("~"); dir = expand_and_dir_to_file (dir); - - if (NILP (Ffile_accessible_directory_p (dir))) - report_file_error ("Setting current directory", - BVAR (current_buffer, directory)); - - /* Remove "/:" from DIR and encode it. */ dir = ENCODE_FILE (remove_slash_colon (dir)); if (! file_accessible_directory_p (dir)) - report_file_error ("Setting current directory", - BVAR (current_buffer, directory)); + report_file_error ("Setting current directory", curdir); return dir; } |