strings often break config files

--HG--
branch : pmacs2
This commit is contained in:
Erik Osheim 2009-09-08 23:06:14 -04:00
parent 3a67c6eb10
commit 4643bf3d61
2 changed files with 8 additions and 8 deletions

View File

@ -6,8 +6,8 @@ class ConfGrammar(Grammar):
rules = [ rules = [
PatternRule('conf.comment', '#.*$'), PatternRule('conf.comment', '#.*$'),
PatternRule('conf.comment', '//.*$'), PatternRule('conf.comment', '//.*$'),
RegionRule('conf.string', "'", StringGrammar1, "'"), #RegionRule('conf.string', "'", StringGrammar1, "'"),
RegionRule('conf.string', '"', StringGrammar2, '"'), #RegionRule('conf.string', '"', StringGrammar2, '"'),
PatternRule('conf.data', r'(?:[^\'"#/]|/(?!/))+'), PatternRule('conf.data', r'(?:[^\'"#/]|/(?!/))+'),
] ]

View File

@ -329,7 +329,6 @@ class PerldocModule(PerlBase):
'''View documentation about this buffer using perldoc''' '''View documentation about this buffer using perldoc'''
bname = '*Perldoc*' bname = '*Perldoc*'
prog = 'use Pod::Text; Pod::Text->new()->parse_from_filehandle();'; prog = 'use Pod::Text; Pod::Text->new()->parse_from_filehandle();';
#prog = 'use Pod::Text::Termcap; Pod::Text::Termcap->new()->parse_from_filehandle();';
def get_args(self, w, **vargs): def get_args(self, w, **vargs):
return ('perl', '-e', self.prog) return ('perl', '-e', self.prog)
def _execute(self, w, **vargs): def _execute(self, w, **vargs):
@ -889,16 +888,17 @@ class Perl(Fundamental):
} }
format = "%(flag)s %(bname)-18s (%(mname)s) %(indent)s %(cursor)s %(perc)s [%(func)s] %(vc-info)s" format = "%(flag)s %(bname)-18s (%(mname)s) %(indent)s %(cursor)s %(perc)s [%(func)s] %(vc-info)s"
_bindings = { _bindings = {
'perl-set-lib': ('C-c l',),
'perl-check-syntax': ('C-c s',), 'perl-check-syntax': ('C-c s',),
'perl-hash-cleanup': ('C-c h',),
'perldoc-module': ('C-c v',),
'perldoc-word': ('C-c p',),
'perl-wrap-paragraph': ('M-q',),
'perl-goto-function': ('C-c M-g',), 'perl-goto-function': ('C-c M-g',),
'perl-hash-cleanup': ('C-c h',),
'perl-open-module': ('C-c C-f',), 'perl-open-module': ('C-c C-f',),
'perl-open-module-word': ('C-c M-f',), 'perl-open-module-word': ('C-c M-f',),
'perl-run': ('C-c r',),
'perl-semantic-complete': ('C-c TAB',), 'perl-semantic-complete': ('C-c TAB',),
'perl-set-lib': ('C-c l',),
'perl-wrap-paragraph': ('M-q',),
'perldoc-module': ('C-c v',),
'perldoc-word': ('C-c p',),
'close-paren': (')'), 'close-paren': (')'),
'close-bracket': (']'), 'close-bracket': (']'),
'close-brace': ('}'), 'close-brace': ('}'),