Revision: 4610
http://geany.svn.sourceforge.net/geany/?rev=4610&view=rev
Author: eht16
Date: 2010-01-31 16:26:13 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Backport from trunk:
Before looking for line and column numbers specified as part of a filename, ensure the file doesn't exist on disk. This allows opening of files like "test:0".
Modified Paths:
--------------
branches/geany-0.18.1/ChangeLog
branches/geany-0.18.1/src/main.c
Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog 2010-01-31 16:25:37 UTC (rev 4609)
+++ branches/geany-0.18.1/ChangeLog 2010-01-31 16:26:13 UTC (rev 4610)
@@ -47,6 +47,10 @@
* plugins/saveactions.c:
Fix adding the filetype's default extension when using the
Instant Save plugin (closes #2885142).
+ * src/main.c:
+ Before looking for line and column numbers specified as part
+ of a filename, ensure the file doesn't exist on disk. This allows
+ opening of files like "test:0".
2009-10-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: branches/geany-0.18.1/src/main.c
===================================================================
--- branches/geany-0.18.1/src/main.c 2010-01-31 16:25:37 UTC (rev 4609)
+++ branches/geany-0.18.1/src/main.c 2010-01-31 16:26:13 UTC (rev 4610)
@@ -316,6 +316,10 @@
if (! NZV(filename))
return;
+ /* allow to open files like "test:0" */
+ if (g_file_test(filename, G_FILE_TEST_EXISTS))
+ return;
+
len = strlen(filename);
for (i = len - 1; i >= 1; i--)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4609
http://geany.svn.sourceforge.net/geany/?rev=4609&view=rev
Author: eht16
Date: 2010-01-31 16:25:37 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Backport from trunk:
Fix adding the filetype's default extension when using the Instant Save plugin (closes #2885142).
Modified Paths:
--------------
branches/geany-0.18.1/ChangeLog
branches/geany-0.18.1/plugins/saveactions.c
Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog 2010-01-31 16:25:14 UTC (rev 4608)
+++ branches/geany-0.18.1/ChangeLog 2010-01-31 16:25:37 UTC (rev 4609)
@@ -42,6 +42,13 @@
Add 'Doc-comments' plugin API subsection.
+2009-10-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * plugins/saveactions.c:
+ Fix adding the filetype's default extension when using the
+ Instant Save plugin (closes #2885142).
+
+
2009-10-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* THANKS, src/about.c:
Modified: branches/geany-0.18.1/plugins/saveactions.c
===================================================================
--- branches/geany-0.18.1/plugins/saveactions.c 2010-01-31 16:25:14 UTC (rev 4608)
+++ branches/geany-0.18.1/plugins/saveactions.c 2010-01-31 16:25:37 UTC (rev 4609)
@@ -250,7 +250,7 @@
if (fd != -1)
close(fd); /* close the returned file descriptor as we only need the filename */
- if (ft == NULL)
+ if (ft == NULL || ft->id == GEANY_FILETYPES_NONE)
/* ft is NULL when a new file without template was opened, so use the
* configured default file type */
ft = filetypes_lookup_by_name(instantsave_default_ft);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4608
http://geany.svn.sourceforge.net/geany/?rev=4608&view=rev
Author: eht16
Date: 2010-01-31 16:25:14 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Backport from trunk:
Map global types (read from tags files) to keyword style for filetype Java.
Modified Paths:
--------------
branches/geany-0.18.1/ChangeLog
branches/geany-0.18.1/src/highlighting.c
Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog 2010-01-31 16:24:35 UTC (rev 4607)
+++ branches/geany-0.18.1/ChangeLog 2010-01-31 16:25:14 UTC (rev 4608)
@@ -60,6 +60,9 @@
* src/printing.c:
Enable embedded page setup properties in the (Unix) Print dialog
on newer GTK versions (closes #2870596).
+ * src/highlighting.c:
+ Map global types (read from tags files) to keyword style for
+ filetype Java.
2009-09-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: branches/geany-0.18.1/src/highlighting.c
===================================================================
--- branches/geany-0.18.1/src/highlighting.c 2010-01-31 16:24:35 UTC (rev 4607)
+++ branches/geany-0.18.1/src/highlighting.c 2010-01-31 16:25:14 UTC (rev 4608)
@@ -1575,6 +1575,9 @@
SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_JAVA].keywords[2]);
SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) style_sets[GEANY_FILETYPES_JAVA].keywords[3]);
+ /* assign global types, merge them with user defined keywords and set them */
+ assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang);
+
styleset_c_like(sci, GEANY_FILETYPES_JAVA);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4605
http://geany.svn.sourceforge.net/geany/?rev=4605&view=rev
Author: eht16
Date: 2010-01-31 16:24:03 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Backport from trunk:
Update VBScript keywords (patch by Ross McKay, thanks).
Modified Paths:
--------------
branches/geany-0.18.1/ChangeLog
branches/geany-0.18.1/data/filetypes.xml
Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog 2010-01-31 16:23:47 UTC (rev 4604)
+++ branches/geany-0.18.1/ChangeLog 2010-01-31 16:24:03 UTC (rev 4605)
@@ -64,6 +64,12 @@
Don't build pluginutils.o if HAVE_PLUGINS is not defined.
+2009-09-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/filetypes.xml:
+ Update VBScript keywords (patch by Ross McKay, thanks).
+
+
2009-09-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* doc/geany.txt, doc/geany.html:
Modified: branches/geany-0.18.1/data/filetypes.xml
===================================================================
--- branches/geany-0.18.1/data/filetypes.xml 2010-01-31 16:23:47 UTC (rev 4604)
+++ branches/geany-0.18.1/data/filetypes.xml 2010-01-31 16:24:03 UTC (rev 4605)
@@ -74,7 +74,7 @@
[keywords]
html=a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml xml:lang
javascript=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with
-vbscript=and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant
+vbscript=and as boolean byref byte byval call case class const continue currency date dim do double each else elseif empty end error exit false for function get global goto if in integer long loop me new next not nothing object on optional or private property public put redim rem resume select set single string sub then to true type until variant wend while with
python=and assert break class continue complex def del elif else except exec finally for from global if import in inherit is int lambda not or pass print raise return tuple try unicode while yield long float str list
php=abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function goto global if implements include include_once int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor
sgml=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.