SF.net SVN: geany-plugins:[1152] trunk/geanylatex/src/geanylatex.c

[frlan at users.sourceforge.net]

Revision: 1152
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1152&view=rev
Author:   frlan
Date:     2010-02-09 18:46:14 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
GeanyLaTeX: Put Check for whether auto completion should be done into one single if-construct.

Modified Paths:
--------------
    trunk/geanylatex/src/geanylatex.c

Modified: trunk/geanylatex/src/geanylatex.c
===================================================================
--- trunk/geanylatex/src/geanylatex.c	2010-02-09 18:45:37 UTC (rev 1151)
+++ trunk/geanylatex/src/geanylatex.c	2010-02-09 18:46:14 UTC (rev 1152)
@@ -402,21 +402,13 @@
 	 *
 	 * Function has been taken from Geany's core under terms of GPLv2+
 	 * where it was original developed. */
-	if (glatex_autocompletion_active == TRUE)
+	if (glatex_autocompletion_active == TRUE &&
+		!(glatex_autocompletion_only_for_latex == TRUE &&
+		editor->document->file_type->id != GEANY_FILETYPES_LATEX))
 	{
 		sci = editor->sci;
 		pos = sci_get_current_position(sci);
 		
-		/* Check whether this is a LaTeX file at all. If not, we most
-		likely don't want to do anything. However, there is only one
-		exception: In case of user really wants to do so and is forcing
-		us with hidden preference */
-		if (glatex_autocompletion_only_for_latex == TRUE &&
-			editor->document->file_type->id != GEANY_FILETYPES_LATEX)
-		{
-			return FALSE;
-		}
-	
 		if (nt->nmhdr.code == SCN_CHARADDED)
 		{
 			switch (nt->ch)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.