Re: [Geany-devel] Fix styling group copying
On 04/14/11 20:11, Matthew Brush wrote: Hi, I fixed an issue that was noticed once geany-themes switched to the styling group copying stuff added in r5596[1]. If the user config files are using named styles with different names from the system ones, then only copying the styling group from the system file means that some of the user's colour scheme named styles won't be used and the result is some stuff not being colourized. Attached is a patch to fix this. ...and introduce another problem. Why do I always notice these things after I click send (seemed to work during testing). Anyway, I forgot to create a new keyfile after the first one is freed. Slap the attached patch on top of the first one. Sorry, Matthew Brush >From 7f954dcf2aaa61019df37d320d33143deff321e0 Mon Sep 17 00:00:00 2001 From: Matthew Brush Date: Thu, 14 Apr 2011 20:15:39 -0700 Subject: [PATCH 2/2] Create a new keyfile after freeing the first one (oops). --- src/filetypes.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/filetypes.c b/src/filetypes.c index 7d54040..b35f460 100644 --- a/src/filetypes.c +++ b/src/filetypes.c @@ -1258,6 +1258,7 @@ static void add_group_keys(GKeyFile *kf, const gchar *group, GeanyFiletype *ft) add_keys(kf, group, src); g_key_file_free(src); + src = g_key_file_new(); f = filetypes_get_filename(ft, TRUE); g_key_file_load_from_file(src, f, G_KEY_FILE_NONE, NULL); g_free(f); -- 1.7.1 ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
[Geany-devel] Fix styling group copying
Hi,
I fixed an issue that was noticed once geany-themes switched to the
styling group copying stuff added in r5596[1]. If the user config files
are using named styles with different names from the system ones, then
only copying the styling group from the system file means that some of
the user's colour scheme named styles won't be used and the result is
some stuff not being colourized.
Attached is a patch to fix this.
[1]
http://geany.svn.sourceforge.net/viewvc/geany?view=revision&revision=5596
Cheers,
Matthew Brush
>From 844a22ed008182f2f369cadee7635ecd78150070 Mon Sep 17 00:00:00 2001
From: Matthew Brush
Date: Thu, 14 Apr 2011 19:49:08 -0700
Subject: [PATCH] Add group keys from user's filetypes.* after system's.
Make sure user's styles are also used, rather than only using user
styles if system ones cannot be read.
Fix leak where 'src' keyfile was not freed.
---
src/filetypes.c | 13 ++---
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/filetypes.c b/src/filetypes.c
index db2e247..7d54040 100644
--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -1252,18 +1252,17 @@ static void add_group_keys(GKeyFile *kf, const gchar *group, GeanyFiletype *ft)
gchar *f;
f = filetypes_get_filename(ft, FALSE);
- if (!g_file_test(f, G_FILE_TEST_EXISTS))
- f = filetypes_get_filename(ft, TRUE);
-
if (!g_key_file_load_from_file(src, f, G_KEY_FILE_NONE, NULL))
- {
geany_debug("Could not read config file %s for [%s=%s]!", f, group, ft->name);
- g_free(f);
- return;
- }
g_free(f);
+ add_keys(kf, group, src);
+ g_key_file_free(src);
+ f = filetypes_get_filename(ft, TRUE);
+ g_key_file_load_from_file(src, f, G_KEY_FILE_NONE, NULL);
+ g_free(f);
add_keys(kf, group, src);
+ g_key_file_free(src);
}
--
1.7.1
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] {datetime} & {date} are updated only after config reload
On 14 April 2011 23:27, Liviu Andronic wrote:
> Dear devels
> The {datetime} & {date} templates are updated only after reloading the
> config. To reproduce insert {datetime} in
> ~/.config/geany/templates/changelog, reload the config and then in a
> blank document do c-menu > insert > changelog. Wait a minute (or an
> hour, or a day) and insert again the entry, and you will notice that
> Geany always uses the time of the last Tools > Reload config, and not
> the current system time. The behaviour can easily make the user insert
> the wrong time (or even day or week, when keeping the session alive
> using suspend) when compiling logs.
>
> Is this something that could be easily fixed? Thank you
> Liviu
>
> System: Geany 0.20 on Xubuntu 10.04 64bit
>
Yes the {datetime} and {date} are substituted when the templates are
initialised, usually when Geany is opened. As you say this may not be
very useful.
This can be changed just by moving the call to
templates_replace_default_dates, but where to?
Options are:
1. when the document is created from the template
2. when the document is saved as a file (when untitled gets replaced)
Votes please.
Cheers
Lex
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] hex mode
On 15 April 2011 06:51, Dominic Hopf wrote: > Am Donnerstag, den 14.04.2011, 22:29 +0200 schrieb Liviu Andronic: >> And a bit more OT, Geany refuses to force-open a PDF file. Nano, for >> example, opens the PDF. Is it normal? > > This is intended behavior as far as I know, yes. > > Regards, > Dominic > You can force the open by setting the encoding to none, but as Scintilla takes a null terminated string of text to display, what is shown stops at the first zero byte in the file. As Scintilla is a text editing widget, and because changing it would break the interface to all the users of Scintilla, this behavior is unlikely to change. Cheers Lex > -- > Dominic Hopf > http://dominichopf.de/ > > Key Fingerprint: A7DF C4FC 07AE 4DDC 5CA0 BD93 AAB0 6019 CA7D 868D > > ___ > Geany-devel mailing list > Geany-devel@uvena.de > https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel > > ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] hex mode
Am Donnerstag, den 14.04.2011, 22:29 +0200 schrieb Liviu Andronic: > And a bit more OT, Geany refuses to force-open a PDF file. Nano, for > example, opens the PDF. Is it normal? This is intended behavior as far as I know, yes. Regards, Dominic -- Dominic Hopf http://dominichopf.de/ Key Fingerprint: A7DF C4FC 07AE 4DDC 5CA0 BD93 AAB0 6019 CA7D 868D signature.asc Description: This is a digitally signed message part ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
[Geany-devel] hex mode
Hello Does Geany have a hex mode, that is can I open files in hex mode? And a bit more OT, Geany refuses to force-open a PDF file. Nano, for example, opens the PDF. Is it normal? Regards Liviu -- Do you know how to read? http://www.alienetworks.com/srtest.cfm http://goodies.xfce.org/projects/applications/xfce4-dict#speed-reader Do you know how to write? http://garbl.home.comcast.net/~garbl/stylemanual/e.htm#e-mail ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] SF.net SVN: geany:[5724] trunk
Le 14/04/2011 19:15, Frank Lanitz a écrit : > Hi, Hi Frank, > On Wed, 13 Apr 2011 21:55:31 + > colomb...@users.sourceforge.net wrote: > >> Revision: 5724 >> http://geany.svn.sourceforge.net/geany/?rev=5724&view=rev >> Author: colombanw >> Date: 2011-04-13 21:55:31 + (Wed, 13 Apr 2011) >> >> Log Message: >> --- >> Avoid triggering autocompletion on PHP open tags (closes #3199442) > > I'm not sure whether this is really useful as this is adding (not much) > complexity and more check on typing time, but not increasing typing > comfort much IMHO. I saw you responded to the bug report and said wontfix, but I personally agree with the reporters of #3199442 that when writing PHP code it's common to type "id == GEANY_FILETYPES_PHP && rootlen == 3 && startword >= 2 && style == SCE_HPHP_DEFAULT && strcmp(&root[-2], "https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] SF.net SVN: geany:[5724] trunk
Hi, On Wed, 13 Apr 2011 21:55:31 + colomb...@users.sourceforge.net wrote: > Revision: 5724 > http://geany.svn.sourceforge.net/geany/?rev=5724&view=rev > Author: colombanw > Date: 2011-04-13 21:55:31 + (Wed, 13 Apr 2011) > > Log Message: > --- > Avoid triggering autocompletion on PHP open tags (closes #3199442) I'm not sure whether this is really useful as this is adding (not much) complexity and more check on typing time, but not increasing typing comfort much IMHO. Cheers, Frank -- http://frank.uvena.de/en/ pgpdaZTMwhtUb.pgp Description: PGP signature ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
[Geany-devel] {datetime} & {date} are updated only after config reload
Dear devels
The {datetime} & {date} templates are updated only after reloading the
config. To reproduce insert {datetime} in
~/.config/geany/templates/changelog, reload the config and then in a
blank document do c-menu > insert > changelog. Wait a minute (or an
hour, or a day) and insert again the entry, and you will notice that
Geany always uses the time of the last Tools > Reload config, and not
the current system time. The behaviour can easily make the user insert
the wrong time (or even day or week, when keeping the session alive
using suspend) when compiling logs.
Is this something that could be easily fixed? Thank you
Liviu
System: Geany 0.20 on Xubuntu 10.04 64bit
--
Do you know how to read?
http://www.alienetworks.com/srtest.cfm
http://goodies.xfce.org/projects/applications/xfce4-dict#speed-reader
Do you know how to write?
http://garbl.home.comcast.net/~garbl/stylemanual/e.htm#e-mail
___
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
