From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 3 Oct 2022 22:07:22 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1856^2~48
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a5169e747623541fc21429ef066d6de1eea7d8b;p=emacs.git

Merge from origin/emacs-28

992611b10a Fix documentation  of 'TAB' in cc-mode
08e485a2a5 Fix 'org-export-dispatch' command name in manual
e5a49f44ff * src/emacs.c (load_pdump): Fix use of xpalloc.
7ff5207624 Avoid assertion violation in 'xpalloc'

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

6a5169e747623541fc21429ef066d6de1eea7d8b
diff --cc src/emacs.c
index 91bf0a9b59e,92779a8d0de..b2078aaef31
--- a/src/emacs.c
+++ b/src/emacs.c
@@@ -891,14 -867,8 +891,8 @@@ load_pdump (int argc, char **argv
      }
  
    /* Where's our executable?  */
-   ptrdiff_t bufsize;
- #ifndef NS_SELF_CONTAINED
-   ptrdiff_t exec_bufsize;
- #endif
-   emacs_executable = find_emacs_executable (argv[0], &bufsize);
- #ifndef NS_SELF_CONTAINED
-   exec_bufsize = bufsize;
- #endif
+   ptrdiff_t exec_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.  */