aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2025-07-12 12:06:09 -0700
committerPaul Eggert2025-07-13 21:09:39 -0700
commitb1ada33b5dfac62258e9e3cb957dbe722b7c8990 (patch)
tree551a17f8d8675ddad8ee3692cd979d7fcc6ada87 /src
parent6a9dbed40ccebc18fda6078058b1978e29ef98fa (diff)
downloademacs-b1ada33b5dfac62258e9e3cb957dbe722b7c8990.tar.gz
emacs-b1ada33b5dfac62258e9e3cb957dbe722b7c8990.zip
Non-nil orig_filename in insert-file-contents
* src/fileio.c (Finsert_file_contents): Don’t let orig_filename be nil, as that might mess up later diagnostics.
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 5d383a7b44d..24efff21e4c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4100,11 +4100,11 @@ by calling `format-decode', which see. */)
4100 4100
4101 val = Qnil; 4101 val = Qnil;
4102 p = Qnil; 4102 p = Qnil;
4103 orig_filename = Qnil;
4104 old_undo = Qnil; 4103 old_undo = Qnil;
4105 4104
4106 CHECK_STRING (filename); 4105 CHECK_STRING (filename);
4107 filename = Fexpand_file_name (filename, Qnil); 4106 filename = Fexpand_file_name (filename, Qnil);
4107 orig_filename = filename;
4108 4108
4109 /* The value Qnil means that the coding system is not yet 4109 /* The value Qnil means that the coding system is not yet
4110 decided. */ 4110 decided. */
@@ -4134,7 +4134,6 @@ by calling `format-decode', which see. */)
4134 off_t beg_offset = !NILP (beg) ? file_offset (beg) : 0; 4134 off_t beg_offset = !NILP (beg) ? file_offset (beg) : 0;
4135 off_t end_offset = !NILP (end) ? file_offset (end) : -1; 4135 off_t end_offset = !NILP (end) ? file_offset (end) : -1;
4136 4136
4137 orig_filename = filename;
4138 filename = ENCODE_FILE (filename); 4137 filename = ENCODE_FILE (filename);
4139 4138
4140 /* A hint about the file size, or -1 if there is no hint. */ 4139 /* A hint about the file size, or -1 if there is no hint. */