Hi, We've merged the editor-struct branch which moves some of the GeanyDocument fields to a new struct GeanyEditor, and updates EditorFuncs in the API.

Details: http://geany.svn.sourceforge.net/viewvc/geany?view=rev&revision=2779

Please be careful when updating plugins for GeanyEditor::sci, as GeanyDocument::editor is only non-NULL when the document is valid. So instead of checking: doc->sci != NULL check: doc->is_valid (or doc->editor != NULL).

(This was done so that for functions taking GeanyEditor* as an argument, the function can just check against NULL instead of checking for NULL and editor->sci != NULL.)

Regards, Nick