Branch: refs/heads/master
Author: Baptiste Darthenay <baptiste+github(a)darthenay.fr>
Committer: Baptiste Darthenay <baptiste+github(a)darthenay.fr>
Date: Sat, 23 Nov 2013 09:18:24 UTC
Commit: b4ff4eb6ece295e7829854b046643b54c1ce4be6
https://github.com/geany/geany-themes/commit/b4ff4eb6ece295e7829854b046643b…
Log Message:
-----------
Add Steampunk color scheme.
Modified Paths:
--------------
AUTHORS
colorschemes/steampunk.conf
screenshots/steampunk.png
Modified: AUTHORS
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -97,6 +97,10 @@ solarized-light.conf
Joshua Hoff <https://github.com/joshuarh>
*Matthew Brush <matt(at)geany(dot)org>
+steampunk.conf
+--------------------
+ *Baptiste Darthenay <geany(dot)batisteo(at)recursor(dot)net>
+
tango-dark.conf
---------------
Barry van Oudtshoorn <unknown email address>
Modified: colorschemes/steampunk.conf
123 files changed, 123 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,123 @@
+#
+# Copyright 2013 Baptiste Darthenay <geany(dot)batisteo(at)recursor(dot)net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+#
+# Best folding style with this theme, in filedefs/filetypes.common:
+# folding_style=2,2
+#
+
+[theme_info]
+name=Steampunk
+description=A dark brown and shiny brass theme for the 19th century developer.
+version=2
+author=Baptiste Darthenay
+url=https://github.com/batisteo/geany-themes/blob/master/steampunk.conf
+# list of each compatible Geany release version
+compat=1.22;1.23;1.23.1;1.24
+
+[named_styles]
+
+default=#fea;#252016;false;false
+error=#faecbd;#a22
+
+# Editor styles
+#-------------------------------------------------------------------------------
+
+selection=#000;#605339;false;true
+current_line=#000;#342d1f;true
+brace_good=#8ab634;#514630;true
+brace_bad=#ce5c00;#484333;true
+margin_line_number=#caa223
+margin_folding=#665511;#362a1d
+fold_symbol_highlight=#b79024;#252016
+indent_guide=#b79024
+caret=#d3d7cf;#000
+marker_line=#c4a000;#edd400
+marker_search=#000;#0000f0
+marker_mark=#8c5200;#cf7900
+call_tips=#ccc;#fff;false
+white_space=#650;;true
+
+# Programming languages
+#-------------------------------------------------------------------------------
+
+comment=#786442
+comment_doc=comment
+comment_line=comment
+comment_line_doc=comment_doc
+comment_doc_keyword=comment_doc,bold
+comment_doc_keyword_error=comment_doc,italic
+
+number=#fce94f
+number_1=number
+number_2=number_1
+
+type=#cf7900;;true
+class=type
+function=#cf7900
+parameter=function
+
+keyword=#cc9d22;;true
+keyword_1=keyword
+keyword_2=#729f9c
+keyword_3=keyword_1
+keyword_4=keyword_1
+
+identifier=default
+identifier_1=identifier
+identifier_2=identifier_1
+identifier_3=identifier_1
+identifier_4=identifier_1
+
+string=#ebc95d
+string_1=string
+string_2=comment,italic
+string_3=default
+string_4=default
+string_eol=string_1,italic
+character=string_1
+backtick=string_2
+here_doc=string_2
+verbatim=string
+
+scalar=string_2
+label=default,bold
+preprocessor=#729f9c
+regex=number_1
+operator=#fa5;;true
+decorator=#997788;;;true
+other=default
+extra=#359
+
+# Markup-type languages
+#-------------------------------------------------------------------------------
+
+tag=#729f9c
+tag_unknown=tag
+tag_end=tag,bold
+attribute=#729f9c
+attribute_unknown=attribute
+value=string_1
+entity=default
+
+# Diff
+#-------------------------------------------------------------------------------
+
+line_added=#595
+line_removed=#a66
+line_changed=preprocessor
Modified: screenshots/steampunk.png
0 files changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Fri, 22 Nov 2013 23:45:39 UTC
Commit: f99e627bb0d28821168a44553f92fd5dd60eafe3
https://github.com/geany/geany/commit/f99e627bb0d28821168a44553f92fd5dd60ea…
Log Message:
-----------
Fix folding of the very last line in a level when unfolding children
Fix an off-by-one mistake resulting on the very last line of a nested
folded level not to be unfolded when recursively unfolding it's parent.
This was only visible when the last fold point was only one line long,
otherwise unfolding the (N-1)th line was enough.
Closes #1007.
Modified Paths:
--------------
src/editor.c
Modified: src/editor.c
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -473,7 +473,7 @@ void editor_toggle_fold(GeanyEditor *editor, gint line, gint modifiers)
if (sci_get_line_is_visible(sci, line + 1))
{ /* unfold all children of the current fold point */
- for (i = line; i < last_line; i++)
+ for (i = line; i <= last_line; i++)
{
if (! sci_get_line_is_visible(sci, i))
{
@@ -483,7 +483,7 @@ void editor_toggle_fold(GeanyEditor *editor, gint line, gint modifiers)
}
else
{ /* fold all children of the current fold point */
- for (i = line; i < last_line; i++)
+ for (i = line; i <= last_line; i++)
{
gint level = sci_get_fold_level(sci, i);
if (level & SC_FOLDLEVELHEADERFLAG)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Wed, 13 Nov 2013 20:22:22 UTC
Commit: d35d0374ffc7ef5ea40641484096b62fb7651129
https://github.com/geany/infrastructure/commit/d35d0374ffc7ef5ea40641484096…
Log Message:
-----------
Don't put the IRC userlist into the webserver's docroot anymore
This was necessary long time ago but today we access it locally and so we can
use a non-public location.
Modified Paths:
--------------
ircbot-plugins/Geany/plugin.py
Modified: ircbot-plugins/Geany/plugin.py
3 files changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -44,6 +44,7 @@
import supybot.conf as conf
+IRC_USERLIST_FILEPATH = '/var/tmp/irc_userlist'
GOODIES = {
'coffee': 'A nice sexy waitress brings %s a big cup of coffee!',
'coke': 'A nice sexy waitress brings %s a cool bottle of coke!',
@@ -103,7 +104,7 @@ def filter_services(value):
# filter myself and ChanServ
users = filter(filter_services, channel_users)
- f = open('/srv/www/irc.geany.org/irc_userlist', 'w')
+ f = open(IRC_USERLIST_FILEPATH, 'w')
f.write('\n'.join(users))
f.close()
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Wed, 13 Nov 2013 20:20:03 UTC
Commit: fa4025a05cdb6dafba1537f56925a7945b37789d
https://github.com/geany/infrastructure/commit/fa4025a05cdb6dafba1537f56925…
Log Message:
-----------
Add !commit command to display a Github link for a commit hash
This is already present on IRC, I just forgot to commit this piece.
Modified Paths:
--------------
ircbot-plugins/Geany/plugin.py
Modified: ircbot-plugins/Geany/plugin.py
14 files changed, 14 insertions(+), 0 deletions(-)
===================================================================
@@ -268,6 +268,19 @@ def moo(self, irc, msg, args):
else:
irc.reply('I have Super Cow Powers. Have you mooed today?')
+ def commit(self, irc, msg, args, idx):
+ """takes one argument, a Git ID SHA
+
+ Type '!commit <SHA-ID-HERE>' to print a URL/link to view the commit
+ in Geany's online Git repository browser.
+ """
+ idx = str(idx).lower().strip()
+ if all(ch in 'abcdef0123456789' for ch in idx):
+ irc.reply('https://github.com/geany/geany/commit/' + idx)
+ # using Github since it allows shortened SHAs also
+ #irc.reply('http://git.geany.org/geany/commit/?id=' + idx)
+ else:
+ irc.reply('Malformed Git SHA')
# "decorate" our commands (wrap is a decorator replacement for old Python versions)
tea = wrap(goodie, [ optional(many('text')) ])
@@ -297,6 +310,7 @@ def moo(self, irc, msg, args):
test = wrap(test, [ optional(many('text')) ])
moo = wrap(moo)
+ commit = wrap(commit, [ 'text' ])
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).