Revision: 4756
http://geany.svn.sourceforge.net/geany/?rev=4756&view=rev
Author: ntrel
Date: 2010-03-12 15:09:48 +0000 (Fri, 12 Mar 2010)
Log Message:
-----------
Make Long Line Marker settings for existing projects default to
general settings instead of 0 (thanks to Eugene Arshinov).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/project.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-12 14:54:18 UTC (rev 4755)
+++ trunk/ChangeLog 2010-03-12 15:09:48 UTC (rev 4756)
@@ -14,6 +14,9 @@
* src/dialogs.c:
Fix not destroying 'Make Custom Target' input dialog after first
use (oops).
+ * src/project.c:
+ Make Long Line Marker settings for existing projects default to
+ general settings instead of 0 (thanks to Eugene Arshinov).
2010-03-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/project.c
===================================================================
--- trunk/src/project.c 2010-03-12 14:54:18 UTC (rev 4755)
+++ trunk/src/project.c 2010-03-12 15:09:48 UTC (rev 4756)
@@ -1019,8 +1019,10 @@
p->base_path = utils_get_setting_string(config, "project", "base_path", "");
p->file_patterns = g_key_file_get_string_list(config, "project", "file_patterns", NULL, NULL);
- p->long_line_behaviour = g_key_file_get_integer(config, "long line marker", "long_line_behaviour", NULL);
- p->long_line_column = g_key_file_get_integer(config, "long line marker", "long_line_column", NULL);
+ p->long_line_behaviour = utils_get_setting_integer(config, "long line marker",
+ "long_line_behaviour", 1 /* follow global */);
+ p->long_line_column = utils_get_setting_integer(config, "long line marker",
+ "long_line_column", editor_prefs.long_line_global_column);
apply_editor_prefs();
build_load_menu(config, GEANY_BCS_PROJ, (gpointer)p);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4755
http://geany.svn.sourceforge.net/geany/?rev=4755&view=rev
Author: ntrel
Date: 2010-03-12 14:54:18 +0000 (Fri, 12 Mar 2010)
Log Message:
-----------
Fix not destroying 'Make Custom Target' input dialog after first
use (oops).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/dialogs.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-12 13:06:34 UTC (rev 4754)
+++ trunk/ChangeLog 2010-03-12 14:54:18 UTC (rev 4755)
@@ -11,6 +11,9 @@
Split dialogs_show_input() into 2 functions: one simple, one for
a persistent dialog.
Fix possible double-destroy of input dialog when closed by user.
+ * src/dialogs.c:
+ Fix not destroying 'Make Custom Target' input dialog after first
+ use (oops).
2010-03-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c 2010-03-12 13:06:34 UTC (rev 4754)
+++ trunk/src/dialogs.c 2010-03-12 14:54:18 UTC (rev 4755)
@@ -903,6 +903,8 @@
if (persistent)
{
+ /* override default handler */
+ g_signal_connect(dialog, "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL);
gtk_widget_show_all(dialog);
return dialog;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4750
http://geany.svn.sourceforge.net/geany/?rev=4750&view=rev
Author: ntrel
Date: 2010-03-10 13:52:41 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
Warn about some GNU extensions for regular expressions & clarify
some points.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-10 00:55:21 UTC (rev 4749)
+++ trunk/ChangeLog 2010-03-10 13:52:41 UTC (rev 4750)
@@ -1,8 +1,15 @@
+2010-03-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * doc/geany.txt, doc/geany.html:
+ Warn about some GNU extensions for regular expressions & clarify
+ some points.
+
+
2010-03-10 Lex Trotman <elextr.at.gmail.dot.com>
- * src/build.c, src/project.c
- Fix crash due to NULL in project build preferences ( thanks to
- Wolfgang Ocker )
+ * src/build.c, src/project.c:
+ Fix crash due to NULL in project build preferences (thanks to
+ Wolfgang Ocker).
2010-03-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2010-03-10 00:55:21 UTC (rev 4749)
+++ trunk/doc/geany.html 2010-03-10 13:52:41 UTC (rev 4750)
@@ -1642,7 +1642,14 @@
below.</p>
<div class="note">
<p class="first admonition-title">Note</p>
-<p class="last">Searching backwards with regular expressions is not supported.</p>
+<ol class="last arabic simple">
+<li>The <em>Use escape sequences</em> dialog option always applies for regular
+expressions.</li>
+<li>Searching backwards with regular expressions is not supported.</li>
+<li>\b, \d, \s, \w are GNU extensions and may not be available
+on non-GNU POSIX systems unless you built Geany with the
+<tt class="docutils literal"><span class="pre">--enable-gnu-regex</span></tt> option (this is always used on Windows).</li>
+</ol>
</div>
<p><strong>In a regular expression, the following characters are interpreted:</strong></p>
<table border="1" class="docutils">
@@ -1661,10 +1668,13 @@
<td>This marks the end of a tagged region.</td>
</tr>
<tr><td>\n</td>
-<td>Where n is 1 through 9 refers to the first through ninth tagged
-region when replacing. For example, if the search string was
-Fred([1-9])XXX and the replace string was Sam\1YYY, when applied
-to Fred2XXX this would generate Sam2YYY.</td>
+<td><p class="first">Where n is 1 through 9 refers to the first through ninth tagged
+region when searching or replacing.</p>
+<p>Searching for (Wiki)\1 matches WikiWiki.</p>
+<p class="last">If the search string was Fred([1-9])XXX and the
+replace string was Sam\1YYY, when applied to Fred2XXX this
+would generate Sam2YYY.</p>
+</td>
</tr>
<tr><td>\0</td>
<td>When replacing, the whole matching text.</td>
@@ -1691,10 +1701,6 @@
and not as the start of a character set. Use \\ for a literal
backslash.</td>
</tr>
-<tr><td>\uHHHH</td>
-<td>A backslash followed by u and one, two or four hexa digits,
-becomes the character whose Unicode is equal to these digits.</td>
-</tr>
<tr><td>[...]</td>
<td><p class="first">Matches one of the characters in the set. If the first
character in the set is ^, it matches the characters NOT in
@@ -5949,7 +5955,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-03-09 17:17 UTC.
+Generated on: 2010-03-10 13:48 UTC.
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2010-03-10 00:55:21 UTC (rev 4749)
+++ trunk/doc/geany.txt 2010-03-10 13:52:41 UTC (rev 4750)
@@ -1293,7 +1293,12 @@
below.
.. note::
- Searching backwards with regular expressions is not supported.
+ 1. The *Use escape sequences* dialog option always applies for regular
+ expressions.
+ 2. Searching backwards with regular expressions is not supported.
+ 3. \\b, \\d, \\s, \\w are GNU extensions and may not be available
+ on non-GNU POSIX systems unless you built Geany with the
+ ``--enable-gnu-regex`` option (this is always used on Windows).
**In a regular expression, the following characters are interpreted:**
@@ -1305,10 +1310,14 @@
) This marks the end of a tagged region.
\\n Where n is 1 through 9 refers to the first through ninth tagged
- region when replacing. For example, if the search string was
- Fred([1-9])XXX and the replace string was Sam\\1YYY, when applied
- to Fred2XXX this would generate Sam2YYY.
+ region when searching or replacing.
+ Searching for (Wiki)\\1 matches WikiWiki.
+
+ If the search string was Fred([1-9])XXX and the
+ replace string was Sam\\1YYY, when applied to Fred2XXX this
+ would generate Sam2YYY.
+
\\0 When replacing, the whole matching text.
\\b This matches a word boundary.
@@ -1328,9 +1337,6 @@
and not as the start of a character set. Use \\\\ for a literal
backslash.
-\\uHHHH A backslash followed by u and one, two or four hexa digits,
- becomes the character whose Unicode is equal to these digits.
-
[...] Matches one of the characters in the set. If the first
character in the set is ^, it matches the characters NOT in
the set, i.e. complements the set. A shorthand S-E (start
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4748
http://geany.svn.sourceforge.net/geany/?rev=4748&view=rev
Author: ntrel
Date: 2010-03-09 17:20:15 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
Remove warning about no visual indication for zero-column-mode
editing.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-09 17:07:53 UTC (rev 4747)
+++ trunk/ChangeLog 2010-03-09 17:20:15 UTC (rev 4748)
@@ -16,6 +16,9 @@
uninterpreted backslash escapes e.g. '\\', '\e'.
* scintilla/LexMarkdown.cxx:
Backport minor formatting/style changes from Scintilla project.
+ * doc/geany.txt, doc/geany.html:
+ Remove warning about no visual indication for zero-column-mode
+ editing.
2010-03-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2010-03-09 17:07:53 UTC (rev 4747)
+++ trunk/doc/geany.html 2010-03-09 17:20:15 UTC (rev 4748)
@@ -6,7 +6,7 @@
<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
<title>Geany</title>
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" />
-<meta name="date" content="2010-03-07" />
+<meta name="date" content="2010-03-09" />
<style type="text/css">
/*
@@ -139,7 +139,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2010-03-07</td></tr>
+<td>2010-03-09</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.19</td></tr>
</tbody>
@@ -1151,8 +1151,7 @@
<p>There is basic support for column mode editing. To use it, create a
rectangular selection by holding down the Control and Shift keys
(or Control and Alt if it doesn't work) while
-selecting some text. It is also possible to create a zero-column selection
-but be careful because there is no visual indication of this selection.
+selecting some text. It is also possible to create a zero-column selection.
Once a rectangular selection exists you can start editing the text within
this selection and the modifications will be done for every line in the
selection.</p>
@@ -5950,7 +5949,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-03-09 16:30 UTC.
+Generated on: 2010-03-09 17:17 UTC.
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2010-03-09 17:07:53 UTC (rev 4747)
+++ trunk/doc/geany.txt 2010-03-09 17:20:15 UTC (rev 4748)
@@ -727,8 +727,7 @@
There is basic support for column mode editing. To use it, create a
rectangular selection by holding down the Control and Shift keys
(or Control and Alt if it doesn't work) while
-selecting some text. It is also possible to create a zero-column selection
-but be careful because there is no visual indication of this selection.
+selecting some text. It is also possible to create a zero-column selection.
Once a rectangular selection exists you can start editing the text within
this selection and the modifications will be done for every line in the
selection.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4747
http://geany.svn.sourceforge.net/geany/?rev=4747&view=rev
Author: ntrel
Date: 2010-03-09 17:07:53 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
Backport minor formatting/style changes from Scintilla project.
Modified Paths:
--------------
trunk/ChangeLog
trunk/scintilla/LexMarkdown.cxx
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-09 16:56:04 UTC (rev 4746)
+++ trunk/ChangeLog 2010-03-09 17:07:53 UTC (rev 4747)
@@ -14,6 +14,8 @@
- code:
Add argument to utils_str_replace_escape() for keeping
uninterpreted backslash escapes e.g. '\\', '\e'.
+ * scintilla/LexMarkdown.cxx:
+ Backport minor formatting/style changes from Scintilla project.
2010-03-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/scintilla/LexMarkdown.cxx
===================================================================
--- trunk/scintilla/LexMarkdown.cxx 2010-03-09 16:56:04 UTC (rev 4746)
+++ trunk/scintilla/LexMarkdown.cxx 2010-03-09 17:07:53 UTC (rev 4747)
@@ -18,8 +18,7 @@
* there is a following blank line issue that can't be ignored,
* explained in the next paragraph. Embedded HTML and code
* blocks would be better supported with language specific
- * highlighting; something Scintilla isn't really architected
- * to support yet.
+ * highlighting.
*
* The highlighting aims to accurately reflect correct syntax,
* but a few restrictions are relaxed. Delimited code blocks are
@@ -30,8 +29,8 @@
*
* Written by Jon Strait - jstrait(a)moonloop.net
*
- * This source code is released for free distribution under the
- * terms of the GNU General Public License.
+ * The License.txt file describes the conditions under which this
+ * software may be distributed.
*
*****************************************************************/
@@ -59,8 +58,8 @@
}
// True if can follow ch down to the end with possibly trailing whitespace
-static bool FollowToLineEnd(const int ch, const int state, const int endPos, StyleContext &sc) {
- int i = 0;
+static bool FollowToLineEnd(const int ch, const int state, const unsigned int endPos, StyleContext &sc) {
+ unsigned int i = 0;
while (sc.GetRelative(++i) == ch)
;
// Skip over whitespace
@@ -78,13 +77,12 @@
// Set the state on text section from current to length characters,
// then set the rest until the newline to default, except for any characters matching token
static void SetStateAndZoom(const int state, const int length, const int token, StyleContext &sc) {
- int i = 0;
sc.SetState(state);
sc.Forward(length);
sc.SetState(SCE_MARKDOWN_DEFAULT);
sc.Forward();
+ bool started = false;
while (sc.More() && !IsNewline(sc.ch)) {
- bool started = false;
if (sc.ch == token && !started) {
sc.SetState(state);
started = true;
@@ -113,8 +111,9 @@
return false;
}
-static bool IsValidHrule(const int endPos, StyleContext &sc) {
- int c, i = 0, count = 1;
+static bool IsValidHrule(const unsigned int endPos, StyleContext &sc) {
+ int c, count = 1;
+ unsigned int i = 0;
while (++i) {
c = sc.GetRelative(i);
if (c == sc.ch)
@@ -131,35 +130,17 @@
}
else {
sc.SetState(SCE_MARKDOWN_DEFAULT);
- return false;
+ return false;
}
}
}
+ return false;
}
-// Only consume if already valid. Doesn't work for delimiting multiple lines.
-static void ConsumeEnd(const int state, const int origPos, const int endPos,
- const char *token, StyleContext &sc) {
- int targetPos;
- while (sc.currentPos + 1 < endPos) {
- sc.Forward();
- if (sc.Match(token) && sc.chPrev != '\\' && sc.chPrev != ' ') {
- targetPos = sc.currentPos + strlen(token);
- sc.currentPos = origPos;
- sc.SetState(state);
- sc.Forward(targetPos - origPos);
- sc.SetState(SCE_MARKDOWN_DEFAULT);
- break;
- }
- }
-}
-
static void ColorizeMarkdownDoc(unsigned int startPos, int length, int initStyle,
- WordList *keywordlists[], Accessor &styler) {
-
- int digitCount = 0;
- int endPos = startPos + length;
- int precharCount;
+ WordList **, Accessor &styler) {
+ unsigned int endPos = startPos + length;
+ int precharCount = 0;
// Don't advance on a new loop iteration and retry at the same position.
// Useful in the corner case of having to start at the beginning file position
// in the default state.
@@ -330,7 +311,7 @@
}
// Ordered list
else if (IsADigit(sc.ch)) {
- digitCount = 0;
+ int digitCount = 0;
while (IsADigit(sc.GetRelative(++digitCount)))
;
if (sc.GetRelative(digitCount) == '.' &&
@@ -354,7 +335,6 @@
// New state anywhere in doc
if (sc.state == SCE_MARKDOWN_DEFAULT) {
- int origPos = sc.currentPos;
if (sc.atLineStart && sc.ch == '#') {
sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
freezeCursor = true;
@@ -430,4 +410,3 @@
}
LexerModule lmMarkdown(SCLEX_MARKDOWN, ColorizeMarkdownDoc, "markdown");
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.