]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-28
authorStefan Kangas <stefankangas@gmail.com>
Mon, 3 Oct 2022 22:07:22 +0000 (00:07 +0200)
committerStefan Kangas <stefankangas@gmail.com>
Mon, 3 Oct 2022 22:07:22 +0000 (00:07 +0200)
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

1  2 
doc/emacs/programs.texi
doc/emacs/text.texi
src/emacs.c

Simple merge
Simple merge
diff --cc src/emacs.c
index 91bf0a9b59e305ab61d6703c45072da4215e00c3,92779a8d0deef3baf41a33919984efb76495adf3..b2078aaef31104d08adc073b46f0ff3f71c7d7b4
@@@ -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.  */