d6
/
pmacs3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge 

--HG--
branch : pmacs2
This commit is contained in:
Erik Osheim 2009-08-26 10:08:24 -04:00
parent f69ec62f08 e2d0b8d13b
commit abc57cfd80
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mode/sh.py
View File

@ -48,7 +48,7 @@ EvalGrammar.rules = [
PatternRule(r'variable', r"\${(?:" + word + "|\?\$)}"), PatternRule(r'variable', r"\${(?:" + word + "|\?\$)}"),
PatternRule(r"variable", r"\$" + word), PatternRule(r"variable", r"\$" + word),
PatternRule(r'variable', r"\$(?=\()"), PatternRule(r'variable', r"\$(?=\()"),
PatternRule(r'data', r'[^\\`$]+'), PatternRule(r'data', r'[^\\`$\'"]+'),
] ]
NevalGrammar.rules = [ NevalGrammar.rules = [

3
tab.py
View File

@ -412,7 +412,8 @@ class StackTabber2(Tabber):
self.stack.pop() self.stack.pop()
if t.string in self.open_scope_tokens.get(t.name, set()): if t.string in self.open_scope_tokens.get(t.name, set()):
#self._pop_while('continue', 'control') #self._pop_while('continue', 'control')
self._pop_while('continue') #self._pop_while('continue')
self._pop('continue', 'control')
if i == 0 and t.string in self.open_scope_tokens.get(t.name, set()): if i == 0 and t.string in self.open_scope_tokens.get(t.name, set()):
self._save_curr_level() self._save_curr_level()