Commit 2e2fb82e authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from origin/emacs-26

fa953b58 (origin/emacs-26) Fix an epg test for recent GnuPG versions (...
30156364 Document font structure layout constraints
f14d5742 Document font structure layout constraints
f519aa10 Fix display of line numbers in empty lines beyond EOB
24b5026f Fix redisplay when a window's scroll bar or fringes are changed
5d1b158f Tiny markup fix in Elisp manual
parents 498b6cb0 fa953b58
Pipeline #290 failed with stage
in 7 seconds
......@@ -656,7 +656,7 @@ resulting list. Instead, the sequence becomes the final @sc{cdr}, like
any other non-list final argument.
@defun copy-tree tree &optional vecp
This function returns a copy of the tree @code{tree}. If @var{tree} is a
This function returns a copy of the tree @var{tree}. If @var{tree} is a
cons cell, this makes a new cons cell with the same @sc{car} and
@sc{cdr}, then recursively copies the @sc{car} and @sc{cdr} in the
same way.
......
......@@ -35,8 +35,9 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
struct ftcrfont_info
{
struct font font;
/* The following six members must be here in this order to be
compatible with struct ftfont_info (in ftfont.c). */
/* The following members up to and including 'matrix' must be here
in this order to be compatible with struct ftfont_info (in
ftfont.c). */
#ifdef HAVE_LIBOTF
bool maybe_otf; /* Flag to tell if this may be OTF or not. */
OTF *otf;
......
......@@ -56,8 +56,9 @@ struct ftfont_info
{
struct font font;
#ifdef HAVE_LIBOTF
/* The following four members must be here in this order to be
compatible with struct xftfont_info (in xftfont.c). */
/* The following members up to and including 'matrix' must be here in
this order to be compatible with struct xftfont_info (in
xftfont.c). */
bool maybe_otf; /* Flag to tell if this may be OTF or not. */
OTF *otf;
#endif /* HAVE_LIBOTF */
......
......@@ -7176,6 +7176,11 @@ set_window_fringes (struct window *w, Lisp_Object left_width,
w->right_fringe_width = right;
w->fringes_outside_margins = outside;
/* This is needed to trigger immediate redisplay of the window
when its fringes are changed, because fringes are redrawn
only if update_window is called, so we must trigger that even
if the window's glyph matrices did not change at all. */
windows_or_buffers_changed = 35;
return w;
}
else
......@@ -7293,6 +7298,12 @@ set_window_scroll_bars (struct window *w, Lisp_Object width,
wset_horizontal_scroll_bar_type (w, Qnil);
#endif
/* This is needed to trigger immediate redisplay of the window when
scroll bars are changed, because scroll bars are redisplayed only
if more than a single window needs to be considered, see
redisplay_internal. */
if (changed)
windows_or_buffers_changed = 31;
return changed ? w : NULL;
}
......
......@@ -21242,7 +21242,10 @@ maybe_produce_line_number (struct it *it)
if (lnum_face_id != current_lnum_face_id
&& (EQ (Vdisplay_line_numbers, Qvisual)
? this_line == 0
: this_line == it->pt_lnum))
: this_line == it->pt_lnum)
/* Avoid displaying the line-number-current-line face on
empty lines beyond EOB. */
&& it->what != IT_EOB)
tem_it.face_id = current_lnum_face_id;
else
tem_it.face_id = lnum_face_id;
......@@ -42,8 +42,9 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
struct xftfont_info
{
struct font font;
/* The following five members must be here in this order to be
compatible with struct ftfont_info (in ftfont.c). */
/* The following members up to and including 'matrix' must be here
in this order to be compatible with struct ftfont_info (in
ftfont.c). */
#ifdef HAVE_LIBOTF
bool maybe_otf; /* Flag to tell if this may be OTF or not. */
OTF *otf;
......@@ -51,6 +52,7 @@ struct xftfont_info
FT_Size ft_size;
int index;
FT_Matrix matrix;
Display *display;
XftFont *xftfont;
unsigned x_display_id;
......
......@@ -108,6 +108,8 @@
(ert-deftest epg-decrypt-1 ()
(with-epg-tests (:require-passphrase t)
(with-temp-file (expand-file-name "gpg.conf" epg-tests-home-directory)
(insert "ignore-mdc-error"))
(should (equal "test"
(epg-decrypt-string epg-tests-context "\
-----BEGIN PGP MESSAGE-----
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment