Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs into emacs-30

2 files changed, 5 insertions, 2 deletions

diff --git a/src/coding.c b/src/coding.c
index b21ed360578..5591b7fed45 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5270,7 +5270,9 @@ decode_coding_raw_text (struct coding_system *coding)
   coding->chars_at_source = 1;
   coding->consumed_char = coding->src_chars;
   coding->consumed = coding->src_bytes;
-  if (eol_dos && coding->source[coding->src_bytes - 1] == '\r')
+  if (eol_dos
+      && coding->src_bytes > 0  /* empty source text? */
+      && coding->source[coding->src_bytes - 1] == '\r')
     {
       coding->consumed_char--;
       coding->consumed--;
diff --git a/src/fileio.c b/src/fileio.c
index 7afe3e75737..2db2760916b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3788,7 +3788,8 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "",
 DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0,
        doc: /* Return t if file FILE1 is newer than file FILE2.
 If FILE1 does not exist, the answer is nil;
-otherwise, if FILE2 does not exist, the answer is t.  */)
+otherwise, if FILE2 does not exist, the answer is t.
+For existing files, this compares their last-modified times.  */)
   (Lisp_Object file1, Lisp_Object file2)
 {
   struct stat st1, st2;