diff options
| author | Michal Nazarewicz | 2014-06-05 16:39:18 +0200 |
|---|---|---|
| committer | Michal Nazarewicz | 2014-06-05 16:39:18 +0200 |
| commit | 9342feecdd92b769b1f45a6feea8ad34985c5049 (patch) | |
| tree | 5be0d974eccfc0bb98effbe6735cb29271f13d69 /lisp/ChangeLog | |
| parent | af9a3b28c0ca250ed245bd54c8737792916fe4c6 (diff) | |
| download | emacs-9342feecdd92b769b1f45a6feea8ad34985c5049.tar.gz emacs-9342feecdd92b769b1f45a6feea8ad34985c5049.zip | |
tildify.el: Fix matched group indexes in end-regex building
* lisp/textmodes/tildifi.el (tildify-find-env): When looking for
a start of an ignore-environment, the regex is built by
concatenating regexes of all the environments configured in
`tildify-ignored-environments-alist'. So for example, the following
list could be used to match TeX's \verb and \verb* commands:
(("\\\\verb\\(.\\)" . (1))
("\\\\verb\\*\\(.\\)" . (1)))
This would result in the following regex being used to find the start
of any of the variants of the \verb command:
\\\\verb\\(.\\)\\|\\\\verb\\*\\(.\\)
But now, if “\\\\verb\\*\\(.\\)” matches, the first capture group
won't match anything, and thus (match-string 1) will be nil, which
will cause building of the end-matching regex to fail.
Fix this by using capture groups from the time when the opening
regexes are matched individually.
* tests/automated/tildify-tests.el (tildify-test-find-env-group-index-bug):
New test validating fix to the above bug.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7bbaf642d3c..936ae225a8b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,28 @@ | |||
| 1 | 2014-06-05 Michal Nazarewicz <mina86@mina86.com> | 1 | 2014-06-05 Michal Nazarewicz <mina86@mina86.com> |
| 2 | 2 | ||
| 3 | * textmodes/tildify.el (tildify-find-env): Fix matched group | ||
| 4 | indexes in end-regex building | ||
| 5 | |||
| 6 | When looking for a start of an ignore-environment, the regex is built | ||
| 7 | by concatenating regexes of all the environments configured in | ||
| 8 | `tildify-ignored-environments-alist'. So for example, the following | ||
| 9 | list could be used to match TeX's \verb and \verb* commands: | ||
| 10 | |||
| 11 | (("\\\\verb\\(.\\)" . (1)) | ||
| 12 | ("\\\\verb\\*\\(.\\)" . (1))) | ||
| 13 | |||
| 14 | This would result in the following regex being used to find the start | ||
| 15 | of any of the variants of the \verb command: | ||
| 16 | |||
| 17 | \\\\verb\\(.\\)\\|\\\\verb\\*\\(.\\) | ||
| 18 | |||
| 19 | But now, if “\\\\verb\\*\\(.\\)” matches, the first capture group | ||
| 20 | won't match anything, and thus (match-string 1) will be nil, which | ||
| 21 | will cause building of the end-matching regex to fail. | ||
| 22 | |||
| 23 | Fix this by using capture groups from the time when the opening | ||
| 24 | regexes are matched individually. | ||
| 25 | |||
| 3 | * textmodes/tildify.el (tildify-find-env): Fix end-regex building | 26 | * textmodes/tildify.el (tildify-find-env): Fix end-regex building |
| 4 | in `tildify-find-env' | 27 | in `tildify-find-env' |
| 5 | 28 | ||