[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 83000ae: Don't wrap lines at NBSP when nobreak-char-display is t
From: |
Eli Zaretskii |
Subject: |
master 83000ae: Don't wrap lines at NBSP when nobreak-char-display is t |
Date: |
Sat, 15 Aug 2020 06:25:14 -0400 (EDT) |
branch: master
commit 83000ae6d7c6e3c615b16d2ea9274e1088d24178
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Don't wrap lines at NBSP when nobreak-char-display is t
* src/xdisp.c (get_next_display_element): When
nobreak-char-display is t, display NBSP and non-ASCII hyphens as
themselves, not as their ASCII counterparts, just with the
nobreak-space/nobreak-hyphen face. (Bug#42811)
---
src/xdisp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index 4fe1c42..f05319a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7555,7 +7555,7 @@ get_next_display_element (struct it *it)
/* Merge `nobreak-space' into the current face. */
face_id = merge_faces (it->w, Qnobreak_space, 0,
it->face_id);
- XSETINT (it->ctl_chars[0], ' ');
+ XSETINT (it->ctl_chars[0], it->c);
ctl_len = 1;
goto display_control;
}
@@ -7568,7 +7568,7 @@ get_next_display_element (struct it *it)
/* Merge `nobreak-space' into the current face. */
face_id = merge_faces (it->w, Qnobreak_hyphen, 0,
it->face_id);
- XSETINT (it->ctl_chars[0], '-');
+ XSETINT (it->ctl_chars[0], it->c);
ctl_len = 1;
goto display_control;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 83000ae: Don't wrap lines at NBSP when nobreak-char-display is t,
Eli Zaretskii <=