Mercurial > emacs
comparison lisp/textmodes/ispell.el @ 107120:f9eab02425f0
Merge from trunk
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 10 Feb 2010 08:47:34 +0100 |
parents | e4a4161df485 |
children | 0c5ef72c7a9d 376148b31b5e |
comparison
equal
deleted
inserted
replaced
107119:e90c20914c19 | 107120:f9eab02425f0 |
---|---|
3457 ;; Matches shell files (especially auto-decoding) | 3457 ;; Matches shell files (especially auto-decoding) |
3458 "^#! /bin/[ck]?sh" | 3458 "^#! /bin/[ck]?sh" |
3459 ;; Matches context difference listing | 3459 ;; Matches context difference listing |
3460 "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" | 3460 "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" |
3461 ;; Matches unidiff difference listing | 3461 ;; Matches unidiff difference listing |
3462 "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@\n" | 3462 "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@" |
3463 ;; Matches reporter.el bug report | 3463 ;; Matches reporter.el bug report |
3464 "^current state:\n==============\n" | 3464 "^current state:\n==============\n" |
3465 ;; Matches commonly used "cut" boundaries | 3465 ;; Matches commonly used "cut" boundaries |
3466 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)") | 3466 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)") |
3467 "\\|") | 3467 "\\|") |