From: Stefan Kangas <stefankangas@gmail.com>
Date: Tue, 4 Oct 2022 18:04:19 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1856^2~17
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4641130493f0920de0f0c4543ac80504fd5d5f7;p=emacs.git

Merge from origin/emacs-28

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

# Conflicts:
#	src/emacs.c
---

c4641130493f0920de0f0c4543ac80504fd5d5f7
diff --cc src/emacs.c
index b2078aaef31,a8af288bf09..43e81b912c6
--- a/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.  */