fixed missing / in table completion and fixed unmeant auto completion in HTML while writing CDATA
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@8 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
parent
7647013a99
commit
7975a35f39
@ -328,6 +328,7 @@ gboolean sci_cb_start_auto_complete(ScintillaObject *sci, gint pos)
|
|||||||
sci_get_line(sci, line, linebuf);
|
sci_get_line(sci, line, linebuf);
|
||||||
|
|
||||||
if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && lexer != SCLEX_PASCAL) return FALSE;
|
if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && lexer != SCLEX_PASCAL) return FALSE;
|
||||||
|
if (lexer == SCLEX_HTML && style == SCE_H_DEFAULT) return FALSE;
|
||||||
if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT ||
|
if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT ||
|
||||||
style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC)) return FALSE;
|
style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC)) return FALSE;
|
||||||
|
|
||||||
@ -599,7 +600,7 @@ void sci_cb_auto_table(ScintillaObject *sci, gint pos)
|
|||||||
|
|
||||||
sci_cb_get_indent(sci, pos, TRUE);
|
sci_cb_get_indent(sci, pos, TRUE);
|
||||||
table = g_strconcat("\n", indent, indent, "<tr>\n", indent, indent, indent, "<td>\n",
|
table = g_strconcat("\n", indent, indent, "<tr>\n", indent, indent, indent, "<td>\n",
|
||||||
indent, indent, indent, "</td>\n", indent, indent, "<tr>\n",
|
indent, indent, indent, "</td>\n", indent, indent, "</tr>\n",
|
||||||
indent, NULL);
|
indent, NULL);
|
||||||
sci_insert_text(sci, pos, table);
|
sci_insert_text(sci, pos, table);
|
||||||
g_free(table);
|
g_free(table);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user