Merge from origin/emacs-29

4f0121f8dbe Avoid assertion violations in displaying under 'outline-m...
1bf65836622 Improve documentation of 'no-special-glyphs' frame parameter
3647645e948 Fix Python font lock of chained assignment statement
3291dea441f Fix example in Calc manual
350ae75f5c1 Avoid crashes on MS-Windows due to invalid UNC file names
ccf8dba44a3 ; * lisp/face-remap.el (text-scale-adjust): Doc fix.
5ab144c77cd ; Improve documentation of backing up files

2 files changed, 2 insertions, 2 deletions

diff --git a/src/w32.c b/src/w32.c
index d34ab70f82d..a1b34e4103b 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2572,7 +2572,7 @@ parse_root (const char * name, const char ** pPath)
       name += 2;
       do
         {
-          if (IS_DIRECTORY_SEP (*name) && --slashes == 0)
+          if (!*name || (IS_DIRECTORY_SEP (*name) && --slashes == 0))
             break;
           name++;
         }
diff --git a/src/xdisp.c b/src/xdisp.c
index ba5af7127c6..7a00b297d61 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3878,7 +3878,7 @@ init_from_display_pos (struct it *it, struct window *w, struct display_pos *pos)
   if (in_ellipses_for_invisible_text_p (pos, w))
     {
       --charpos;
-      bytepos = 0;
+      bytepos = BYTE_TO_CHAR (charpos);
     }
 
   /* Keep in mind: the call to reseat in init_iterator skips invisible