projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor
[pspp]
/
src
/
ui
/
gui
/
psppire-lex-reader.c
diff --git
a/src/ui/gui/psppire-lex-reader.c
b/src/ui/gui/psppire-lex-reader.c
index 6a87e0a6ab99b3f26497ecba9c1db06fb0a821b5..b34edf97b7ce430432e0f8af3a6755b6a6dc89c5 100644
(file)
--- a/
src/ui/gui/psppire-lex-reader.c
+++ b/
src/ui/gui/psppire-lex-reader.c
@@
-54,11
+54,15
@@
lex_gtk_text_buffer_reader_cast (struct lex_reader *r)
struct lex_reader *
struct lex_reader *
-lex_reader_for_gtk_text_buffer (GtkTextBuffer *buffer, GtkTextIter start, GtkTextIter stop)
+lex_reader_for_gtk_text_buffer (GtkTextBuffer *buffer,
+ GtkTextIter start, GtkTextIter stop,
+ enum segmenter_mode syntax_mode)
{
struct lex_gtk_text_buffer_reader *r = xmalloc (sizeof *r);
lex_reader_init (&r->reader, &lex_gtk_text_buffer_reader_class);
{
struct lex_gtk_text_buffer_reader *r = xmalloc (sizeof *r);
lex_reader_init (&r->reader, &lex_gtk_text_buffer_reader_class);
+ r->reader.syntax = syntax_mode;
+ r->reader.line_number = gtk_text_iter_get_line (&start) + 1;
r->buffer = buffer;
g_object_ref (buffer);
r->buffer = buffer;
g_object_ref (buffer);
@@
-93,7
+97,7
@@
lex_gtk_text_buffer_read (struct lex_reader *r_, char *buf, size_t n,
int offset = gtk_text_iter_get_offset (&iter);
int end_offset = gtk_text_iter_get_offset (&r->stop);
int offset = gtk_text_iter_get_offset (&iter);
int end_offset = gtk_text_iter_get_offset (&r->stop);
- if (
end_offset - offset < n)
+ if (end_offset - offset < n)
n_chars = end_offset - offset;
gtk_text_iter_set_offset (&iter, offset + n_chars);
n_chars = end_offset - offset;
gtk_text_iter_set_offset (&iter, offset + n_chars);