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

Merge from origin/emacs-27

Browse source 
a3d316bbb7 (origin/emacs-27) Update information about refcards
f43e9ad524 Avoid crashes in the daemon due to user interaction
This commit is contained in:
Glenn Morris 2020-11-13 09:00:26 -08:00
commit a32fd9f64d
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
admin/make-tarball.txt
View file

@ -87,10 +87,14 @@ General steps (for each step, check for possible errors):
make -C etc/refcards
make -C etc/refcards clean
If some of the non-English etc/refcards fail to build, you
probably need to install some TeX foreign language packages.
For more information, search for the string "refcard" in the file
admin/release-process.
If some of the etc/refcards, especially the non-English ones, fail
to build, you probably need to install some TeX/LaTeX packages, in
particular for foreign language support. For more information,
search for the string "refcard" in the file admin/release-process.
(ru-refcard causes numerous "Underfull hbox" and "Overfull hbox"
messages from TeX, but those seem to be harmless, as the result
looks just fine.)
5. Copy lisp/loaddefs.el to lisp/ldefs-boot.el.

5
admin/release-process
View file

@ -179,8 +179,9 @@ What paper size are the English versions supposed to be on?
On Debian testing, the packages texlive-lang-czechslovak and
texlive-lang-polish will let you generate the cs-* and sk-* pdfs.
(You may need texlive-lang-cyrillic, texlive-lang-german,
and texlive-fonts-extra for others.) On Fedora-like systems,
texlive-lh may help.
and texlive-fonts-extra for others.) Gnus refcards need
texlive-latex-extra and/or texlive-latex-recommended. On Fedora-like
systems, texlive-lh may help.
** Ask maintainers of refcard translations to update them.

3
src/minibuf.c
View file

@ -728,7 +728,8 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
/* If cursor is on the minibuffer line,
show the user we have exited by putting it in column 0. */
if (XWINDOW (minibuf_window)->cursor.vpos >= 0
&& !noninteractive)
&& !noninteractive
&& !FRAME_INITIAL_P (SELECTED_FRAME ()))
{
XWINDOW (minibuf_window)->cursor.hpos = 0;
XWINDOW (minibuf_window)->cursor.x = 0;