Revision: 5163
http://geany.svn.sourceforge.net/geany/?rev=5163&view=rev
Author: eht16
Date: 2010-08-15 13:33:32 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
Rewrite the logic to auto detect encodings a bit to make it more readable and fix a slightly wrong detection on Windows (closes #3019573).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/encodings.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-08-15 12:53:09 UTC (rev 5162)
+++ trunk/ChangeLog 2010-08-15 13:33:32 UTC (rev 5163)
@@ -2,6 +2,10 @@
* wscript:
Check for libsocket on OpenSolaris to fix build.
+ * src/encodings.c:
+ Rewrite the logic to auto detect encodings a bit to make it more
+ readable and fix a slightly wrong detection on Windows
+ (closes #3019573).
2010-08-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/encodings.c
===================================================================
--- trunk/src/encodings.c 2010-08-15 12:53:09 UTC (rev 5162)
+++ trunk/src/encodings.c 2010-08-15 13:33:32 UTC (rev 5163)
@@ -563,34 +563,38 @@
if (G_UNLIKELY(i == encodings[GEANY_ENCODING_NONE].idx))
continue;
- if (i == -1)
+ if (check_regex)
{
- if (preferred_charset != -1)
- {
- charset = encodings[preferred_charset].charset;
- geany_debug("Using preferred charset: %s", charset);
- }
- else
- continue;
- }
- else if (check_regex)
- {
check_regex = FALSE;
charset = regex_charset;
+ i = -2; /* keep i below the start value to have it again at -1 on the next loop run */
}
else if (check_locale)
{
check_locale = FALSE;
charset = locale_charset;
+ i = -2; /* keep i below the start value to have it again at -1 on the next loop run */
}
- else
+ else if (i == -1)
+ {
+ if (preferred_charset >= 0)
+ {
+ charset = encodings[preferred_charset].charset;
+ geany_debug("Using preferred charset: %s", charset);
+ }
+ else
+ continue;
+ }
+ else if (i >= 0)
charset = encodings[i].charset;
+ else /* in this case we have i == -2, continue to increase i and go ahead */
+ continue;
-
if (G_UNLIKELY(charset == NULL))
continue;
- geany_debug("Trying to convert %" G_GSIZE_FORMAT " bytes of data from %s into UTF-8.", size, charset);
+ geany_debug("Trying to convert %" G_GSIZE_FORMAT " bytes of data from %s into UTF-8.",
+ size, charset);
utf8_content = encodings_convert_to_utf8_from_charset(buffer, size, charset, FALSE);
if (G_LIKELY(utf8_content != NULL))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5161
http://geany.svn.sourceforge.net/geany/?rev=5161&view=rev
Author: ntrel
Date: 2010-08-13 17:00:36 +0000 (Fri, 13 Aug 2010)
Log Message:
-----------
Fix segfault on Tools->Reload Configuration when no documents are
open (#3037079).
Modified Paths:
--------------
branches/Geany-0_19_1/ChangeLog
branches/Geany-0_19_1/NEWS
branches/Geany-0_19_1/src/filetypes.c
Modified: branches/Geany-0_19_1/ChangeLog
===================================================================
--- branches/Geany-0_19_1/ChangeLog 2010-08-13 14:54:27 UTC (rev 5160)
+++ branches/Geany-0_19_1/ChangeLog 2010-08-13 17:00:36 UTC (rev 5161)
@@ -3,6 +3,9 @@
* win32-config.h, geany.nsi, configure.ac, doc/geany.txt,
doc/geany.html, wscript, geany_private.rc:
Version bump.
+ * src/filetypes.c, NEWS:
+ Fix segfault on Tools->Reload Configuration when no documents are
+ open (#3037079).
2010-08-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: branches/Geany-0_19_1/NEWS
===================================================================
--- branches/Geany-0_19_1/NEWS 2010-08-13 14:54:27 UTC (rev 5160)
+++ branches/Geany-0_19_1/NEWS 2010-08-13 17:00:36 UTC (rev 5161)
@@ -15,6 +15,8 @@
document name for menu items (#3038844).
* File Browser: Allow Find in Files when no items are selected.
* Fix build menu translation problems.
+ * Fix segfault on Tools->Reload Configuration when no documents are
+ open (#3037079).
* Fix a memory leak (thanks to Daniel Marjamäki).
* Use g_free instead of free (patch by Daniel Marjamäki, thanks).
Modified: branches/Geany-0_19_1/src/filetypes.c
===================================================================
--- branches/Geany-0_19_1/src/filetypes.c 2010-08-13 14:54:27 UTC (rev 5160)
+++ branches/Geany-0_19_1/src/filetypes.c 2010-08-13 17:00:36 UTC (rev 5161)
@@ -1659,8 +1659,12 @@
/* filetypes_load_config() will skip not loaded filetypes */
filetypes_load_config(i, TRUE);
}
+
+ current_doc = document_get_current();
+ if (!current_doc)
+ return;
+
/* update document styling */
- current_doc = document_get_current();
foreach_document(i)
{
if (current_doc != documents[i])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5160
http://geany.svn.sourceforge.net/geany/?rev=5160&view=rev
Author: ntrel
Date: 2010-08-13 14:54:27 +0000 (Fri, 13 Aug 2010)
Log Message:
-----------
Update for 0.19.1 (all merges).
Modified Paths:
--------------
branches/Geany-0_19_1/NEWS
Modified: branches/Geany-0_19_1/NEWS
===================================================================
--- branches/Geany-0_19_1/NEWS 2010-08-13 14:23:37 UTC (rev 5159)
+++ branches/Geany-0_19_1/NEWS 2010-08-13 14:54:27 UTC (rev 5160)
@@ -1,3 +1,39 @@
+Geany 0.19.1 (TBA)
+
+ Fixes:
+ * Fix broken autocompletion after using scope completion.
+ * Fix scrolling the editor line in view (e.g. after loading a session
+ and switching document tabs).
+ * Fix using filetype extension patterns with upper case letters on
+ Windows (#3028856).
+ * Re-enable comment folding.
+ * Fix not loading plugins built against a newer API when Geany doesn't
+ provide the required version given in PLUGIN_VERSION_CHECK().
+ * Focus toolbar item when pressing Go to Line keybinding only when
+ it's not in the toolbar's drop down overflow menu (#3027454).
+ * Escape the name of the current document for markup when using
+ document name for menu items (#3038844).
+ * File Browser: Allow Find in Files when no items are selected.
+ * Fix build menu translation problems.
+ * Fix a memory leak (thanks to Daniel Marjamäki).
+ * Use g_free instead of free (patch by Daniel Marjamäki, thanks).
+
+ Tweaks:
+ * Always use white background color when printing (except for text
+ with a white foreground) to save ink (#2968998).
+ * Limit build error editor indicators to 50, but parse all errors in
+ the Compiler tab (#3019823).
+ * Align notebook tab close buttons centred vertically (thanks to
+ Robux.Biz (galyuk)).
+ * Show the Project Properties build tab when choosing 'Set Build
+ Commands' when a project is open to prevent confusion with
+ non-project commands.
+
+ Manual:
+ * Fix wording - restarting is required for hidden prefs.
+ * Fix Grep --exclude-dir example.
+
+
Geany 0.19 (June 12, 2010)
General:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5158
http://geany.svn.sourceforge.net/geany/?rev=5158&view=rev
Author: ntrel
Date: 2010-08-13 14:05:34 +0000 (Fri, 13 Aug 2010)
Log Message:
-----------
Check for git-svn repo, not just git because find-rev doesn't
always fail with a git-only repo.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-08-13 11:41:39 UTC (rev 5157)
+++ trunk/ChangeLog 2010-08-13 14:05:34 UTC (rev 5158)
@@ -1,7 +1,14 @@
+2010-08-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * configure.ac:
+ Check for git-svn repo, not just git because find-rev doesn't
+ always fail with a git-only repo.
+
+
2010-08-12 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* src/search.c:
- Fix a memory leak based on input by Daniel Marjamäki. Thanks.
+ Fix a memory leak based on input by Daniel Marjamäki. Thanks.
2010-08-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-08-13 11:41:39 UTC (rev 5157)
+++ trunk/configure.ac 2010-08-13 14:05:34 UTC (rev 5158)
@@ -53,9 +53,13 @@
GIT=`which git 2>/dev/null`
if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}"
then
- REVISION=r`git svn find-rev origin/trunk 2>/dev/null ||
+ # check for git-svn repo first - find-rev (v1.5.4.1) doesn't always fail with git-only repo
+ git svn info &>/dev/null
+ if test "x$?" == "x0"; then
+ REVISION=r`git svn find-rev origin/trunk 2>/dev/null ||
git svn find-rev trunk 2>/dev/null || git svn find-rev HEAD 2>/dev/null ||
git svn find-rev master 2>/dev/null || echo 0`
+ fi
fi
if test "x${REVISION}" = "xr0"
then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.