[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master a32fd9f 5/5: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master a32fd9f 5/5: Merge from origin/emacs-27 |
Date: |
Fri, 13 Nov 2020 12:00:39 -0500 (EST) |
branch: master
commit a32fd9f64d06ccd07a9beaf6d6f1283f7a80edac
Merge: 15035e7 a3d316b
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
a3d316bbb7 (origin/emacs-27) Update information about refcards
f43e9ad524 Avoid crashes in the daemon due to user interaction
---
admin/make-tarball.txt | 12 ++++++++----
admin/release-process | 5 +++--
src/minibuf.c | 3 ++-
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 64c6170..2c81a49 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -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.
diff --git a/admin/release-process b/admin/release-process
index 4d973d3..ef698f5 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -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.
diff --git a/src/minibuf.c b/src/minibuf.c
index 8c19559..c4adca1 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -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;