From: Po Lu <luangruo@yahoo.com>
Date: Sun, 6 Aug 2023 23:56:44 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master' into feature/android
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~4759^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=072a8a434eb0f39f6e4a0c956d3d8cf44b00cff8;p=emacs.git

Merge remote-tracking branch 'origin/master' into feature/android
---

072a8a434eb0f39f6e4a0c956d3d8cf44b00cff8
diff --cc src/fileio.c
index b815a1bdd79,18879aa8fa3..290481c2b5d
--- a/src/fileio.c
+++ b/src/fileio.c
@@@ -2572,10 -2470,10 +2573,11 @@@ If file has multiple names, it continue
  {
    Lisp_Object encoded_file;
  
+   filename = Fexpand_file_name (filename, Qnil);
    encoded_file = ENCODE_FILE (filename);
  
 -  if (unlink (SSDATA (encoded_file)) != 0 && errno != ENOENT)
 +  if (emacs_unlink (SSDATA (encoded_file)) != 0
 +      && errno != ENOENT)
      report_file_error ("Removing old name", filename);
    return Qnil;
  }