diff -Nru gedit-gmate-0.9.19~uorppa0/debian/changelog gedit-gmate-0.9.20~uorppa0/debian/changelog
--- gedit-gmate-0.9.19~uorppa0/debian/changelog	2011-06-30 09:22:24.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/debian/changelog	2011-09-28 19:41:53.000000000 +0000
@@ -1,3 +1,15 @@
+gedit-gmate (0.9.20~uorppa0) natty; urgency=low
+  * Add Highlight Edited Lines plugin.
+  * Add Text Map plugin.
+  * Add Simple Folding plugin.
+  * Add Multi Terminal plugin.
+  * Add MIME detection for RABL templetes.
+  * Add JS support to RHTML highlight.
+  * Add 'smart def' snippet for python.
+  * Fix rspec:capybara:background snippet.
+
+ -- Andrey Sitnik <andrey@sitnik.ru>  Wed, 28 Sep 2011 23:31:15 +0400
+
 gedit-gmate (0.9.19~uorppa0) natty; urgency=low
   * Replace plugin “Align” by “Align columns”.
   * Add Zoom plugin.
diff -Nru gedit-gmate-0.9.19~uorppa0/debian/control gedit-gmate-0.9.20~uorppa0/debian/control
--- gedit-gmate-0.9.19~uorppa0/debian/control	2011-06-30 09:22:24.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/debian/control	2011-09-28 19:41:53.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Andrey Sitnik <andrey@sitnik.ru>
 Build-Depends: debhelper (>= 7)
-Standards-Version: 0.9.19~uorppa0
+Standards-Version: 0.9.20~uorppa0
 Homepage: http://github.com/gmate/gmate
 Vcs-Git: git://github.com/gmate/gmate.git
 Vcs-Browser: http://github.com/gmate/gmate
diff -Nru gedit-gmate-0.9.19~uorppa0/debian/copyright gedit-gmate-0.9.20~uorppa0/debian/copyright
--- gedit-gmate-0.9.19~uorppa0/debian/copyright	2011-06-30 09:22:24.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/debian/copyright	2011-09-28 19:41:53.000000000 +0000
@@ -15,6 +15,7 @@
     disfated <disfated@gmail.com>
     Elia Sarti
     Eric Butler <eric@extremeboredom.net>
+    FaziBear
     Eugene Khorev <eugene.khorev@gmail.com>
     Fernando Luizão
     Franck Marcia <franck.marcia@gmail.com>
@@ -22,6 +23,7 @@
     Gary Haran <gary.haran@gmail.com>
     Hugo Maia Vieira <hugomaiavieira@gmail.com>
     Jonathan Walsh
+    Kawaikunee <kawaikunee0@gmail.com>
     Kevin McGuinness <kevin.mcguinness@gmail.com>
     Mads Buus Jensen <online@buus.net>
     Marc Harter <wavded@gmail.com>
@@ -60,6 +62,9 @@
     Copyright 2008-2010 Eugene Khorev
     Copyright 2011 disfated
     Copyright 2011 Hugo Maia Vieira
+    Copyright 2009 Kawaikunee
+    Copyright 2011 Dan Gindikin
+    Copyright 2008 FaziBear
 
 License:
 
diff -Nru gedit-gmate-0.9.19~uorppa0/lang-specs/rhtml.lang gedit-gmate-0.9.20~uorppa0/lang-specs/rhtml.lang
--- gedit-gmate-0.9.19~uorppa0/lang-specs/rhtml.lang	2011-06-30 09:22:25.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/lang-specs/rhtml.lang	2011-09-28 19:41:53.000000000 +0000
@@ -11,9 +11,10 @@
     <property name="globs">*.rhtml;*.html.erb;*.erb</property>
   </metadata>
   <styles>
-    <style id="comment" 		  _name="Comment"					map-to="xml:comment"/>
-    <style id="helper"			  _name="Rails helpers"/>
-    <style id="rubycode"	    _name="Ruby Code on RHtml"/>
+    <style id="comment"  _name="Comment" map-to="xml:comment"/>
+    <style id="js-block" _name="JavaScript Code"/>
+    <style id="helper"   _name="Rails helpers"/>
+    <style id="rubycode" _name="Ruby Code on RHtml"/>
   </styles>
   <definitions>
 
@@ -24,226 +25,235 @@
             <context ref="def:in-comment"/>
         </include>
     </context>
+    
+    <!-- JS code inside javascript_tag -->
+    <context id="js-block">
+        <start>&lt;%= javascript_tag do %&gt;</start>
+        <end>&lt;% end %&gt;</end>
+        <include>
+            <context ref="js:js"/>
+        </include>
+    </context>
 
     <!-- Rails Helpers -->
     <context id="helpers" style-ref="helper">
-			<keyword>add_expr_escaped</keyword>
-			<keyword>add_expr_literal</keyword>
-			<keyword>add_postamble</keyword>
-			<keyword>add_preamble</keyword>
-			<keyword>add_stmt</keyword>
-			<keyword>add_text</keyword>
-			<keyword>alert</keyword>
-			<keyword>append_if_string=</keyword>
-			<keyword>array_or_string_for_javascript</keyword>
-			<keyword>assign</keyword>
-			<keyword>atom_feed</keyword>
-			<keyword>audio_path</keyword>
-			<keyword>audio_tag</keyword>
-			<keyword>auto_discovery_link_tag</keyword>
-			<keyword>auto_link</keyword>
-			<keyword>build_callbacks</keyword>
-			<keyword>button_to</keyword>
-			<keyword>button_to_function</keyword>
-			<keyword>cache</keyword>
-			<keyword>call</keyword>
-			<keyword>capture</keyword>
-			<keyword>cdata_section</keyword>
-			<keyword>check_box</keyword>
-			<keyword>check_box_checked?</keyword>
-			<keyword>check_box_tag</keyword>
-			<keyword>clear_cache</keyword>
-			<keyword>collection_select</keyword>
-			<keyword>collection_without_template</keyword>
-			<keyword>collection_with_template</keyword>
-			<keyword>compile</keyword>
-			<keyword>concat</keyword>
-			<keyword>config</keyword>
-			<keyword>content_for</keyword>
-			<keyword>content_for?</keyword>
-			<keyword>content_tag</keyword>
-			<keyword>content_tag_for</keyword>
-			<keyword>controller_path=</keyword>
-			<keyword>counter_name</keyword>
-			<keyword>csrf_meta_tag</keyword>
-			<keyword>current_cycle</keyword>
-			<keyword>current_page?</keyword>
-			<keyword>cycle</keyword>
-			<keyword>date_select</keyword>
-			<keyword>datetime_select</keyword>
-			<keyword>debug</keyword>
-			<keyword>default_format</keyword>
-			<keyword>delay</keyword>
-			<keyword>determine_default_helper_class</keyword>
-			<keyword>distance_of_time_in_words</keyword>
-			<keyword>div_for</keyword>
-			<keyword>draggable</keyword>
-			<keyword>draggable_element</keyword>
-			<keyword>drop_receiving</keyword>
-			<keyword>drop_receiving_element</keyword>
-			<keyword>email_field</keyword>
-			<keyword>email_field_tag</keyword>
-			<keyword>emitted_hidden_id?</keyword>
-			<keyword>erb_trim_mode</keyword>
-			<keyword>error_message</keyword>
-			<keyword>error_wrapping</keyword>
-			<keyword>escape_javascript</keyword>
-			<keyword>escape_once</keyword>
-			<keyword>excerpt</keyword>
-			<keyword>exists?</keyword>
-			<keyword>favicon_link_tag</keyword>
-			<keyword>field_set_tag</keyword>
-			<keyword>fields_for</keyword>
-			<keyword>file_field</keyword>
-			<keyword>file_field_tag</keyword>
-			<keyword>find</keyword>
-			<keyword>find_all</keyword>
-			<keyword>find_layout</keyword>
-			<keyword>formats=</keyword>
-			<keyword>form_for</keyword>
-			<keyword>form_tag</keyword>
-			<keyword>from_rails_root</keyword>
-			<keyword>grouped_collection_select</keyword>
-			<keyword>grouped_options_for_select</keyword>
-			<keyword>handles_encoding?</keyword>
-			<keyword>helper_class</keyword>
-			<keyword>helper_method</keyword>
-			<keyword>hidden_field</keyword>
-			<keyword>hidden_field_tag</keyword>
-			<keyword>hide</keyword>
-			<keyword>highlight</keyword>
-			<keyword>image_path</keyword>
-			<keyword>image_submit_tag</keyword>
-			<keyword>image_tag</keyword>
-			<keyword>included</keyword>
-			<keyword>insert_html</keyword>
-			<keyword>inspect</keyword>
-			<keyword>javascript_include_tag</keyword>
-			<keyword>javascript_path</keyword>
-			<keyword>javascript_tag</keyword>
-			<keyword>label</keyword>
-			<keyword>label_tag</keyword>
-			<keyword>link_to</keyword>
-			<keyword>link_to_function</keyword>
-			<keyword>link_to_if</keyword>
-			<keyword>link_to_unless</keyword>
-			<keyword>link_to_unless_current</keyword>
-			<keyword>literal</keyword>
-			<keyword>locale</keyword>
-			<keyword>locale=</keyword>
-			<keyword>localize</keyword>
-			<keyword>locals</keyword>
-			<keyword>logger</keyword>
-			<keyword>mail_to</keyword>
-			<keyword>method_option_to_s</keyword>
-			<keyword>mime_type</keyword>
-			<keyword>model_name</keyword>
-			<keyword>new</keyword>
-			<keyword>number_field</keyword>
-			<keyword>number_field_tag</keyword>
-			<keyword>number_to_currency</keyword>
-			<keyword>number_to_human</keyword>
-			<keyword>number_to_human_size</keyword>
-			<keyword>number_to_percentage</keyword>
-			<keyword>number_to_phone</keyword>
-			<keyword>number_with_delimiter</keyword>
-			<keyword>number_with_precision</keyword>
-			<keyword>object</keyword>
-			<keyword>option_groups_from_collection_for_select</keyword>
-			<keyword>options_for_ajax</keyword>
-			<keyword>options_for_javascript</keyword>
-			<keyword>options_for_select</keyword>
-			<keyword>options_from_collection_for_select</keyword>
-			<keyword>password_field</keyword>
-			<keyword>password_field_tag</keyword>
-			<keyword>pluralize</keyword>
-			<keyword>query</keyword>
-			<keyword>radio_button</keyword>
-			<keyword>radio_button_checked?</keyword>
-			<keyword>radio_button_tag</keyword>
-			<keyword>range_field</keyword>
-			<keyword>range_field_tag</keyword>
-			<keyword>raw</keyword>
-			<keyword>redirect_to</keyword>
-			<keyword>register_javascript_expansion</keyword>
-			<keyword>register_javascript_include_default</keyword>
-			<keyword>register_stylesheet_expansion</keyword>
-			<keyword>reload</keyword>
-			<keyword>remote_function</keyword>
-			<keyword>remove</keyword>
-			<keyword>render</keyword>
-			<keyword>render_collection</keyword>
-			<keyword>_render_partial</keyword>
-			<keyword>render_partial</keyword>
-			<keyword>render_template</keyword>
-			<keyword>replace</keyword>
-			<keyword>replace_html</keyword>
-			<keyword>reset_cycle</keyword>
-			<keyword>reset_javascript_include_default</keyword>
-			<keyword>safe_concat</keyword>
-			<keyword>sanitize</keyword>
-			<keyword>sanitize_css</keyword>
-			<keyword>search_field</keyword>
-			<keyword>search_field_tag</keyword>
-			<keyword>select</keyword>
-			<keyword>select_date</keyword>
-			<keyword>select_datetime</keyword>
-			<keyword>select_day</keyword>
-			<keyword>select_hour</keyword>
-			<keyword>select_minute</keyword>
-			<keyword>select_month</keyword>
-			<keyword>select_second</keyword>
-			<keyword>select_tag</keyword>
-			<keyword>select_time</keyword>
-			<keyword>select_year</keyword>
-			<keyword>_set_detail</keyword>
-			<keyword>setup</keyword>
-			<keyword>setup_with_controller</keyword>
-			<keyword>show</keyword>
-			<keyword>simple_format</keyword>
-			<keyword>skip_default_locale!</keyword>
-			<keyword>sortable</keyword>
-			<keyword>sortable_element</keyword>
-			<keyword>strip_links</keyword>
-			<keyword>strip_tags</keyword>
-			<keyword>stylesheet_link_tag</keyword>
-			<keyword>stylesheet_path</keyword>
-			<keyword>submit</keyword>
-			<keyword>submit_tag</keyword>
-			<keyword>tag</keyword>
-			<keyword>telephone_field</keyword>
-			<keyword>telephone_field_tag</keyword>
-			<keyword>tests</keyword>
-			<keyword>text_area</keyword>
-			<keyword>text_area_tag</keyword>
-			<keyword>text_field</keyword>
-			<keyword>text_field_tag</keyword>
-			<keyword>time_ago_in_words</keyword>
-			<keyword>time_select</keyword>
-			<keyword>time_zone_options_for_select</keyword>
-			<keyword>time_zone_select</keyword>
-			<keyword>toggle</keyword>
-			<keyword>to_model</keyword>
-			<keyword>to_s</keyword>
-			<keyword>translate</keyword>
-			<keyword>truncate</keyword>
-			<keyword>update_details</keyword>
-			<keyword>update_page</keyword>
-			<keyword>update_page_tag</keyword>
-			<keyword>url_field</keyword>
-			<keyword>url_field_tag</keyword>
-			<keyword>url_for</keyword>
-			<keyword>url_options</keyword>
-			<keyword>value</keyword>
-			<keyword>value_before_type_cast</keyword>
-			<keyword>variable_name</keyword>
-			<keyword>video_path</keyword>
-			<keyword>video_tag</keyword>
-			<keyword>view_paths=</keyword>
-			<keyword>visual_effect</keyword>
-			<keyword>with_fallbacks</keyword>
-			<keyword>with_layout_format</keyword>
-			<keyword>word_wrap</keyword>
+      <keyword>add_expr_escaped</keyword>
+      <keyword>add_expr_literal</keyword>
+      <keyword>add_postamble</keyword>
+      <keyword>add_preamble</keyword>
+      <keyword>add_stmt</keyword>
+      <keyword>add_text</keyword>
+      <keyword>alert</keyword>
+      <keyword>append_if_string=</keyword>
+      <keyword>array_or_string_for_javascript</keyword>
+      <keyword>assign</keyword>
+      <keyword>atom_feed</keyword>
+      <keyword>audio_path</keyword>
+      <keyword>audio_tag</keyword>
+      <keyword>auto_discovery_link_tag</keyword>
+      <keyword>auto_link</keyword>
+      <keyword>build_callbacks</keyword>
+      <keyword>button_to</keyword>
+      <keyword>button_to_function</keyword>
+      <keyword>cache</keyword>
+      <keyword>call</keyword>
+      <keyword>capture</keyword>
+      <keyword>cdata_section</keyword>
+      <keyword>check_box</keyword>
+      <keyword>check_box_checked?</keyword>
+      <keyword>check_box_tag</keyword>
+      <keyword>clear_cache</keyword>
+      <keyword>collection_select</keyword>
+      <keyword>collection_without_template</keyword>
+      <keyword>collection_with_template</keyword>
+      <keyword>compile</keyword>
+      <keyword>concat</keyword>
+      <keyword>config</keyword>
+      <keyword>content_for</keyword>
+      <keyword>content_for?</keyword>
+      <keyword>content_tag</keyword>
+      <keyword>content_tag_for</keyword>
+      <keyword>controller_path=</keyword>
+      <keyword>counter_name</keyword>
+      <keyword>csrf_meta_tag</keyword>
+      <keyword>current_cycle</keyword>
+      <keyword>current_page?</keyword>
+      <keyword>cycle</keyword>
+      <keyword>date_select</keyword>
+      <keyword>datetime_select</keyword>
+      <keyword>debug</keyword>
+      <keyword>default_format</keyword>
+      <keyword>delay</keyword>
+      <keyword>determine_default_helper_class</keyword>
+      <keyword>distance_of_time_in_words</keyword>
+      <keyword>div_for</keyword>
+      <keyword>draggable</keyword>
+      <keyword>draggable_element</keyword>
+      <keyword>drop_receiving</keyword>
+      <keyword>drop_receiving_element</keyword>
+      <keyword>email_field</keyword>
+      <keyword>email_field_tag</keyword>
+      <keyword>emitted_hidden_id?</keyword>
+      <keyword>erb_trim_mode</keyword>
+      <keyword>error_message</keyword>
+      <keyword>error_wrapping</keyword>
+      <keyword>escape_javascript</keyword>
+      <keyword>escape_once</keyword>
+      <keyword>excerpt</keyword>
+      <keyword>exists?</keyword>
+      <keyword>favicon_link_tag</keyword>
+      <keyword>field_set_tag</keyword>
+      <keyword>fields_for</keyword>
+      <keyword>file_field</keyword>
+      <keyword>file_field_tag</keyword>
+      <keyword>find</keyword>
+      <keyword>find_all</keyword>
+      <keyword>find_layout</keyword>
+      <keyword>formats=</keyword>
+      <keyword>form_for</keyword>
+      <keyword>form_tag</keyword>
+      <keyword>from_rails_root</keyword>
+      <keyword>grouped_collection_select</keyword>
+      <keyword>grouped_options_for_select</keyword>
+      <keyword>handles_encoding?</keyword>
+      <keyword>helper_class</keyword>
+      <keyword>helper_method</keyword>
+      <keyword>hidden_field</keyword>
+      <keyword>hidden_field_tag</keyword>
+      <keyword>hide</keyword>
+      <keyword>highlight</keyword>
+      <keyword>image_path</keyword>
+      <keyword>image_submit_tag</keyword>
+      <keyword>image_tag</keyword>
+      <keyword>included</keyword>
+      <keyword>insert_html</keyword>
+      <keyword>inspect</keyword>
+      <keyword>javascript_include_tag</keyword>
+      <keyword>javascript_path</keyword>
+      <keyword>javascript_tag</keyword>
+      <keyword>label</keyword>
+      <keyword>label_tag</keyword>
+      <keyword>link_to</keyword>
+      <keyword>link_to_function</keyword>
+      <keyword>link_to_if</keyword>
+      <keyword>link_to_unless</keyword>
+      <keyword>link_to_unless_current</keyword>
+      <keyword>literal</keyword>
+      <keyword>locale</keyword>
+      <keyword>locale=</keyword>
+      <keyword>localize</keyword>
+      <keyword>locals</keyword>
+      <keyword>logger</keyword>
+      <keyword>mail_to</keyword>
+      <keyword>method_option_to_s</keyword>
+      <keyword>mime_type</keyword>
+      <keyword>model_name</keyword>
+      <keyword>new</keyword>
+      <keyword>number_field</keyword>
+      <keyword>number_field_tag</keyword>
+      <keyword>number_to_currency</keyword>
+      <keyword>number_to_human</keyword>
+      <keyword>number_to_human_size</keyword>
+      <keyword>number_to_percentage</keyword>
+      <keyword>number_to_phone</keyword>
+      <keyword>number_with_delimiter</keyword>
+      <keyword>number_with_precision</keyword>
+      <keyword>object</keyword>
+      <keyword>option_groups_from_collection_for_select</keyword>
+      <keyword>options_for_ajax</keyword>
+      <keyword>options_for_javascript</keyword>
+      <keyword>options_for_select</keyword>
+      <keyword>options_from_collection_for_select</keyword>
+      <keyword>password_field</keyword>
+      <keyword>password_field_tag</keyword>
+      <keyword>pluralize</keyword>
+      <keyword>query</keyword>
+      <keyword>radio_button</keyword>
+      <keyword>radio_button_checked?</keyword>
+      <keyword>radio_button_tag</keyword>
+      <keyword>range_field</keyword>
+      <keyword>range_field_tag</keyword>
+      <keyword>raw</keyword>
+      <keyword>redirect_to</keyword>
+      <keyword>register_javascript_expansion</keyword>
+      <keyword>register_javascript_include_default</keyword>
+      <keyword>register_stylesheet_expansion</keyword>
+      <keyword>reload</keyword>
+      <keyword>remote_function</keyword>
+      <keyword>remove</keyword>
+      <keyword>render</keyword>
+      <keyword>render_collection</keyword>
+      <keyword>_render_partial</keyword>
+      <keyword>render_partial</keyword>
+      <keyword>render_template</keyword>
+      <keyword>replace</keyword>
+      <keyword>replace_html</keyword>
+      <keyword>reset_cycle</keyword>
+      <keyword>reset_javascript_include_default</keyword>
+      <keyword>safe_concat</keyword>
+      <keyword>sanitize</keyword>
+      <keyword>sanitize_css</keyword>
+      <keyword>search_field</keyword>
+      <keyword>search_field_tag</keyword>
+      <keyword>select</keyword>
+      <keyword>select_date</keyword>
+      <keyword>select_datetime</keyword>
+      <keyword>select_day</keyword>
+      <keyword>select_hour</keyword>
+      <keyword>select_minute</keyword>
+      <keyword>select_month</keyword>
+      <keyword>select_second</keyword>
+      <keyword>select_tag</keyword>
+      <keyword>select_time</keyword>
+      <keyword>select_year</keyword>
+      <keyword>_set_detail</keyword>
+      <keyword>setup</keyword>
+      <keyword>setup_with_controller</keyword>
+      <keyword>show</keyword>
+      <keyword>simple_format</keyword>
+      <keyword>skip_default_locale!</keyword>
+      <keyword>sortable</keyword>
+      <keyword>sortable_element</keyword>
+      <keyword>strip_links</keyword>
+      <keyword>strip_tags</keyword>
+      <keyword>stylesheet_link_tag</keyword>
+      <keyword>stylesheet_path</keyword>
+      <keyword>submit</keyword>
+      <keyword>submit_tag</keyword>
+      <keyword>tag</keyword>
+      <keyword>telephone_field</keyword>
+      <keyword>telephone_field_tag</keyword>
+      <keyword>tests</keyword>
+      <keyword>text_area</keyword>
+      <keyword>text_area_tag</keyword>
+      <keyword>text_field</keyword>
+      <keyword>text_field_tag</keyword>
+      <keyword>time_ago_in_words</keyword>
+      <keyword>time_select</keyword>
+      <keyword>time_zone_options_for_select</keyword>
+      <keyword>time_zone_select</keyword>
+      <keyword>toggle</keyword>
+      <keyword>to_model</keyword>
+      <keyword>to_s</keyword>
+      <keyword>translate</keyword>
+      <keyword>truncate</keyword>
+      <keyword>update_details</keyword>
+      <keyword>update_page</keyword>
+      <keyword>update_page_tag</keyword>
+      <keyword>url_field</keyword>
+      <keyword>url_field_tag</keyword>
+      <keyword>url_for</keyword>
+      <keyword>url_options</keyword>
+      <keyword>value</keyword>
+      <keyword>value_before_type_cast</keyword>
+      <keyword>variable_name</keyword>
+      <keyword>video_path</keyword>
+      <keyword>video_tag</keyword>
+      <keyword>view_paths=</keyword>
+      <keyword>visual_effect</keyword>
+      <keyword>with_fallbacks</keyword>
+      <keyword>with_layout_format</keyword>
+      <keyword>word_wrap</keyword>
     </context>
     <!-- End Helpers -->
 
@@ -259,6 +269,7 @@
     <context id="rhtml">
       <include>
         <context ref="comment"/>
+        <context ref="js-block"/>
         <context ref="erb-block"/>
         <context ref="html:html"/>
       </include>
diff -Nru gedit-gmate-0.9.19~uorppa0/mime/rails.xml gedit-gmate-0.9.20~uorppa0/mime/rails.xml
--- gedit-gmate-0.9.19~uorppa0/mime/rails.xml	2011-06-30 09:22:25.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/mime/rails.xml	2011-09-28 19:41:53.000000000 +0000
@@ -50,6 +50,10 @@
     <glob pattern="*.rxml"/>
     <glob pattern="*.builder"/>
   </mime-type>
+  <mime-type type="application/x-ruby">
+    <comment>Ruby API Builder Language template</comment>
+    <glob pattern="*.rabl"/>
+  </mime-type>
   <mime-type type="text/x-yaml">
     <comment>YAML Ain't Markup Language</comment>
     <glob pattern="*.yml"/>
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit2/folding/folding.gedit-plugin gedit-gmate-0.9.20~uorppa0/plugins/gedit2/folding/folding.gedit-plugin
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit2/folding/folding.gedit-plugin	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit2/folding/folding.gedit-plugin	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,10 @@
+[Gedit Plugin]
+Loader=python
+Module=folding
+IAge=2
+Name=Simple Folding
+Description=Highlight the text and press Alt-Z to collapse. Put the cursor on the line, followed by indented text (such as def, if, class, etc.) and press Alt-Z to collapse a block of text indented. Put the cursor in a folded line and press Alt-Z to expand. Press Alt-X to expand all the collapsed blocks.
+Description[ru]=Выделите текст и нажмите Alt-Z для сворачивания. Поставьте курсор на строку, после которой идет текст с отступом (например def, if, class и т.п.) и нажмите Alt-Z чтобы свернуть блок текста с отступом. Поставьте курсор в свернутую строку и нажмите Alt-Z для разворачивания. Нажмите Alt-X для разворачивания всех свернутых блоков.
+Authors=Kawaikunee <kawaikunee0@gmail.com>
+Copyright=Copyright © 2009 Kawaikunee <kawaikunee0@gmail.com>
+Website=http://kawaikunee.blogspot.com
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit2/folding/folding.py gedit-gmate-0.9.20~uorppa0/plugins/gedit2/folding/folding.py
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit2/folding/folding.py	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit2/folding/folding.py	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,160 @@
+# -*- coding: utf-8 -*-
+import gtk
+import gedit
+
+ui_str = """<ui>
+	<menubar name="MenuBar">
+		<menu name="ToolsMenu" action="Tools">
+			<placeholder name="ToolsOps_2">
+				<menuitem name="Folding" action="FoldingPy"/>
+			</placeholder>
+		</menu>
+	</menubar>
+</ui>
+"""
+	
+class FoldingPyWindowHelper():
+	def __init__(self, plugin, window):
+		self._window = window
+		self._plugin = plugin
+		self._insert_menu()
+		self.update_ui()
+
+	def deactivate(self):
+		self._remove_menu()
+		self._window = None
+		self._plugin = None
+		self._action_group = None
+
+	def _insert_menu(self):
+		manager = self._window.get_ui_manager()
+		self._action_group = gtk.ActionGroup("FoldingPyPluginActions")
+		self._action_group.add_actions(
+			[
+				(
+					"FoldingPy", None, "Fold",
+					"<Alt>Z", "Fold",
+					self.fold
+				)
+			],
+		)
+		manager.insert_action_group(self._action_group, -1)
+		self._ui_id = manager.add_ui_from_string(ui_str)
+
+	def _remove_menu(self):
+		manager = self._window.get_ui_manager()
+		manager.remove_ui(self._ui_id)
+		manager.remove_action_group(self._action_group)
+		manager.ensure_update()
+
+	def update_ui(self):
+		self._action_group.set_sensitive(self._window.get_active_document() != None)
+		self.doc=self._window.get_active_document()
+		if self.doc:
+			self.view=self._window.get_active_view()
+			self.view.connect('key-press-event', self.fold_off)
+			
+			table=self.doc.get_tag_table()
+			self.fld=table.lookup('fld')
+			if self.fld==None:
+				self.fld=self.doc.create_tag('fld',foreground="#333333",paragraph_background="#aadc5c")
+			self.inv=table.lookup('inv')
+			if self.inv==None:
+				self.inv=self.doc.create_tag('inv',invisible=True)
+
+	def detect_sps(self,sps):
+		sps_lstrip=sps.lstrip()
+		i=sps.index(sps_lstrip)
+		sps=sps[:i]
+		return sps.count(' ')+sps.count('\t')*self.view.get_tab_width()
+
+	def fold_off(self,widget,e=None):
+		if e.hardware_keycode==53 and self.keycode==64:
+			s,e=self.doc.get_bounds()
+			self.doc.remove_tag(self.fld,s,e)
+			self.doc.remove_tag(self.inv,s,e)
+			self.keycode=53
+			print "SimpleFolding plugin: remove all fold"
+		else:
+			self.keycode=e.hardware_keycode
+
+	def fold(self, action):
+		a=self.doc.get_iter_at_mark(self.doc.get_insert())
+		if a.has_tag(self.fld):
+			try:
+				a.set_line_offset(0)
+				b=a.copy()
+				b.forward_line()
+				self.doc.remove_tag(self.fld,a,b)
+				a.forward_to_tag_toggle(self.inv)
+				b.forward_to_tag_toggle(self.inv)
+				self.doc.remove_tag(self.inv,a,b)
+				print "SimpleFolding plugin: remove one fold"
+			except:
+				pass
+
+		elif len(self.doc.get_selection_bounds())==2:
+			a,c=self.doc.get_selection_bounds()
+			b=a.copy()
+			a.set_line_offset(0)
+			b.forward_line()
+			c.forward_line()
+			self.doc.apply_tag(self.fld,a,b)
+			self.doc.remove_tag(self.fld,b,c)
+			self.doc.remove_tag(self.inv,b,c)
+			self.doc.apply_tag(self.inv,b,c)
+			print "SimpleFolding plugin: create fold by selection"
+
+		else:
+			s=a.copy()
+			s.set_line_offset(0)
+			line = s.get_line()
+			e=s.copy()
+			e.forward_line()
+			t=s.get_text(e)
+			if t.strip()!="":
+				main_indent = self.detect_sps(s.get_text(e))
+				ns=s.copy()
+				fin=ns.copy()
+				while 1==1:
+					if ns.forward_line():
+						ne=ns.copy()
+						if ne.get_char()=="\n":
+							continue
+						ne.forward_to_line_end()
+						text=ns.get_text(ne)
+						if text.strip()=="":
+							continue
+						child_indent=self.detect_sps(text)
+						if child_indent <= main_indent:
+							break
+						else:
+							line=ns.get_line()
+						fin=ns.copy()
+						fin.set_line(line)
+						fin.forward_line()
+					else:
+						fin=ne.copy()
+						fin.forward_to_end()
+						line=fin.get_line()
+						break
+				
+				if s.get_line()<line:
+					self.doc.apply_tag(self.fld,s,e)
+					self.doc.remove_tag(self.fld,e,fin)
+					self.doc.remove_tag(self.inv,e,fin)
+					self.doc.apply_tag(self.inv,e,fin)
+					print "SimpleFolding plugin: create fold by indent"
+
+
+class FoldingPyPlugin(gedit.Plugin):
+	def __init__(self):
+		gedit.Plugin.__init__(self)
+		self._instances = {}
+	def activate(self, window):
+		self._instances[window] = FoldingPyWindowHelper(self, window)
+	def deactivate(self, window):
+		self._instances[window].deactivate()
+		del self._instances[window]
+	def update_ui(self, window):
+		self._instances[window].update_ui()
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit2/highlight_edited_lines/highlight_edited_lines.gedit-plugin gedit-gmate-0.9.20~uorppa0/plugins/gedit2/highlight_edited_lines/highlight_edited_lines.gedit-plugin
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit2/highlight_edited_lines/highlight_edited_lines.gedit-plugin	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit2/highlight_edited_lines/highlight_edited_lines.gedit-plugin	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,9 @@
+[Gedit Plugin]
+Loader=python
+Module=highlight_edited_lines
+IAge=2
+Name=Highlight Edited Lines
+Description=Highlights lines changed during your edit session. [v. 0.1]
+Authors=Dan Gindikin <dgindikin@gmail.com>
+Copyright=Copyright © 2011 Dan Gindikin <dgindikin@gmail.com>
+Website=http://1dan.org
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit2/highlight_edited_lines/highlight_edited_lines.py gedit-gmate-0.9.20~uorppa0/plugins/gedit2/highlight_edited_lines/highlight_edited_lines.py
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit2/highlight_edited_lines/highlight_edited_lines.py	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit2/highlight_edited_lines/highlight_edited_lines.py	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,295 @@
+import gtk
+import gconf
+import gedit
+import copy
+
+version = "0.1"
+
+Xpm_Data = [
+  "16 16 2 1",
+  "       c None",
+  "X      c %s",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     ",
+  "          XX     "
+  ]
+
+CONFROOT = '/apps/gedit-2/plugins/highlight_edited_lines/'
+
+PREFS = {
+  'show_line_marks': True,
+  'line_marks_color': '#ff0000',
+  'highlight': True,
+  'highlight_bg_color': '#282828',
+}
+
+def new_pixbuf(color):
+  xpm = copy.copy(Xpm_Data)
+  xpm[2] = xpm[2]%color
+  return gtk.gdk.pixbuf_new_from_xpm_data(xpm)
+  
+def colorstr_from_gdkcolor(c):
+  s = c.to_string()
+  return '#'+s[1:3]+s[5:7]+s[9:11]
+  
+class PreferencesDialog(gtk.Dialog):
+
+  def __init__(M, window):
+    gtk.Dialog.__init__(M, parent=window)
+    M.view = window.get_active_view()
+    M.init_dialog(window)
+    
+    M.conf = gconf.client_get_default()
+
+    T = gtk.Table(2,3)
+    T.set_row_spacings(3)
+    T.set_col_spacings(3)
+    
+    # line marks
+    if 1:
+    
+      # label
+      if 1:
+        T.attach(gtk.Label("Line Marks:"),0,1,0,1)
+      
+      # checkbox
+      if 1:
+        cbut = gtk.CheckButton()
+        cbut.set_active(PREFS['show_line_marks'])
+        cbut.show()
+        cbut.connect("toggled", M.on_show_line_marks_toggled)
+        T.attach(cbut,1,2,0,1)
+        
+      # color button
+      if 1:
+        M.line_marks_WDGT = gtk.ColorButton(gtk.gdk.Color(PREFS['line_marks_color']))
+        M.line_marks_WDGT.set_sensitive(PREFS['show_line_marks'])
+        M.line_marks_WDGT.connect("color-set",M.on_line_marks_color_set)
+        T.attach(M.line_marks_WDGT,2,3,0,1)
+        
+    # highlight
+    if 1:
+      
+      # label
+      if 1:
+        al = gtk.Alignment(1,.5,0,0)
+        al.add(gtk.Label("Background:"))
+        T.attach(al,0,1,1,2)
+        
+      # checkbox
+      if 1:
+        w = gtk.CheckButton()
+        w.set_active(PREFS['highlight'])
+        w.show()
+        w.connect('toggled', M.on_highlight_bg_toggled)
+        T.attach(w,1,2,1,2)
+        
+      # color button
+      if 1:
+        M.highlight_bg_WDGT = gtk.ColorButton(gtk.gdk.Color(PREFS['highlight_bg_color']))
+        M.highlight_bg_WDGT.set_sensitive(PREFS['highlight'])
+        M.highlight_bg_WDGT.connect('color-set',M.on_highlight_bg_color_set)
+        T.attach(M.highlight_bg_WDGT,2,3,1,2)
+        
+    vbox = M.get_child()
+    vbox.add(T)
+    vbox.show_all()
+  
+  def on_highlight_bg_color_set(M, widget):
+    color = widget.get_color()
+    M.conf.set_string(CONFROOT+'highlight_bg_color',colorstr_from_gdkcolor(color))
+
+  def on_highlight_bg_toggled(M, widget):
+    flag = widget.get_active()
+    M.conf.set_bool(CONFROOT+'highlight',flag)
+    M.highlight_bg_WDGT.set_sensitive(flag)
+    
+  def on_line_marks_color_set(M, widget):
+    color = widget.get_color()
+    M.conf.set_string(CONFROOT+'line_marks_color',colorstr_from_gdkcolor(color))
+    
+  def on_show_line_marks_toggled(M,cbut):
+    flag = cbut.get_active()
+    M.conf.set_bool(CONFROOT+'show_line_marks',flag)
+    M.line_marks_WDGT.set_sensitive(flag)
+    
+  def init_dialog(M, window):
+    M.set_title("Highlight Edited Lines Preferences")
+    M.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)
+    M.set_default_response(gtk.RESPONSE_CLOSE)
+    M.set_has_separator(False)
+    M.set_transient_for(window)
+    M.set_resizable(False)
+    M.set_border_width(6)
+    M.set_modal(True)
+    on_response = lambda M, response: M.destroy()
+    M.connect("response", on_response)
+    
+class WinAttachedObject:
+  def __init__(M, win):
+    M.win            = win
+    M.connected_docs = []
+    M.win.connect("tab-added",M.on_win_tab_added)
+    
+  def getdoc(M):
+    tab = M.win.get_active_tab()
+    if not tab:
+      return
+    return tab.get_document()
+    
+  def getview(M): return M.win.get_active_view()
+        
+  def on_win_tab_added(M, win, tab):
+    #print 'tab added'
+    view = tab.get_view()
+    # create mark
+    view.set_mark_category_priority('EDITED',10)
+    # line mark
+    if PREFS['show_line_marks']:
+      view.set_show_line_marks(True)
+      view.set_mark_category_icon_from_pixbuf('EDITED',new_pixbuf(PREFS['line_marks_color']))
+    if PREFS['highlight']:
+      map = view.get_colormap()
+      view.set_mark_category_background('EDITED',map.alloc_color(PREFS['highlight_bg_color']))
+  def on_doc_loaded(M, doc, unused):
+    # the initial insertion of the entire text left a spurious mark
+    doc.remove_source_marks(doc.get_start_iter(),doc.get_end_iter())
+
+  def on_doc_insert_text(M, doc, loc, text, N):
+    N        = text.count('\n') + 1
+    nextchar = loc.get_char()
+    itr      = loc.copy()
+    if text[0]=='\n' and nextchar=='\n':
+      # we inserted a \n at end of line, leave that line alone
+      N -= 1
+    for i in range(N):
+      doc.create_source_mark(None,'EDITED',itr)
+      itr.backward_line()
+      
+  def on_doc_delete_range(M, doc, start, end):
+    if not start.ends_line():
+      doc.create_source_mark(None,'EDITED',start)
+    else:
+      doc.remove_source_marks(start, end, 'EDITED')
+
+  def update_ui(M):
+    doc = M.getdoc()
+    if not doc:
+      return
+    if id(doc) in M.connected_docs:
+      return
+    
+    # insert id() so that the doc is not kept alive by this list
+    M.connected_docs.append(id(doc)) 
+    
+    doc.connect("loaded", M.on_doc_loaded)
+    doc.connect_after("insert-text", M.on_doc_insert_text)
+    doc.connect("delete-range", M.on_doc_delete_range)
+    
+  def deactivate(M):
+    #print 'deactivate called'
+    # ?? turn off EDITED line mark
+    M.win.disconnect_by_func(M.on_win_tab_added)
+    for doc in M.win.get_documents():
+      if id(doc) in M.connected_docs:
+        doc.disconnect_by_func(M.on_doc_loaded)
+        doc.disconnect_by_func(M.on_doc_insert_text)
+      doc.disconnect_by_func(M.on_doc_delete_range)
+    M.connected_docs = []
+    
+
+class HighlightEditedLinesPlugin(gedit.Plugin):
+  def __init__(M):
+    gedit.Plugin.__init__(M)
+    conf=gconf.client_get_default()
+    
+    M.children = {}
+    
+    # read in preferences. if absent, set them
+    # register handler for their change
+    for key,get,set in (('show_line_marks',    conf.get_bool,   conf.set_bool),
+                        ('line_marks_color',   conf.get_string, conf.set_string),
+                        ('highlight',          conf.get_bool,   conf.set_bool),
+                        ('highlight_bg_color', conf.get_string, conf.set_string),):
+      if conf.get(CONFROOT+key) is None:
+        set(CONFROOT+key,PREFS[key])
+      else:
+        PREFS[key]=get(CONFROOT+key)
+      # ?? disconnect notification somewhere
+      conf.notify_add(CONFROOT+key, M.on_gconf_client_notify)
+    
+  def on_gconf_client_notify(M, conf, gconf_id, entry, data):
+    
+    key = entry.get_key().rsplit('/')[-1]
+    
+    if key == 'show_line_marks':
+    
+      PREFS['show_line_marks']=conf.get_bool(CONFROOT+key)
+      if PREFS['show_line_marks']:
+        pixbuf = new_pixbuf(PREFS['line_marks_color'])
+      else:
+        pixbuf = None
+      for win in M.children.keys():
+        for view in win.get_views():
+          if pixbuf:
+            view.set_show_line_marks(True)
+          view.set_mark_category_icon_from_pixbuf('EDITED',pixbuf)
+          
+    elif key == 'line_marks_color':
+    
+      PREFS['line_marks_color']=conf.get_string(CONFROOT+key)
+      # not showing line marks anyway, doesn't matter if the color changed
+      if not PREFS['show_line_marks']:
+        return
+      for win in M.children.keys():
+        for view in win.get_views():
+          view.set_mark_category_icon_from_pixbuf('EDITED',new_pixbuf(PREFS['line_marks_color']))
+    
+    elif key == 'highlight':
+    
+      PREFS['highlight'] = conf.get_bool(CONFROOT+key)        
+      for win in M.children:
+        for view in win.get_views():   
+          if PREFS['highlight']:
+            map = view.get_colormap()           
+            view.set_mark_category_background('EDITED',map.alloc_color(PREFS['highlight_bg_color']))
+          else:
+            view.set_mark_category_background('EDITED',None)
+            
+    elif key == 'highlight_bg_color':
+
+      PREFS['highlight_bg_color']=conf.get_string(CONFROOT+key)
+      if not PREFS['highlight']:
+        return
+      for win in M.children:
+        for view in win.get_views():
+          map = view.get_colormap()
+          view.set_mark_category_background('EDITED',map.alloc_color(PREFS['highlight_bg_color']))
+                  
+  def activate(M, win):
+    M.children[win] = WinAttachedObject(win)
+
+  def create_configure_dialog(M):
+    window = gedit.app_get_default().get_active_window()
+    return PreferencesDialog(window)
+        
+  def deactivate(M, win):
+    M.children[win].deactivate()
+
+  def update_ui(M, win):
+    # Called whenever the win has been updated (active tab changed, etc.)
+    M.children[win].update_ui()
+  
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit2/mterminal/mterminal.gedit-plugin gedit-gmate-0.9.20~uorppa0/plugins/gedit2/mterminal/mterminal.gedit-plugin
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit2/mterminal/mterminal.gedit-plugin	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit2/mterminal/mterminal.gedit-plugin	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,10 @@
+[Gedit Plugin]
+Loader=python
+Module=mterminal
+IAge=2
+Name=Embedded Terminal
+Description=Terminal with multiple windows
+Icon=gnome-terminal
+Authors=FaziBear
+Copyright=Copyright © 2008
+Website=http://fazibear.blogspot.com/2008/04/gedit-with-multi-terminal.html
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit2/mterminal/mterminal.py gedit-gmate-0.9.20~uorppa0/plugins/gedit2/mterminal/mterminal.py
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit2/mterminal/mterminal.py	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit2/mterminal/mterminal.py	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,313 @@
+# -*- coding: utf8 -*-
+
+# terminal.py - Embeded VTE terminal for gedit
+# This file is part of gedit
+#
+# Copyright (C) 2005-2006 - Paolo Borelli
+#
+# gedit is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# gedit is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with gedit; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, 
+# Boston, MA  02110-1301  USA
+
+import gedit
+import gedit.utils
+import pango
+import gtk
+import gobject
+import vte
+import gconf
+import gettext
+import gnomevfs
+import os
+from gpdefs import *
+
+try:
+    gettext.bindtextdomain(GETTEXT_PACKAGE, GP_LOCALEDIR)
+    _ = lambda s: gettext.dgettext(GETTEXT_PACKAGE, s);
+except:
+    _ = lambda s: s
+
+class GeditTerminal(gtk.HBox):
+    """VTE terminal which follows gnome-terminal default profile options"""
+
+    __gsignals__ = {
+        "populate-popup": (
+            gobject.SIGNAL_RUN_LAST,
+            None,
+            (gobject.TYPE_OBJECT,)
+        )
+    }
+
+    GCONF_PROFILE_DIR = "/apps/gnome-terminal/profiles/Default"
+    
+    defaults = {
+        'allow_bold'            : True,
+        'audible_bell'          : False,
+        'background'            : None,
+        'background_color'      : '#000000',
+        'backspace_binding'     : 'ascii-del',
+        'cursor_blinks'         : False,
+        'emulation'             : 'xterm',
+        'font_name'             : 'Monospace 10',
+        'foreground_color'      : '#AAAAAA',
+        'scroll_on_keystroke'   : False,
+        'scroll_on_output'      : False,
+        'scrollback_lines'      : 100,
+        'visible_bell'          : False,
+        'word_chars'            : '-A-Za-z0-9,./?%&#:_'
+    }
+
+    def __init__(self):
+        gtk.HBox.__init__(self, False, 4)
+
+        gconf_client.add_dir(self.GCONF_PROFILE_DIR,
+                             gconf.CLIENT_PRELOAD_RECURSIVE)
+
+        self._vte = vte.Terminal()
+        self.reconfigure_vte()
+        self._vte.set_size(self._vte.get_column_count(), 5)
+        self._vte.set_size_request(200, 50)
+        self._vte.show()
+        self.pack_start(self._vte)
+        
+        self._scrollbar = gtk.VScrollbar(self._vte.get_adjustment())
+        self._scrollbar.show()
+        self.pack_start(self._scrollbar, False, False, 0)
+        
+        gconf_client.notify_add(self.GCONF_PROFILE_DIR,
+                                self.on_gconf_notification)
+        
+        self._vte.connect("key-press-event", self.on_vte_key_press)
+        self._vte.connect("button-press-event", self.on_vte_button_press)
+        self._vte.connect("popup-menu", self.on_vte_popup_menu)
+        self._vte.connect("child-exited", lambda term: term.fork_command())
+
+        self._vte.fork_command()
+
+    def reconfigure_vte(self):
+        # Fonts
+        if gconf_get_bool(self.GCONF_PROFILE_DIR + "/use_system_font"):
+            font_name = gconf_get_str("/desktop/gnome/interface/monospace_font",
+                                      self.defaults['font_name'])
+        else:
+            font_name = gconf_get_str(self.GCONF_PROFILE_DIR + "/font",
+                                      self.defaults['font_name'])
+
+        try:
+            self._vte.set_font(pango.FontDescription(font_name))
+        except:
+            pass
+
+        # colors
+        fg_color = gconf_get_str(self.GCONF_PROFILE_DIR + "/foreground_color",
+                                 self.defaults['foreground_color'])
+        bg_color = gconf_get_str(self.GCONF_PROFILE_DIR + "/background_color",
+                                 self.defaults['background_color'])
+        self._vte.set_colors(gtk.gdk.color_parse (fg_color),
+                             gtk.gdk.color_parse (bg_color),
+                             [])
+
+        self._vte.set_cursor_blinks(gconf_get_bool(self.GCONF_PROFILE_DIR + "/cursor_blinks",
+                                                   self.defaults['cursor_blinks']))
+
+        self._vte.set_audible_bell(not gconf_get_bool(self.GCONF_PROFILE_DIR + "/silent_bell",
+                                                      not self.defaults['audible_bell']))
+
+        self._vte.set_scrollback_lines(gconf_get_int(self.GCONF_PROFILE_DIR + "/scrollback_lines",
+                                                     self.defaults['scrollback_lines']))
+        
+        self._vte.set_allow_bold(gconf_get_bool(self.GCONF_PROFILE_DIR + "/allow_bold",
+                                                self.defaults['allow_bold']))
+
+        self._vte.set_scroll_on_keystroke(gconf_get_bool(self.GCONF_PROFILE_DIR + "/scroll_on_keystroke",
+                                                         self.defaults['scroll_on_keystroke']))
+
+        self._vte.set_scroll_on_output(gconf_get_bool(self.GCONF_PROFILE_DIR + "/scroll_on_output",
+                                                      self.defaults['scroll_on_output']))
+
+        self._vte.set_word_chars(gconf_get_str(self.GCONF_PROFILE_DIR + "/word_chars",
+                                               self.defaults['word_chars']))
+
+        self._vte.set_emulation(self.defaults['emulation'])
+        self._vte.set_visible_bell(self.defaults['visible_bell'])
+
+    def on_gconf_notification(self, client, cnxn_id, entry, what):
+        self.reconfigure_vte()
+
+    def on_vte_key_press(self, term, event):
+        modifiers = event.state & gtk.accelerator_get_default_mod_mask()
+        if event.keyval in (gtk.keysyms.Tab, gtk.keysyms.KP_Tab, gtk.keysyms.ISO_Left_Tab):
+            if modifiers == gtk.gdk.CONTROL_MASK:
+                self.get_toplevel().child_focus(gtk.DIR_TAB_FORWARD)
+                return True
+            elif modifiers == gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK:
+                self.get_toplevel().child_focus(gtk.DIR_TAB_BACKWARD)
+                return True
+        return False
+
+    def on_vte_button_press(self, term, event):
+        if event.button == 3:
+            self.do_popup(event)
+            return True
+
+    def on_vte_popup_menu(self, term):
+        self.do_popup()
+
+    def create_popup_menu(self):
+        menu = gtk.Menu()
+
+        item = gtk.ImageMenuItem(gtk.STOCK_COPY)
+        item.connect("activate", lambda menu_item: self._vte.copy_clipboard())
+        item.set_sensitive(self._vte.get_has_selection())
+        menu.append(item)
+
+        item = gtk.ImageMenuItem(gtk.STOCK_PASTE)
+        item.connect("activate", lambda menu_item: self._vte.paste_clipboard())
+        menu.append(item)
+        
+        self.emit("populate-popup", menu)
+        menu.show_all()
+        return menu
+
+    def do_popup(self, event = None):
+        menu = self.create_popup_menu()
+   
+        if event is not None:
+	        menu.popup(None, None, None, event.button, event.time)
+        else:
+            menu.popup(None, None,
+                       lambda m: gedit.utils.menu_position_under_widget(m, self),
+                       0, gtk.get_current_event_time())
+            menu.select_first(False)        
+
+    def change_directory(self, path):
+        path = path.replace('\\', '\\\\').replace('"', '\\"')
+        self._vte.feed_child('cd "%s"\n' % path)
+
+    def add_terminal(self, terminal, panel):
+        bottom = terminal._window.get_bottom_panel()
+        term = GeditTerminal()
+        term.connect("populate-popup", terminal.on_panel_populate_popup)
+        term.show()
+
+        image = gtk.Image()
+        image.set_from_icon_name("utilities-terminal", gtk.ICON_SIZE_MENU)
+
+        bottom.add_item(term, _("Terminal"), image)
+        terminal._terminals.insert(0,term)
+
+    def remove_terminal(self, terminal, panel):
+        if len(terminal._terminals) <= 1:
+          return
+        bottom = terminal._window.get_bottom_panel()  
+        bottom.remove_item(panel)
+        terminal._terminals.remove(panel)
+
+class TerminalWindowHelper(object):
+    def __init__(self, window):
+        
+        self._terminals = []
+        self._window = window
+
+        term = GeditTerminal()
+        term.connect("populate-popup", self.on_panel_populate_popup)
+        term.show()
+
+        image = gtk.Image()
+        image.set_from_icon_name("utilities-terminal", gtk.ICON_SIZE_MENU)
+
+        bottom = window.get_bottom_panel()
+        bottom.add_item(term, _("Terminal"), image)
+        self._terminals.insert(0,term)
+
+    def deactivate(self):
+        bottom = self._window.get_bottom_panel()
+        for term in range(len(self._terminals)):
+            bottom.remove_item(self._terminals[term])
+        self._terminals = []
+    def update_ui(self):
+        pass
+
+    def get_active_document_directory(self):
+        doc = self._window.get_active_document()
+        if doc is None:
+            return None
+        uri = doc.get_uri()
+        if uri is not None and gedit.utils.uri_has_file_scheme(uri):
+            return os.path.dirname(gnomevfs.get_local_path_from_uri(uri))
+        return None
+
+    def on_panel_populate_popup(self, panel, menu):
+        menu.prepend(gtk.SeparatorMenuItem())
+        path = self.get_active_document_directory()
+        item = gtk.MenuItem(_("C_hange Directory"))
+        item.connect("activate", lambda menu_item: panel.change_directory(path))
+        item.set_sensitive(path is not None)
+        menu.prepend(item)
+        
+        menu.prepend(gtk.SeparatorMenuItem())
+
+        add = gtk.MenuItem(_("Remove Terminal"))
+        add.connect("activate", lambda menu_item: panel.remove_terminal(self, panel))
+        menu.prepend(add)
+        
+        add = gtk.MenuItem(_("New Terminal"))
+        add.connect("activate", lambda menu_item: panel.add_terminal(self,panel))
+        menu.prepend(add)
+        
+
+class TerminalPlugin(gedit.Plugin):
+    WINDOW_DATA_KEY = "TerminalPluginWindowData"
+
+    def __init__(self):
+        gedit.Plugin.__init__(self)
+
+    def activate(self, window):
+        helper = TerminalWindowHelper(window)
+        window.set_data(self.WINDOW_DATA_KEY, helper)
+
+    def deactivate(self, window):
+        window.get_data(self.WINDOW_DATA_KEY).deactivate()
+        window.set_data(self.WINDOW_DATA_KEY, None)
+
+    def update_ui(self, window):
+        window.get_data(self.WINDOW_DATA_KEY).update_ui()
+
+gconf_client = gconf.client_get_default()
+def gconf_get_bool(key, default = False):
+    val = gconf_client.get(key)
+    
+    if val is not None and val.type == gconf.VALUE_BOOL:
+        return val.get_bool()
+    else:
+        return default
+
+def gconf_get_str(key, default = ""):
+    val = gconf_client.get(key)
+    
+    if val is not None and val.type == gconf.VALUE_STRING:
+        return val.get_string()
+    else:
+        return default
+
+def gconf_get_int(key, default = 0):
+    val = gconf_client.get(key)
+    
+    if val is not None and val.type == gconf.VALUE_INT:
+        return val.get_int()
+    else:
+        return default
+
+
+# ex:ts=4:et: Let's conform to PEP8
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit2/textmap/textmap.gedit-plugin gedit-gmate-0.9.20~uorppa0/plugins/gedit2/textmap/textmap.gedit-plugin
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit2/textmap/textmap.gedit-plugin	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit2/textmap/textmap.gedit-plugin	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,9 @@
+[Gedit Plugin]
+Loader=python
+Module=textmap
+IAge=2
+Name=Text Map
+Description=Navigatable thumbnail of the entire file
+Authors=Dan Gindikin <dgindikin@gmail.com>
+Copyright=Copyright © 2011 Dan Gindikin <dgindikin@gmail.com>
+Website=http://www.gedit.org
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit2/textmap/textmap.py gedit-gmate-0.9.20~uorppa0/plugins/gedit2/textmap/textmap.py
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit2/textmap/textmap.py	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit2/textmap/textmap.py	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,1185 @@
+# Copyright 2011, Dan Gindikin <dgindikin@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+import gtk
+import time
+import gobject
+import gedit
+import sys
+import math
+import cairo
+import re
+import copy
+import platform
+
+version = "0.2 beta"
+
+# ------------------------------------------------------------------------------
+# These regular expressions are applied in sequence ot each line, to determine
+# whether it is a section start or not
+
+SectionREs = (
+  re.compile('def\s*(\w+)\s*\('),                          # python method
+  re.compile('class\s*(\w+)\s*'),                          # python/java class
+  
+  re.compile('cdef\s*class\s*(\w+)\s*[(:]'),               # cython class
+  re.compile('cdef\s*(?:[\w\.]*?\**\s*)?(\w+)\s*\('),      # cython method
+  
+  re.compile('^(\w*)\s*\('),                               # C method
+  re.compile('^\w+[\w\s\*]*?(\w*)\s*\('),                  # C method
+  
+  re.compile('^function\s*(\w+)\s*\('),                    # javascript method
+  
+  re.compile('\w+[\w\s]*?class (\w*)'),                    # java class
+)
+
+SubsectionREs = (
+  re.compile('\s+def\s*(\w+)\s*\('),                       # python class method
+  
+  re.compile('\s+cdef\s*(?:[\w\.]*?\**\s*)?(\w+)\s*\('),   # cython class method
+  
+  re.compile('\s+(?:public|static|private|final)[\w\s]*?(\w+)\s*\('), # java method
+)
+
+# ------------------------------------------------------------------------------
+
+class struct:pass
+
+class TimeRec:
+  def __init__(M):
+    M.tot = M.N = M.childtot = M.heretot = 0
+    M.start_ = None
+    
+class Timer:
+  'L == label'
+  def __init__(M):
+    M.dat = {}
+    M.stack = []
+  def push(M,L):
+    assert L not in M.stack,(L,M.stack)
+    M.stack.append(L)
+    tmrec = M.dat.setdefault(L,TimeRec())
+    tmrec.start_=time.time()
+  def pop(M,L):
+    assert M.stack[-1]==L,(L,M.stack)
+    M.stack.pop()
+    tmrec = M.dat[L]
+    dur = time.time()-tmrec.start_
+    tmrec.start_ = None
+    tmrec.tot += dur
+    tmrec.N += 1
+    #for parent in M.stack:
+    #  M.dat[parent].childtot += dur
+    if M.stack <> []:
+      M.dat[M.stack[-1]].childtot += dur
+  def print_(M):
+    for tmrec in M.dat.values():
+      tmrec.heretot = tmrec.tot-tmrec.childtot
+    R = sorted(M.dat.items(),lambda x,y:-cmp(x[1].heretot,y[1].heretot))
+    print '%7s %7s %5s' % ('Tm Here', 'Tm Avg', 'Count')
+    for L,tmrec in R:
+      print '%7s %7s %5d %s' % ('%.3f'%tmrec.heretot, '%.3f'%(tmrec.heretot/float(tmrec.N)), tmrec.N, L)
+    print
+      
+#TIMER = Timer()
+TIMER = None
+   
+def indent(s):
+  x = 0
+  for c in s:
+    if c == ' ':
+      x += 1
+    elif c == '\t':
+      x += 8
+    else:
+      break
+  return x
+  
+def probj(ob,*substrs):
+  meths = dir(ob)
+  meths.sort()
+  print ob,type(ob)
+  for m in meths:
+    doprint=True
+    if substrs:
+      doprint=False
+      for s in substrs:
+        if s in m:
+          doprint=True
+          break
+    if doprint:
+      print '%40s'%m
+      
+def match_RE_list(str, REs):
+  for r in REs:
+    m = r.match(str)
+    if m:
+      return m.groups()[0]
+  return None
+
+def document_lines(document):
+  if not document:
+    return None
+  #print 'document_lines',document
+  STR = document.get_property('text')
+  lines = STR.split('\n')
+  ans = []
+  for i,each in enumerate(lines):
+    x = struct()
+    x.i = i
+    x.len = len(each)
+    x.indent = indent(each)
+    x.raw = each
+    x.section = match_RE_list(x.raw,SectionREs)
+    x.subsection = None
+    x.search_match = False
+    if not x.section:
+      x.subsection = match_RE_list(x.raw,SubsectionREs)
+    if x.section or x.subsection:
+      match = Split_Off_Indent_Pattern.match(x.raw)
+      x.indentSTR = None
+      x.justextSTR = None
+      if match:
+        groups = match.groups()
+        if len(groups) == 2:
+          x.indentSTR, x.justextSTR = groups
+    ans.append(x)
+  return ans
+  
+def lines_add_section_len(lines):
+  line_prevsection = None
+  counter = 0
+  for i, line in enumerate(lines):
+    if line.section:
+      if line_prevsection:
+        line_prevsection.section_len = counter
+      line_prevsection = line
+      counter = 0
+    counter += 1
+  if line_prevsection:
+    line_prevsection.section_len = counter
+  return lines
+
+def lines_mark_changed_sections(lines):
+  sec = None
+  subsec = None
+  for line in lines:
+    if line.section:
+      line.sectionchanged = False
+      sec = line
+      subsec = None
+    if line.subsection:
+      line.subsectionchanged = False
+      subsec = line
+    if line.changed:
+      if sec is not None:
+        sec.sectionchanged = True
+      if subsec is not None:
+        subsec.subsectionchanged = True
+  return lines
+  
+BUG_MASK = 0
+
+BUG_CAIRO_MAC_FONT_REF  = 1
+BUG_CAIRO_TEXT_EXTENTS  = 2
+BUG_DOC_GET_SEARCH_TEXT = 4
+
+if platform.system() == 'Darwin':
+  BUG_MASK |= BUG_CAIRO_MAC_FONT_REF  # extra decref causes aborts, use less font ops
+
+major,minor,patch = gedit.version
+if major<=2 and minor<28:
+  BUG_MASK |= BUG_CAIRO_TEXT_EXTENTS  # some reference problem
+  BUG_MASK |= BUG_DOC_GET_SEARCH_TEXT # missing INCREF then
+  
+def text_extents(str,cr):
+  "code around bug in older cairo"
+  
+  if BUG_MASK & BUG_CAIRO_TEXT_EXTENTS:  
+    if str:
+      x, y = cr.get_current_point()
+      cr.move_to(0,-5)
+      cr.show_text(str)
+      nx,ny = cr.get_current_point()
+      cr.move_to(x,y)
+    else:
+      nx = 0
+      ny = 0
+
+    #print repr(str),x,nx,y,ny
+    ascent, descent, height, max_x_advance, max_y_advance = cr.font_extents()
+    
+    return nx, height
+  
+  else:
+  
+    x_bearing, y_bearing, width, height, x_advance, y_advance = cr.text_extents(str)
+    return width, height
+    
+def pr_text_extents(s,cr):
+  x_bearing, y_bearing, width, height, x_advance, y_advance = cr.text_extents(s)
+  print repr(s),':','x_bearing',x_bearing,'y_bearing',y_bearing,'width',width,'height',height,'x_advance',x_advance,'y_advance',y_advance
+  
+def show_section_label(str, fg, bg, cr):
+  tw,th = text_extents(str,cr)
+  x,y = cr.get_current_point()
+  cr.set_source_rgba(bg[0],bg[1],bg[2],.75)
+  cr.rectangle(x,y-th+3,tw,th)
+  cr.fill()
+  cr.move_to(x,y)
+  cr.set_source_rgb(*fg)
+  cr.show_text(str)
+    
+def fit_text(str, w, h, fg, bg, cr):
+  moved_down = False
+  originalx,_ = cr.get_current_point()
+  sofarH = 0
+  rn = []
+  if dark(*bg):
+    bg_rect_C = lighten(.1,*bg)
+  else:
+    bg_rect_C = darken(.1,*bg)
+    
+  while 1:
+    # find the next chunk of the string that fits
+    for i in range(len(str)):
+      tw, th = text_extents(str[:i],cr)
+      if tw > w:
+        break
+    disp = str[:i+1]
+    str = str[i+1:]
+    tw, th = text_extents(disp,cr)
+    
+    sofarH += th
+    if sofarH > h:
+      return rn
+    if not moved_down:
+      moved_down = True
+      cr.rel_move_to(0, th)
+      
+    # bg rectangle
+    x,y = cr.get_current_point()
+    #cr.set_source_rgba(46/256.,52/256.,54/256.,.75)
+    cr.set_source_rgba(bg_rect_C[0],bg_rect_C[1],bg_rect_C[2],.75)
+    if str:
+      cr.rectangle(x,y-th+2,tw,th+3)
+    else: # last line does not need a very big rectangle
+      cr.rectangle(x,y-th+2,tw,th)    
+    cr.fill()
+    cr.move_to(x,y)
+    
+    # actually display
+    cr.set_source_rgb(*fg)
+    cr.show_text(disp)
+    
+    # remember
+    rec = struct()
+    rec.x = x
+    rec.y = y
+    rec.th = th
+    rec.tw = tw
+    rn.append(rec)
+    
+    cr.rel_move_to(0,th+3)
+    x,y = cr.get_current_point()
+    cr.move_to(originalx,y)
+    
+    if not str:
+      break
+  return rn
+      
+def downsample_lines(lines, h, min_scale, max_scale):
+  n = len(lines)
+  
+  # pick scale
+  for scale in range(max_scale,min_scale-1,-1): 
+    maxlines_ = h/(.85*scale)
+    if n < 2*maxlines_:
+      break
+      
+  if n <= maxlines_:
+    downsampled = False
+    return lines, scale, downsampled
+    
+  # need to downsample
+  lines[0].score = sys.maxint # keep the first line
+  for i in range(1, len(lines)):
+    if lines[i].section:  # keep sections
+      lines[i].score = sys.maxint
+    elif lines[i].subsection:
+      lines[i].score = sys.maxint/2
+    elif lines[i].changed or lines[i].search_match:
+      lines[i].score = sys.maxint/2
+    else:
+      if 0: # get rid of lines that are very different
+        lines[i].score = abs(lines[i].indent-lines[i-1].indent) \
+                         + abs(len(lines[i].raw)-len(lines[i-1].raw))
+      if 1: # get rid of lines randomly
+        lines[i].score = hash(lines[i].raw)
+        if lines[i].score > sys.maxint/2:
+          lines[i].score -= sys.maxint/2
+                     
+  scoresorted = sorted(lines, lambda x,y: cmp(x.score,y.score))
+  erasures_ = int(math.ceil(n - maxlines_))
+  #print 'erasures_',erasures_
+  scoresorted[0:erasures_]=[]
+    
+  downsampled = True
+  
+  return sorted(scoresorted, lambda x,y:cmp(x.i,y.i)), scale, downsampled
+      
+def visible_lines_top_bottom(geditwin):
+  view = geditwin.get_active_view()
+  rect = view.get_visible_rect()
+  topiter = view.get_line_at_y(rect.y)[0]
+  botiter = view.get_line_at_y(rect.y+rect.height)[0]
+  return topiter.get_line(), botiter.get_line()
+      
+def dark(r,g,b):
+  "return whether the color is light or dark"
+  if r+g+b < 1.5:
+    return True
+  else:
+    return False
+    
+def darken(fraction,r,g,b):
+  return r-fraction*r,g-fraction*g,b-fraction*b
+  
+def lighten(fraction,r,g,b):
+  return r+(1-r)*fraction,g+(1-g)*fraction,b+(1-b)*fraction
+  
+def scrollbar(lines,topI,botI,w,h,bg,cr,scrollbarW=10):
+  "top and bot a passed as line indices"
+  # figure out location
+  topY = None
+  botY = None
+  for line in lines:
+    if not topY:
+      if line.i >= topI:
+        topY = line.y
+    if not botY:
+      if line.i >= botI:
+        botY = line.y
+  
+  if topY is None:
+    topY = 0
+  if botY is None:
+    botY = lines[-1].y
+
+  if 0: # bg rectangle     
+    cr.set_source_rgba(.1,.1,.1,.35)
+    cr.rectangle(w-scrollbarW,0,scrollbarW,topY)
+    cr.fill()
+    cr.rectangle(w-scrollbarW,botY,scrollbarW,h-botY)
+    cr.fill()
+    
+  if 0: # scheme 1
+    cr.set_line_width(1)
+    #cr.set_source_rgb(0,0,0)
+    #cr.set_source_rgb(1,1,1)
+    cr.set_source_rgb(0xd3/256.,0xd7/256.,0xcf/256.)
+    if 0: # big down line
+      cr.set_source_rgb(0xd3/256.,0xd7/256.,0xcf/256.)
+      cr.move_to(w-scrollbarW/2.,0)
+      cr.line_to(w-scrollbarW/2.,topY)
+      cr.stroke()
+      cr.move_to(w-scrollbarW/2.,botY)
+      cr.line_to(w-scrollbarW/2.,h)
+      cr.stroke()
+    if 0:
+      cr.rectangle(w-scrollbarW,topY,scrollbarW-1,botY-topY)
+      cr.stroke()
+    if 1: # bottom lines
+      #cr.set_line_width(2)
+      #cr.move_to(w-scrollbarW,topY)
+      cr.move_to(0,topY)
+      cr.line_to(w,topY)
+      cr.stroke()
+      cr.move_to(0,botY)
+      cr.line_to(w,botY)
+      cr.stroke()
+    if 0: # rect
+      cr.set_source_rgba(.5,.5,.5,.1)
+      #cr.set_source_rgba(.1,.1,.1,.35)
+      #cr.rectangle(w-scrollbarW,topY,scrollbarW,botY-topY)
+      cr.rectangle(0,topY,w,botY-topY)
+      cr.fill()
+
+  if 0: # scheme 2
+    cr.set_line_width(3)
+    cr.set_source_rgb(0xd3/256.,0xd7/256.,0xcf/256.)
+    if 1: # bottom lines
+      cr.move_to(0,topY)
+      cr.line_to(w,topY)
+      cr.stroke()
+      cr.move_to(0,botY)
+      cr.line_to(w,botY)
+      cr.stroke()
+    if 1: # side lines
+      cr.set_line_width(2)
+      len = (botY-topY)/8
+      margin = 1
+      if 0: # left
+        cr.move_to(margin,topY)
+        cr.line_to(margin,topY+len)
+        cr.stroke()
+        cr.move_to(margin,botY-len)
+        cr.line_to(margin,botY)
+        cr.stroke()
+      if 1: # right
+        cr.move_to(w-margin,topY)
+        cr.line_to(w-margin,topY+len)
+        cr.stroke()
+        cr.move_to(w-margin,botY-len)
+        cr.line_to(w-margin,botY)
+        cr.stroke()
+    if 0: # center
+      len = (botY-topY)/5
+      cx = w/2
+      cy = topY+(botY-topY)/2
+      if 1: # vert
+        for x in (cx,):#(cx-len/2,cx,cx+len/2):
+          cr.move_to(x,cy-len/2)
+          cr.line_to(x,cy+len/2)
+          cr.stroke()
+      if 0: # horiz
+        cr.move_to(cx-len/2,cy)
+        cr.line_to(cx+len/2,cy)
+        cr.stroke()
+    
+  if 0: # view indicator  
+    cr.set_source_rgba(.5,.5,.5,.5)
+    #cr.set_source_rgba(.1,.1,.1,.35)
+    cr.rectangle(w-scrollbarW,topY,scrollbarW,botY-topY)
+    cr.fill()
+    cr.rectangle(w-scrollbarW,topY,scrollbarW-1,botY-topY)
+    cr.set_line_width(.5)
+    cr.set_source_rgb(1,1,1)
+    #cr.set_source_rgb(0,0,0)
+    cr.stroke()
+  
+  if 0: # lines
+    cr.set_source_rgb(1,1,1)
+    cr.move_to(w,0)
+    cr.line_to(w-scrollbarW,topY)
+    cr.line_to(w-scrollbarW,botY)
+    cr.line_to(w,h)
+    cr.stroke()
+    
+  if 0: # scheme 3
+  
+    if 1: # black lines
+      cr.set_line_width(2)
+      cr.set_source_rgb(0,0,0)
+      cr.move_to(0,topY)
+      cr.line_to(w,topY)
+      cr.stroke()
+      cr.move_to(0,botY)
+      cr.line_to(w,botY)
+      cr.stroke() 
+      
+    if 1: # white lines
+      cr.set_line_width(2)
+      cr.set_dash([1,2])
+      cr.set_source_rgb(1,1,1)
+      cr.move_to(0,topY)
+      cr.line_to(w,topY)
+      cr.stroke()
+      cr.move_to(0,botY)
+      cr.line_to(w,botY)
+      cr.stroke()   
+  
+  if 0: # scheme 4
+    pat = cairo.LinearGradient(0,topY-10,0,topY)
+    pat.add_color_stop_rgba(0, 1, 1, 1,1)
+    pat.add_color_stop_rgba(1, .2,.2,.2,1)
+    pat.add_color_stop_rgba(2, 0, 0, 0,1)
+    cr.rectangle(0,topY-10,w,10)
+    cr.set_source(pat)
+    cr.fill()
+    
+  if 0: # triangle right
+    # triangle
+    size=12
+    midY = topY+(botY-topY)/2
+    cr.set_line_width(2)
+    cr.set_source_rgb(1,1,1)
+    cr.move_to(w-size-1,midY)
+    cr.line_to(w-1,midY-size/2)
+    #cr.stroke_preserve()
+    cr.line_to(w-1,midY+size/2)
+    #cr.stroke_preserve()
+    cr.line_to(w-size-1,midY)
+    cr.fill()
+    # line
+    cr.move_to(w-2,topY+2)
+    cr.line_to(w-2,botY-2)
+    cr.stroke()
+    
+  if dark(*bg):
+    color = (1,1,1)
+  else:
+    color = (0,0,0)
+    
+  if 0: # triangle left
+    # triangle
+    size=12
+    midY = topY+(botY-topY)/2
+    cr.set_line_width(2)
+    cr.set_source_rgb(*color)
+    cr.move_to(size+1,midY)
+    cr.line_to(1,midY-size/2)
+    #cr.stroke_preserve()
+    cr.line_to(1,midY+size/2)
+    #cr.stroke_preserve()
+    cr.line_to(size+1,midY)
+    cr.fill()
+    # line
+    #cr.move_to(2,topY+2)
+    #cr.line_to(2,botY-2)
+    #cr.stroke()
+    
+  if 1: # dashed lines
+    cr.set_line_width(2)
+    cr.set_source_rgb(*color)
+    cr.set_dash([8,8])
+    #cr.rectangle(2,topY,w-4,botY-topY)
+    cr.move_to(4,topY); cr.line_to(w,topY)
+    cr.stroke()
+    cr.move_to(4,botY); cr.line_to(w,botY)
+    cr.stroke()
+        
+def queue_refresh(textmapview):
+  try:
+    win = textmapview.darea.get_window()
+  except AttributeError:
+    win = textmapview.darea.window
+  if win:
+    w,h = win.get_size()
+    textmapview.darea.queue_draw_area(0,0,w,h)
+    
+def str2rgb(s):
+  assert s.startswith('#') and len(s)==7,('not a color string',s)
+  r = int(s[1:3],16)/256.
+  g = int(s[3:5],16)/256.
+  b = int(s[5:7],16)/256.
+  return r,g,b
+  
+def init_original_lines_info(doc,lines):
+  rn = []
+  # now we insert marks at the end of every line
+  iter = doc.get_start_iter()
+  n = 0
+  while 1:
+    if n>=len(lines):
+      break
+    more_left = iter.forward_line()
+    rec = struct()
+    lines[n].mark = doc.create_mark(None,iter,False) 
+    n+=1
+    if not more_left:
+      break
+  assert n>=len(lines)-1,(n,len(lines),'something off with our iterator logic')
+  if n==len(lines)-1:
+    lines[-1].mark=doc.create_mark(None,doc.get_end_iter(),False)
+  return lines
+  
+def mark_changed_lines(doc,original,current):
+  'unfortunate choice of name, has nothing to do with GtkTextBuffer marks'
+
+  # presume all current lines are changed
+  for line in current:
+    line.changed = True
+  
+  # mark any original lines we find as unchanged
+  start = doc.get_start_iter()
+  c=0
+  for oline in original:
+    end = doc.get_iter_at_mark(oline.mark)
+    slice = doc.get_slice(start,end)
+    # see if the first line between the marks is the original line
+    if slice.split('\n',1)[0] == oline.raw:
+      current[c].changed = False
+    # forward through all the slice lines
+    c += slice.count('\n')
+
+    start = end
+
+  return current
+      
+def lines_mark_search_matches(lines,docrec):
+  for line in lines:
+    if docrec.search_text and docrec.search_text in line.raw:
+      line.search_match = True
+    else:
+      line.search_match = False
+  return lines
+  
+Split_Off_Indent_Pattern = re.compile('(\s*)(.*)$')
+      
+class TextmapView(gtk.VBox):
+  def __init__(me, geditwin):
+    gtk.VBox.__init__(me)
+    
+    me.geditwin = geditwin
+    
+    darea = gtk.DrawingArea()
+    darea.connect("expose-event", me.expose)
+    
+    darea.add_events(gtk.gdk.BUTTON_PRESS_MASK)
+    darea.connect("button-press-event", me.button_press)
+    darea.connect("scroll-event", me.on_darea_scroll_event)
+    darea.add_events(gtk.gdk.ENTER_NOTIFY_MASK)
+    darea.connect("enter-notify-event", me.on_darea_enter_notify_event)
+    darea.add_events(gtk.gdk.LEAVE_NOTIFY_MASK)
+    darea.connect("leave-notify-event", me.on_darea_leave_notify_event)
+    darea.add_events(gtk.gdk.POINTER_MOTION_MASK)
+    darea.connect("motion-notify-event", me.on_darea_motion_notify_event)
+    
+    
+    me.pack_start(darea, True, True)
+    
+    me.darea = darea
+    #probj(me.darea)
+
+    me.connected = {}
+    me.draw_scrollbar_only = False
+    me.draw_sections = False
+    me.topL = None
+    me.surface_textmap = None
+    
+    me.line_count = 0
+    
+    me.doc_attached_data = {}
+    
+    me.show_all()
+    
+    # need this bc of a cairo bug, keep references to all our font faces
+    me.font_face_keepalive = None
+    
+     #'''
+     #   gtk.gdk.SCROLL_UP, 
+     #  gtk.gdk.SCROLL_DOWN, 
+     #  gtk.gdk.SCROLL_LEFT, 
+     #  gtk.gdk.SCROLL_RIGHT
+   #
+     #Example:
+   #
+     #  def on_button_scroll_event(button, event):
+     #    if event.direction == gtk.gdk.SCROLL_UP:
+     #       print "You scrolled up"
+     #       
+     #event = gtk.gdk.Event(gtk.gdk.EXPOSE)
+     #
+     #      def motion_notify(ruler, event):
+     #          return ruler.emit("motion_notify_event", event)
+     #      self.area.connect_object("motion_notify_event", motion_notify,
+     #                               self.hruler)
+     #      self.area.connect_object("motion_notify_event", motion_notify,
+     #                               self.vruler)
+     #'''
+  
+  def on_darea_motion_notify_event(me, widget, event):
+    #probj(event)
+    #print event.type
+    if event.state & gtk.gdk.BUTTON1_MASK:
+      me.scroll_from_y_mouse_pos(event.y)
+      
+  def on_darea_enter_notify_event(me, widget, event):
+    if event.mode.value_name == 'GDK_CROSSING_GTK_UNGRAB':
+      return
+    #print 'in here enter'
+    me.draw_sections = True
+    queue_refresh(me)
+    
+  def on_darea_leave_notify_event(me, widget, event):
+    #print 'in here leaving'
+    me.draw_sections = False
+    queue_refresh(me)
+    
+  def on_darea_scroll_event(me, widget, event):
+    pass
+    #print 'XXX on_darea_scroll_event'
+    
+    # this scheme does not work
+    # somehow pass this on, scroll the document/view
+    #print type(widget),widget,type(event),event
+    #probj(event)
+    #view = me.geditwin.get_active_view()
+    #if not view:
+    #  return
+    #return view.emit('scroll-event',event)
+
+    # the following crashes
+    #pagesize = 12
+    #topI,botI = visible_lines_top_bottom(me.geditwin)
+    #if event.direction == gtk.gdk.SCROLL_UP:
+    #  newI = topI - pagesize
+    #elif event.direction == gtk.gdk.SCROLL_DOWN:
+    #  newI = botI + pagesize
+    #else:
+    #  return
+    #  
+    #view = me.geditwin.get_active_view()
+    #doc  = me.geditwin.get_active_tab().get_document()
+    #view.scroll_to_iter(doc.get_iter_at_line_index(newI,0),0,False,0,0)
+    #
+    #queue_refresh(me)
+    
+  def on_doc_cursor_moved(me, doc):
+    #new_line_count = doc.get_line_count()
+    #print 'new_line_count',new_line_count
+    topL = visible_lines_top_bottom(me.geditwin)[0]
+    if topL <> me.topL:
+      queue_refresh(me)
+      me.draw_scrollbar_only = True
+    
+  def on_insert_text(me, doc, piter, text, len):
+    pass
+    #if len < 20 and '\n' in text:
+    #  print 'piter',piter,'text',repr(text),'len',len
+    
+  def scroll_from_y_mouse_pos(me,y):
+    for line in me.lines:
+      if line.y > y:
+        break
+    #print line.i, repr(line.raw)
+    view = me.geditwin.get_active_view()
+    doc = me.geditwin.get_active_tab().get_document()
+    
+    #doc.place_cursor(doc.get_iter_at_line_index(line.i,0))
+    #view.scroll_to_cursor()
+    #print view
+    
+    view.scroll_to_iter(doc.get_iter_at_line_index(line.i,0),0,True,0,.5)
+    
+    queue_refresh(me)
+        
+  def button_press(me, widget, event):
+    me.scroll_from_y_mouse_pos(event.y)
+    
+  def on_scroll_finished(me):
+    #print 'in here',me.last_scroll_time,time.time()-me.last_scroll_time
+    if time.time()-me.last_scroll_time > .47:
+      if me.draw_sections:
+        me.draw_sections = False
+        me.draw_scrollbar_only = False
+        queue_refresh(me)
+    return False
+    
+  def on_scroll_event(me,view,event):
+    me.last_scroll_time = time.time()
+    if me.draw_sections: # we are in the middle of scrolling
+      me.draw_scrollbar_only = True
+    else:
+      me.draw_sections = True # for the first scroll, turn on section names
+    gobject.timeout_add(500,me.on_scroll_finished) # this will fade out sections
+    queue_refresh(me)
+    
+  def on_search_highlight_updated(me,doc,t,u):
+    #print 'on_search_highlight_updated:',repr(doc.get_search_text())
+    docrec = me.doc_attached_data[id(doc)]
+    s = doc.get_search_text()[0]
+    if s <> docrec.search_text:
+      docrec.search_text = s
+      queue_refresh(me)    
+    
+  def test_event(me, ob, event):
+    print 'here',ob
+    
+  def save_refs_to_all_font_faces(me, cr, *scales):
+    me.font_face_keepalive = []
+    for each in scales:
+      cr.set_font_size(each)
+      me.font_face_keepalive.append(cr.get_font_face())
+    
+  def expose(me, widget, event):
+    doc = me.geditwin.get_active_tab().get_document()
+    if not doc:   # nothing open yet
+      return
+    
+    if id(doc) not in me.connected:
+      me.connected[id(doc)] = True
+      doc.connect("cursor-moved", me.on_doc_cursor_moved)
+      doc.connect("insert-text", me.on_insert_text)
+      doc.connect("search-highlight-updated", me.on_search_highlight_updated)
+      
+    view = me.geditwin.get_active_view()
+    if not view:
+      return
+    
+    if TIMER: TIMER.push('expose')
+    
+    if id(view) not in me.connected:
+      me.connected[id(view)] = True
+      view.connect("scroll-event", me.on_scroll_event)
+      #view.connect("start-interactive-goto-line", me.test_event)
+      #view.connect("start-interactive-search", me.test_event)
+      #view.connect("reset-searched-text", me.test_event)
+      
+    bg = (0,0,0)
+    fg = (1,1,1)
+    try:
+      style = doc.get_style_scheme().get_style('text')
+      if style is None: # there is a style scheme, but it does not specify default
+        bg = (1,1,1)
+        fg = (0,0,0)
+      else:
+        fg,bg = map(str2rgb, style.get_properties('foreground','background'))  
+    except Exception,e:
+      pass  # probably an older version of gedit, no style schemes yet
+    
+    changeCLR = (1,0,1)
+    
+    #search_match_style = None
+    #try:
+    #  search_match_style = doc.get_style_scheme().get_style('search-match')
+    #except:
+    #  pass
+    #if search_match_style is None:
+    #  searchFG = fg
+    #  searchBG = (0,1,0)
+    #else:
+    #  searchFG,searchBG = map(str2rgb, style.get_properties('foreground','background'))
+    searchFG = fg
+    searchBG = (0,1,0)
+      
+    
+    #print doc
+       
+    try:
+      win = widget.get_window()
+    except AttributeError:
+      win = widget.window
+    w,h = map(float,win.get_size())
+    cr = widget.window.cairo_create()
+    
+    #probj(cr,'rgb')
+    
+    # Are we drawing everything, or just the scrollbar?
+    fontfamily = 'sans-serif'
+    cr.select_font_face('monospace', cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_NORMAL)
+            
+    if me.surface_textmap is None or not me.draw_scrollbar_only:
+    
+      if TIMER: TIMER.push('document_lines')
+
+      lines = document_lines(doc)
+      
+      if TIMER: TIMER.pop('document_lines')
+      
+      if TIMER: TIMER.push('draw textmap')
+      
+      if id(doc) not in me.doc_attached_data:
+        docrec = struct()
+        me.doc_attached_data[id(doc)] = docrec
+        docrec.original_lines_info = None # we skip the first one, its empty
+        docrec.search_text = None
+        for l in lines:
+          l.changed = False
+      else:
+        docrec = me.doc_attached_data[id(doc)]
+        if docrec.original_lines_info == None:
+          docrec.original_lines_info = init_original_lines_info(doc,lines)
+        lines = mark_changed_lines(doc, docrec.original_lines_info, lines)
+        
+      if BUG_MASK & BUG_DOC_GET_SEARCH_TEXT:
+        pass
+      else:
+        docrec.search_text = doc.get_search_text()[0]
+        lines = lines_mark_search_matches(lines,docrec)
+     
+      cr.push_group()
+      
+      # bg
+      if 1:
+        #cr.set_source_rgb(46/256.,52/256.,54/256.)
+        cr.set_source_rgb(*bg)
+        cr.move_to(0,0)
+        cr.rectangle(0,0,w,h)
+        cr.fill()
+        cr.move_to(0,0)
+      
+      if not lines:
+        return
+        
+      # translate everthing in
+      margin = 3
+      cr.translate(margin,0)
+      w -= margin # an d here
+            
+      if TIMER: TIMER.push('downsample')
+      max_scale = 3
+      lines, scale, downsampled = downsample_lines(lines, h, 2, max_scale)
+      if TIMER: TIMER.pop('downsample')
+      
+      smooshed = False
+      if downsampled or scale < max_scale:
+        smooshed = True
+      
+      if TIMER: TIMER.push('lines_add_section_len')
+      lines = lines_add_section_len(lines)
+      if TIMER: TIMER.pop('lines_add_section_len')
+      
+      if TIMER: TIMER.push('lines_mark_changed_sections')
+      lines = lines_mark_changed_sections(lines)
+      if TIMER: TIMER.pop('lines_mark_changed_sections')
+
+      n = len(lines)
+      lineH = h/n
+      
+      #print 'doc',doc.get_uri(), lines[0].raw
+      
+      if BUG_MASK & BUG_CAIRO_MAC_FONT_REF and me.font_face_keepalive is None:
+        me.save_refs_to_all_font_faces(cr,scale,scale+3,10,12)
+      
+      cr.set_font_size(scale)
+      whitespaceW = text_extents('.',cr)[0]
+      #print pr_text_extents(' ',cr)
+      #print pr_text_extents('.',cr)
+      #print pr_text_extents(' .',cr)
+      
+      # ------------------------ display text silhouette -----------------------
+      if TIMER: TIMER.push('draw silhouette')
+      
+      if dark(*fg):
+        faded_fg = lighten(.5,*fg)
+      else:
+        faded_fg = darken(.5,*fg)
+          
+      rectH = h/float(len(lines))
+      sofarH= 0
+      sections = []
+      for i, line in enumerate(lines):
+      
+        line.y = sofarH
+        lastH = sofarH
+        cr.set_font_size(scale)
+        
+        if line.raw.strip(): # there is some text here
+            
+          tw,th = text_extents(line.raw,cr)
+        
+          if line.search_match:
+            cr.set_source_rgb(*searchBG)
+          elif line.changed:
+            cr.set_source_rgb(*changeCLR)
+          elif me.draw_sections:
+            cr.set_source_rgb(*faded_fg)
+          else:
+            cr.set_source_rgb(*fg)
+            
+          if line.section or line.subsection:
+            #cr.select_font_face(fontfamily, cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD)
+            cr.set_font_size(scale+3)
+            if line.justextSTR:
+              x,y = cr.get_current_point()
+              cr.move_to(whitespaceW*line.indent,y)
+              cr.show_text(line.justextSTR)
+            else:
+              cr.show_text(line.raw)
+          else:
+            #cr.select_font_face(fontfamily, cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_NORMAL)
+            cr.set_font_size(scale)
+            cr.show_text(line.raw)
+          
+          if smooshed:
+            sofarH += lineH
+          else:
+            sofarH += th
+        else: # empty line
+          if smooshed:
+            sofarH += lineH
+          else:
+            sofarH += scale-1
+          
+        if line.section:
+          sections.append((line, lastH))
+          
+        cr.move_to(0, sofarH)
+        
+      if TIMER: TIMER.pop('draw silhouette')
+          
+      # ------------------- display sections and subsections labels  ------------------
+
+      if me.draw_sections:
+        # Subsections
+        
+        if TIMER: TIMER.push('draw subsections')
+        
+        if dark(*bg):
+          bg_rect_C = lighten(.1,*bg)
+        else:
+          bg_rect_C = darken(.1,*bg)
+          
+        if 0: # - blot out the background -
+          cr.set_source_rgba(bg_rect_C[0],bg_rect_C[1],bg_rect_C[2],.5)
+          cr.rectangle(0,0,w,h)
+          cr.fill()
+        
+        cr.new_path()
+        cr.set_line_width(1.5)
+        subsW = 10
+        subsmargin = 10
+        cr.set_font_size(10)
+        for line in lines:
+          if line.subsection:
+            if 0:
+              cr.move_to(subsmargin,line.y)
+              cr.line_to(subsmargin+subsW,line.y)
+            #if line.subsectionchanged:
+            #  cr.set_source_rgb(*changeCLR)
+            #else:
+            #  cr.set_source_rgb(*fg)
+            if 0:
+              cr.set_source_rgb(*fg)
+              cr.arc(subsmargin,line.y+3,2,0,6.28)
+              cr.stroke()
+            if 1:
+              #cr.move_to(20,line.y)
+              cr.set_source_rgb(*fg)
+              #cr.show_text(line.subsection)
+              cr.move_to(whitespaceW*line.indent,line.y)
+              #cr.move_to(10,line.y)
+              #fit_text(line.subsection, 10000, 10000, fg, bg, cr)
+              show_section_label(line.subsection, fg, bg_rect_C, cr)
+              
+        if TIMER: TIMER.pop('draw subsections')
+        
+        # Sections
+        
+        if TIMER: TIMER.push('draw sections')
+        cr.set_font_size(12)
+        for line, lastH in sections:
+        
+          if 0: # section lines
+            cr.move_to(0, lastH)
+            cr.set_line_width(1)
+            cr.set_source_rgb(*fg)
+            cr.line_to(w,lastH)
+            cr.stroke()
+          
+          if 1: # section heading
+            cr.move_to(0,lastH)
+            #if line.sectionchanged:
+            #  cr.set_source_rgb(*changeCLR)
+            #else:
+            #  cr.set_source_rgb(*fg)
+            cr.set_source_rgb(*fg)         
+            #dispnfo = fit_text(line.section,4*w/5,line.section_len*rectH,fg,bg,cr)
+            show_section_label(line.section, fg, bg_rect_C, cr)
+            
+          if 0 and dispnfo: # section hatches
+            cr.set_line_width(1)
+            r=dispnfo[0] # first line
+            cr.move_to(r.x+r.tw+2,r.y-r.th/2+2)
+            cr.line_to(w,r.y-r.th/2+2)
+            cr.stroke()
+            
+        if TIMER: TIMER.pop('draw sections')
+          
+      # ------------------ translate back for the scroll bar -------------------
+      
+      cr.translate(-margin,0)
+      w += margin
+
+      # -------------------------- mark lines markers --------------------------
+            
+      if TIMER: TIMER.push('draw line markers')
+      for line in lines:
+        if line.search_match:
+          clr = searchBG
+        elif line.changed:
+          clr = changeCLR
+        else:
+          continue # nothing interesting has happened with this line
+        cr.set_source_rgb(*clr)      
+        cr.rectangle(w-3,line.y-2,2,5)
+        cr.fill()
+      if TIMER: TIMER.pop('draw line markers')
+        
+      if TIMER: TIMER.pop('draw textmap')
+      
+      # save
+      me.surface_textmap = cr.pop_group() # everything but the scrollbar
+      me.lines = lines
+
+    if TIMER: TIMER.push('surface_textmap')
+    cr.set_source(me.surface_textmap)
+    cr.rectangle(0,0,w,h)
+    cr.fill()
+    if TIMER: TIMER.pop('surface_textmap')
+        
+    # ------------------------------- scrollbar -------------------------------
+
+    if TIMER: TIMER.push('scrollbar')
+    
+    topL,botL = visible_lines_top_bottom(me.geditwin)
+    
+    if topL==0 and botL==doc.get_end_iter().get_line():
+      pass # everything is visible, don't draw scrollbar
+    else:
+      scrollbar(me.lines,topL,botL,w,h,bg,cr)
+    
+    if TIMER: TIMER.pop('scrollbar')
+    
+    me.topL = topL
+    me.draw_scrollbar_only = False
+    
+    if TIMER: TIMER.pop('expose')
+    if TIMER: TIMER.print_()
+      
+        
+class TextmapWindowHelper:
+  def __init__(me, plugin, window):
+    me.window = window
+    me.plugin = plugin
+
+    panel = me.window.get_side_panel()
+    image = gtk.Image()
+    image.set_from_stock(gtk.STOCK_DND_MULTIPLE, gtk.ICON_SIZE_BUTTON)
+    me.textmapview = TextmapView(me.window)
+    me.ui_id = panel.add_item(me.textmapview, "TextMap", image)
+    
+    me.panel = panel
+
+  def deactivate(me):
+    me.window = None
+    me.plugin = None
+    me.textmapview = None
+
+  def update_ui(me):
+    queue_refresh(me.textmapview)
+    
+class TextmapPlugin(gedit.Plugin):
+  def __init__(me):
+    gedit.Plugin.__init__(me)
+    me._instances = {}
+
+  def activate(me, window):
+    me._instances[window] = TextmapWindowHelper(me, window)
+
+  def deactivate(me, window):
+    if window in me._instances:
+      me._instances[window].deactivate()
+
+  def update_ui(me, window):
+    # Called whenever the window has been updated (active tab
+    # changed, etc.)
+    #print 'plugin.update_ui'
+    if window in me._instances:
+      me._instances[window].update_ui()
+      #window.do_expose_event()
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit3/rubyonrailsloader/rubyonrailsloader.plugin gedit-gmate-0.9.20~uorppa0/plugins/gedit3/rubyonrailsloader/rubyonrailsloader.plugin
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit3/rubyonrailsloader/rubyonrailsloader.plugin	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit3/rubyonrailsloader/rubyonrailsloader.plugin	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,9 @@
+[Plugin]
+Loader=python
+Module=rubyonrailsloader
+IAge=3
+Name=Rails File Loader
+Description=Detects if a File is a part of a Rails Project and set the language to RubyOnRails
+Authors=Hassan Zamani <hsn.zamani@gmail.com>
+Copyright=Copyright © 2011 Hassan Zamani <hsn.zamani@gmail.com>
+Website=http://www.gedit.org
diff -Nru gedit-gmate-0.9.19~uorppa0/plugins/gedit3/rubyonrailsloader/rubyonrailsloader.py gedit-gmate-0.9.20~uorppa0/plugins/gedit3/rubyonrailsloader/rubyonrailsloader.py
--- gedit-gmate-0.9.19~uorppa0/plugins/gedit3/rubyonrailsloader/rubyonrailsloader.py	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/plugins/gedit3/rubyonrailsloader/rubyonrailsloader.py	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,100 @@
+# Copyright (C) 2011 Hassan Zamani
+# Thanks to Alexandre da Silva
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+"""Automatically detects if file resides in a ruby on rails application and set the properly language."""
+
+import os
+from gi.repository import GObject, Gedit, GtkSource
+
+class RubyOnRailsLoader(GObject.Object, Gedit.WindowActivatable):
+    __gtype_name__ = "RubyOnRailsLoader"
+    name = __gtype_name__
+    
+    window = GObject.property(type=Gedit.Window)
+    
+    def __init__(self):
+        GObject.Object.__init__(self)
+    
+
+    def do_activate(self):
+        handler_id = self.window.connect("tab-added", self.on_tab_added)
+        self.window.set_data(self.name,  handler_id)
+        for doc in self.window.get_documents():
+            self.connect_document(doc)
+
+
+    def do_deactivate(self):
+        handler_id = self.window.get_data(self.name)
+        self.window.disconnect(handler_id)
+        self.window.set_data(self.name, None)
+    
+
+    def do_update_state(self):
+        pass
+        
+
+    def on_tab_added(self, window, tab):
+        doc = tab.get_document()
+        self.connect_document(doc)
+        
+
+    def connect_document(self, doc):
+        """Connect to doc's `load` signal."""
+        handler_id = doc.connect("loaded", self.on_document_load)
+        doc.set_data(self.name, handler_id)
+        
+
+    def on_document_load(self, doc, *args):
+        language = doc.get_language()
+        if language:
+            lang = language.get_id()
+            if lang == 'ruby':
+                uri = doc.get_uri_for_display()
+                if self.get_in_rails(uri):
+                    lang = GtkSource.LanguageManager.get_default().get_language('rubyonrails')
+                    doc.set_language(lang)
+
+
+    def get_in_rails(self, uri):
+        rails_root = self.get_data('RailsLoaderRoot')
+        if rails_root:
+            return rails_root
+        base_dir = os.path.dirname(uri)
+        depth = 10
+        while depth > 0:
+            depth -= 1
+            app_dir = os.path.join(base_dir, 'app')
+            config_dir = os.path.join(base_dir, 'config')
+            environment_file = os.path.join(base_dir, 'config', 'environment.rb')
+            if os.path.isdir(app_dir) and os.path.isdir(config_dir) and os.path.isfile(environment_file):
+                rails_root = base_dir
+                break
+            else:
+                base_dir = os.path.abspath(os.path.join(base_dir, '..'))
+        if rails_root:
+            self.set_data('RailsLoaderRoot', rails_root)
+            return True
+        return False
+
+
+    def set_data(self, name, value):
+        self.window.get_active_tab().get_view().set_data(name, value)
+
+
+    def get_data(self, name):
+        return self.window.get_active_tab().get_view().get_data(name)
+
diff -Nru gedit-gmate-0.9.19~uorppa0/README.markdown gedit-gmate-0.9.20~uorppa0/README.markdown
--- gedit-gmate-0.9.19~uorppa0/README.markdown	2011-06-30 09:22:25.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/README.markdown	2011-09-28 19:41:53.000000000 +0000
@@ -49,6 +49,7 @@
 * **Align columns**. Align text blocks into columns separated by pipe ( | )
 * **Classbrowser**. A Classbrowser (depends of ctags, I use exuberant-ctags).
 * **Encoding**. Reopen the document in a different encoding
+* **Embedded Terminal**. Terminal with multiple windows
 * **File Search**. This is a search plugin for Gedit to search for a text inside
   a directory. <https://github.com/oliver/gedit-file-search>
 * **Find in Project**. Search in the project with ack/grep.
@@ -58,6 +59,8 @@
 * **Gedit Open File**. Regex based file open (like textmate Go to file…).
 * **Gedit Todo**. Find Todo Marks in source files (integrated with filebrowser).
 * **Gemini**. Pair complete for quotes and braces.
+* **Highlight Edited Lines**. Highlights lines changed during your edit session.
+  <http://1dan.org/gedit-plugins/highlight-edited-lines/>
 * **Indent Converter**. Converts tabs to spaces and spaces to tabs.
 * **Multi Edit**. Check it out at author's page
   <http://jon-walsh.com/journal/multi-edit>
@@ -69,10 +72,13 @@
 * **Rails Hotkeys**. Navigation in Rails Project Files.
 * **Regex Search Replace**. Search and replace with regular expressions.
 * **Reopen Tabs**. Saves opened tabs on exit to restore them on next run.
+* **Simple Folding**. Collapse selected text.
 * **Smart Indent**. Smart Indentation regex based.
 * **Tabulation**. Auto set tabs and spaces based on file type.
 * **TextMate Style Autocompletion**. Better autocompletion. Tap `Esc` to cycle
   through the available completions.
+* **Text Map**. Navigatable thumbnail of the entire file
+  <http://1dan.org/gedit-plugins/textmap/>
 * **Text Tools**. Some text manipulation improvements (adapted from line tools).
 * **Trailsave**. Remove trailing spaces before save a document.
 * **Word Completion**. Word completion plugin.
diff -Nru gedit-gmate-0.9.19~uorppa0/snippets/gmate-python.xml gedit-gmate-0.9.20~uorppa0/snippets/gmate-python.xml
--- gedit-gmate-0.9.19~uorppa0/snippets/gmate-python.xml	1970-01-01 00:00:00.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/snippets/gmate-python.xml	2011-09-28 19:41:53.000000000 +0000
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='utf-8'?>
+<snippets language="python">
+  <snippet>
+    <text><![CDATA[$<
+import re
+global white_spaces
+white_spaces = ''
+regex=re.compile(r'(?P<white_spaces\>\s*)(def )?(?P<method\>[_ \w]+\w)[ ]?(\((?P<params\>.*)\))?:?')
+regex=regex.match($GEDIT_CURRENT_LINE)
+if regex:
+    dictionary=regex.groupdict()
+    method=dictionary['method'].replace(' ','_')
+    white_spaces=dictionary['white_spaces']
+    params= dictionary['params'] and 'self, ' + dictionary['params'] or 'self'
+    result = white_spaces + 'def ' + method + '(' + params + '):'
+else:
+    result = $GEDIT_CURRENT_LINE
+return result
+>
+	$<return white_spaces>]]></text>
+    <accelerator><![CDATA[<Control>u]]></accelerator>
+    <description>Smart def</description>
+  </snippet>
+</snippets>
diff -Nru gedit-gmate-0.9.19~uorppa0/snippets/rubyonrails.xml gedit-gmate-0.9.20~uorppa0/snippets/rubyonrails.xml
--- gedit-gmate-0.9.19~uorppa0/snippets/rubyonrails.xml	2011-06-30 09:22:25.000000000 +0000
+++ gedit-gmate-0.9.20~uorppa0/snippets/rubyonrails.xml	2011-09-28 19:41:53.000000000 +0000
@@ -1850,7 +1850,7 @@
     <description>rspec:capybara:scenario</description>
   </snippet>
   <snippet>
-    <text><![CDATA[background '${1:description}' do
+    <text><![CDATA[background do
 	$0
 end]]></text>
     <tag>background</tag>