SF.net SVN: geany: [1311] branches/geany-0.10.1

[eht16 at users.sourceforge.net]

Revision: 1311
          http://svn.sourceforge.net/geany/?rev=1311&view=rev
Author:   eht16
Date:     2007-02-21 06:01:41 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
Auto close brackets only when auto completion of constructs is enabled (closes #1665015).

Modified Paths:
--------------
    branches/geany-0.10.1/NEWS
    branches/geany-0.10.1/src/sci_cb.c

Modified: branches/geany-0.10.1/NEWS
===================================================================
--- branches/geany-0.10.1/NEWS	2007-02-21 12:11:28 UTC (rev 1310)
+++ branches/geany-0.10.1/NEWS	2007-02-21 14:01:41 UTC (rev 1311)
@@ -1,4 +1,4 @@
-Geany 0.10.1 (TBA)
+Geany 0.10.1 (February 23, 2007)
 
     Bugs fixed:
     * Wrong tab foreground colour for unmodified documents.
@@ -37,6 +37,8 @@
     * Update the symbol list when starting a new document.
     * Scroll Compiler and Messages window in view when using Next Error
       or Next Message.
+    * Auto close brackets only when auto completion of constructs is
+      enabled (closes #1665015).
 
     Internationalisation:
     * New translations: fi (thanks to Harri Koskinen).

Modified: branches/geany-0.10.1/src/sci_cb.c
===================================================================
--- branches/geany-0.10.1/src/sci_cb.c	2007-02-21 12:11:28 UTC (rev 1310)
+++ branches/geany-0.10.1/src/sci_cb.c	2007-02-21 14:01:41 UTC (rev 1311)
@@ -1,7 +1,8 @@
 /*
  *      sci_cb.c - this file is part of Geany, a fast and lightweight IDE
  *
- *      Copyright 2006 Enrico Troeger <enrico.troeger at uvena.de>
+ *      Copyright 2005-2007 Enrico Tröger <enrico.troeger at uvena.de>
+ *      Copyright 2006-2007 Nick Treleaven <nick.treleaven at btinternet.com>
  *
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by
@@ -378,7 +379,8 @@
 
 void sci_cb_auto_close_bracket(ScintillaObject *sci, gint pos, gchar c)
 {
-	if (SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_LATEX) return;
+	if (! app->pref_editor_auto_complete_constructs || SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_LATEX)
+		return;
 
 	if (c == '[')
 	{


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