SF.net SVN: geany:[2957] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Wed Sep 17 12:12:54 UTC 2008
Revision: 2957
http://geany.svn.sourceforge.net/geany/?rev=2957&view=rev
Author: ntrel
Date: 2008-09-17 12:12:49 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Cancel autocompletion on Undo/Redo (based on a patch by Jason Oster,
thanks; #2102715).
Modified Paths:
--------------
trunk/ChangeLog
trunk/THANKS
trunk/src/callbacks.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-17 10:09:16 UTC (rev 2956)
+++ trunk/ChangeLog 2008-09-17 12:12:49 UTC (rev 2957)
@@ -1,3 +1,10 @@
+2008-09-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/callbacks.c, THANKS:
+ Cancel autocompletion on Undo/Redo (based on a patch by Jason Oster,
+ thanks; #2102715).
+
+
2008-09-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/keybindings.c, src/sciwrappers.c, src/sciwrappers.h,
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2008-09-17 10:09:16 UTC (rev 2956)
+++ trunk/THANKS 2008-09-17 12:12:49 UTC (rev 2957)
@@ -47,6 +47,7 @@
Felipe Pena <felipensp(at)gmail(dot)com> - Missing PHP keywords
Colomban Wendling <colombanw(at)users(dot)sourceforge(dot)net> - GLSL filetype patch
Timothy Boronczyk <tboronczyk(at)gmail(dot)com> - scroll_stop_at_last_line GUI pref patch
+Jason Oster <parasytic(at)users(dot)sourceforge(dot)net> - various patches
Translators:
------------
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2008-09-17 10:09:16 UTC (rev 2956)
+++ trunk/src/callbacks.c 2008-09-17 12:12:49 UTC (rev 2957)
@@ -280,8 +280,12 @@
gpointer user_data)
{
GeanyDocument *doc = document_get_current();
+
if (doc != NULL && document_can_undo(doc))
+ {
+ SSM(doc->editor->sci, SCI_CANCEL, 0, 0);
document_undo(doc);
+ }
}
@@ -290,8 +294,12 @@
gpointer user_data)
{
GeanyDocument *doc = document_get_current();
+
if (doc != NULL && document_can_redo(doc))
+ {
+ SSM(doc->editor->sci, SCI_CANCEL, 0, 0);
document_redo(doc);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list