--HG--

branch : pmacs2

method/__init__.py

@@ -939,10 +939,13 @@ class CloseTag(Method):
             i = len(tokens[y]) - 1
 
 class CloseParen(CloseTag):
+    '''Insert ), matching if applicable'''
     mytag = ')'
 class CloseBrace(CloseTag):
+    '''Insert }, matching if applicable'''
     mytag = '}'
 class CloseBracket(CloseTag):
+    '''Insert ], matching if applicable'''
     mytag = ']'
 
 class RegisterSave(Method):

method/help.py

@@ -4,9 +4,51 @@ from subprocess import Popen, PIPE, STDOUT
 import buffer, buffer.about
 import default, dirutil, regex, util, window
 from point import Point
-
+from mode import Fundamental
 from method import Method, Argument
 
+class ShowMode(Method):
+    '''Show helpful information for the current mode'''
+
+    def _execute(self, w, **vargs):
+        a = w.application
+        m = w.mode
+        f = Fundamental(w)
+
+        lines = ['%s mode' % m.modename, '']
+
+        seen    = set()
+        triples = []
+        l1, l2 = 0, 0
+        for keys in m.bindings:
+            if f.bindings.get(keys) == m.bindings.get(keys):
+                continue
+            name = m.bindings[keys]
+            seen.add(name)
+            l1 = max(l1, len(name))
+            l2 = max(l2, len(keys))
+            triples.append([name, keys, a.methods[name].help])
+
+        for cls in m.actions:
+            name = cls._name()
+            if name in seen:
+                continue
+            triples.append([name, '', a.methods[name].help])
+
+        last = None
+        lines.append('Key Bindings:')
+        for triple in sorted(triples):
+            name, keys, _help = triple
+            if name == last:
+                name = ''
+            else:
+                last = name
+            lines.append('  %-*s  %-*s  %s' % (l1, name, l2, keys, _help))
+        lines.append('')
+
+        data = '\n'.join(lines)
+        w.application.data_buffer("*Mode-Help*", data, switch_to=True)
+
 class ShowBindingsBuffer(Method):
     '''Dump all keybindings for current mode into a new buffer'''
     def _execute(self, w, **vargs):

mode/__init__.py

@@ -256,12 +256,14 @@ class Fundamental(Handler):
         self.add_bindings('insert-text', ('C-c i',))
         self.add_bindings('insert-text2', ('C-c M-i',))
         self.add_bindings('insert-multiline-text', ('C-c m',))
-        self.add_bindings('increment', ('M-+',))
+        self.add_bindings('increment', ('M-+', 'M-='))
         self.add_bindings('decrement', ('M--',))
 
         self.add_bindings('uppercase-word', ('M-u',))
         self.add_bindings('lowercase-word', ('M-l',))
 
+        i = 31
+
         # used for all word operations
         if not self.word_letters:
             self.word_letters = w.application.config['word_letters']

mode/forth.py

@@ -10,8 +10,6 @@ class DataGrammar(Grammar):
 class LineGrammar(Grammar):
     rules = [PatternRule(r'data', r'.+')]
 
-#class StringGrammar1(Grammar):
-#    rules = [PatternRule(r'data', r'[^\']+')]
 class StringGrammar3(Grammar):
     rules = [PatternRule(r'data', r'[^)]+')]