Merge lp:~sinzui/ubuntu/precise/gedit-developer-plugins/0.5.11 into lp:ubuntu/precise/gedit-developer-plugins

[Curtis Hovey]

Update package to 0.5.11 release which fixes many bugs that affect the current version in precise.

[Daniel Holbach (dholbach)]

Thanks for your work on this!

I took the liberty of changing the launchpad bug syntax in debian/changelog to "LP: #123456" instead of "LP:123456" - this should automatically close all the bugs involved on upload. :)

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-08 12:12:28 +0000
+++ ChangeLog	2012-02-07 18:01:21 +0000
@@ -1,5 +1,733 @@
 <Generated by bzr log --log-format=gnu>
 
[phone]  Curtis Hovey <[e-mail]>
+
+	[543] Updated docs for release.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[542] Construct test to use the tabs size from gsettings.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[541] Ensure the settings are migrated before activation.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[540] Added functions to migrate settings and config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[539] Survive gedit plugin configuration changes.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[538] Removed unused setup/teardown.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[537] Use make_gsettings.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[536] Add a helper to safely test gsettings.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[535] Increment version.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[534] Extracted temp file rules to _ensure_file_path.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[533] Fallback to a temporary file when checking syntax and the file
+	has not been created yet.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[532] Remove unused methods.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[531] Do not hash info.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[530] Auto colour test output.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[529] Added a test to verify that the FilteredReporter is used.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[528] Use the FilteredReporter.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[527] Do not assume the controller is connected on document save.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[526] Move __all__.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[525] Updated copyright.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[524] Updated copyright.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[523] Restore bzr to previous version.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[522] Updated copyright.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[521] Renamed local_symbols => get_local_symbols and it takes an
+	optional is_interactive argument. The syntax-error-python signal is
+	only emitted when the call is not interactive.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[520] Removed unused attr.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[519] Completed CompletionProposal implementation.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[518] Return early when _info is '' or None.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[517] Added tests for DynamicProposal.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[516] Remove hacks for get_char() because it works again.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[515] Load the icon using the name.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[514] Reuse the python generator if the cursor has not changed line.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[513] Extracted local_symbols that uses cache to avoid unnneeded
+	python compilation.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[512] Only enale the format css and doctest menu items when action is
+	applicable.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[511] Implement more Gedit menu.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[510] moved correct_language() to ControllerMixin so that all plugins
+	can access it.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[509] Renamed on_tab_added to on_tab_added_or_changed and set it to
+	the active-tab-changed signal.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[508] Accept a hack because it may last for 5 years.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[507] Remove non-existent directories from paths during setup. Restore
+	previous searches using config on start.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[506] Removed config_get_list functions.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[505] Pushed get/set list methods into the Config class.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[504] Extracted make_config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[503] Inlined make_gedit().
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[502] Use make_config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[501] Updated module to use GeditTestCase.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[500] Updated module to use GeditTestCase.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[499] Updated module to use GeditTestCase.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[498] Updated test to use make_config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[497] Used GeditTestCase.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[496] Updated module to use GeditTestCase.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[495] Use GeditTestCase to make gedit and config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[494] Created GeditTestCase with setup_config() and make_gedit()
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[493] Save the find params to the config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[492] Added save_find_data(). The find methods needs to call it.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[491] Replaced values arg with config_key arg to get values from the
+	finder config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[490] Added values arg to setup_comboentry
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[489] Added a test for update_comboentry.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[488] Added tests for setup_comboentry.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[487] Added a test for the existing setup_widgets() method.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[486] Added a test to verify the list serialisation works with config
+	parser.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[485] Added config_set_list.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[484] added config_get_list.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[483] Added a finder section to the config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[482] Renamed test modules.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[481] Remove 'syntax' from the contoller and generator classes.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[480] Renamed SyntaxCompleterPlugin => CompletePlugin.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[479] Revise plugin description.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[478] Renamed syntaxcompleter module to complete.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[477] Build a sane target in the python rules.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[476] Inlined function and updated var names.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[475] Only use bzr when there is a working tree.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[474] Add python specific rules.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[473] Added rudimentatory refactor module based on my rename_module
+	helper.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[472] Do not attempt to get the working tree before the document is
+	loaded.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[471] Increment version.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[470] Restore decorator property because it is less code.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[469] Update to new upsteam support for filtered reporting: Drop
+	__call__, handle setter.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[468] Extracted builtin rules to a cached property.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[467] OR the CompletionActivation bits to enable both user_requested
+	and interactive.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[466] Reverted diff parent call.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[465] Added the missing signals the fake gedit.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[464] Add robust recovery for exception in import attempts.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[463] Extracted the smart logic from do_popupate to a private method
+	that is easier to test and does not interacte the c-object.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[462] Disabled window.show_all() since code refactors do not require
+	it for tests; tests run 200% faster.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[461] Added signal to Fake document.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[460] Hushed cruft in test output.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[459] Added sdist to sign the distributed package.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[458] Added twisted python files (tac) to syntax highlighting and
+	style checking.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[457] Increment version and deps (because many warning disapear with
+	the newer versions).
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[456] Added ShowSyntaxErrorsOnly to menu.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[455] Added a callback to toggle show syntax errors only.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[454] Use config to determine report_only_errors
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[453] Added formatter section of config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[452] Use a filtered reporter to permit users to choose only errors.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[451] Do not return the same word from differnent generators.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[450] Persist the suggest_completions option.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[449] Added sanity rules for word suggestions to minimise the
+	intrusion.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[448] Fixed completions title.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[447] Renamed suggest_completions
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[446] Use get_iter().
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[445] Use the iter.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[444] Recover from a key error in interactive completions.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[443] Added AutoShowCompleter to the menu.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[442] Added on_auto_show_completer_toggled.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[441] do_get_activation checks the config to return USER_REQUESTED or
+	INTERACTIVE.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[440] Added auto_show to config.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[439] Removed hack. Do not report errors if the tree does not have a
+	parent.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[438] add toggle_actions if they are present.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[437] Update the accel, but the menu does not show it.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[436] Tell the user to restart gedit. Real-time updates to menu accels
+	is hard.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[435] Update the menu on do_update_state.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[434] Use focus-out-event so that the config is updated once per
+	change. add padding to the ui.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[433] Include complete.ui in the install.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[432] Updated test to use a legitimate accel.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[431] Added do_create_configure_widget.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[430] Fixed comment.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[429] Added test for load without a conf file.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[428] Added a config.load and config.dump test.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[427] Corrected capitalisaion. Added test for dir_path and file_path.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[426] Added the config instance to all. Config is not intended to be
+	visible.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[425] Added config that supports the current behaviour as the default.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[424] Added test for existing syntax completer action.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[423] Set button sensativity to automatic (not off) to fix "filename
+	pattern" entry. Removed the has_frame overrides to let the theme make
+	the descision.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[422] remove `__metaclass__ = type` from modules because TypeError:
+	metaclass conflict with pygobject.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[421] Use <Control>F5 to get diff from parent to be consistent with
+	other accels.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[420] Remove window.destroy from add clean up because of gtk warning
+	about not in main loop.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[419] Fixed casting error.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[418] Do not break on hyphens when wrapping text.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[417] Ensure windows are destroyed as soon as possible during tests.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[416] Used GSettings instead og GConf.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[415] Removed crufty class and fixed window types.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[414] Removed unused var.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[413] Replaced doctest with unittest.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[412] Added more tests for methods used and removed unused property.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[411] Added basic unittest for fakes. Removed fake languages because
+	that was pushed down to GtkSource.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[410] Do not package removed module. Run tests in testing.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[409] Moved and renamed get_window to make_gedit.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[408] Removed doctest for unused test helpers.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[407] Replaced doctest with unittest. Add missing method.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[406] Replaced doctest with unittest.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[405] Fix setup.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[404] Use a signal to show the completion. Restore the <Control>space
+	accelerator.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[403] Removed unneeded test.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[402] Added SyntaxController unittest.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[401] Removed unneeded doctest.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[400] Corrected set/list rule for MarkupGenerator.get_words().
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[399] Added unittest for MarkupGenerator. Adjusted get_words to return
+	a set.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[398] Added PythonProposal tests.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[397] Added unittest for PythonSyntaxGenerator
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[396] Added unittest for TextGenerator.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[395] Added unittest for BaseSyntaxGenerator.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[394] Removed unneeded doctest.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[393] Replaced doctest with unittest.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[392] Add unittest to replace doctest.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[391] Restored show_syntax_view() to support menus.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[390] Removed unused document.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[389] Do not use a document to init a DynamicProvider.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[388] Use the CompletionContext at the moment of need rather than the
+	document at init.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[387] Removed language_id from DynamicProvider because it is knowable
+	from the document.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[386] Use explicit check to use fake Gedit.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[385] fixed order of code to avoid warnings in tests.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[384] Revised hack to pass existing tests.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[383] Save a working, though incomplete syntax completer.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[382] Removed erroneously serialised properties from the builder ui
+	file.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[381] Extracted the "Do want to test this replacement using Find
+	first?" dialog. Updated the code to gtk3.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[380] Removed unneeded doctest.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[379] Wrap text and unknown at 72 characters.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[378] Added a test for the current wrap text rules.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[377] Converted doctest to unittest.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[376] Renamed testcases.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[375] Increment minor version for bug fix.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[374] Fixed show_replace as suggested by Tristan Schmelcher.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[373] Extracted FakePanel and introsuce FakeProps.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[372] Revise code for readability.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[371] Update POTFILES.in and .skip to match renames.
+
 2011-09-08  Curtis Hovey <[e-mail]>
 
 	[370] Increment release.

=== modified file 'Makefile.am'
--- Makefile.am	2011-07-01 12:36:16 +0000
+++ Makefile.am	2012-02-07 18:01:21 +0000
@@ -36,6 +36,9 @@
 
 dist: ChangeLog
 
+sdist: dist
+	gpg --armor --sign --detach-sig *.tar.gz
+
 # Build ChangeLog from bazaar history. Only build this when in an
 # bzr branch.
 ChangeLog:

=== modified file 'Makefile.in'
--- Makefile.in	2011-07-01 12:36:16 +0000
+++ Makefile.in	2012-02-07 18:01:21 +0000
@@ -102,6 +102,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -141,6 +142,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -202,6 +207,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -728,6 +735,9 @@
 
 dist: ChangeLog
 
+sdist: dist
+	gpg --armor --sign --detach-sig *.tar.gz
+
 # Build ChangeLog from bazaar history. Only build this when in an
 # bzr branch.
 ChangeLog:

=== modified file 'NEWS'
--- NEWS	2011-01-14 10:24:47 +0000
+++ NEWS	2012-02-07 18:01:21 +0000
@@ -1,3 +1,23 @@
+gdp-0.5.11: All features refined
+================================
+
+This releases completes an extensive set of refinements to gedit developer
+plugins. Notable feature changes include.
+
+    * Formatting is more reliable.
+    * Use Tools > Show syntax errors only to hide warnings when checking
+      the syntax of a file.
+
+    * GDP completions are integrated with Gedit's snippet and word completions.
+    * Use <Control>+space to activate all proposals.
+    * Use Tools > Suggest completions for the edit to automatically
+      show the proposed completions.
+    * The completion accelerator key can be configured with the plugin.
+
+    * Find and replace widgets were adjusted to take less space an obey
+      the theme rules.
+
+
 gdp-0.4.1 (2.30.0): Pydoc proprosals in completions
 ===================================================
 

=== modified file 'README'
--- README	2011-01-14 10:24:47 +0000
+++ README	2012-02-07 18:01:21 +0000
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is version 2.28.0 of gedit-developer-plugins (GDP). GDP are a
+This is version 0.5.11 of gedit-developer-plugins (GDP). GDP are a
 set of plugins for gedit that provide additional editing features
 for software development. GDP provides:
 
@@ -13,7 +13,7 @@
       word completion based on the words in the file. XML-based markup
       completion will suggest open tag, close tags, and attributes based on
       the cursor's position.
-      Use <Control>Slash (Ctrl+/) to activate the completer window.
+      Use <Control>space (Ctrl+space) to activate the completer window.
     * Formatting
       Format paragraphs, lists, and imports. Reformat test using regular
       expressions. Check the syntax and style of Python, XML, and plain

=== modified file 'aclocal.m4'
--- aclocal.m4	2011-07-01 12:36:16 +0000
+++ aclocal.m4	2012-02-07 18:01:21 +0000
@@ -260,6 +260,10 @@
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -454,7 +458,7 @@
 
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
+# serial 41 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL], [
 AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_NLS])dnl
@@ -486,25 +490,44 @@
     AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 
 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -550,7 +573,7 @@
 if test $? -ne 0; then
    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then

=== modified file 'configure'
--- configure	2011-09-08 12:12:28 +0000
+++ configure	2012-02-07 18:01:21 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.4.
+# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.11.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='gedit-developer-plugins'
 PACKAGE_TARNAME='gedit-developer-plugins'
-PACKAGE_VERSION='0.5.4'
-PACKAGE_STRING='gedit-developer-plugins 0.5.4'
+PACKAGE_VERSION='0.5.11'
+PACKAGE_STRING='gedit-developer-plugins 0.5.11'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -681,6 +681,13 @@
 INTLTOOL_KEYS_RULE
 INTLTOOL_DIRECTORY_RULE
 INTLTOOL_DESKTOP_RULE
+intltool__v_merge_options_0
+intltool__v_merge_options_
+INTLTOOL_V_MERGE_OPTIONS
+INTLTOOL__v_MERGE_0
+INTLTOOL__v_MERGE_
+INTLTOOL_V_MERGE
+AM_DEFAULT_VERBOSITY
 INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
@@ -1310,7 +1317,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gedit-developer-plugins 0.5.4 to adapt to many kinds of systems.
+\`configure' configures gedit-developer-plugins 0.5.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1377,7 +1384,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.4:";;
+     short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1481,7 +1488,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gedit-developer-plugins configure 0.5.4
+gedit-developer-plugins configure 0.5.11
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1850,7 +1857,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gedit-developer-plugins $as_me 0.5.4, which was
+It was created by gedit-developer-plugins $as_me 0.5.11, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2665,7 +2672,7 @@
 
 # Define the identity of the package.
  PACKAGE='gedit-developer-plugins'
- VERSION='0.5.4'
+ VERSION='0.5.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3847,25 +3854,44 @@
     as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
+
+
+
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+
+
+
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
 
 
 
@@ -4184,7 +4210,7 @@
 if test $? -ne 0; then
    as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
@@ -4589,28 +4615,28 @@
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GEDIT_CFLAGS=`$PKG_CONFIG --cflags "
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4624,28 +4650,28 @@
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GEDIT_LIBS=`$PKG_CONFIG --libs "
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4668,30 +4694,30 @@
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 " 2>&1`
         else
 	        GEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GEDIT_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 ) were not met:
 
 $GEDIT_PKG_ERRORS
@@ -5715,6 +5741,10 @@
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -6488,7 +6518,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gedit-developer-plugins $as_me 0.5.4, which was
+This file was extended by gedit-developer-plugins $as_me 0.5.11, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6545,7 +6575,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gedit-developer-plugins config.status 0.5.4
+gedit-developer-plugins config.status 0.5.11
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-09-08 12:12:28 +0000
+++ configure.ac	2012-02-07 18:01:21 +0000
@@ -4,7 +4,7 @@
 
 m4_define(gdp_major_version, 0)
 m4_define(gdp_minor_version, 5)
-m4_define(gdp_micro_version, 4)
+m4_define(gdp_micro_version, 11)
 m4_define(gdp_version, gdp_major_version.gdp_minor_version.gdp_micro_version)
 
 AC_INIT(gedit-developer-plugins, gdp_version, [e-mail])
@@ -29,11 +29,11 @@
 # not always available. gtksourceview is a good indicator of the
 # Gedit version.
 PKG_CHECK_MODULES(GEDIT, [
-    pygobject-3.0 >= 2.90.3
-    gobject-introspection-1.0 >= 1.29.17
-    libpeas-1.0 >= 1.1.3
-    libpeas-gtk-1.0 >= 1.1.3
-    gedit >= 3.1.4
+    pygobject-3.0 >= 3.0.0
+    gobject-introspection-1.0 >= 1.30.0
+    libpeas-1.0 >= 1.2.0
+    libpeas-gtk-1.0 >= 1.2.0
+    gedit >= 3.2.0
 ])
 
 # i18n configuration.

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-22 18:09:53 +0000
+++ debian/changelog	2012-02-07 18:01:21 +0000
@@ -1,3 +1,10 @@
+gedit-developer-plugins (0.5.11-0ubuntu1) precise; urgency=low
+
+  * New upstream release. Fixes LP:892848, LP:909810, LP:910310, LP:919853,
+    LP:919872, LP:919900, LP:920041, LP:922928
+
+ -- Curtis C. Hovey <[e-mail]>  Tue, 07 Feb 2012 12:20:48 -0500
+
 gedit-developer-plugins (0.5.4-0ubuntu2) precise; urgency=low
 
   * Drop debian/patches/dont_use_bzr_gtk.patch:

=== modified file 'debian/control'
--- debian/control	2011-12-22 18:09:53 +0000
+++ debian/control	2012-02-07 18:01:21 +0000
@@ -5,15 +5,16 @@
 Build-Depends: debhelper (>= 8),
                intltool (>= 0.35.0),
                python (>= 2.7),
-               gnome-common (>= 2.24.0),
-               gnome-pkg-tools (>= 0.11),
-               python-gobject-dev (>= 2.90.3),
-               libgirepository1.0-dev (>= 1.29.17),
-               gir1.2-glib-2.0 (>= 0.10.2),
-               gir1.2-gtk-3.0 (>= 3.1.0),
-               libpeas-dev (>= 1.1.3),
-               gedit-dev (>= 3.1.4),
-               python-pocket-lint (>= 0.5.10)
+               dh-autoreconf,
+               gnome-common (>= 3.1.0),
+               gnome-pkg-tools (>= 0.19),
+               libgirepository1.0-dev (>= 1.30.0),
+               gir1.2-glib-2.0 (>= 1.30.0),
+               gir1.2-gtk-3.0 (>= 3.2.0),
+               python-gi-dev (>= 3.0.0),
+               libpeas-dev (>= 1.2.0),
+               gedit-dev (>= 3.2.0),
+               python-pocket-lint (>= 0.5.23)
 Standards-Version: 3.9.2
 XS-Python-Version: >= 2.7
 
@@ -23,11 +24,11 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},
-         python-gobject (>= 2.90.3),
-         gir1.2-glib-2.0 (>= 0.10.2),
-         gir1.2-gtk-3.0 (>= 3.1.0),
-         gedit (>= 3.1.4),
-         python-pocket-lint (>= 0.5.10)
+         python-gi (>= 3.0.0),
+         gir1.2-glib-2.0 (>= 1.30.0),
+         gir1.2-gtk-3.0 (>= 3.2.0),
+         gedit (>= 3.2.0),
+         python-pocket-lint (>= 0.5.23)
 Enhances: gedit
 Recommends: bzr, bzr-gtk, python-cssutils
 XB-Python-Version: ${python:Versions}
@@ -41,8 +42,7 @@
  * Syntax completion
    Python completion using the file's imports and definitions. Simple
    word completion based on the words in the file. XML tag and attribute
-   completions based on document content.
-   Use <Alt>/ to activate the completion window.
+   completions based on document structure.
  * Formatting
    Format paragraphs, lists, and imports. Reformat test using regular
    expressions. Check the syntax and style of Python, XML, CSS, and plain

=== modified file 'language-specs/Makefile.in'
--- language-specs/Makefile.in	2011-04-15 13:50:46 +0000
+++ language-specs/Makefile.in	2012-02-07 18:01:21 +0000
@@ -71,6 +71,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -110,6 +111,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -171,6 +176,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@

=== modified file 'plugins/Makefile.am'
--- plugins/Makefile.am	2011-07-01 12:36:16 +0000
+++ plugins/Makefile.am	2012-02-07 18:01:21 +0000
@@ -9,14 +9,14 @@
 	gdpbzr.py \
 	gdpfind.py \
 	gdpformat.py \
-	gdpsyntaxcompleter.py \
+	gdpcomplete.py \
 	$(NULL)
 
 plugin_in_files = \
 	gdpbzr.plugin.desktop.in \
 	gdpfind.plugin.desktop.in \
 	gdpformat.plugin.desktop.in \
-	gdpsyntaxcompleter.plugin.desktop.in \
+	gdpcomplete.plugin.desktop.in \
 	$(NULL)
 
 %.plugin: %.plugin.desktop.in \
@@ -33,5 +33,8 @@
 	cp -p $(srcdir)/tests/* $(distdir)/tests
 	rm -f $(distdir)/tests/*.pyc
 
+install-data-hook:
+	rm -f $(GEDIT_PLUGIN_DIR)/gdpsyntaxcompleter.*
+
 CLEANFILES = *.bak *.pyc *.pyo $(plugin_DATA)
 DISTCLEANFILES = *.bak *.pyc *.pyo $(plugin_DATA)

=== modified file 'plugins/Makefile.in'
--- plugins/Makefile.in	2011-07-01 12:36:16 +0000
+++ plugins/Makefile.in	2012-02-07 18:01:21 +0000
@@ -113,6 +113,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -152,6 +153,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -213,6 +218,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -244,14 +251,14 @@
 	gdpbzr.py \
 	gdpfind.py \
 	gdpformat.py \
-	gdpsyntaxcompleter.py \
+	gdpcomplete.py \
 	$(NULL)
 
 plugin_in_files = \
 	gdpbzr.plugin.desktop.in \
 	gdpfind.plugin.desktop.in \
 	gdpformat.plugin.desktop.in \
-	gdpsyntaxcompleter.plugin.desktop.in \
+	gdpcomplete.plugin.desktop.in \
 	$(NULL)
 
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
@@ -602,7 +609,8 @@
 info-am:
 
 install-data-am: install-pluginDATA install-pluginPYTHON
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
@@ -648,22 +656,22 @@
 uninstall-am: uninstall-pluginDATA uninstall-pluginPYTHON
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+	install-am install-data-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive dist-hook distclean distclean-generic \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginPYTHON install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-pluginDATA \
-	uninstall-pluginPYTHON
+	install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginPYTHON install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-pluginDATA uninstall-pluginPYTHON
 
 
 %.plugin: %.plugin.desktop.in \
@@ -676,6 +684,9 @@
 	cp -p $(srcdir)/tests/* $(distdir)/tests
 	rm -f $(distdir)/tests/*.pyc
 
+install-data-hook:
+	rm -f $(GEDIT_PLUGIN_DIR)/gdpsyntaxcompleter.*
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

=== modified file 'plugins/gdp/Makefile.am'
--- plugins/gdp/Makefile.am	2011-01-14 10:24:47 +0000
+++ plugins/gdp/Makefile.am	2012-02-07 18:01:21 +0000
@@ -5,10 +5,11 @@
 	bzr.py \
 	find.py \
 	format.py \
-	syntaxcompleter.py
+	complete.py
 
 uidir = $(plugindir)
 ui_DATA = \
+	complete.ui \
 	find.ui \
 	format.ui
 
@@ -21,6 +22,9 @@
 	mkdir $(distdir)/data
 	cp -p $(srcdir)/data/* $(distdir)/data
 
+install-data-hook:
+	rm -f $(GEDIT_PLUGIN_DIR)/gdp/syntaxcompleter.*
+
 CLEANFILES = *.bak *.pyc *.pyo
 DISTCLEANFILES = *.bak *.pyc *.pyo
 

=== modified file 'plugins/gdp/Makefile.in'
--- plugins/gdp/Makefile.in	2011-04-15 13:50:46 +0000
+++ plugins/gdp/Makefile.in	2012-02-07 18:01:21 +0000
@@ -73,6 +73,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -112,6 +113,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -173,6 +178,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -202,10 +209,11 @@
 	bzr.py \
 	find.py \
 	format.py \
-	syntaxcompleter.py
+	complete.py
 
 uidir = $(plugindir)
 ui_DATA = \
+	complete.ui \
 	find.ui \
 	format.ui
 
@@ -398,7 +406,8 @@
 info-am:
 
 install-data-am: install-pluginPYTHON install-uiDATA
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
 
 install-dvi-am:
@@ -443,19 +452,19 @@
 
 uninstall-am: uninstall-pluginPYTHON uninstall-uiDATA
 
-.MAKE: install-am install-strip
+.MAKE: install-am install-data-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic dist-hook \
 	distclean distclean-generic distdir dvi dvi-am html html-am \
 	info info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-pluginPYTHON \
-	install-ps install-ps-am install-strip install-uiDATA \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-pluginPYTHON \
-	uninstall-uiDATA
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginPYTHON install-ps install-ps-am install-strip \
+	install-uiDATA installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-pluginPYTHON uninstall-uiDATA
 
 
 dist-hook:
@@ -465,6 +474,9 @@
 	mkdir $(distdir)/data
 	cp -p $(srcdir)/data/* $(distdir)/data
 
+install-data-hook:
+	rm -f $(GEDIT_PLUGIN_DIR)/gdp/syntaxcompleter.*
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

=== modified file 'plugins/gdp/__init__.py'
--- plugins/gdp/__init__.py	2011-07-01 12:36:16 +0000
+++ plugins/gdp/__init__.py	2012-02-07 18:01:21 +0000
@@ -1,34 +1,46 @@
-# Copyright (C) 2009-2011 - Curtis Hovey <sinzui.is at verizon.net>
+# Copyright (C) 2009-2012 - Curtis Hovey <sinzui.is at verizon.net>
 # This software is licensed under the GNU General Public License version 2
 # (see the file COPYING).
 """GDP Gedit Developer Plugins."""
 
-__metaclass__ = type
-
 __all__ = [
+    'config',
     'ControllerMixin',
     'set_file_line',
     'setup_file_lines_view',
     ]
 
 
+from ConfigParser import SafeConfigParser
 import mimetypes
 import os
-
-from gi.repository import GObject
-from gi.repository import Gio
-from gi.repository import Pango
-from gi.repository import Gtk
-
+import re
+from StringIO import StringIO
+
+from xdg import BaseDirectory
+
+from gi.repository import (
+    GObject,
+    Gio,
+    Pango,
+    Gtk,
+    GtkSource,
+    )
 
 # Initialise the mimetypes for document type inspection.
 mimetypes.init()
 mimetypes.add_type('application/x-zope-configuation', '.zcml')
 mimetypes.add_type('application/x-zope-page-template', '.pt')
 mimetypes.add_type('text/x-python-doctest', '.doctest')
-
-
-class ControllerMixin:
+mimetypes.add_type('text/x-python', '.tac')
+
+lang_manager = GtkSource.LanguageManager.get_default()
+
+doctest_pattern = re.compile(
+    r'^.*(doc|test|stories).*/.*\.(txt|doctest)$')
+
+
+class ControllerMixin(object):
     """Provide common features to plugins"""
 
     def deactivate(self):
@@ -105,6 +117,16 @@
         end_iter = document.get_end_iter()
         return document.get_text(start_iter, end_iter, True)
 
+    def correct_language(self, document):
+        """Correct the language for ambuguous mime-types."""
+        if not hasattr(document, 'get_language'):
+            return
+        file_path = document.get_uri_for_display()
+        if doctest_pattern.match(file_path):
+            document.set_language(lang_manager.get_language('doctest'))
+        elif file_path.endswith('.tac'):
+            document.set_language(lang_manager.get_language('python'))
+
 
 def set_file_line(column, cell, model, piter, cell_type):
     """Set the value as file or line information."""
@@ -194,3 +216,59 @@
         'row-activated', on_file_lines_row_activated, plugin)
     file_lines_view.connect_after(
         'size-allocate', on_file_lines_resize, column, cell)
+
+
+CONFIG_VERSION = 1
+
+default_conf = """\
+[gdp]
+version = %s
+
+[completer]
+show_accel = <Control>space
+suggest_completions = False
+
+[formatter]
+report_only_errors = False
+
+[finder]
+paths = <Current File>
+    <Working Directory>
+matches =
+files = <Any Text File>
+substitutions =
+""" % CONFIG_VERSION
+
+
+class Config(SafeConfigParser):
+    """A config parser that knows it's defaults and file locations."""
+
+    def __init__(self):
+        SafeConfigParser.__init__(self)
+        self.do_update_state = False
+        self.readfp(StringIO(default_conf), 'default_conf')
+        self.dir_path = os.path.join(BaseDirectory.xdg_config_home, 'gdp')
+        self.file_path = os.path.join(self.dir_path, 'gdp.conf')
+        self._loaded_file_path = None
+
+    def load(self):
+        """Read the optional conf."""
+        self._loaded_file_path = self.read(self.file_path)
+
+    def dump(self):
+        """Write the user changes to the optional conf."""
+        if not os.path.isdir(self.dir_path):
+            os.makedirs(self.dir_path)
+        with open(self.file_path, 'wb') as config_file:
+            self.write(config_file)
+
+    def getlist(self, section, key):
+        return self.get(section, key).split('\n')
+
+    def setlist(self, section, key, value_list):
+        value = '\n'.join(value_list)
+        self.set(section, key, value)
+
+
+config = Config()
+config.load()

=== modified file 'plugins/gdp/bzr.py'
--- plugins/gdp/bzr.py	2011-12-22 18:09:53 +0000
+++ plugins/gdp/bzr.py	2012-02-07 18:01:21 +0000
@@ -1,9 +1,13 @@
-# Copyright (C) 2009-2011 - Curtis Hovey <sinzui.is at verizon.net>
+# Copyright (C) 2009-2012 - Curtis Hovey <sinzui.is at verizon.net>
 # This software is licensed under the GNU General Public License version 2
 # (see the file COPYING).
 """Bazaar integration."""
 
-__metaclass__ = type
+
+__all__ = [
+    'BzrProject',
+    ]
+
 
 import os
 from StringIO import StringIO
@@ -35,17 +39,12 @@
 from gdp import ControllerMixin
 
 
-__all__ = [
-    'BzrProject',
-    ]
-
-
 class BzrProject(ControllerMixin):
     """View and manage a bazaar branch."""
 
     def __init__(self, window, working_tree=None):
         self.window = window
-        self.working_tree = working_tree or self.set_working_tree()
+        self.working_tree = working_tree
 
     def deactivate(self):
         """Clean up resources before deactivation."""
@@ -139,11 +138,6 @@
         """Diff the working tree against an anoter tree."""
         if another_tree is None:
             return
-#        if not HAS_BZR_GTK:
-#            return
-        # XXX sinzui 2011-08-01: Hack diff on.
-        from bzrlib.plugin import load_plugins
-        load_plugins()
         from bzrlib.plugins.gtk.diff import DiffWindow
         window = DiffWindow(parent=self.window)
         window.set_diff("Working Tree", self.working_tree, another_tree)
@@ -161,7 +155,10 @@
 
     def diff_changes_from_parent(self, action):
         """Create a diff of changes from the parent tree."""
-        self._diff_tree(self._parent_tree)
+        try:
+            self._diff_tree(self._parent_tree)
+        except:
+            pass
 
     def diff_changes_to_push(self, action):
         """Create a diff of changes to the push tree."""

=== added file 'plugins/gdp/complete.py'
--- plugins/gdp/complete.py	1970-01-01 00:00:00 +0000
+++ plugins/gdp/complete.py	2012-02-07 18:01:21 +0000
@@ -0,0 +1,754 @@
+# Copyright (C) 2007-2012 - Curtis Hovey <sinzui.is at verizon.net>
+# This software is licensed under the GNU General Public License version 2
+# (see the file COPYING).
+"""A completer for document words and python symbols."""
+
+
+__all__ = [
+    'BaseGenerator',
+    'MarkupGenerator',
+    'PythonGenerator',
+    'Completer',
+    'TextGenerator',
+    ]
+
+
+import re
+from gettext import gettext as _
+from keyword import kwlist
+from pydoc import TextDoc
+from xml.sax import saxutils
+
+from gi.repository import GObject
+from gi.repository import Gtk
+from gi.repository import GtkSource
+
+from gdp import (
+    config,
+    ControllerMixin,
+    )
+
+
+def get_word(document, word_pattern, end=None):
+    """Return a 3-tuple of the word fragment before the cursor.
+
+    The tuple contains the (word_fragment, start_iter, end_iter) to
+    identify the prefix and its starting and end position in the
+    document.
+    """
+    if end is None:
+        end = document.get_iter_at_mark(document.get_insert())
+    start = end.copy()
+    word = None
+
+    # When the preceding character is not alphanumeric,
+    # there is be no word before the cursor.
+    start_char = start.copy()
+    if start_char.backward_char():
+        char = start_char.get_char()
+        if not word_pattern.match(char):
+            return (None, start, end)
+
+    # GtkTextIter *_word_end() methods do not seek for '_' and '-', so
+    # we need to walk backwards through the iter to locate the word end.
+    count = 0
+    peek = start.copy()
+    while peek.backward_chars(1):
+        char = peek.get_char()
+        if not word_pattern.match(char):
+            break
+        else:
+            count += 1
+
+    if count > 0:
+        start.backward_chars(count)
+        word = document.get_text(start, end, True)
+    else:
+        word = None
+
+    return (word, start, end)
+
+
+class DynamicProposal(GObject.GObject, GtkSource.CompletionProposal):
+    """A common CompletionProposal for dymamically generated info."""
+    __gtype_name__ = "GDPDynamicProposal"
+
+    def __init__(self, word, info=None):
+        GObject.GObject.__init__(self)
+        self._word = word
+        self._info = info or ''
+
+    def __repr__(self):
+        return '<%s word="%s" at 0x%x>' % (
+            self.__class__.__name__, self._word, id(self))
+
+    def __eq__(self, other):
+        if not (isinstance(other, type(self))
+            or isinstance(self, type(other))):
+            return False
+        return other._word == self._word
+
+    def __lt__(self, other):
+        return self._word < other._word
+
+    def __hash__(self):
+        return hash((type(self), self._word))
+
+    def do_changed(self):
+        """See `CompletionProposal`."""
+        return False
+
+    def do_equal(self, other):
+        """See `CompletionProposal`."""
+        return self.__eq__(other)
+
+    def do_hash(self):
+        """See `CompletionProposal`."""
+        return self.__hash__()
+
+    def do_get_text(self):
+        """See `CompletionProposal`."""
+        return self._word
+
+    def do_get_label(self):
+        """See `CompletionProposal`."""
+        return self._word
+
+    def do_get_markup(self):
+        """See `CompletionProposal`."""
+        return saxutils.escape(self._word)
+
+    def do_get_info(self):
+        """See `CompletionProposal`."""
+        return self._info
+
+    def do_get_icon(self):
+        """See `CompletionProposal`."""
+        return None
+
+
+class PangoDoc(TextDoc):
+
+    def bold(self, text):
+        return '\x86%s\x87' % text
+
+    def document(self, mod, *args):
+        text = TextDoc.document(self, mod)
+        text = saxutils.escape(text)
+        text = text.replace('\x86', '<b>')
+        text = text.replace('\x87', '</b>')
+        return text
+
+
+class PythonProposal(DynamicProposal):
+    """A proposal that provides pydoc info."""
+
+    def do_get_info(self):
+        """See `CompletionProvider`."""
+        if not self._info:
+            return ''
+        return PangoDoc().document(self._info)
+
+
+class DynamicProvider(GObject.GObject, GtkSource.CompletionProvider):
+    """A common CompletionProvider for dynamically generated info."""
+    __gtype_name__ = "GDPDynamicProvider"
+    word_char = re.compile(r'[\w_-]', re.I)
+
+    def __init__(self, name, handler):
+        GObject.GObject.__init__(self)
+        self._name = name
+        self.last_line_no = 0
+        self.last_python_generator = None
+        self.handler = handler
+        self.info_widget = None
+        self.mark = None
+        theme = Gtk.IconTheme.get_default()
+        s, w, h = Gtk.icon_size_lookup(Gtk.IconSize.MENU)
+        icon_name = 'format-justify-left'  # Gtk.STOCK_JUSTIFY_LEFT
+        self.icon = theme.load_icon(icon_name, w, 0)
+
+    def mark_position(self, it):
+        """Create or move the mark of the word start."""
+        if not self.mark:
+            self.mark = it.get_buffer().create_mark(None, it, False)
+        else:
+            self.mark.get_buffer().move_mark(self.mark, it)
+
+    def get_word(self, context):
+        it = context.get_iter()
+        document = it.get_buffer()
+        word, start, end = get_word(document, self.word_char, it)
+        if word is not None:
+            self.mark_position(start)
+        else:
+            word = ''
+        return word
+
+    def is_interactive(self, context):
+        INTERACTIVE = GtkSource.CompletionActivation.INTERACTIVE
+        activation = context.get_activation() or INTERACTIVE
+        return activation == INTERACTIVE
+
+    def do_get_start_iter(self, context, proposal, iter_):
+        """See `CompletionProvider`."""
+        if not self.mark or self.mark.get_deleted():
+            return None
+        return self.mark.get_buffer().get_iter_at_mark(self.mark)
+
+    def do_match(self, context):
+        """See `CompletionProvider`."""
+        word = self.get_word(context)
+        if self.is_interactive(context) and len(word) < 4:
+            return False
+        return True
+
+    def get_generator(self, document, prefix):
+        """Return the specialized generator for document's language."""
+        cursor_iter = document.get_iter_at_mark(document.get_insert())
+        current_line_no = cursor_iter.get_line()
+        is_same_line = current_line_no == self.last_line_no
+        language_id = None
+        if hasattr(document, 'get_language'):
+            # How can we not get a document or language?
+            language = document.get_language()
+            if language is not None:
+                language_id = language.get_id()
+        if language_id == 'python':
+            if is_same_line and self.last_python_generator:
+                # Use the last generator which caches the python compilation.
+                return self.last_python_generator
+            self.last_python_generator = PythonGenerator(
+                document, prefix=prefix)
+            self.last_line_no = current_line_no
+            return self.last_python_generator
+        if language_id in (
+            'xml', 'xslt', 'html', 'pt', 'mallard', 'docbook'):
+            return MarkupGenerator(document, prefix=prefix)
+        else:
+            # The text generator is never returned because get_proposals will
+            # use it in non-authoritative cases.
+            return None
+
+    def get_proposals(self, prefix, context):
+        """See `CompletionProvider`."""
+        all_words = []
+        is_authoritative = False
+        document = context.get_iter().get_buffer()
+        generator = self.get_generator(document, prefix)
+        if generator:
+            is_authoritative, words = generator.get_words(
+                is_interactive=self.is_interactive(context))
+            all_words += words
+        if not is_authoritative:
+            is_authoritative, simple_words = TextGenerator(
+                document, prefix=prefix).get_words()
+            simple_words = [
+                w for w in simple_words
+                if PythonProposal(w._word) not in all_words]
+            all_words += simple_words
+        if prefix:
+            # Ensure that the prefix is first in the list.
+            dynamic_prefix = DynamicProposal(prefix)
+            if dynamic_prefix in all_words:
+                all_words.remove(dynamic_prefix)
+                all_words.insert(0, dynamic_prefix)
+        return all_words
+
+    def _do_populate(self, context):
+        word = self.get_word(context)
+        if self.is_interactive(context) and len(word) < 4:
+            # Delete was pressed while the completer was displayed.
+            proposals = []
+        else:
+            proposals = self.get_proposals(word, context)
+        if self.is_interactive(context) and len(proposals) == 1:
+            # Tell the completer this act is finished without suggestions.
+            proposals = []
+        return proposals
+
+    def do_populate(self, context):
+        """See `CompletionProvider`."""
+        proposals = self._do_populate(context)
+        context.add_proposals(self, proposals, True)
+
+    def do_get_name(self):
+        """See `CompletionProvider`."""
+        return self._name
+
+    def do_activate_proposal(self, proposal, piter):
+        """See `CompletionProvider`."""
+        return self.handler(proposal, piter)
+
+    def do_get_icon(self):
+        """See `CompletionProvider`."""
+        return self.icon
+
+    def do_get_activation(self):
+        """See `CompletionProvider`."""
+        activation = GtkSource.CompletionActivation.USER_REQUESTED
+        if config.getboolean('completer', 'suggest_completions'):
+            activation |= GtkSource.CompletionActivation.INTERACTIVE
+        return activation
+
+    def do_get_info_widget(self, proposal):
+        """See `DynamicProvider`."""
+        if self.info_widget is None:
+            self.info_view = Gtk.Label(label='')
+            self.info_view.set_alignment(0.0, 0.0)
+            self.info_widget = Gtk.ScrolledWindow()
+            self.info_widget.add_with_viewport(self.info_view)
+        return self.info_widget
+
+    def do_update_info(self, proposal, info):
+        """See `CompletionProvider`."""
+        markup = proposal.get_info() or ''
+        self.info_view.set_markup(markup)
+        self.info_view.show()
+        self.info_widget.set_size_request(400, -1)
+
+GObject.type_register(DynamicProposal)
+GObject.type_register(DynamicProvider)
+
+
+class BaseGenerator(object):
+    """An abstract class representing the source of a word prefix."""
+
+    def __init__(self, document, prefix=None):
+        """Create a new Generator.
+
+        :param prefix: A `str`. The word prefix used to match words.
+        :param document: `gedit.Document`. The source of words to search.
+        """
+        self._prefix = prefix
+        self._document = document
+
+    word_char = re.compile(r'[\w_]', re.I)
+
+    @property
+    def string_before_cursor(self):
+        """Return the string that matches `word_char` before the cursor."""
+        text, start_iter, end_iter = get_word(self._document, self.word_char)
+        if text is None:
+            text = ''
+        return text
+
+    def ensure_prefix(self, prefix):
+        """Return the available prefix or an empty string."""
+        if prefix:
+            return prefix
+        elif self._prefix:
+            return self._prefix
+        else:
+            # Match all words in the text.
+            return ''
+
+    def get_words(self, prefix=None, is_interactive=False):
+        """Return a 2-tuple of is_authoritative and unique `set` of words.
+
+        :param prefix: A `str`. The word prefix used to match words.
+        :return: a 2-tuple of is_authoritative and a set of words.
+            is_authoritative is True when the set of words are the only words
+            that can match the prefix. The words are a set of words.
+        """
+        raise NotImplementedError
+
+    @property
+    def prefix(self):
+        """The prefix use to match words to."""
+        return self._prefix
+
+    @property
+    def file_path(self):
+        """The path to the file that is the word source."""
+        return self._document.get_uri_for_display()
+
+    @property
+    def text(self):
+        """The text of the gedit.Document or None."""
+        if not self._document:
+            return None
+        start_iter = self._document.get_start_iter()
+        end_iter = self._document.get_end_iter()
+        return self._document.get_text(start_iter, end_iter, True)
+
+
+class TextGenerator(BaseGenerator):
+    """Generate a list of words that match a given prefix for a document."""
+
+    def get_words(self, prefix=None, is_interactive=False):
+        """See `BaseGenerator.get_words`.
+
+        is_authoritative is always False because TextGenerator because it is
+        not for a specific document Language.
+        """
+        prefix = self.ensure_prefix(prefix)
+        is_authoritative = False
+        if len(prefix) > 0:
+            # Match words that are just the prefix too.
+            conditional = r'*'
+        else:
+            conditional = r'+'
+        pattern = r'\b(%s[\w-]%s)' % (re.escape(prefix), conditional)
+        word_re = re.compile(pattern, re.I)
+        words = word_re.findall(self.text)
+        # Find the unique words that do not have pseudo m-dashed in them.
+        words = set(words)
+        words = [DynamicProposal(word) for word in words if '--' not in word]
+        return is_authoritative, words
+
+
+class MarkupGenerator(BaseGenerator):
+    """Generate a list of elements and attributes for a document."""
+
+    word_char = re.compile(r'[^<>]')
+    common_attrs = []
+
+    INSIDE_ATTRIBUTES = 'INSIDE_ATTRIBUTES'
+    INSIDE_CLOSE = 'INSIDE_CLOSE'
+    INSIDE_OPEN = 'INSIDE_OPEN'
+    OUTSIDE = 'OUTSIDE'
+
+    def get_cursor_context(self):
+        """Return the context of the cursor in relation to the last tag."""
+        text, start_iter, end_iter = get_word(self._document, self.word_char)
+        if not start_iter.backward_char():
+            # The start was at the begining of the doc; no tags were found.
+            return self.OUTSIDE
+        char_iter = start_iter.copy()
+        char_iter.forward_char()
+        char = start_iter.get_char()
+        if char == '>':
+            return self.OUTSIDE
+        elif text and text.startswith('/'):
+            return self.INSIDE_CLOSE
+        elif text and ' ' in text:
+            return self.INSIDE_ATTRIBUTES
+        else:
+            return self.INSIDE_OPEN
+
+    def get_words(self, prefix=None, is_interactive=False):
+        """See `BaseGenerator.get_words`."""
+        prefix = self.ensure_prefix(prefix)
+        context = self.get_cursor_context()
+        if context == self.OUTSIDE:
+            # is_authoritative is false and there are no words because the
+            # cursor is not in a tag to complete.
+            return False, set()
+        is_authoritative = True
+        if context == self.INSIDE_OPEN:
+            words = set(self._get_open_tags(prefix))
+        elif context == self.INSIDE_ATTRIBUTES:
+            words = set(self._get_attributes(prefix))
+        else:
+            # Close tags is not a test because it returns a ordered list.
+            words = self._get_close_tags(prefix)
+        return is_authoritative, words
+
+    def get_cardinality(self, prefix):
+        if prefix:
+            # Match words that are just the prefix too.
+            return r'*'
+        else:
+            return r'+'
+
+    def _get_open_tags(self, prefix):
+        """Return all the tag names."""
+        cardinality = self.get_cardinality(prefix)
+        prefix = re.escape(prefix)
+        pattern = r'<(%s[\w_.:-]%s)' % (prefix, cardinality)
+        word_re = re.compile(pattern, re.I)
+        words = word_re.findall(self.text)
+        return [DynamicProposal(word) for word in words]
+
+    def _get_attributes(self, prefix):
+        pattern = r'<[\w_.:-]+ ([\w_.:-]*)=[^>]+>'
+        attrs_re = re.compile(pattern, re.I)
+        attr_clusters = attrs_re.findall(self.text)
+        attrs = set(self.common_attrs)
+        for attr_cluster in attr_clusters:
+            attr_pairs = attr_cluster.split()
+            for pair in attr_pairs:
+                attr = pair.split('=')
+                attrs.add(attr[0])
+        if prefix:
+            for attr in list(attrs):
+                if not attr.startswith(prefix):
+                    attrs.remove(attr)
+        return [DynamicProposal(attr) for attr in attrs]
+
+    def _get_close_tags(self, prefix):
+        """Return the tags that are still open before the cursor."""
+        cardinality = self.get_cardinality(prefix)
+        prefix = re.escape(prefix)
+        # Get the text before the cursor.
+        start_iter = self._document.get_start_iter()
+        end_iter = self._document.get_iter_at_mark(
+            self._document.get_insert())
+        text = self._document.get_text(start_iter, end_iter, True)
+        # Get all the open tags.
+        open_pattern = r'<(%s[\w_.:-]%s)' % (prefix, cardinality)
+        open_re = re.compile(open_pattern, re.I)
+        open_tags = open_re.findall(text)
+        # Get all the empty tags.
+        empty_pattern = r'<(%s[\w_.:-]%s)[^>]*/>' % (prefix, cardinality)
+        empty_re = re.compile(empty_pattern, re.I)
+        empty_tags = empty_re.findall(text)
+        # Get all the close tags.
+        close_pattern = r'</(%s[\w_.:-]%s)' % (prefix, cardinality)
+        close_re = re.compile(close_pattern, re.I)
+        close_tags = close_re.findall(text)
+        # Return only the tags that are still open.
+        for tag in empty_tags:
+            if tag in open_tags:
+                open_tags.remove(tag)
+        for tag in close_tags:
+            if tag in open_tags:
+                open_tags.remove(tag)
+        return [DynamicProposal(tag + '>') for tag in open_tags]
+
+
+class PythonGenerator(BaseGenerator):
+    """Generate a list of Python symbols that match a given prefix."""
+
+    word_char = re.compile(r'[\w_.]', re.I)
+    _kwlist = None
+    _builtin = None
+
+    def __init__(self, document, prefix=None):
+        super(PythonGenerator, self).__init__(document, prefix)
+        self._local_symsbols = None
+
+    @property
+    def kwlist(self):
+        if self._kwlist is None:
+            self._kwlist = [
+                self._get_dynamic_proposal(None, word) for word in kwlist]
+        return self._kwlist
+
+    @property
+    def builtin(self):
+        if self._builtin is None:
+            import __builtin__
+            self._builtin = [
+                self._get_dynamic_proposal(__builtin__, name)
+                for name in dir(__builtin__)]
+        return self._builtin
+
+    def get_local_symbols(self, is_interactive=False):
+        if self._local_symsbols:
+            return self._local_symsbols
+        try:
+            pyo = compile(self._get_parsable_text(), 'sc.py', 'exec')
+        except SyntaxError:
+            # This cannot be completed because of syntax errors.
+            # Return
+            if not is_interactive:
+                self._document.emit('syntax-error-python')
+            return []
+        co_names = ('SIGNAL_RUN_LAST', 'TYPE_NONE', 'TYPE_PYOBJECT', 'object')
+        self._local_symsbols = [
+            self._get_dynamic_proposal(None, name)
+            for name in pyo.co_names if name not in co_names]
+        return self._local_symsbols
+
+    def get_words(self, prefix=None, is_interactive=False):
+        """See `BaseGenerator.get_words`.
+
+        :return: a 2-tuple of is_authoritative and a set of matching
+            identifiers. is_authoritative is True when the prefix is a part
+            of a dotted identifier.
+        """
+        prefix = self.ensure_prefix(prefix)
+        local_symsbols = self.get_local_symbols(is_interactive)
+        is_authoritative = False
+        if prefix == '' and local_symsbols:
+            is_authoritative = True
+
+        namespaces = self.string_before_cursor.split('.')
+        if len(namespaces) == 1:
+            # The identifier is scoped to this module (the document).
+            symbols = local_symsbols + self.builtin + self.kwlist
+            symbols = [proposal for proposal in symbols
+                       if proposal.get_text().startswith(prefix)]
+            return is_authoritative, symbols
+
+        # Remove the prefix to create the module's full name.
+        namespaces.pop()
+        module_name = '.'.join(namespaces)
+        locald = {}
+        try:
+            # Check this file first.
+            module_ = eval(module_name, globals(), locald)
+        except NameError:
+            # Try a true import.
+            try:
+                module_ = __import__(module_name, globals(), locald, [])
+            except ImportError:
+                return is_authoritative, []
+        except:
+            return is_authoritative, []
+
+        for symbol in namespaces[1:]:
+            module_ = getattr(module_, symbol)
+        is_authoritative = True
+        symbols = [self._get_dynamic_proposal(module_, name)
+                   for name in dir(module_) if name.startswith(prefix)]
+        return is_authoritative, symbols
+
+    def _get_parsable_text(self):
+        """Return the parsable text of the module.
+
+        The line being edited may not be valid syntax, so the line is
+        replaced with 'pass', or if it starts a block, it becomes 'if True:'
+        """
+        current_iter = self._document.get_iter_at_mark(
+            self._document.get_insert())
+        index = current_iter.get_line()
+        text_lines = self.text.splitlines()
+        if index + 1 == len(text_lines):
+            # The current line is the last line. Add a fake line because
+            # the compiler will require another line to follow a comment.
+            text_lines.append('')
+        current_indentation = self._get_indentation(text_lines[index])
+        next_indentation = self._get_indentation(text_lines[index + 1])
+        if len(next_indentation) > len(current_indentation):
+            # Make this line compilable for the next block.
+            text_lines[index] = current_indentation + 'if True:'
+        else:
+            # Comment-out this line so that it is not compiled.
+            text_lines[index] = current_indentation + 'pass'
+        return '\n'.join(text_lines)
+
+    def _get_indentation(self, line):
+        "Return the line's indentation"
+        indentation_pattern = re.compile(r'^[ \t]*')
+        match = indentation_pattern.match(line)
+        if match:
+            return match.group()
+        # No match means the indentation is an empty string.
+        return ''
+
+    def _get_dynamic_proposal(self, module, name):
+        try:
+            if module is None:
+                identifier = None
+            elif type(module) == 'dict':
+                identifier = module[name]
+            else:
+                identifier = module.__dict__[name]
+        except KeyError:
+            identifier = None
+        return PythonProposal(name, info=identifier)
+
+
+class Completer(ControllerMixin):
+    """This class manages the gedit.View's interaction with completions."""
+
+    word_char = re.compile(r'[\w_-]', re.I)
+
+    def __init__(self, window):
+        """Initialize the controller for the gedit.View."""
+        self.window = window
+        self.signal_ids = {}
+        self.view = None
+        self.completion = None
+        self.provider = None
+        self.completer_title = _('GDP words')
+        self.set_view(window.get_active_view())
+
+    def deactivate(self):
+        """Clean up resources before deactivation."""
+        self.set_view(None)
+
+    def set_view(self, view, is_reset=False):
+        """Set the view to be controlled.
+
+        Installs signal handlers for the view. Calling
+        document.get_uri_for_display() self.set_view(None) will effectively
+        remove all the control from the current view. when is_reset is True,
+        the current view's signals will be reset.
+        """
+        if view is self.view and not is_reset:
+            return
+
+        if self.view:
+            # Unregister the current view before assigning the new one.
+            self._disconnectSignal(self.view, 'destroy')
+            self._disconnectSignal(self.view, 'notify::editable')
+            if (self.completion
+                and self.provider in self.completion.get_providers()):
+                self.completion.remove_provider(self.provider)
+            self.completion = None
+            self.provider = None
+
+        self.view = view
+        if view is not None:
+            self.signal_ids['destroy'] = view.connect(
+                'destroy', self.on_view_destroy)
+            self.signal_ids['notify::editable'] = view.connect(
+                'notify::editable', self.on_notify_editable)
+            self.provider = DynamicProvider(
+                self.completer_title, self.on_proposal_activated)
+            self.completion = self.view.get_completion()
+            if self.provider not in self.completion.get_providers():
+                self.completion.add_provider(self.provider)
+
+    def _disconnectSignal(self, obj, signal):
+        """Disconnect the signal from the provided object."""
+        if signal in self.signal_ids:
+            obj.disconnect(self.signal_ids[signal])
+            del self.signal_ids[signal]
+
+    def show_completion(self, widget=None, data=None):
+        """Show the completion proposals."""
+        self.view.emit('show-completion')
+
+    def get_word_prefix(self, document):
+        """Return a 3-tuple of the word fragment before the cursor.
+
+        The tuple contains the (word_fragement, start_iter, end_iter) to
+        identify the prefix and its starting and end position in the
+        document.
+        """
+        return get_word(document, self.word_char)
+
+    def insert_word(self, word, start=None):
+        """Return True when the word is inserted into the Document.
+
+        The word cannot be None or an empty string.
+        """
+        assert word, "The word cannot be None or an empty string."
+        document = self.view.get_buffer()
+        if start:
+            document.delete(
+                start, document.get_iter_at_mark(document.get_insert()))
+        document.insert_at_cursor(word)
+
+    def on_proposal_activated(self, proposal, piter):
+        """Complete the word using the proposal."""
+        if not proposal:
+            return
+        document = self.view.get_buffer()
+        (ignored, start, end_) = self.get_word_prefix(document)
+        word = proposal.get_text()
+        self.insert_word(word, start)
+        return True
+
+    def on_suggest_completions_toggled(self, menu_item, data=None):
+        config.set(
+            'completer', 'suggest_completions', str(menu_item.props.active))
+        config.dump()
+        self.set_view(self.view, is_reset=True)
+
+    def on_notify_editable(self, view, param_spec):
+        """Update the controller when the view editable state changes.
+
+        This method is ultimately responsible for enabling and disabling
+        the completion widget for completer.
+        """
+        self.set_view(view, True)
+
+    def on_view_destroy(self, view):
+        """Disconnect the controller."""
+        self.deactivate()

=== added file 'plugins/gdp/complete.ui'
--- plugins/gdp/complete.ui	1970-01-01 00:00:00 +0000
+++ plugins/gdp/complete.ui	2012-02-07 18:01:21 +0000
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkGrid" id="preferences">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_left">6</property>
+    <property name="margin_right">6</property>
+    <property name="margin_top">6</property>
+    <property name="margin_bottom">6</property>
+    <property name="column_spacing">6</property>
+    <child>
+      <object class="GtkLabel" id="label2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Completer shortcut</property>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkEntry" id="shortcut_entry">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="has_tooltip">True</property>
+        <property name="tooltip_markup" translatable="yes">Enter one or more modifiers and the key name.</property>
+        <property name="tooltip_text" translatable="yes">Enter one or more modifiers and the key name.</property>
+        <property name="invisible_char">•</property>
+        <property name="invisible_char_set">True</property>
+        <property name="placeholder_text">&lt;Control&gt;&lt;Alt&gt;key-name</property>
+        <signal name="focus-out-event" handler="on_focus_out_event" swapped="no"/>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Requires a restart of Gedit.</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">1</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>

=== modified file 'plugins/gdp/find.py'
--- plugins/gdp/find.py	2011-09-08 12:12:28 +0000
+++ plugins/gdp/find.py	2012-02-07 18:01:21 +0000
@@ -1,11 +1,9 @@
 #!/usr/bin/python
-# Copyright (C) 2009-2011 - Curtis Hovey <sinzui.is at verizon.net>
+# Copyright (C) 2009-2012 - Curtis Hovey <sinzui.is at verizon.net>
 # This software is licensed under the GNU General Public License version 2
 # (see the file COPYING).
 """Find in files and replace strings in many files."""
 
-__metaclass__ = type
-
 __all__ = [
     'extract_match',
     'find_files',
@@ -24,9 +22,14 @@
 from optparse import OptionParser
 
 from gi.repository import GObject
+from gi.repository import Gdk
 from gi.repository import Gtk
 
-from gdp import ControllerMixin, setup_file_lines_view
+from gdp import (
+    config,
+    ControllerMixin,
+    setup_file_lines_view,
+    )
 
 
 find_params = namedtuple(
@@ -124,9 +127,9 @@
                     None,
                     (file_path, mime_type, 0, None, self.find_params.path))
                 if self.substitution is None:
-                    icon = Gtk.STOCK_FIND
+                    icon = 'edit-find'  # Gtk.STOCK_FIND
                 else:
-                    icon = Gtk.STOCK_FIND_AND_REPLACE
+                    icon = 'edit-find-replace'  # Gtk.STOCK_FIND_AND_REPLACE
                 for line in summary['lines']:
                     self.treestore.append(piter,
                         (file_path, icon, line['lineno'], line['text'],
@@ -168,15 +171,18 @@
         self.pattern_comboentry = self.widgets.get_object(
             'pattern_comboentry')
         self.pattern_comboentry.get_child().set_width_chars(24)
-        self.setup_comboentry(self.pattern_comboentry)
+        self.setup_comboentry(self.pattern_comboentry, config_key='matches')
         self.path_comboentry = self.widgets.get_object('path_comboentry')
-        self.setup_comboentry(self.path_comboentry, self.CURRENT_FILE)
+        self.setup_comboentry(
+            self.path_comboentry, self.CURRENT_FILE, 'paths')
         self.update_comboentry(self.path_comboentry, os.getcwd())
         self.file_comboentry = self.widgets.get_object('file_comboentry')
-        self.setup_comboentry(self.file_comboentry, self.ANY_FILE)
+        self.setup_comboentry(
+            self.file_comboentry, self.ANY_FILE, 'files')
         self.substitution_comboentry = self.widgets.get_object(
             'substitution_comboentry')
-        self.setup_comboentry(self.substitution_comboentry)
+        self.setup_comboentry(
+            self.substitution_comboentry, config_key='substitutions')
         self.file_lines_view = self.widgets.get_object('file_lines_view')
         setup_file_lines_view(self.file_lines_view, self, 'Matches')
 
@@ -185,11 +191,22 @@
         panel = self.window.get_side_panel()
         panel.remove_item(self.find_panel)
 
-    def setup_comboentry(self, comboentry, default=None):
+    def valid_state(self, config_key, value):
+        if (config_key == 'paths'
+            and value not in (self.WORKING_DIRECTORY, self.CURRENT_FILE)):
+            return os.path.exists(value)
+        return True
+
+    def setup_comboentry(self, comboentry, default=None, config_key=None):
         liststore = Gtk.ListStore.new([GObject.TYPE_STRING])
         liststore.set_sort_column_id(0, Gtk.SortType.ASCENDING)
         comboentry.set_model(liststore)
         comboentry.set_entry_text_column(0)
+        if config_key is not None:
+            for value in config.getlist('finder', config_key):
+                # This might need to know that paths contains dirs.
+                if value and self.valid_state(config_key, value):
+                    self.update_comboentry(comboentry, value, False)
         if default is not None:
             self.update_comboentry(comboentry, default)
 
@@ -225,7 +242,7 @@
 
     def show_replace(self, action):
         """Show the finder pane and expand replace."""
-        self.show(None, None)
+        self.show(None)
         self.widgets.get_object('actions').activate()
 
     @property
@@ -262,6 +279,23 @@
         self.update_comboentry(
             self.path_comboentry, new_path, set_active=False)
 
+    def save_find_data(self):
+        data = [
+            ('paths', self.path),
+            ('matches', self.match_pattern),
+            ('files', self.file_comboentry.get_active_text()),
+            ('substitutions', self.substitution_comboentry.get_active_text()),
+            ]
+        for key, value in data:
+            history = config.getlist('finder', key)
+            if value in history:
+                history.remove(value)
+            history.insert(0, value)
+            if len(history) > 10:
+                history = history[0:10]
+            config.setlist('finder', key, history)
+        config.dump()
+
     def get_find_params(self):
         """Return the find parameters as a tuple."""
         return find_params(
@@ -278,6 +312,7 @@
         find_params = self.get_find_params()
         self.last_find = find_params
         pattern = find_params.pattern
+        self.save_find_data()
         self.file_lines_view.get_column(0).props.title = (
             'Matches for [%s]' % pattern)
         find_worker = FinderWorker(
@@ -288,6 +323,42 @@
         if self.path_comboentry.get_active_text() == self.CURRENT_FILE:
             self.file_lines_view.expand_all()
 
+    def _get_untested_replacement_dialog(self, find_params):
+        dialog_flags = Gtk.DialogFlags
+        dialog = Gtk.Dialog(
+            title="Untested replacement", parent=self.window,
+            flags=dialog_flags.MODAL | dialog_flags.DESTROY_WITH_PARENT,
+            buttons=(Gtk.STOCK_FIND, Gtk.ResponseType.REJECT,
+                     Gtk.STOCK_FIND_AND_REPLACE, Gtk.ResponseType.ACCEPT))
+        question = Gtk.Label(
+            _("Do want to test this replacement using Find first?"))
+        question.set_alignment(0, 0)
+        question.props.xpad = 6
+        dialog.vbox.pack_start(question, True, False, 6)
+        question.show()
+        params_summary = Gtk.Label()
+        params_summary.set_markup(_(
+            "<b>Look in:</b> %s\n"
+            "<b>Search for:</b> %s\n"
+            "<b>Regular expression:</b> %s\n"
+            "<b>Match case:</b> %s\n"
+            "<b>File name pattern:</b> %s")
+            % find_params)
+        params_summary.props.selectable = True
+        params_summary.props.xpad = 3
+        params_summary.props.ypad = 3
+        box = Gtk.EventBox()
+        box.set_border_width(6)
+        white = Gdk.color_parse('#fff')
+        box.modify_bg(Gtk.StateType.NORMAL, white)
+        box.add(params_summary)
+        dialog.vbox.pack_start(box, True, False, 0)
+        box.show()
+        params_summary.show()
+        # Uncomment the next line to preview the layout.
+        #dialog.run()
+        return dialog
+
     def on_replace_in_files(self, widget=None):
         """Find, replace, and present the matches."""
         substitution = self.substitution_comboentry.get_active_text() or ''
@@ -295,36 +366,7 @@
         response = Gtk.ResponseType.ACCEPT
         find_params = self.get_find_params()
         if self.last_find != find_params:
-            dialog_flags = Gtk.DialogFlags
-            dialog = Gtk.Dialog(
-                title="Untested replacement", parent=self.window,
-                flags=dialog_flags.MODAL | dialog_flags.DESTROY_WITH_PARENT,
-                buttons=(Gtk.STOCK_FIND, Gtk.ResponseType.REJECT,
-                         Gtk.STOCK_FIND_AND_REPLACE, Gtk.ResponseType.ACCEPT))
-            question = Gtk.Label(
-                _("Do want to test this replacement using Find first?"))
-            question.set_alignment(0, 0)
-            question.props.xpad = 6
-            dialog.vbox.pack_start(question, expand=False, padding=6)
-            question.show()
-            params_summary = Gtk.Label()
-            params_summary.set_markup(_(
-                "<b>Look in:</b> %s\n"
-                "<b>Search for:</b> %s\n"
-                "<b>Regular expression:</b> %s\n"
-                "<b>Match case:</b> %s\n"
-                "<b>File name pattern:</b> %s")
-                % find_params)
-            params_summary.props.selectable = True
-            params_summary.props.xpad = 3
-            params_summary.props.ypad = 3
-            box = Gtk.EventBox()
-            box.set_border_width(6)
-            box.modify_bg(Gtk.STATE_NORMAL, Gtk.gdk.Color('#fff'))
-            box.add(params_summary)
-            dialog.vbox.pack_start(box)
-            box.show()
-            params_summary.show()
+            dialog = self._get_untested_replacement_dialog(find_params)
             response = dialog.run()
             dialog.destroy()
         if response == Gtk.ResponseType.REJECT:

=== modified file 'plugins/gdp/find.ui'
--- plugins/gdp/find.ui	2011-09-08 12:12:28 +0000
+++ plugins/gdp/find.ui	2012-02-07 18:01:21 +0000
@@ -18,8 +18,6 @@
             <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">2</property>
             <child>
               <object class="GtkLabel" id="path_label">
                 <property name="visible">True</property>
@@ -60,7 +58,6 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">The plain text or Python regular expression to find in files.</property>
                     <property name="tooltip_text" translatable="yes">The plain text or Python regular expression to find in files.</property>
-                    <property name="has_frame">False</property>
                     <property name="has_entry">True</property>
                     <child internal-child="entry">
                       <object class="GtkEntry" id="comboboxtext-entry3">
@@ -107,7 +104,6 @@
                 <property name="tooltip_markup" translatable="yes">The directory to start searching in.</property>
                 <property name="tooltip_text" translatable="yes">The directory to start searching in.</property>
                 <property name="hexpand">True</property>
-                <property name="has_frame">False</property>
                 <property name="has_entry">True</property>
                 <child internal-child="entry">
                   <object class="GtkEntry" id="comboboxtext-entry4">
@@ -123,6 +119,21 @@
                 <property name="height">1</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -198,8 +209,6 @@
                       <object class="GtkComboBoxText" id="file_comboentry">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="has_frame">False</property>
-                        <property name="button_sensitivity">off</property>
                         <property name="has_entry">True</property>
                         <child internal-child="entry">
                           <object class="GtkEntry" id="comboboxtext-entry25">
@@ -300,7 +309,6 @@
 The replacement may use backslash escapes to access groups in match expression</property>
                         <property name="tooltip_text" translatable="yes">The text to replace each found match with.
 The replacement may use backslash escapes to access groups in match expression</property>
-                        <property name="has_frame">False</property>
                         <property name="has_entry">True</property>
                         <child internal-child="entry">
                           <object class="GtkEntry" id="comboboxtext-entry23">

=== modified file 'plugins/gdp/format.py'
--- plugins/gdp/format.py	2011-09-08 12:12:28 +0000
+++ plugins/gdp/format.py	2012-02-07 18:01:21 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2011 - Curtis Hovey <sinzui.is at verizon.net>
+# Copyright (C) 2009-2012 - Curtis Hovey <sinzui.is at verizon.net>
 # This software is licensed under the GNU General Public License version 2
 # (see the file COPYING).
 """Format text and code"""
@@ -10,15 +10,39 @@
 from gettext import gettext as _
 import os
 import re
+from tempfile import NamedTemporaryFile
 from textwrap import wrap
 
-from gi.repository import GConf
-from gi.repository import Gtk
+from gi.repository import (
+    Gio,
+    Gtk,
+    )
 
 from pocketlint.formatdoctest import DoctestReviewer
-from pocketlint.formatcheck import Language, Reporter, UniversalChecker
-
-from gdp import ControllerMixin, setup_file_lines_view
+from pocketlint.formatcheck import (
+    Language,
+    Reporter,
+    UniversalChecker,
+    )
+
+from gdp import (
+    config,
+    ControllerMixin,
+    setup_file_lines_view,
+    )
+
+
+class FilteredReporter(Reporter):
+    """A class that can report only errors."""
+
+    @property
+    def error_only(self):
+        return config.getboolean('formatter', 'report_only_errors')
+
+    @error_only.setter
+    def error_only(self, val):
+        # Suppress the set behaviour because the config controls the rules.
+        pass
 
 
 class Formatter(ControllerMixin):
@@ -108,12 +132,20 @@
         lines = [line.rstrip() for line in text.splitlines()]
         self._put_bounded_text(bounds, '\n'.join(lines))
 
+    def get_tab_size(self):
+        tab_size = 4
+        try:
+            settings_schema = 'org.gnome.gedit.preferences.editor'
+            settings = Gio.Settings.new(settings_schema)
+            tab_size = settings.get_uint('tabs-size')
+        except:
+            pass
+        return tab_size
+
     def tabs_to_spaces(self, action):
         """Fix the selection's line endings."""
+        tab_size = self.get_tab_size()
         bounds, text = self._get_bounded_text()
-        gconf_client = GConf.Client.get_default()
-        tab_size = gconf_client.get_int(
-            '/apps/gedit-2/preferences/editor/tabs/tabs_size') or 4
         tab_spaces = ' ' * tab_size
         lines = [line.replace('\t', tab_spaces) for line in text.splitlines()]
         self._put_bounded_text(bounds, '\n'.join(lines))
@@ -190,14 +222,19 @@
         line = self._single_line(text)
         lines = wrap(
             line, width=width, initial_indent=padding,
-            subsequent_indent=padding)
+            subsequent_indent=padding, break_on_hyphens=False)
         paragraph = '\n'.join(lines)
         return paragraph
 
     def rewrap_text(self, action):
         """Rewrap the paragraph."""
         bounds, text = self._get_bounded_text()
-        text = self._wrap_text(text)
+        width = 78
+        file_path = self.active_document.get_uri_for_display()
+        language = Language.get_language(file_path)
+        if language in (Language.TEXT, None):
+            width = 72
+        text = self._wrap_text(text, width=width)
         self._put_bounded_text(bounds, text)
 
     def reformat_css(self, action):
@@ -271,18 +308,32 @@
         new_text = reviewer.format()
         self._put_bounded_text(bounds, new_text)
 
+    def _ensure_file_path(self, checker):
+        if os.path.isfile(checker.file_path):
+            return None
+        temp_file = NamedTemporaryFile(suffix='gdp', delete=False)
+        temp_file.write(checker.text)
+        temp_file.flush()
+        checker.file_path = temp_file.name
+        return temp_file
+
     def _check_style(self, document):
         """Check the style and syntax of a document."""
         file_path = document.get_uri_for_display()
         start_iter = document.get_start_iter()
         end_iter = document.get_end_iter()
         text = document.get_text(start_iter, end_iter, True)
-        reporter = Reporter(
+        reporter = FilteredReporter(
             Reporter.FILE_LINES, treeview=self.file_lines_view)
         language = Language.get_language(file_path)
         checker = UniversalChecker(
             file_path, text=text, language=language, reporter=reporter)
-        checker.check()
+        temp_file = self._ensure_file_path(checker)
+        try:
+            checker.check()
+        finally:
+            if temp_file:
+                temp_file.unlink(temp_file.name)
 
     def check_style(self, action, documents=None, quiet=False):
         """Check the style and syntax of the active document."""
@@ -305,3 +356,8 @@
     def check_all_style(self, action):
         """Check the style and syntax of all open documents."""
         self.check_style(None, documents=self.window.get_documents())
+
+    def on_show_syntax_errors_only_toggled(self, menu_item, data=None):
+        config.set(
+            'formatter', 'report_only_errors', str(menu_item.props.active))
+        config.dump()

=== removed file 'plugins/gdp/syntaxcompleter.py'
--- plugins/gdp/syntaxcompleter.py	2011-09-08 12:12:28 +0000
+++ plugins/gdp/syntaxcompleter.py	1970-01-01 00:00:00 +0000
@@ -1,688 +0,0 @@
-# Copyright (C) 2007-2011 - Curtis Hovey <sinzui.is at verizon.net>
-# This software is licensed under the GNU General Public License version 2
-# (see the file COPYING).
-"""A syntax completer for document words and python symbols."""
-
-
-__metaclass__ = type
-
-__all__ = [
-    'BaseSyntaxGenerator',
-    'MarkupGenerator',
-    'PythonSyntaxGenerator',
-    'SyntaxController',
-    'TextGenerator',
-    ]
-
-
-import re
-from gettext import gettext as _
-from keyword import kwlist
-from pydoc import TextDoc
-from xml.sax import saxutils
-
-from gi.repository import GObject
-from gi.repository import Gtk
-from gi.repository import GtkSource
-
-from gdp import ControllerMixin
-
-
-lang_manager = GtkSource.LanguageManager.get_default()
-doctest_language = lang_manager.get_language('doctest')
-
-doctest_pattern = re.compile(
-    r'^.*(doc|test|stories).*/.*\.(txt|doctest)$')
-
-
-def get_word(document, word_pattern, end=None):
-    """Return a 3-tuple of the word fragment before the cursor.
-
-    The tuple contains the (word_fragment, start_iter, end_iter) to
-    identify the prefix and its starting and end position in the
-    document.
-    """
-    if end is None:
-        end = document.get_iter_at_mark(document.get_insert())
-    start = end.copy()
-    word = None
-
-    # When the preceding character is not alphanumeric,
-    # there is be no word before the cursor.
-    start_char = start.copy()
-    if start_char.backward_char():
-        # XXX sinzui 2011-01-07: get_char() dies, but get_text works.
-        # char = start_char.get_char()
-        char = start_char.get_text(start)[0]
-        if not word_pattern.match(char):
-            return (None, start, end)
-
-    # GtkTextIter *_word_end() methods do not seek for '_' and '-', so
-    # we need to walk backwards through the iter to locate the word end.
-    count = 0
-    peek = start.copy()
-    while peek.backward_chars(1):
-        # XXX sinzui 2011-01-07: get_char() dies, but get_text works.
-        char = peek.get_text(start)[0]
-        if not word_pattern.match(char):
-            break
-        else:
-            count += 1
-
-    if count > 0:
-        start.backward_chars(count)
-        word = document.get_text(start, end, True)
-    else:
-        word = None
-
-    return (word, start, end)
-
-
-class DynamicProposal(GObject.GObject, GtkSource.CompletionProposal):
-    """A common CompletionProposal for dymamically generated info.
-
-    XXX sinzui 2010-03-14: do_changed, do_equal, do_get_icon, do_get_label,
-    do_hash may need implementation.
-    """
-    __gtype_name__ = "GDPDynamicProposal"
-
-    def __init__(self, word, info=None):
-        GObject.GObject.__init__(self)
-        self._word = word
-        self._info = info or ''
-
-    def __repr__(self):
-        return '<%s word="%s" at 0x%x>' % (
-            self.__class__.__name__, self._word, id(self))
-
-    def __eq__(self, other):
-        if type(other) != type(self):
-            return False
-        return other._word == self._word and other._info == self._info
-
-    def __lt__(self, other):
-        return self._word < other._word
-
-    def __hash__(self):
-        return hash((type(self), self._word, self._info))
-
-    def equal(self, other):
-        return self.__eq__(other)
-
-    def hash(self):
-        return self.__hash__()
-
-    def do_get_text(self):
-        """See `CompletionProvider`."""
-        return self._word
-
-    def do_get_markup(self):
-        """See `CompletionProvider`."""
-        return saxutils.escape(self._word)
-
-    def do_get_info(self):
-        """See `CompletionProvider`."""
-        return self._info
-
-
-class PangoDoc(TextDoc):
-
-    def bold(self, text):
-        return '\x86%s\x87' % text
-
-    def document(self, mod, *args):
-        text = TextDoc.document(self, mod)
-        text = saxutils.escape(text)
-        text = text.replace('\x86', '<b>')
-        text = text.replace('\x87', '</b>')
-        return text
-
-
-class PythonProposal(DynamicProposal):
-    """A proposal that provides pydoc info."""
-
-    def do_get_info(self):
-        """See `CompletionProvider`."""
-        if self._info is None:
-            return None
-        return PangoDoc().document(self._info)
-
-
-class DynamicProvider(GObject.GObject, GtkSource.CompletionProvider):
-    """A common CompletionProvider for dynamically generated info."""
-    __gtype_name__ = "GDPDynamicProvider"
-    word_char = re.compile(r'[\w_-]', re.I)
-
-    def __init__(self, name, language_id, handler, document):
-        GObject.GObject.__init__(self)
-        self._name = name
-        self.proposals = []
-        self.language_id = language_id
-        self.handler = handler
-        self.document = document
-        self.info_widget = None
-        self.mark = None
-        theme = Gtk.IconTheme.get_default()
-        s, w, h = Gtk.icon_size_lookup(Gtk.IconSize.MENU)
-        try:
-            self.icon = theme.load_icon(Gtk.STOCK_JUSTIFY_LEFT, w, 0)
-        except:
-            # The theme is not complete.
-            self.icon = None
-
-    def mark_position(self, it):
-        """Create or move the mark of the word start."""
-        if not self.mark:
-            self.mark = it.get_buffer().create_mark(None, it, False)
-        else:
-            self.mark.get_buffer().move_mark(self.mark, it)
-
-    def get_word(self, context):
-        """See `CompletionProvider`."""
-        it = context.get_iter()
-        word, start, end = get_word(self.document, self.word_char, it)
-        if word is not None:
-            self.mark_position(start)
-        return word
-
-    def do_get_start_iter(self, context, proposal, iter_):
-        """See `CompletionProvider`."""
-        if not self.mark or self.mark.get_deleted():
-            return None
-        return self.mark.get_buffer().get_iter_at_mark(self.mark)
-
-    def do_match(self, context):
-        """See `CompletionProvider`."""
-        return True
-
-    def get_generator(self, document, prefix):
-        """Return the specialized generator for document's language."""
-        if self.language_id == 'python':
-            return PythonSyntaxGenerator(document, prefix=prefix)
-        if self.language_id in (
-            'xml', 'xslt', 'html', 'pt', 'mallard', 'docbook'):
-            return MarkupGenerator(document, prefix=prefix)
-        else:
-            # The text generator is never returned because get_proposals will
-            # use it in non-authoritative cases.
-            return None
-
-    def get_proposals(self, prefix):
-        """See `CompletionProvider`."""
-        all_words = []
-        is_authoritative = False
-        generator = self.get_generator(self.document, prefix)
-        if generator:
-            is_authoritative, words = generator.get_words()
-            all_words += words
-        if not is_authoritative:
-            is_authoritative, simple_words = TextGenerator(
-                self.document, prefix=prefix).get_words()
-            all_words += simple_words
-        return all_words
-
-    def do_populate(self, context):
-        """See `CompletionProvider`."""
-        proposals = self.get_proposals(self.get_word(context))
-        context.add_proposals(self, proposals, True)
-
-    def do_get_name(self):
-        """See `CompletionProvider`."""
-        return self._name
-
-    def do_activate_proposal(self, proposal, piter):
-        """See `CompletionProvider`."""
-        return self.handler(proposal, piter)
-
-    def do_get_icon(self):
-        """See `CompletionProvider`."""
-        return self.icon
-
-    def do_get_activation(self):
-        """See `CompletionProvider`."""
-        return GtkSource.CompletionActivation.USER_REQUESTED
-
-    def do_get_info_widget(self, proposal):
-        """See `DynamicProvider`."""
-        if self.info_widget is None:
-            self.info_view = Gtk.Label(label='')
-            self.info_view.set_alignment(0.0, 0.0)
-            self.info_widget = Gtk.ScrolledWindow()
-            self.info_widget.add_with_viewport(self.info_view)
-        return self.info_widget
-
-    def do_update_info(self, proposal, info):
-        """See `CompletionProvider`."""
-        markup = proposal.get_info() or ''
-        self.info_view.set_markup(markup)
-        self.info_view.show()
-        self.info_widget.set_size_request(400, -1)
-
-GObject.type_register(DynamicProposal)
-GObject.type_register(DynamicProvider)
-
-
-class BaseSyntaxGenerator:
-    """An abstract class representing the source of a word prefix."""
-
-    def __init__(self, document, prefix=None):
-        """Create a new SyntaxGenerator.
-
-        :param prefix: A `str`. The word prefix used to match words.
-        :param document: `gedit.Document`. The source of words to search.
-        """
-        self._prefix = prefix
-        self._document = document
-
-    word_char = re.compile(r'[\w_]', re.I)
-
-    @property
-    def string_before_cursor(self):
-        """Return the string that matches `word_char` before the cursor."""
-        text, start_iter, end_iter = get_word(self._document, self.word_char)
-        if text is None:
-            text = ''
-        return text
-
-    def ensure_prefix(self, prefix):
-        """Return the available prefix or an empty string."""
-        if prefix:
-            return prefix
-        elif self._prefix:
-            return self._prefix
-        else:
-            # Match all words in the text.
-            return ''
-
-    def get_words(self, prefix=None):
-        """Return a 2-tuple of is_authoritative and unique `set` of words.
-
-        :param prefix: A `str`. The word prefix used to match words.
-        :return: a 2-tuple of is_authoritative and a set of words.
-            is_authoritative is True when the set of words are the only words
-            that can match the prefix. The words are a set of words.
-        """
-        raise NotImplementedError
-
-    @property
-    def prefix(self):
-        """The prefix use to match words to."""
-        return self._prefix
-
-    @property
-    def file_path(self):
-        """The path to the file that is the word source."""
-        return self._document.get_uri_for_display()
-
-    @property
-    def text(self):
-        """The text of the gedit.Document or None."""
-        if not self._document:
-            return None
-        start_iter = self._document.get_start_iter()
-        end_iter = self._document.get_end_iter()
-        return self._document.get_text(start_iter, end_iter, True)
-
-
-class TextGenerator(BaseSyntaxGenerator):
-    """Generate a list of words that match a given prefix for a document."""
-
-    def get_words(self, prefix=None):
-        """See `BaseSyntaxGenerator.get_words`.
-
-        is_authoritative is always False because TextGenerator because it is
-        not for a specific document Language.
-        """
-        prefix = self.ensure_prefix(prefix)
-        is_authoritative = False
-        if len(prefix) > 0:
-            # Match words that are just the prefix too.
-            conditional = r'*'
-        else:
-            conditional = r'+'
-        pattern = r'\b(%s[\w-]%s)' % (re.escape(prefix), conditional)
-        word_re = re.compile(pattern, re.I)
-        words = word_re.findall(self.text)
-        # Find the unique words that do not have pseudo m-dashed in them.
-        words = set(words)
-        words = [DynamicProposal(word) for word in words if '--' not in word]
-        return is_authoritative, words
-
-
-class MarkupGenerator(BaseSyntaxGenerator):
-    """Generate a list of elements and attributes for a document."""
-
-    word_char = re.compile(r'[^<>]')
-    common_attrs = []
-
-    INSIDE_ATTRIBUTES = 'INSIDE_ATTRIBUTES'
-    INSIDE_CLOSE = 'INSIDE_CLOSE'
-    INSIDE_OPEN = 'INSIDE_OPEN'
-    OUTSIDE = 'OUTSIDE'
-
-    def get_cursor_context(self):
-        """Return the context of the cursor in relation to the last tag."""
-        text, start_iter, end_iter = get_word(self._document, self.word_char)
-        if not start_iter.backward_char():
-            # The start was at the begining of the doc; no tags were found.
-            return self.OUTSIDE
-        # XXX sinzui 2011-01-07: get_char() dies, but get_text works.
-        char_iter = start_iter.copy()
-        char_iter.forward_char()
-        char = start_iter.get_text(char_iter)[0]
-        #char = start_iter.get_char()
-        if char == '>':
-            return self.OUTSIDE
-        elif text and text.startswith('/'):
-            return self.INSIDE_CLOSE
-        elif text and ' ' in text:
-            return self.INSIDE_ATTRIBUTES
-        else:
-            return self.INSIDE_OPEN
-
-    def get_words(self, prefix=None):
-        """See `BaseSyntaxGenerator.get_words`."""
-        prefix = self.ensure_prefix(prefix)
-        context = self.get_cursor_context()
-        if context == self.OUTSIDE:
-            # is_authoritative is false and there are no words because the
-            # cursor is not in a tag to complete.
-            return False, set()
-        is_authoritative = True
-        if context == self.INSIDE_OPEN:
-            words = self._get_open_tags(prefix)
-        elif context == self.INSIDE_ATTRIBUTES:
-            words = self._get_attributes(prefix)
-        else:
-            words = self._get_close_tags(prefix)
-        return is_authoritative, words
-
-    def get_cardinality(self, prefix):
-        if prefix:
-            # Match words that are just the prefix too.
-            return r'*'
-        else:
-            return r'+'
-
-    def _get_open_tags(self, prefix):
-        """Return all the tag names."""
-        cardinality = self.get_cardinality(prefix)
-        prefix = re.escape(prefix)
-        pattern = r'<(%s[\w_.:-]%s)' % (prefix, cardinality)
-        word_re = re.compile(pattern, re.I)
-        words = word_re.findall(self.text)
-        return [DynamicProposal(word) for word in words]
-
-    def _get_attributes(self, prefix):
-        pattern = r'<[\w_.:-]+ ([\w_.:-]*)=[^>]+>'
-        attrs_re = re.compile(pattern, re.I)
-        attr_clusters = attrs_re.findall(self.text)
-        attrs = set(self.common_attrs)
-        for attr_cluster in attr_clusters:
-            attr_pairs = attr_cluster.split()
-            for pair in attr_pairs:
-                attr = pair.split('=')
-                attrs.add(attr[0])
-        if prefix:
-            for attr in list(attrs):
-                if not attr.startswith(prefix):
-                    attrs.remove(attr)
-        return [DynamicProposal(attr) for attr in attrs]
-
-    def _get_close_tags(self, prefix):
-        """Return the tags that are still open before the cursor."""
-        cardinality = self.get_cardinality(prefix)
-        prefix = re.escape(prefix)
-        # Get the text before the cursor.
-        start_iter = self._document.get_start_iter()
-        end_iter = self._document.get_iter_at_mark(
-            self._document.get_insert())
-        text = self._document.get_text(start_iter, end_iter, True)
-        # Get all the open tags.
-        open_pattern = r'<(%s[\w_.:-]%s)' % (prefix, cardinality)
-        open_re = re.compile(open_pattern, re.I)
-        open_tags = open_re.findall(text)
-        # Get all the empty tags.
-        empty_pattern = r'<(%s[\w_.:-]%s)[^>]*/>' % (prefix, cardinality)
-        empty_re = re.compile(empty_pattern, re.I)
-        empty_tags = empty_re.findall(text)
-        # Get all the close tags.
-        close_pattern = r'</(%s[\w_.:-]%s)' % (prefix, cardinality)
-        close_re = re.compile(close_pattern, re.I)
-        close_tags = close_re.findall(text)
-        # Return only the tags that are still open.
-        for tag in empty_tags:
-            if tag in open_tags:
-                open_tags.remove(tag)
-        for tag in close_tags:
-            if tag in open_tags:
-                open_tags.remove(tag)
-        return [DynamicProposal(tag + '>') for tag in open_tags]
-
-
-class PythonSyntaxGenerator(BaseSyntaxGenerator):
-    """Generate a list of Python symbols that match a given prefix."""
-
-    word_char = re.compile(r'[\w_.]', re.I)
-    _kwlist = None
-
-    @property
-    def kwlist(self):
-        if self._kwlist is None:
-            self._kwlist = [
-                self._get_dynamic_proposal(None, word) for word in kwlist]
-        return self._kwlist
-
-    def get_words(self, prefix=None):
-        """See `BaseSyntaxGenerator.get_words`.
-
-        :return: a 2-tuple of is_authoritative and a set of matching
-            identifiers. is_authoritative is True when the prefix is a part
-            of a dotted identifier.
-        """
-        prefix = self.ensure_prefix(prefix)
-        is_authoritative = False
-        if prefix == '':
-            is_authoritative = True
-
-        import __builtin__
-        global_syms = [
-            self._get_dynamic_proposal(__builtin__, name)
-            for name in dir(__builtin__)]
-        try:
-            pyo = compile(self._get_parsable_text(), 'sc.py', 'exec')
-        except SyntaxError:
-            # This cannot be completed because of syntax errors.
-            # Return
-            self._document.emit('syntax-error-python')
-            is_authoritative = False
-            return is_authoritative, []
-        co_names = ('SIGNAL_RUN_LAST', 'TYPE_NONE', 'TYPE_PYOBJECT', 'object')
-        local_syms = [
-            self._get_dynamic_proposal(None, name)
-            for name in pyo.co_names if name not in co_names]
-
-        namespaces = self.string_before_cursor.split('.')
-        if len(namespaces) == 1:
-            # The identifier is scoped to this module (the document).
-            symbols = local_syms + global_syms + self.kwlist
-            symbols = [proposal for proposal in symbols
-                       if proposal.get_text().startswith(prefix)]
-            return is_authoritative, symbols
-
-        # Remove the prefix to create the module's full name.
-        namespaces.pop()
-        module_name = '.'.join(namespaces)
-        locald = {}
-        try:
-            # Check this file first.
-            module_ = eval(module_name, globals(), locald)
-        except NameError:
-            # Try a true import.
-            try:
-                module_ = __import__(module_name, globals(), locald, [])
-            except ImportError:
-                return is_authoritative, []
-
-        for symbol in namespaces[1:]:
-            module_ = getattr(module_, symbol)
-        is_authoritative = True
-        symbols = [self._get_dynamic_proposal(module_, name)
-                   for name in dir(module_) if name.startswith(prefix)]
-        return is_authoritative, symbols
-
-    def _get_parsable_text(self):
-        """Return the parsable text of the module.
-
-        The line being edited may not be valid syntax, so the line is
-        replaced with 'pass', or if it starts a block, it becomes 'if True:'
-        """
-        current_iter = self._document.get_iter_at_mark(
-            self._document.get_insert())
-        index = current_iter.get_line()
-        text_lines = self.text.splitlines()
-        if index + 1 == len(text_lines):
-            # The current line is the last line. Add a fake line because
-            # the compiler will require another line to follow a comment.
-            text_lines.append('')
-        current_indentation = self._get_indentation(text_lines[index])
-        next_indentation = self._get_indentation(text_lines[index + 1])
-        if len(next_indentation) > len(current_indentation):
-            # Make this line compilable for the next block.
-            text_lines[index] = current_indentation + 'if True:'
-        else:
-            # Comment-out this line so that it is not compiled.
-            text_lines[index] = current_indentation + 'pass'
-        return '\n'.join(text_lines)
-
-    def _get_indentation(self, line):
-        "Return the line's indentation"
-        indentation_pattern = re.compile(r'^[ \t]*')
-        match = indentation_pattern.match(line)
-        if match:
-            return match.group()
-        # No match means the indentation is an empty string.
-        return ''
-
-    def _get_dynamic_proposal(self, module, name):
-        if module is None:
-            identifier = None
-        elif type(module) == 'dict':
-            identifier = module[name]
-        else:
-            identifier = module.__dict__[name]
-        return PythonProposal(name, info=identifier)
-
-
-class SyntaxController(ControllerMixin):
-    """This class manages the gedit.View's interaction with the SyntaxView."""
-
-    def __init__(self, window):
-        """Initialize the controller for the gedit.View."""
-        self.signal_ids = {}
-        self.view = None
-        self.window = window
-        self.set_view(window.get_active_view())
-
-    def deactivate(self):
-        """Clean up resources before deactivation."""
-        self.set_view(None)
-
-    def set_view(self, view, is_reset=False):
-        """Set the view to be controlled.
-
-        Installs signal handlers for the view. Calling
-        document.get_uri_for_display() self.set_view(None) will effectively
-        remove all the control from the current view. when is_reset is True,
-        the current view's signals will be reset.
-        """
-        if view is self.view and not is_reset:
-            return
-
-        if self.view:
-            # Unregister the current view before assigning the new one.
-            self._disconnectSignal(self.view, 'destroy')
-            self._disconnectSignal(self.view, 'notify::editable')
-
-        self.view = view
-        if view is not None:
-            self.signal_ids['destroy'] = view.connect(
-                'destroy', self.on_view_destroy)
-            self.signal_ids['notify::editable'] = view.connect(
-                'notify::editable', self.on_notify_editable)
-
-    def _disconnectSignal(self, obj, signal):
-        """Disconnect the signal from the provided object."""
-        if signal in self.signal_ids:
-            obj.disconnect(self.signal_ids[signal])
-            del self.signal_ids[signal]
-
-    def show_syntax_view(self, widget=None, data=None):
-        """Show the SyntaxView widget."""
-        if not self.view.get_editable():
-            return
-        self.completion = self.view.get_completion()
-        language_id = None
-        document = self.view.get_buffer()
-        if hasattr(document, 'get_language'):
-            # How can we not get a document or language?
-            language = document.get_language()
-            if language is not None:
-                language_id = language.get_id()
-        title = _('GDP Syntax Completer')
-        self.provider = DynamicProvider(
-            title, language_id, self.on_proposal_activated, document)
-        self.completion.show(
-            [self.provider], self.completion.create_context(None))
-
-    def get_word_prefix(self, document):
-        """Return a 3-tuple of the word fragment before the cursor.
-
-        The tuple contains the (word_fragement, start_iter, end_iter) to
-        identify the prefix and its starting and end position in the
-        document.
-        """
-        word_char = re.compile(r'[\w_-]', re.I)
-        return get_word(document, word_char)
-
-    def insert_word(self, word, start=None):
-        """Return True when the word is inserted into the Document.
-
-        The word cannot be None or an empty string.
-        """
-        assert word, "The word cannot be None or an empty string."
-        document = self.view.get_buffer()
-        if start:
-            document.delete(
-                start, document.get_iter_at_mark(document.get_insert()))
-        document.insert_at_cursor(word)
-
-    def correct_language(self, document):
-        """Correct the language for ambuguous mime-types."""
-        if not hasattr(document, 'get_language'):
-            return
-        file_path = document.get_uri_for_display()
-        if doctest_pattern.match(file_path):
-            document.set_language(doctest_language)
-
-    def on_proposal_activated(self, proposal, piter):
-        """Complete the word using the proposal."""
-        if not proposal:
-            return
-        document = self.view.get_buffer()
-        (ignored, start, end_) = self.get_word_prefix(document)
-        word = proposal.get_text()
-        self.insert_word(word, start)
-        return True
-
-    def on_notify_editable(self, view, param_spec):
-        """Update the controller when the view editable state changes.
-
-        This method is ultimately responsible for enabling and disabling
-        the SyntaxView widget for syntax completion.
-        """
-        self.set_view(view, True)
-
-    def on_view_destroy(self, view):
-        """Disconnect the controller."""
-        self.deactivate()

=== modified file 'plugins/gdp/tests/__init__.py'
--- plugins/gdp/tests/__init__.py	2011-01-14 10:24:47 +0000
+++ plugins/gdp/tests/__init__.py	2012-02-07 18:01:21 +0000
@@ -1,4 +1,1 @@
 """gdp unit/doctests."""
-
-__metaclass__ = type
-

=== removed file 'plugins/gdp/tests/find-generator.doctest'
--- plugins/gdp/tests/find-generator.doctest	2011-01-14 10:24:47 +0000
+++ plugins/gdp/tests/find-generator.doctest	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-Finder
-======
-
-The Finder is a controller between the UI and the match gengerato. The
-__init__ method requires a gedit window. An error is raised if it is not
-provided.
-
-    >>> from testing.gedithelpers import get_window
-    >>> from gdp.find import Finder
-
-    >>> finder = Finder()
-    Traceback (most recent call last):
-    ...
-    TypeError: __init__() takes exactly 2 arguments (1 given)
-
-    >>> window, view, document = get_window('plugins/gdp/data/snark12.txt')
-    >>> finder = Finder(window)
-    >>> finder
-    <gdp.find.Finder ...>
-
-

=== removed file 'plugins/gdp/tests/formatter.doctest'
--- plugins/gdp/tests/formatter.doctest	2011-09-08 12:12:28 +0000
+++ plugins/gdp/tests/formatter.doctest	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-Text formatters
----------------
-
-CSS can be reformatted.
-
-    >>> from gdp.format import Formatter
-    >>> from testing.gedithelpers import get_window
-
-    >>> window, view, document = get_window('plugins/gdp/data/snark.css')
-    >>> formatter = Formatter(window)
-    >>> formatter.reformat_css(None)
-    >>> print formatter.text #doctest: -NORMALIZE_WHITESPACE
-    .snark {
-        font-style: italic;
-        color: #ff0000;
-        }
-    .baker {
-        font-style: italic;
-        color: #3333ff;
-        }
-    .banker {
-        font-style: italic;
-        color: #666;
-        }
-    ...
-
-

=== removed file 'plugins/gdp/tests/syntaxcompleter-controller.doctest'
--- plugins/gdp/tests/syntaxcompleter-controller.doctest	2011-07-01 12:36:16 +0000
+++ plugins/gdp/tests/syntaxcompleter-controller.doctest	1970-01-01 00:00:00 +0000
@@ -1,329 +0,0 @@
-SyntaxControler for SyntaxCompleter
-===================================
-
-The SyntaxControler manages the interaction between the SyntaxView
-and the Gedit.View classes. The SyntaxControler is is the public
-interface of the SyntaxCompleter. It is used by the
-SyntaxCompleterPlugin to add the Syntax behaviours to Gedit.
-
-
-SyntaxControler
----------------
-
-The SyntaxView requires a Gedit.View for which it will be handling
-requests to complete words.
-
-    >>> from gdp.syntaxcompleter import SyntaxController
-    >>> SyntaxController()
-    Traceback (most recent call last):
-    ...
-    TypeError: __init__() takes exactly 2 arguments (1 given)
-
-    >>> from testing.gedithelpers import get_window
-    >>> from testing import Gedit 
-    >>> window, view, document = get_window('plugins/gdp/data/snark12.txt')
-    >>> controller = SyntaxController(window)
-    >>> controller
-    <gdp.syntaxcompleter.SyntaxController ...>
-
-
-set_view()
-~~~~~~~~~
-
-The view is bound and unbound to the controller using the set_view()
-method. It takes an optional reset parameter that rebinds the
-current view, for example, when a document's editability changes.
-
-    >>> current_view = controller.view
-    >>> current_view
-    <View ...>
-
-    >>> new_view = Gedit.View(document)
-    >>> controller.set_view(new_view)
-    >>> controller.view
-    <View ...>
-    >>> new_view is controller.view
-    True
-    >>> new_view is current_view
-    False
-
-The set_view connects and disconnects signals between the controller
-and the view and document. When the document is editable, the
-key-press-event is connected.
-
-    >>> controller.view.get_editable()
-    True
-    >>> controller.view.set_editable(False)
-    >>> controller.set_view(new_view, is_reset=True)
-    >>> new_view is controller.view
-    True
-
-Passing None will disconnect the signals and the view.
-
-    >>> controller.set_view(None)
-    >>> literal(controller.view)
-    None
-
-Passing an existing view connects the signals.
-
-    >>> controller.set_view(current_view)
-    >>> current_view is controller.view
-    True
-
-
-show_syntax_view()
-~~~~~~~~~~~~~~~~
-
-The show_syntax_view() methods displays the SyntaxView widget at the
-cursor. It determines the prefix from the left adjacent word and passes
-it to the SyntaxView.
-
-    >>> # The widget can only be observed to work when Gtk.main()
-    >>> # is run.
-    >>> controller.show_syntax_view()
-    >>> syntax_view = controller.completion
-    >>> syntax_view
-    <Completion object at ...>
-
-
-get_word_prefix()
-~~~~~~~~~~~~~~~
-
-This method will return the prefix before the cursor. The prefix is a
-3-tuple of the word fragment, its starting iterator and its ending
-iterator.
-
-    >>> def print_prefix(prefix):
-    ...     return (
-    ...         prefix[0], prefix[1].get_offset(), prefix[2].get_offset())
-
-    >>> document.get_text(document.get_start_iter(),
-    ...     document.get_end_iter(), True)
-    'This is the Project Gutenberg Etext of The Hunting of the Snark...'
-
-There is no word fragment when the cursor is at the start of the
-document.
-
-    >>> document.place_cursor(document.get_start_iter())
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> cursor_iter.get_offset()
-    0
-    >>> prefix = controller.get_word_prefix(document)
-    >>> print_prefix(prefix)
-    (None, 0, 0)
-
-When the cursor is at the end of a word, such as 'is', the leading
-characters are the prefix.
-
-    >>> cursor_iter.forward_cursor_positions(7)
-    True
-    >>> document.place_cursor(cursor_iter)
-    >>> cursor_iter.get_offset()
-    7
-    >>> prefix = controller.get_word_prefix(document)
-    >>> print_prefix(prefix)
-    ('is', 5, 7)
-
-When the cursor is in the middle of a word, such as 'is', the leading
-characters are the prefix.
-
-    >>> cursor_iter.backward_cursor_positions(1)
-    True
-    >>> document.place_cursor(cursor_iter)
-    >>> prefix = controller.get_word_prefix(document)
-    >>> print_prefix(prefix)
-    ('i', 5, 6)
-
-A space is not a word character. There is no prefix. The start and end
-positions are identical.
-
-    >>> cursor_iter.backward_cursor_positions(1)
-    True
-    >>> document.place_cursor(cursor_iter)
-    >>> prefix = controller.get_word_prefix(document)
-    >>> print_prefix(prefix)
-    (None, 5, 5)
-
-Period and other symbols that end a word are not a part of the word.
-The first sentence of the test document ends with 'Snark.' at position
-64. 'Snark' is the word before position 63. There is no word before
-position 64 ('.').
-
-    >>> document.place_cursor(document.get_start_iter())
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> cursor_iter.forward_cursor_positions(63)
-    True
-    >>> document.place_cursor(cursor_iter)
-    >>> prefix = controller.get_word_prefix(document)
-    >>> print_prefix(prefix)
-    ('Snark', 58, 63)
-
-    >>> cursor_iter.forward_cursor_position()
-    True
-    >>> document.place_cursor(cursor_iter)
-    >>> prefix = controller.get_word_prefix(document)
-    >>> print_prefix(prefix)
-    (None, 64, 64)
-
-Underscores are considered word characters. Words that start with, or
-contain underscores are included in the list of words.
-
-    >>> hacker_window, hacker_view, hacker_doc = get_window(
-    ...     'plugins/gdp/data/hackerese.txt')
-    >>> hacker_controller = SyntaxController(window)
-    >>> print hacker_doc.get_text(hacker_doc.get_start_iter(),
-    ...     hacker_doc.get_end_iter(), True)
-    H... syntax_generator syntax_completer __call__(self) __dict__ file_ ...
-
-    >>> hacker_doc.place_cursor(hacker_doc.get_start_iter())
-    >>> h_cursor_iter = hacker_doc.get_iter_at_mark(hacker_doc.get_insert())
-    >>> h_cursor_iter.forward_cursor_positions(464)
-    True
-    >>> hacker_doc.place_cursor(h_cursor_iter)
-    >>> prefix = hacker_controller.get_word_prefix(hacker_doc)
-    >>> print_prefix(prefix)
-    ('syntax_completer', 448, 464)
-
-    >>> h_cursor_iter.forward_cursor_positions(48)
-    True
-    >>> hacker_doc.place_cursor(h_cursor_iter)
-    >>> prefix = hacker_controller.get_word_prefix(hacker_doc)
-    >>> print_prefix(prefix)
-    ('_', 511, 512)
-
-
-insert_word()
-~~~~~~~~~~~~
-
-This method inserts a word into the document. It will raise an error
-if the word is None or an empty string.
-
-    >>> controller.insert_word(None, cursor_iter)
-    Traceback (most recent call last):
-    ...
-    AssertionError: The word cannot be None or an empty string.
-
-    >>> controller.insert_word('', cursor_iter)
-    Traceback (most recent call last):
-    ...
-    AssertionError: The word cannot be None or an empty string.
-
-Continuing from the document demonstrated in the get_word_prefix()
-section, words can be inserted into the first sentence. Inserting
-happens when the start iterator is None or it is the same position
-as the cursor.
-
-    >>> sentence_mark = document.create_mark(
-    ...     'sentence_end', cursor_iter, False)
-    >>> cursor_iter = document.get_start_iter()
-    >>> cursor_iter.forward_cursor_positions(12)
-    True
-    >>> document.place_cursor(cursor_iter)
-    >>> controller.insert_word('Est ', cursor_iter)
-    >>> document.get_text(document.get_start_iter(),
-    ...     document.get_iter_at_mark(sentence_mark), True)
-    'This is the Est Project Gutenberg Etext of The Hunting of the Snark.'
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> cursor_iter.backward_cursor_positions(1)
-    True
-    >>> document.place_cursor(cursor_iter)
-    >>> controller.insert_word('e', None)
-    >>> document.get_text(document.get_start_iter(),
-    ...     document.get_iter_at_mark(sentence_mark), True)
-    'This is the Este Project Gutenberg Etext of The Hunting of the Snark.'
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> document.place_cursor(cursor_iter)
-    >>> controller.insert_word('e')
-    >>> document.get_text(document.get_start_iter(),
-    ...     document.get_iter_at_mark(sentence_mark), True)
-    'This is the Estee Project Gutenberg Etext of The Hunting of the Snark.'
-
-The method can replace text in the document when a start iter is
-provided, and it is not the same position at the cursor. The text
-between the start and the cursor is deleted, and the word is inserted
-at the cursor position.
-
-    >>> start = document.get_iter_at_mark(document.get_insert())
-    >>> start.backward_chars(5)
-    True
-    >>> controller.insert_word('esteem', start)
-    >>> document.get_text(document.get_start_iter(),
-    ...     document.get_iter_at_mark(sentence_mark), True)
-    'This is the esteem Project Gutenberg Etext of The Hunting of the Snark.'
-
-
-GSignals
---------
-
-The SyntaxController relies on GSignals to respond the of Gedit.View
-and the SyntaxView.
-
-Signal test requires some help to isolate the emission and reception
-of the sginals.
-
-#    >>> signal_tester = SignalTester()
-#    >>> signal_tester.attachReceptionHarness(controller)
-#    >>> controller.testeeConnect(
-#    ...     controller, syntax_view, 'syntax-view', 'syntax-activated',
-#    ...     controller.on_proposal_activated)
-
-
-on_proposal_activated()
-~~~~~~~~~~~~~~~~~~~~~~~
-
-SyntaxView sends a syntax-activated signal to return the user's chosen
-word. The method calls insert_word. Unlike the afore mentioned method,
-when the word is None or an empty string, there is no error
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> cursor_iter.backward_chars(6)
-    True
-    >>> document.place_cursor(cursor_iter)
-
-When the word is None, the Document is no changed.
-
-    >>> controller.on_proposal_activated(None, None)
-    >>> document.get_text(document.get_start_iter(),
-    ...     document.get_iter_at_mark(sentence_mark), True)
-    'This is the esteem Project Gutenberg Etext of The Hunting of the Snark.'
-
-When the word is a string (as it should be), the word is inserted into
-the document. According the rules of insert_word(), when a space or
-symbol preceeds the cursor the word is inserted. Otherwise, the
-characters before the cursor are replaced.
-
-    >>> from gdp.syntaxcompleter import DynamicProposal
-
-    >>> proposal = DynamicProposal('ed')
-    >>> controller.on_proposal_activated(proposal, None)
-    True
-    >>> document.get_text(document.get_start_iter(),
-    ...     document.get_iter_at_mark(sentence_mark), True)
-    'This is the edesteem Project Gutenberg Etext of The Hunting of the Sn...'
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> cursor_iter.forward_chars(6)
-    True
-    >>> document.place_cursor(cursor_iter)
-
-    >>> proposal._word = 'esteemed'
-    >>> controller.on_proposal_activated(proposal, None)
-    True
-    >>> document.get_text(document.get_start_iter(),
-    ...     document.get_iter_at_mark(sentence_mark), True)
-    'This is the esteemed Project Gutenberg Etext of The Hunting of the Sn...'
-
-
-on_view_destroy() and deactivate()
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The deactivate() method removes the detaches the signals and removes
-view. The method is called by on_view_destroy() for the destroy signal.
-
-    >>> controller.view
-    <View ...>
-    >>> view.destroy()
-    >>> literal(controller.view)
-    None

=== removed file 'plugins/gdp/tests/syntaxcompleter-generator.doctest'
--- plugins/gdp/tests/syntaxcompleter-generator.doctest	2011-07-01 12:36:16 +0000
+++ plugins/gdp/tests/syntaxcompleter-generator.doctest	1970-01-01 00:00:00 +0000
@@ -1,367 +0,0 @@
-SyntaxGenerators
-================
-
-The a SyntaxGenerators class represents a word source and syntax rules.
-It can build a list of matching words when provided a word prefix.
-Some syntax completers require a Gedit.Document as their word source.
-
-
-SyntaxGenerator
----------------
-
-The base SyntaxGenerator class defines the core methods that all
-subclasses may choose override. It also provides several helper methods
-and properties. The __init__ method requires a Gedit.Document.
-
-    >>> from gi.repository import Gio
-    >>> from gdp.syntaxcompleter import BaseSyntaxGenerator
-    >>> generator = BaseSyntaxGenerator()
-    Traceback (most recent call last):
-    ...
-    TypeError: __init__() takes at least 2 arguments (1 given)
-
-    >>> from testing import Gedit 
-    >>> document = Gedit.Document()
-    >>> hunting_the_snark = 'plugins/gdp/data/snark12.txt'
-    >>> location = Gio.file_new_for_path(hunting_the_snark)
-    >>> document.load(location, None, 0, False)
-    >>> generator = BaseSyntaxGenerator(document)
-    >>> generator
-    <gdp.syntaxcompleter.BaseSyntaxGenerator object at ...>
-
-    >>> generator.file_path
-    'file:///...plugins/gdp/data/snark12.txt'
-    >>> generator.text == document.get_text(document.get_start_iter(),
-    ...     document.get_end_iter(), True)
-    True
-
-    >>> generator.get_words('Ba')
-    Traceback (most recent call last):
-    ...
-    NotImplementedError
-
-The string_before_cursor property and word_char attribute allow the
-generator sub-class to get the text before the cursor using its own
-rules.
-
-    generator.word_char.pattern
-    r'[\w_]'
-
-    generator.string_before_cursor
-    ''
-
-TextGenerator
--------------
-
-The TextGenerator class represents plain text sources. The words of the
-source are the words it represents, no alteration or interpretation is
-applied. Words are identified by common word boundaries like
-punctuation and line ends.
-
-    >>> from gdp.syntaxcompleter import TextGenerator
-    >>> text_generator = TextGenerator(document)
-    >>> text_generator
-    <gdp.syntaxcompleter.TextGenerator object at ...>
-
-    >>> text_generator.file_path
-    'file:///...plugins/gdp/data/snark12.txt'
-
-    >>> text_generator.text
-    'This is the Project Gutenberg Etext of The Hunting of the Snark...'
-
-The get_words() method returns a 2-tuple of is_authoritative and a list of
-all proposals in the generator.
-
-    >>> is_authoritative, proposals = text_generator.get_words()
-
-    >>> len(proposals)
-    1987
-
-    >>> type(proposals)
-    <type 'list'>
-
-    >>> proposals = sorted([proposal for proposal in proposals])
-    >>> proposals[0]
-    <DynamicProposal word="000" ...>
-
-    >>> [proposal._word for proposal in proposals][0:9]
-    ['000', '000x100', '03', '08', '1', '10', '1992', '2', '20']
-
-is_authoritative is always False because the TextGenerator works with all
-documents instead of a specific GtkSourceView Language.
-
-    >>> is_authoritative
-    False
-
-When the generator is created with a prefix, the generator will only
-contain words that start with the prefix. Matching is case-insensitive.
-
-    >>> text_generator = TextGenerator(document, prefix='Ba')
-    >>> is_authoritative, proposals = text_generator.get_words()
-    >>> len(proposals)
-    16
-    >>> sorted([proposal._word for proposal in proposals])
-    ['BAKER', 'BANKER', 'BARRISTER', 'Baker', 'Bandersnatch', ...]
-
-    >>> text_generator = TextGenerator(document, prefix='Snar')
-    >>> is_authoritative, proposals = text_generator.get_words()
-    >>> len(proposals)
-    5
-    >>> sorted([proposal._word for proposal in proposals])
-    ['SNARK', 'Snark', 'Snarks', 'snark12', 'snarked']
-
-    >>> text_generator = TextGenerator(document, prefix='snar')
-    >>> is_authoritative, lowercase_proposals = text_generator.get_words()
-    >>> lowercase_proposals == proposals
-    True
-
-    >>> text_generator = TextGenerator(document, prefix='SNAR')
-    >>> is_authoritative, uppercase_proposals = text_generator.get_words()
-    >>> lowercase_proposals == uppercase_proposals == proposals
-    True
-
-Hyphenated words are included in the list of words.
-
-    >>> text_generator = TextGenerator(document, prefix='What-')
-    >>> is_authoritative, proposals = text_generator.get_words()
-    >>> sorted([proposal._word for proposal in proposals])
-    ['What-was-his-name', 'What-you-may-call-um']
-
-Underscores are considered word characters. Words that start with, or
-contain underscores are included in the list of words.
-
-    >>> hacker_doc = Gedit.Document()
-    >>> hackerese = 'plugins/gdp/data/hackerese.txt'
-    >>> location = Gio.file_new_for_path(hackerese)
-    >>> hacker_doc.load(location, None, 0, False)
-    >>> print hacker_doc.get_text(hacker_doc.get_start_iter(),
-    ...     hacker_doc.get_end_iter(), True)
-    H... syntax_generator syntax_completer __call__(self) __dict__ file_ ...
-
-    >>> text_generator = TextGenerator(hacker_doc, prefix='_')
-    >>> is_authoritative, proposals = text_generator.get_words()
-    >>> sorted([proposal._word for proposal in proposals])
-    ['_', '__call__', '__dict__', '__init__', '_dict', '_private']
-
-
-PythonGenerator
----------------
-
-The PythonGenerator represents all the identifiers in a Python source
-file. The identifiers come from the document, the imports, the builtins,
-and the Python keywords.
-
-    >>> from gdp.syntaxcompleter import PythonSyntaxGenerator
-
-    >>> snark_py = 'plugins/gdp/data/snark.py'
-    >>> location = Gio.file_new_for_path(snark_py)
-    >>> document.load(location, None, 0, False)
-    >>> document.place_cursor(document.get_start_iter())
-    >>> python_generator = PythonSyntaxGenerator(document)
-    >>> python_generator
-    <gdp.syntaxcompleter.PythonSyntaxGenerator object at ...>
-
-    >>> python_generator.file_path
-    'file:///...plugins/gdp/data/snark.py'
-
-    >>> python_generator.text
-    '"""An example python module for testing."""...'
-
-The get_words() method returns a 2-tuple of is_authoritative and a set
-of all words in the generator.
-
-    >>> is_authoritative, proposals = python_generator.get_words('A')
-    >>> sorted([proposal._word for proposal in proposals])
-    ['ArithmeticError', 'AssertionError', 'AttributeError']
-
-The is_authoritative return value may be True or false. It is False when
-the set of words from more than one namespace and there is a prefix.
-
-    >>> is_authoritative
-    False
-
-Python keywords are among the symbols that can be matched.
-
-    >>> is_authoritative, proposals = python_generator.get_words('wh')
-    >>> sorted([proposal._word for proposal in proposals])
-    ['while']
-
-The generator uses the compiled module to get the symbols it contains.
-The private _get_parsable_text() method is responsible for returning
-compilable code. The line being edited is modified to ensure it is
-valid. This can be observed when the main() function is amended with
-some sample code.
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> cursor_iter.set_line(document.get_line_count() - 6)
-    >>> document.place_cursor(cursor_iter)
-    >>> document.insert_at_cursor("""
-    ...     found = False
-    ...     while not found:
-    ...         found = True
-    ...     """)
-
-When the line being edited starts a new block, it is replaced with
-with code (if True:) to ensure the module will compile.
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> success = cursor_iter.backward_lines(2)
-    >>> document.place_cursor(cursor_iter)
-    >>> parsable_lines = python_generator._get_parsable_text().splitlines()
-    >>> print '\n'.join(parsable_lines[77:80])
-        found = False
-        if True:
-            found = True
-
-When line has the same indentation as the next line, or it is the last
-line, it is replaced with 'pass'.
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> success = cursor_iter.forward_lines(1)
-    >>> document.place_cursor(cursor_iter)
-    >>> parsable_lines = python_generator._get_parsable_text().splitlines()
-    >>> print '\n'.join(parsable_lines[77:80])
-        found = False
-        while not found:
-            pass
-
-
-PythonProposal
-..............
-
-The PythonGenerator returns PythonProposals.
-
-    >>> location = Gio.file_new_for_path(snark_py)
-    >>> document.load(location, None, 0, False)
-    >>> document.place_cursor(document.get_end_iter())
-    >>> document.insert_at_cursor('os.path.j')
-    >>> is_authoritative, proposals = python_generator.get_words('j')
-    >>> proposals
-    [<PythonProposal word="join" ...]
-
-The PythonProposal has the identifier as the info. The do_get_info() method
-returns the PangoDoc formating of the instance's pydoc.
-
-    >>> proposal = proposals[0]
-    >>> proposal._info
-    <function join ...>
-
-    >>> print proposal.do_get_info()
-    <b>join</b>(a, *p)
-    Join two or more pathname components, inserting '/' as needed.
-    If any component is an absolute path, all previous path components
-    will be discarded.
-
-The pydoc is None if the info is None.
-
-    >>> proposal._info = None
-    >>> print proposal.do_get_info()
-    None
-
-MarkupGenerator
----------------
-
-The MarkupGenerator creates a vocabulary of elements from the tags used in
-the document.
-
-    >>> from gdp.syntaxcompleter import MarkupGenerator
-
-    >>> snark_html = 'plugins/gdp/data/snark.html'
-    >>> location = Gio.file_new_for_path(snark_html)
-    >>> document.load(location, None, 0, False)
-    >>> document.place_cursor(document.get_start_iter())
-    >>> markup_generator = MarkupGenerator(document)
-    >>> markup_generator
-    <gdp.syntaxcompleter.MarkupGenerator object at ...>
-
-    >>> markup_generator.file_path
-    'file:///...plugins/gdp/data/snark.html'
-
-    >>> print markup_generator.text
-    <html> <head> <title>The Hunting of The Snark</title> ...
-
-The get_words() method returns a 2-tuple of is_authoritative and a set
-of all words in the generator. When the cursor is not in a tag, there are no
-matches and the results are not authoritative. The cursor is outside a tag
-at the start of the document.
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> document.place_cursor(cursor_iter)
-    >>> is_authoritative, proposals = markup_generator.get_words()
-    >>> is_authoritative
-    False
-
-    >>> print markup_generator.get_cursor_context()
-    OUTSIDE
-
-    >>> sorted([proposal._word for proposal in proposals])
-    []
-
-The cursor is outside a tag when it is is between tags.
-
-    >>> cursor_iter.forward_lines(2)
-    True
-    >>> document.place_cursor(cursor_iter)
-    >>> is_authoritative, proposals = markup_generator.get_words()
-    >>> print markup_generator.get_cursor_context()
-    OUTSIDE
-
-When the cursor in the name of an open tag, all matching open or empty
-tags are listed.
-
-    >>> success = cursor_iter.forward_chars(10)
-    >>> document.place_cursor(cursor_iter)
-    >>> print markup_generator.string_before_cursor
-    title
-
-    >>> is_authoritative, proposals = markup_generator.get_words('title')
-    >>> is_authoritative
-    True
-
-    >>> print markup_generator.get_cursor_context()
-    INSIDE_OPEN
-
-    >>> sorted([proposal._word for proposal in proposals])
-    ['title']
-
-When the cursor is in the attribute portion of an open or empty tag, all
-known attributes are listed.
-
-    >>> document.insert_at_cursor(" l")
-    >>> print markup_generator.string_before_cursor
-    title l
-
-    >>> is_authoritative, proposals = markup_generator.get_words()
-    >>> is_authoritative
-    True
-
-    >>> print markup_generator.get_cursor_context()
-    INSIDE_ATTRIBUTES
-
-    >>> sorted([proposal._word for proposal in proposals])
-    ['class']
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> delete_iter = cursor_iter.copy()
-    >>> success = delete_iter.backward_chars(2)
-    >>> document.delete(delete_iter, cursor_iter)
-
-When the cursor is in the name of a close tag, only the names of the open
-tags listed.
-
-    >>> cursor_iter = document.get_iter_at_mark(document.get_insert())
-    >>> success = cursor_iter.forward_chars(34)
-    >>> document.place_cursor(cursor_iter)
-    >>> document.insert_at_cursor("<style>body {color: #333;}</")
-    >>> print markup_generator.string_before_cursor
-    /
-
-    >>> is_authoritative, proposals = markup_generator.get_words()
-    >>> is_authoritative
-    True
-
-    >>> print markup_generator.get_cursor_context()
-    INSIDE_CLOSE
-
-    >>> sorted([proposal._word for proposal in proposals])
-    ['head>', 'html>', 'style>']

=== removed file 'plugins/gdp/tests/syntaxcompleter-provider.doctest'
--- plugins/gdp/tests/syntaxcompleter-provider.doctest	2011-07-01 12:36:16 +0000
+++ plugins/gdp/tests/syntaxcompleter-provider.doctest	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-DynamicProvider for SyntaxCompleter
-===================================
-
-The DynamicProvider manages a list of proposals that may complete the
-prefix provided. It is used by SyntaxCompleter.
-
-
-DynamicProvider
----------------
-
-DynamicProvider is responsible for selecting a SyntaxGenerator that provides
-the words. DynamicProvider controls the filtering and retrieval of the
-words.
-
-The complete model requires a tuple of sources that identify and
-provide the data. The document is a Gedit.Document. The words in
-the document may be used to create the vocabulary. A prefix may be
-provided to filter the words in the vocabulary.
-
-    >>> from gi.repository import Gio
-    >>> from gdp.syntaxcompleter import DynamicProvider
-    >>> from testing import Gedit 
-
-    >>> DynamicProvider()
-    Traceback (most recent call last):
-    ...
-    TypeError: __init__() takes exactly 5 arguments (1 given)
-
-    >>> def handler(proposal, piter):
-    ...     return proposal.get_text()
-
-    >>> document = Gedit.Document()
-    >>> location = Gio.file_new_for_path('plugins/gdp/data/snark12.txt')
-    >>> document.load(location, None, 0, False)
-    >>> language_id = None
-    >>> provider = DynamicProvider("tester", language_id, handler, document)
-    >>> provider
-    <DynamicProvider object at ... (GDPDynamicProvider ...)>
-
-
-get_proposals()
-~~~~~~~~~~~~~~~
-
-The model calls get_proposals() to generate the unqiue list of words
-that match the prefix. The list must be unique because the
-CompleteModel.on_iter_next() can enter an infinite loop.
-
-    >>> proposals = provider.get_proposals(prefix='')
-    >>> len(proposals)
-    1987
-
-    >>> proposals = sorted([proposal for proposal in proposals])
-    >>> proposals[0]
-    <DynamicProposal word="000" ...>
-
-    >>> [proposal._word for proposal in proposals][0:9]
-    ['000', '000x100', '03', '08', '1', '10', '1992', '2', '20']
-
-
-get_generator()
-~~~~~~~~~~~~~~~
-
-The create_list() method uses the get_generator() method to get the generator
-for the language of the document.
-
-The TextGenerator is used for text documents and unsupported languages, but
-the get_generator() method does not return it because create_list() will
-instantiate it when the results are not authoritative.
-
-    >>> print provider.get_generator(document, '')
-    None
-
-The PythonSyntaxGenerator is returned for python files.
-
-    >>> python_document = Gedit.Document()
-    >>> location = Gio.file_new_for_path('plugins/gdp/data/snark.py')
-    >>> python_document.load(location, None, 0, False)
-    >>> language_id = python_document.get_language().get_id()
-    >>> print language_id
-    python
-    >>> provider = DynamicProvider(
-    ...     "tester", language_id, handler, python_document)
-    >>> provider.get_generator(python_document, '')
-    <gdp.syntaxcompleter.PythonSyntaxGenerator ...>
-
-The MarkupGenerator is returned for XML-based markup documents.
-
-    >>> markup_document = Gedit.Document()
-    >>> location = Gio.file_new_for_path('plugins/gdp/data/snark.html')
-    >>> markup_document.load(location, None, 0, False)
-    >>> language_id = markup_document.get_language().get_id()
-    >>> print language_id
-    html
-    >>> provider = DynamicProvider(
-    ...     "tester", language_id, handler, markup_document)
-    >>> provider.get_generator(markup_document, '')
-    <gdp.syntaxcompleter.MarkupGenerator ...>
-
-
-do_get_info_widget
-~~~~~~~~~~~~~~~~~~
-
-    >>> widget = provider.do_get_info_widget(None)
-    >>> widget
-    <ScrolledWindow ...>

=== added file 'plugins/gdp/tests/test_complete.py'
--- plugins/gdp/tests/test_complete.py	1970-01-01 00:00:00 +0000
+++ plugins/gdp/tests/test_complete.py	2012-02-07 18:01:21 +0000
@@ -0,0 +1,742 @@
+# Copyright (C) 2011-2012 - Curtis Hovey <sinzui.is at verizon.net>
+# This software is licensed under the MIT license (see the file COPYING).
+
+import os
+
+from gi.repository import (
+    GdkPixbuf,
+    Gtk,
+    GtkSource,
+    )
+
+from gdp import (
+    Config,
+    config,
+    )
+from gdp import complete
+from gdp.complete import (
+    BaseGenerator,
+    DynamicProposal,
+    DynamicProvider,
+    MarkupGenerator,
+    PangoDoc,
+    PythonProposal,
+    PythonGenerator,
+    Completer,
+    TextGenerator,
+    )
+from testing import SignalTester
+from testing import GeditTestCase
+
+
+class BaseGeneratorTestCase(GeditTestCase):
+
+    def test_properies(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        text = document.get_text(
+            document.get_start_iter(), document.get_end_iter(), True)
+        generator = BaseGenerator(document)
+        self.assertIn('plugins/gdp/data/snark12.txt', generator.file_path)
+        self.assertEqual(text, generator.text)
+        self.assertEqual(r'[\w_]', generator.word_char.pattern)
+        self.assertEqual('', generator.string_before_cursor)
+
+    def test_get_words_error(self):
+        # Subclass must implement get_words.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        generator = BaseGenerator(document)
+        self.assertRaises(NotImplementedError, generator.get_words, 'Ba')
+
+
+class TextGeneratorTestCase(GeditTestCase):
+
+    def test_get_words_without_prefix(self):
+        # Subclass must implement get_words.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        generator = TextGenerator(document)
+        is_authoritative, proposals = generator.get_words()
+        self.assertIs(False, is_authoritative)
+        self.assertEqual(1987, len(proposals))
+        self.assertIsInstance(proposals[0], DynamicProposal)
+        self.assertEqual(
+            ['000', '000x100', '03', '08', '1', '10', '1992', '2', '20'],
+            [proposal._word for proposal in sorted(proposals)][0:9])
+
+    def test_get_words_with_prefix(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        generator = TextGenerator(document, prefix='Ba')
+        is_authoritative, proposals = generator.get_words()
+        self.assertEqual(16, len(proposals))
+        self.assertEqual(
+            ['BAKER', 'BANKER', 'BARRISTER', 'Baker', 'Bandersnatch'],
+            [proposal._word for proposal in sorted(proposals)][0:5])
+
+    def test_get_words_case_insensitivity(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        generator = TextGenerator(document)
+        is_authoritative, lowercase_proposals = generator.get_words('snar')
+        is_authoritative, uppercase_proposals = generator.get_words('SNAR')
+        self.assertEqual(
+            ['SNARK', 'Snark', 'Snarks', 'snark12', 'snarked'],
+            [proposal._word for proposal in sorted(lowercase_proposals)])
+        self.assertEqual(lowercase_proposals, uppercase_proposals)
+
+    def test_get_words_with_hyphenation(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        generator = TextGenerator(document)
+        is_authoritative, proposals = generator.get_words('What-')
+        self.assertEqual(2, len(proposals))
+        self.assertEqual(
+            ['What-was-his-name', 'What-you-may-call-um'],
+            [proposal._word for proposal in sorted(proposals)])
+
+    def test_get_words_with_undescored(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/hackerese.txt')
+        generator = TextGenerator(document)
+        is_authoritative, proposals = generator.get_words('_')
+        self.assertEqual(6, len(proposals))
+        self.assertEqual(
+            ['_', '__call__', '__dict__', '__init__', '_dict', '_private'],
+            [proposal._word for proposal in sorted(proposals)])
+
+
+class MarkupGeneratorTestCase(GeditTestCase):
+
+    def test_string_before_cursor(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.html')
+        generator = MarkupGenerator(document)
+        cursor_iter = document.get_start_iter()
+        cursor_iter.forward_lines(2)
+        cursor_iter.forward_chars(10)
+        document.place_cursor(cursor_iter)
+        self.assertEqual(r'[^<>]', generator.word_char.pattern)
+        self.assertEqual('title', generator.string_before_cursor)
+
+    def test_get_words_outside_tag(self):
+        # There are no proposals when the cursor is outside of a tag.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.html')
+        document.place_cursor(document.get_start_iter())
+        generator = MarkupGenerator(document)
+        is_authoritative, proposals = generator.get_words()
+        self.assertIs(MarkupGenerator.OUTSIDE, generator.get_cursor_context())
+        self.assertEqual(set(), proposals)
+        self.assertIs(False, is_authoritative)
+
+    def test_get_words_inside_open_tag(self):
+        # The proposals match the unique tags uses in the document.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.html')
+        generator = MarkupGenerator(document)
+        cursor_iter = document.get_start_iter()
+        cursor_iter.forward_lines(2)
+        cursor_iter.forward_chars(10)
+        document.place_cursor(cursor_iter)
+        is_authoritative, proposals = generator.get_words('')
+        self.assertIs(
+            MarkupGenerator.INSIDE_OPEN, generator.get_cursor_context())
+        self.assertIs(True, is_authoritative)
+        self.assertEqual('title', generator.string_before_cursor)
+        self.assertEqual(
+            ['body', 'br', 'div', 'em', 'h1', 'h2', 'head', 'html',
+             'p', 'pre', 'title'],
+            [proposal._word for proposal in sorted(proposals)])
+
+    def test_get_words_inside_attributes_tag(self):
+        # The proposals match the unique attributes used in the document
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.html')
+        generator = MarkupGenerator(document)
+        cursor_iter = document.get_start_iter()
+        cursor_iter.forward_lines(2)
+        cursor_iter.forward_chars(10)
+        document.place_cursor(cursor_iter)
+        document.insert_at_cursor(" c")
+        is_authoritative, proposals = generator.get_words()
+        self.assertIs(
+            MarkupGenerator.INSIDE_ATTRIBUTES, generator.get_cursor_context())
+        self.assertIs(True, is_authoritative)
+        self.assertEqual('title c', generator.string_before_cursor)
+        self.assertEqual(
+            ['class'], [proposal._word for proposal in sorted(proposals)])
+
+    def test_get_words_inside_close_tag(self):
+        # The proposals match the unique tags that are open before the cursor.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.html')
+        generator = MarkupGenerator(document)
+        cursor_iter = document.get_start_iter()
+        cursor_iter.forward_lines(2)
+        cursor_iter.forward_chars(37)
+        document.place_cursor(cursor_iter)
+        is_authoritative, proposals = generator.get_words('')
+        self.assertIs(
+            MarkupGenerator.INSIDE_CLOSE, generator.get_cursor_context())
+        self.assertIs(True, is_authoritative)
+        self.assertEqual('/', generator.string_before_cursor)
+        self.assertEqual(
+            ['head>', 'html>', 'title>'],
+            [proposal._word for proposal in sorted(proposals)])
+
+
+class PythonGeneratorTestCase(GeditTestCase):
+
+    def test_kwlist(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        generator = PythonGenerator(document)
+        proposals = set(proposal._word for proposal in generator.kwlist)
+        self.assertTrue(set(['and', 'as', 'assert']).issubset(proposals))
+
+    def test_builtin(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        generator = PythonGenerator(document)
+        proposals = set(proposal._word for proposal in generator.builtin)
+        self.assertTrue(set(['list', 'str', 'xrange']).issubset(proposals))
+
+    def test_get_local_symbols(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        document.place_cursor(document.get_start_iter())
+        generator = PythonGenerator(document)
+        self.assertIs(None, generator._local_symsbols)
+        generator.get_words()
+        self.assertIsNone(None, generator._local_symsbols)
+        self.assertIs(
+            generator._local_symsbols, generator.get_local_symbols())
+        symbols = [pp._word for pp in generator.get_local_symbols()[0:3]]
+        self.assertEqual(['type', '__metaclass__', '__all__'], symbols)
+
+    def test_get_words_returns_pythonproposal(self):
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        generator = PythonGenerator(document)
+        document.place_cursor(document.get_end_iter())
+        document.insert_at_cursor('os.path.j')
+        is_authoritative, proposals = generator.get_words('j')
+        proposal = proposals[0]
+        self.assertIsInstance(proposal, PythonProposal)
+
+    def test_pythonproposal_do_get_info(self):
+        # do_get_info returns pydoc for the identifier.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        generator = PythonGenerator(document)
+        document.place_cursor(document.get_end_iter())
+        document.insert_at_cursor('os.path.j')
+        is_authoritative, proposals = generator.get_words('j')
+        proposal = proposals[0]
+        text = proposal.do_get_info()
+        self.assertIs(os.path.join, proposal._info)
+        self.assertIn(
+            '<b>join</b>(a, *p)\n    Join two or more pathname', text)
+
+    def test_pythonproposal_do_get_info_none(self):
+        # do_get_info returns None if the info is None.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        document.place_cursor(document.get_start_iter())
+        generator = PythonGenerator(document)
+        is_authoritative, proposals = generator.get_words('A')
+        proposal = proposals[0]
+        proposal._info = None
+        self.assertIs('', proposal.do_get_info())
+
+    def test_get_words_with_prefix(self):
+        # Python identifiers are matched, not words.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        document.place_cursor(document.get_start_iter())
+        generator = PythonGenerator(document)
+        is_authoritative, proposals = generator.get_words('A')
+        self.assertIn('An ',  generator.text)
+        self.assertEqual(3, len(proposals))
+        self.assertEqual(
+            ['ArithmeticError', 'AssertionError', 'AttributeError'],
+            [proposal._word for proposal in sorted(proposals)])
+
+    def test_get_words_with_keywords(self):
+        # Python keywords are matches.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        document.place_cursor(document.get_start_iter())
+        generator = PythonGenerator(document)
+        is_authoritative, proposals = generator.get_words('wh')
+        self.assertEqual(1, len(proposals))
+        self.assertEqual(
+            ['while'],
+            [proposal._word for proposal in sorted(proposals)])
+
+    def test_get_words_is_authoratative(self):
+        # The matches are authoritative when a namespace is
+        # matched without a prefix.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        document.place_cursor(document.get_start_iter())
+        cursor_iter = document.get_iter_at_mark(document.get_insert())
+        cursor_iter.set_line(document.get_line_count() - 6)
+        generator = PythonGenerator(document)
+        is_authoritative, proposals = generator.get_words('wh')
+        self.assertIs(False, is_authoritative)
+        document.place_cursor(document.get_end_iter())
+        document.insert_at_cursor('os.path.j')
+        is_authoritative, proposals = generator.get_words('j')
+        self.assertIs(True, is_authoritative)
+
+    def test_get_parsable_text_at_start_of_block(self):
+        # If the line being edited starts a block, get_parsable_text replaces
+        # line with code (if True:) that will guarantee the module will
+        # compile.
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark.py')
+        document.place_cursor(document.get_start_iter())
+        generator = PythonGenerator(document)
+        cursor_iter = document.get_iter_at_mark(document.get_insert())