emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-28 d5728f129f: Another fix for non-ASCII 'overlay-arrow-string'


From: Eli Zaretskii
Subject: emacs-28 d5728f129f: Another fix for non-ASCII 'overlay-arrow-string'
Date: Fri, 22 Apr 2022 02:07:36 -0400 (EDT)

branch: emacs-28
commit d5728f129fb2c20e9c0ff44651a538a40f3088af
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Another fix for non-ASCII 'overlay-arrow-string'
    
    * src/xdisp.c (get_overlay_arrow_glyph_row): Fix yet another place
    that assumed each character is a single byte.
---
 src/xdisp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 42c3e81e5c..6963935666 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -774,7 +774,7 @@ static bool message_buf_print;
 static bool message_cleared_p;
 
 /* A scratch glyph row with contents used for generating truncation
-   glyphs.  Also used in direct_output_for_insert.  */
+   glyphs and overlay-arrow glyphs.  */
 
 #define MAX_SCRATCH_GLYPHS 100
 static struct glyph_row scratch_glyph_row;
@@ -21653,7 +21653,7 @@ get_overlay_arrow_glyph_row (struct window *w, 
Lisp_Object overlay_arrow_string)
   struct buffer *buffer = XBUFFER (w->contents);
   struct buffer *old = current_buffer;
   const unsigned char *arrow_string = SDATA (overlay_arrow_string);
-  ptrdiff_t arrow_len = SCHARS (overlay_arrow_string), char_num = 0;
+  ptrdiff_t arrow_len = SBYTES (overlay_arrow_string), char_num = 0;
   const unsigned char *arrow_end = arrow_string + arrow_len;
   const unsigned char *p;
   struct it it;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]