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

Merge from origin/emacs-28

Browse source 
6ba4e3b78c Drop support for native compilation on 32-bit Cygwin
7e15ee5bc9 ; * doc/emacs/help.texi (Help Mode): Improve indexing.
This commit is contained in:
Ken Brown 2021-10-31 19:36:04 -04:00
commit c86a3029ec
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -486,6 +486,7 @@ OPTION_DEFAULT_ON([zlib],[don't compile with zlib decompression support])
OPTION_DEFAULT_ON([modules],[don't compile with dynamic modules support])
OPTION_DEFAULT_ON([threads],[don't compile with elisp threading support])
OPTION_DEFAULT_OFF([native-compilation],[compile with Emacs Lisp native compiler support])
OPTION_DEFAULT_OFF([cygwin32-native-compilation],[use native compilation on 32-bit Cygwin])
AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB],
[use a file notification library (LIB one of: yes, inotify, kqueue, gfile, w32, no)])],
@ -3839,6 +3840,16 @@ source on this site:
HAVE_NATIVE_COMP=no
LIBGCCJIT_LIBS=
LIBGCCJIT_CFLAGS=
if test "$canonical" = i686-pc-cygwin; then
if test "${with_cygwin32_native_compilation}" = yes; then
with_native_compilation=yes
elif test "${with_native_compilation}" != no; then
AC_MSG_ERROR([Native compilation is not supported on 32-bit Cygwin.
If you really want to try it anyway, use the configure option
'--with-cygwin32-native-compilation'.])
fi
fi
if test "${with_native_compilation}" != "no"; then
if test "${HAVE_PDUMPER}" = no; then
AC_MSG_ERROR(['--with-native-compilation' requires '--with-dumping=pdumper'])

10
doc/emacs/help.texi
View file

@ -443,11 +443,13 @@ alphabetical order, change the variable
@node Help Mode
@section Help Mode Commands
@findex help-mode
@cindex help mode
Help buffers provide the same commands as View mode (@pxref{View
Mode}); for instance, @key{SPC} scrolls forward, and @key{DEL} or
@kbd{S-@key{SPC}} scrolls backward. A few special commands are also
provided:
Help buffers have Help mode as their major mode. Help mode provides
the same commands as View mode (@pxref{View Mode}); for instance,
@key{SPC} scrolls forward, and @key{DEL} or @kbd{S-@key{SPC}} scrolls
backward. It also provides a few special commands:
@table @kbd
@item @key{RET}