See question from subject line. How can I merge a pull request without
adding a new commit stating the merge? Is there some kind of ff or
cherry-pick available through front end?
You can't do a cherry pick or rebase through the front-end. I think adding
this 'merge pull request' commit
You can't do a cherry pick or rebase through the front-end. I think
adding this 'merge pull request' commit is a good idea, since it shows
more information about where the commit came from.
OK. So I assume its best practice also on github to do so?
Yes, this is a best practice. It's also
Now that the geany-plugins has been converted to Git, I thought I'd post
this patch that adds the feature I've been working on (wrapping text with
characters) to the Addons plugin. Any chance of it being added?
Now that geany-plugins is on github, we can take advantage of the
And another question: Is github allowing to do an automatic rebase for
E.g. I have forked geany-plugins into my namespace
and want to keep it up to date. Do I need to to it locally with git
remote --add etc. or is there any gui for?
I'm working on the TreeBrowser plugin. I have fixed a few bugs, so I'm
looking forward to sending pull requests when geany-plugins is on
I'm currently trying to add a keybinding for deleting objects from the
treeview. I have added a KB_DELETE_OBJECT keybinding, and I've mapped
So what I propose is to move these links (and also the online color scheme
generator) to a sub-page or sub-section for legacy color schemes, with a
description about when to use which colour schemes with which versions. This
way people who use older Geany versions can still access them but
Actually the plugin is option 3, It is return plus user activated,
just some activations are normal keys.
Aha, I understand. Thanks for the explanation.
Maybe it works for Ruby, but
it doesn't for C, and after looking at the code I don't see how it can
possibly generate GNU style
1. calculate the indent each change, and then ripple that through the file
2. calculate the indent each change and only apply it to this line
3. calculate and apply the indent to lines N and N-1 only on new line
or user command
4. calculate and apply the indent on user command
Option 1 is
It turned out to be quite easy, because the two meanings are actualy
Thanks very much for the patch, it works great!
- Make 'Wrap search' checked by default.
And that'll irritate anyone who prefers not to wrap, and has to uncheck
(close dialog currently only closes the dialog for find all style
This is true. However, if you look at the Add wrapped search 
feature request (which is still open), Nick Treleaven
and Enrico Tröger had a conversation about changing this back in 2009:
2009-10-14 05:49:13 ntrel: I
It took me a little while to find the Search preferences. I did not expect
them to be filed under 'General' - 'Miscellaneous'.
From a usability perspective: In my attempt to configure search, I first
looked in Editor, and then Interface.
I was getting very irritated with the message
* Move the 'Search' preferences to 'Editor' - 'Search Replace', instead of
'General' - 'Miscellaneous'
* Remove the Always wrap search and hide the Find dialog setting.
* Add a 'Wrap search' checkbox to the Find dialog, below the 'Close dialog'
* Make 'Wrap search' checked by
my personal preference is to always wrap search, but keep the find
This is your personal preference only.
Yes, I was just saying that I would like my personal preference to be possible
I'm not really against having a General - Search tab, but I'm not sure
having a tab
I'm also really keen for this feature, so could I please request a recent
copy of the plugin? Perhaps you could update your repo on github?
I'd like to start using it right away, and could help to fix any bugs.
I also really think that this should to be added to the 'Auto-close quotes
, Frank Lanitz fr...@frank.uvena.de wrote:
Am 30.11.2011 07:36, schrieb Nathan Broadbent:
P.S. The documentation needs to be updated for the 'waf' build system,
in quite a few places, including geany-plugins.
I don't refer to other points as I would need to catch up discussion on
github before (wth
Dear Scintilla Geany mailing lists,
I would like to write a Scintilla lexer for the HAML syntax. HAML is
used by many (if not most) Ruby on Rails developers. It is an indented
HTML markup language with inline Ruby evaluation. It also needs to
(continued from github - https://github.com/geany/geany/pull/15)
I don't think any of Geany's developers will argue that having some sort of
unit testing would be a good idea, especially for the plugin API, but mainly
it boils down to:
1) What framework to use (Geany is written in plain
I'm a Ruby on Rails programmer with a bit of C and C++ experience.
I was using gedit 2.x the gmate plugins happily for over a year, until
Ubuntu 11 decided to go to GTK3, and bump gedit to 3.x. All my plugins are
no longer compatible, so I decided that it was about time to find a new
Thanks for your reply.
Certainly you could use a plugin to provide an improvement in
auto-closing braces etc. In general these days it is preferable that
all language specific parts go in plugins so they don't interfere with
other languages. Since braces are shared by all the C
If I understand you correctly, you're referring to this bug report
. It was recently discussed on the list , and there is even some
code implementing the feature as a plugin .
Mail list logo