andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-27

Browse source 
19da602991 Fix input method translation near read-only text
5aabf2cc7f Fix display of truncated R2L lines on TTY frames
daff3bda10 Avoid crashes when a reversed glyph row starts with a comp...
b697bb91a1 ; * .gitignore: src/fingerprint.c not generated since 2019...
This commit is contained in:
Glenn Morris 2020-11-16 08:59:47 -08:00
commit a280a6d7ca
5 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -198,7 +198,6 @@ src/bootstrap-emacs
src/emacs src/emacs
src/emacs-[0-9]* src/emacs-[0-9]*
src/temacs src/temacs
src/fingerprint.c
src/dmpstruct.h src/dmpstruct.h
src/*.pdmp src/*.pdmp

6
doc/emacs/mule.texi
View file

@ -563,6 +563,12 @@ method's keys by defining key bindings in the keymap returned by the
function @code{quail-translation-keymap}, using @code{define-key}. function @code{quail-translation-keymap}, using @code{define-key}.
@xref{Init Rebinding}. @xref{Init Rebinding}.
Input methods are inhibited when the text in the buffer is read-only
for some reason. This is so single-character key bindings work in
modes that make buffer text or parts of it read-only, such as
@code{read-only-mode} and @code{image-mode}, even when an input method
is active.
Another facility for typing characters not on your keyboard is by Another facility for typing characters not on your keyboard is by
using @kbd{C-x 8 @key{RET}} (@code{insert-char}) to insert a single using @kbd{C-x 8 @key{RET}} (@code{insert-char}) to insert a single
character based on its Unicode name or code-point; see @ref{Inserting character based on its Unicode name or code-point; see @ref{Inserting

3
lisp/international/quail.el
View file

@ -1330,7 +1330,8 @@ If STR has `advice' text property, append the following special event:
(defun quail-input-method (key) (defun quail-input-method (key)
(if (or (and (or buffer-read-only (if (or (and (or buffer-read-only
(get-char-property (point) 'read-only)) (and (get-char-property (point) 'read-only)
(get-char-property (point) 'front-sticky)))
(not (or inhibit-read-only (not (or inhibit-read-only
(get-char-property (point) 'inhibit-read-only)))) (get-char-property (point) 'inhibit-read-only))))
(and overriding-terminal-local-map (and overriding-terminal-local-map

10
src/dispnew.c
View file

@ -2558,11 +2558,15 @@ build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct w
the corresponding frame row to be updated. */ the corresponding frame row to be updated. */
frame_row->enabled_p = true; frame_row->enabled_p = true;
/* Maybe insert a vertical border between horizontally adjacent /* Maybe insert a vertical border between horizontally adjacent
windows. */ windows. */
if (GLYPH_CHAR (right_border_glyph) != 0) if (GLYPH_CHAR (right_border_glyph) != 0)
{ {
struct glyph *border = window_row->glyphs[LAST_AREA] - 1; struct glyph *border = window_row->glyphs[LAST_AREA] - 1;
/* It's a subtle bug if we are overwriting some non-char
glyph with the vertical border glyph. */
eassert (border->type == CHAR_GLYPH);
border->type = CHAR_GLYPH;
SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph);
} }

18
src/xdisp.c
View file

@ -22272,14 +22272,15 @@ extend_face_to_end_of_line (struct it *it)
default_face->id : face->id); default_face->id : face->id);
/* Display fill-column indicator if needed. */ /* Display fill-column indicator if needed. */
/* We need to subtract 1 to the indicator_column here because we const int indicator_column = fill_column_indicator_column (it, 1);
will add the indicator IN the column indicator number, not
after it. We compare the variable it->current_x before /* Make sure our idea of current_x is in sync with the glyphs
producing the glyph. When FRAME_WINDOW_P we subtract actually in the glyph row. They might differ because
CHAR_WIDTH calculating STRETCH_WIDTH for the same reason. */ append_space_for_newline can insert one glyph without
const int indicator_column = updating current_x. */
fill_column_indicator_column (it, 1) - 1; it->current_x = it->glyph_row->used[TEXT_AREA];
do
while (it->current_x <= it->last_visible_x)
{ {
if (it->current_x != indicator_column) if (it->current_x != indicator_column)
PRODUCE_GLYPHS (it); PRODUCE_GLYPHS (it);
@ -22297,7 +22298,6 @@ extend_face_to_end_of_line (struct it *it)
it->c = it->char_to_display = ' '; it->c = it->char_to_display = ' ';
} }
} }
while (it->current_x <= it->last_visible_x);
if (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0 if (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0
&& (it->glyph_row->used[RIGHT_MARGIN_AREA] && (it->glyph_row->used[RIGHT_MARGIN_AREA]