Merge branch 'feature/native-comp' into feature/native-comp-macos-fixesfeature/native-comp-macos-fixes

1 files changed, 4 insertions, 4 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 4fe1c4288af..ad03ac46054 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -180,8 +180,8 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
    present (non-empty) only if the corresponding display margin is
    shown in the window.  If the glyph array for a marginal area is not
    present its beginning and end coincide, i.e. such arrays are
-   actually empty (they contain no glyphs).  Frame glyph matrics, used
-   on text-mode terminals (see below) never have marginal areas, they
+   actually empty (they contain no glyphs).  Frame glyph matrices, used
+   on text-mode terminals (see below) never have marginal areas; they
    treat the entire frame-wide row of glyphs as a single large "text
    area".
 
@@ -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;
                 }