Merge from origin/emacs-28

a78af3018e * src/emacs.c (load_pdump): Propery handle case when execu...

# Conflicts:
#	src/emacs.c

diff --cc src/emacs.c
index b2078aaef31104d08adc073b46f0ff3f71c7d7b4,a8af288bf09564bfee11c0abb50e614eb3322570..43e81b912c6cf9c0ae1c35ab233f7a20ea9528ff
--- 1/src/emacs.c
--- 2/src/emacs.c
+++ b/src/emacs.c
@@@ -891,8 -867,8 +891,8 @@@ load_pdump (int argc, char **argv
      }
  
    /* Where's our executable?  */
-   ptrdiff_t exec_bufsize, needed;
+   ptrdiff_t exec_bufsize, bufsize, needed;
 -  emacs_executable = load_pdump_find_executable (argv[0], &exec_bufsize);
 +  emacs_executable = find_emacs_executable (argv[0], &exec_bufsize);
  
    /* If we couldn't find our executable, go straight to looking for
       the dump in the hardcoded location.  */