SF.net SVN: geany: [1819] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Fri Aug 24 11:31:27 UTC 2007
Revision: 1819
http://geany.svn.sourceforge.net/geany/?rev=1819&view=rev
Author: ntrel
Date: 2007-08-24 04:31:27 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
Fix wrong brace formatting.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
trunk/src/highlighting.c
trunk/src/sciwrappers.c
trunk/src/symbols.c
trunk/src/utils.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-24 11:19:26 UTC (rev 1818)
+++ trunk/ChangeLog 2007-08-24 11:31:27 UTC (rev 1819)
@@ -3,6 +3,9 @@
* src/dialogs.c, src/callbacks.c:
Fix saving the wrong document when using Save All with unnamed
documents.
+ * src/utils.c, src/highlighting.c, src/sciwrappers.c, src/document.c,
+ src/symbols.c:
+ Fix wrong brace formatting.
2007-08-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2007-08-24 11:19:26 UTC (rev 1818)
+++ trunk/src/document.c 2007-08-24 11:31:27 UTC (rev 1819)
@@ -1402,9 +1402,9 @@
if (find_len <= 0)
{
gchar chNext = sci_get_char_at(sci, SSM(sci, SCI_GETTARGETEND, 0, 0));
- if (chNext == '\r' || chNext == '\n') {
+
+ if (chNext == '\r' || chNext == '\n')
movepastEOL = 1;
- }
}
replace_len = sci_target_replace(sci, replace_text,
flags & SCFIND_REGEXP);
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2007-08-24 11:19:26 UTC (rev 1818)
+++ trunk/src/highlighting.c 2007-08-24 11:31:27 UTC (rev 1819)
@@ -1318,7 +1318,8 @@
//~ #define SCE_HB_START 70
// Show the whole section of VBScript
-/* for (bstyle=SCE_HB_DEFAULT; bstyle<=SCE_HB_STRINGEOL; bstyle++) {
+/* for (bstyle=SCE_HB_DEFAULT; bstyle<=SCE_HB_STRINGEOL; bstyle++)
+ {
SSM(sci, SCI_STYLESETBACK, bstyle, 0xf5f5f5);
// This call extends the backround colour of the last style on the line to the edge of the window
SSM(sci, SCI_STYLESETEOLFILLED, bstyle, 1);
Modified: trunk/src/sciwrappers.c
===================================================================
--- trunk/src/sciwrappers.c 2007-08-24 11:19:26 UTC (rev 1818)
+++ trunk/src/sciwrappers.c 2007-08-24 11:31:27 UTC (rev 1819)
@@ -151,11 +151,10 @@
void sci_set_visible_white_spaces(ScintillaObject* sci, gboolean set )
{
- if(set){
+ if (set)
SSM(sci,SCI_SETVIEWWS,SCWS_VISIBLEALWAYS,0);
- }else{
+ else
SSM(sci,SCI_SETVIEWWS,SCWS_INVISIBLE,0);
- }
}
gboolean sci_get_visible_white_spaces(ScintillaObject* sci)
@@ -165,12 +164,13 @@
void sci_set_lines_wrapped(ScintillaObject* sci, gboolean set )
{
- if( set ){
+ if (set)
+ {
SSM(sci,SCI_SETWRAPMODE,SC_WRAP_WORD,0);
SSM(sci, SCI_SETWRAPVISUALFLAGS, SC_WRAPVISUALFLAG_END, 0);
- }else{
+ }
+ else
SSM(sci,SCI_SETWRAPMODE,SC_WRAP_NONE,0);
- }
}
gboolean sci_get_lines_wrapped(ScintillaObject* sci)
@@ -231,9 +231,10 @@
void sci_undo( ScintillaObject* sci )
{
- if( sci_can_undo(sci) ){
+ if( sci_can_undo(sci) )
SSM( sci, SCI_UNDO, 0, 0);
- }else{ // change it to a document function
+ else
+ { // change it to a document function
}
}
@@ -241,9 +242,10 @@
void sci_redo( ScintillaObject* sci )
{
- if( sci_can_redo( sci ) ){
+ if( sci_can_redo( sci ) )
SSM( sci, SCI_REDO,0,0);
- }else{// change it to a document function
+ else
+ { // change it to a document function
}
}
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c 2007-08-24 11:19:26 UTC (rev 1818)
+++ trunk/src/symbols.c 2007-08-24 11:31:27 UTC (rev 1819)
@@ -470,11 +470,13 @@
g_assert(title != NULL);
gtk_tree_store_append(tree_store, iter, NULL);
- if (G_IS_OBJECT(icon)) {
+ if (G_IS_OBJECT(icon))
+ {
gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_ICON, icon,
SYMBOLS_COLUMN_NAME, title, -1);
g_object_unref(icon);
- } else
+ }
+ else
gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, -1);
}
va_end(args);
Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c 2007-08-24 11:19:26 UTC (rev 1818)
+++ trunk/src/utils.c 2007-08-24 11:31:27 UTC (rev 1819)
@@ -103,7 +103,8 @@
for ( i = 0; i < size ; i++ )
{
- if ( buffer[i] == 0x0a ){
+ if ( buffer[i] == 0x0a )
+ {
// LF
lf++;
}
@@ -114,7 +115,9 @@
// Last char
// CR
cr++;
- } else {
+ }
+ else
+ {
if (buffer[i+1] != 0x0a)
{
// CR
@@ -133,17 +136,18 @@
/* Vote for the maximum */
mode = SC_EOL_LF;
max_mode = lf;
- if (crlf > max_mode) {
+ if (crlf > max_mode)
+ {
mode = SC_EOL_CRLF;
max_mode = crlf;
}
- if (cr > max_mode) {
+ if (cr > max_mode)
+ {
mode = SC_EOL_CR;
max_mode = cr;
}
//geany_debug("EOL chars: LF = %d, CR = %d, CRLF = %d", lf, cr, crlf);
-
return mode;
}
@@ -265,7 +269,8 @@
gchar *result = g_malloc(max_tag_size);
const gchar *begin, *cur;
- if (size < 3) {
+ if (size < 3)
+ {
// Smallest tag is "<p>" which is 3 characters
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list