procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
2eb738f2b8 Support builds configured with a separate --bindir
cf4c204df8 * doc/misc/eww.texi (Overview, Basics): Fix typos.
This commit is contained in:
Stefan Kangas 2022-06-21 06:30:25 +02:00
commit c175984e2c
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/misc/eww.texi
View file

@ -69,7 +69,7 @@ Indices
@chapter Overview
@dfn{EWW}, the Emacs Web Wowser, is a web browser for GNU Emacs. It
can load, parse, and display various web pages using @dfn{shr.el}.
However a GNU Emacs with @code{libxml2} support is required.
However, a GNU Emacs with @code{libxml2} support is required.
@node Basics
@chapter Basic Usage
@ -213,7 +213,7 @@ switch EWW buffers through a minibuffer prompt, press @kbd{s}
@cindex External Browser
Although EWW and shr.el do their best to render webpages in GNU
Emacs some websites use features which can not be properly represented
or are not implemented (E.g., JavaScript). If you have trouble
or are not implemented (e.g., JavaScript). If you have trouble
viewing a website with EWW then hit @kbd{&}
(@code{eww-browse-with-external-browser}) inside the EWW buffer to
open the website in the external browser specified by

28
src/emacs.c
View file

@ -975,20 +975,24 @@ load_pdump (int argc, char **argv)
sprintf (dump_file, "%s%c%s-%s%s",
path_exec, DIRECTORY_SEP, argv0_base, hexbuf, suffix);
#if !defined (NS_SELF_CONTAINED)
/* Assume the Emacs binary lives in a sibling directory as set up by
the default installation configuration. */
const char *go_up = "../../../../bin/";
needed += (strip_suffix ? strlen (strip_suffix) : 0)
- strlen (suffix) + strlen (go_up);
if (exec_bufsize < needed)
if (!(emacs_executable && *emacs_executable))
{
xfree (emacs_executable);
emacs_executable = xpalloc (NULL, &exec_bufsize, needed - exec_bufsize,
-1, 1);
/* If we didn't find the Emacs binary, assume that it lives in a
sibling directory as set up by the default installation
configuration. */
const char *go_up = "../../../../bin/";
needed += (strip_suffix ? strlen (strip_suffix) : 0)
- strlen (suffix) + strlen (go_up);
if (exec_bufsize < needed)
{
xfree (emacs_executable);
emacs_executable = xpalloc (NULL, &exec_bufsize,
needed - exec_bufsize, -1, 1);
}
sprintf (emacs_executable, "%s%c%s%s%s",
path_exec, DIRECTORY_SEP, go_up, argv0_base,
strip_suffix ? strip_suffix : "");
}
sprintf (emacs_executable, "%s%c%s%s%s",
path_exec, DIRECTORY_SEP, go_up, argv0_base,
strip_suffix ? strip_suffix : "");
#endif
result = pdumper_load (dump_file, emacs_executable);