HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken auto multiline comment with files in CR/LF mode.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2352 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2008-03-17 13:11:29 +00:00
parent d5da60a242
commit ec2bce2f94
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,6 +1,9 @@
2008-03-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> 2008-03-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* doc/geany.txt, doc/geany.html: Add a note about column mode editing. * doc/geany.txt, doc/geany.html:
Add a note about column mode editing.
* src/editor.c:
Fix broken auto multiline comment with files in CR/LF mode.
2008-03-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> 2008-03-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

9
src/editor.c
View File

@ -65,7 +65,7 @@ static gchar indent[100];
static void on_new_line_added(gint idx); static void on_new_line_added(gint idx);
static gboolean handle_xml(gint idx, gchar ch); static gboolean handle_xml(gint idx, gchar ch);
static void get_indent(document *doc, gint pos, gboolean use_this_line); static void get_indent(document *doc, gint pos, gboolean use_this_line);
static void auto_multiline(ScintillaObject *sci, gint pos); static void auto_multiline(gint idx, gint pos);
static gboolean is_comment(gint lexer, gint style); static gboolean is_comment(gint lexer, gint style);
static void auto_close_bracket(ScintillaObject *sci, gint pos, gchar c); static void auto_close_bracket(ScintillaObject *sci, gint pos, gchar c);
static void editor_auto_table(document *doc, gint pos); static void editor_auto_table(document *doc, gint pos);
@ -467,7 +467,7 @@ static void on_new_line_added(gint idx)
if (editor_prefs.complete_snippets) if (editor_prefs.complete_snippets)
{ {
/* " * " auto completion in multiline C/C++/D/Java comments */ /* " * " auto completion in multiline C/C++/D/Java comments */
auto_multiline(sci, pos); auto_multiline(idx, pos);
editor_auto_latex(idx, pos); editor_auto_latex(idx, pos);
} }
@ -2026,9 +2026,10 @@ static gboolean is_doc_comment_char(gchar c, gint lexer)
} }
static void auto_multiline(ScintillaObject *sci, gint pos) static void auto_multiline(gint idx, gint pos)
{ {
gint style = SSM(sci, SCI_GETSTYLEAT, pos - 2, 0); ScintillaObject *sci = doc_list[idx].sci;
gint style = SSM(sci, SCI_GETSTYLEAT, pos - 1 - utils_get_eol_char_len(idx), 0);
gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); gint lexer = SSM(sci, SCI_GETLEXER, 0, 0);
gint i; gint i;