diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-07-29 08:38:51 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-07-29 08:38:51 -0700 |
| commit | 775a3e19d2c14531055ae8cba21bc6a0a97f6a94 (patch) | |
| tree | 124031eab2903fc9c5751313bb8b982a73121c8e /src/indent.c | |
| parent | 50237759b042d5f2e3df9403a4c1697c381f6eae (diff) | |
| parent | 4b3085a7fe8980432aa63ddf614fee2a6fb04e94 (diff) | |
| download | emacs-775a3e19d2c14531055ae8cba21bc6a0a97f6a94.tar.gz emacs-775a3e19d2c14531055ae8cba21bc6a0a97f6a94.tar.bz2 emacs-775a3e19d2c14531055ae8cba21bc6a0a97f6a94.zip | |
Merge from origin/emacs-27
4b3085a7fe Fix last change
efdd4632c9 Fix Arabic shaping when column-number-mode is in effect
d5acc50941 Fix description of kmacro-* commands in the user manual
Diffstat (limited to 'src/indent.c')
| -rw-r--r-- | src/indent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/indent.c b/src/indent.c index c0b4c13b2c5..581323b91ee 100644 --- a/src/indent.c +++ b/src/indent.c @@ -596,7 +596,7 @@ scan_for_column (ptrdiff_t *endpos, EMACS_INT *goalcol, ptrdiff_t *prevcol) if (cmp_it.id >= 0 || (scan == cmp_it.stop_pos && composition_reseat_it (&cmp_it, scan, scan_byte, end, - w, NEUTRAL_DIR, NULL, Qnil))) + w, -1, NULL, Qnil))) composition_update_it (&cmp_it, scan, scan_byte, Qnil); if (cmp_it.id >= 0) { @@ -1504,7 +1504,7 @@ compute_motion (ptrdiff_t from, ptrdiff_t frombyte, EMACS_INT fromvpos, if (cmp_it.id >= 0 || (pos == cmp_it.stop_pos && composition_reseat_it (&cmp_it, pos, pos_byte, to, win, - NEUTRAL_DIR, NULL, Qnil))) + -1, NULL, Qnil))) composition_update_it (&cmp_it, pos, pos_byte, Qnil); if (cmp_it.id >= 0) { |