aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-08-27 15:18:27 +0300
committerEli Zaretskii2011-08-27 15:18:27 +0300
commitb75258b32810f3690442bddef2e10eef126d2d25 (patch)
tree359f479c57a05af6ca9ced3fcfe14c1e656379f3
parentbd206ce50c9d0c464a51586822628832467eeb2b (diff)
downloademacs-b75258b32810f3690442bddef2e10eef126d2d25.tar.gz
emacs-b75258b32810f3690442bddef2e10eef126d2d25.zip
src/bidi.c: Rearrange commentary to bidi_fetch_char.
-rw-r--r--src/bidi.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/bidi.c b/src/bidi.c
index 564d985f890..bb29647ea88 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -910,16 +910,15 @@ bidi_char_at_pos (EMACS_INT bytepos, const unsigned char *s, int unibyte)
910 covered characters as a single character, either u+2029 or u+FFFC, 910 covered characters as a single character, either u+2029 or u+FFFC,
911 and return their combined length in CH_LEN and NCHARS. DISP_POS 911 and return their combined length in CH_LEN and NCHARS. DISP_POS
912 specifies the character position of the next display string, or -1 912 specifies the character position of the next display string, or -1
913 if not yet computed. DISP_PROP non-zero means that there's really 913 if not yet computed. When the next character is at or beyond that
914 position, the function updates DISP_POS with the position of the
915 next display string. DISP_PROP non-zero means that there's really
914 a display string at DISP_POS, as opposed to when we searched till 916 a display string at DISP_POS, as opposed to when we searched till
915 DISP_POS without finding one. If DISP_PROP is 2, it means the 917 DISP_POS without finding one. If DISP_PROP is 2, it means the
916 display spec is of the form `(space ...)', which is replaced with 918 display spec is of the form `(space ...)', which is replaced with
917 u+2029 to handle it as a paragraph separator. When the next 919 u+2029 to handle it as a paragraph separator. STRING->s is the C
918 character is at or beyond that position, the function updates 920 string to iterate, or NULL if iterating over a buffer or a Lisp
919 DISP_POS with the position of the next display string. STRING->s 921 string; in the latter case, STRING->lstring is the Lisp string. */
920 is the C string to iterate, or NULL if iterating over a buffer or a
921 Lisp string; in the latter case, STRING->lstring is the Lisp
922 string. */
923static inline int 922static inline int
924bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos, 923bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
925 int *disp_prop, struct bidi_string_data *string, 924 int *disp_prop, struct bidi_string_data *string,