[geany/geany] ac34a1: Show SGML entity completion on first typing '&' again
Nick Treleaven
git-noreply at xxxxx
Thu Jul 26 00:04:02 UTC 2012
Branch: refs/heads/document-messages
Author: Nick Treleaven <nick.treleaven at btinternet.com>
Committer: Nick Treleaven <nick.treleaven at btinternet.com>
Date: Mon, 16 Apr 2012 11:05:18
Commit: ac34a19abe60def11a821d54fe2fbb0b9b6ca845
https://github.com/geany/geany/commit/ac34a19abe60def11a821d54fe2fbb0b9b6ca845
Log Message:
-----------
Show SGML entity completion on first typing '&' again
Modified Paths:
--------------
src/editor.c
Modified: src/editor.c
8 files changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -2188,6 +2188,7 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc
return FALSE;
autocomplete_scope(editor);
+ ret = autocomplete_check_html(editor, style, pos);
if (ft->id == GEANY_FILETYPES_LATEX)
wordchars = GEANY_WORDCHARS"\\"; /* add \ to word chars if we are in a LaTeX file */
@@ -2198,13 +2199,12 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc
root = cword;
rootlen = strlen(root);
- if (rootlen > 0)
+ if (!ret && rootlen > 0)
{
- ret = autocomplete_check_html(editor, style, pos);
- if (ret || (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT &&
+ if (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT &&
rootlen == 3 && strcmp(root, "php") == 0 && pos >= 5 &&
sci_get_char_at(sci, pos - 5) == '<' &&
- sci_get_char_at(sci, pos - 4) == '?'))
+ sci_get_char_at(sci, pos - 4) == '?')
{
/* nothing, don't complete PHP open tags */
}
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
More information about the Commits
mailing list