diff options
| author | Tassilo Horn | 2015-01-28 10:32:50 +0100 |
|---|---|---|
| committer | Tassilo Horn | 2015-01-28 10:36:17 +0100 |
| commit | 8a8bd38fedb89b2d04cca2419698813a22862c3b (patch) | |
| tree | ce6bcc3a08d9e72fb9a6e1dc9f1c48034dd7b599 | |
| parent | 173ac1caac65543956ce0d72a9d6ae10b6729fa8 (diff) | |
| download | emacs-8a8bd38fedb89b2d04cca2419698813a22862c3b.tar.gz emacs-8a8bd38fedb89b2d04cca2419698813a22862c3b.zip | |
Fix issues with BibTeX entries containing ")".
* textmodes/reftex.el (reftex-syntax-table-for-bib): Give ( and )
punctuation syntax since to allow bibtex fields with values such
as {Test 1) and 2)} (bug#19205, bug#19707).
(reftex--prepare-syntax-tables): New function.
(reftex-mode): Use it.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/textmodes/reftex.el | 22 |
2 files changed, 17 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eb6ef6b19d2..90681c80656 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2015-01-28 Tassilo Horn <tsdh@gnu.org> | ||
| 2 | |||
| 3 | * textmodes/reftex.el (reftex-syntax-table-for-bib): Give ( and ) | ||
| 4 | punctuation syntax since to allow bibtex fields with values such | ||
| 5 | as {Test 1) and 2)} (bug#19205, bug#19707). | ||
| 6 | (reftex--prepare-syntax-tables): New function. | ||
| 7 | (reftex-mode): Use it. | ||
| 8 | |||
| 1 | 2015-01-26 Fabián Ezequiel Gallina <fgallina@gnu.org> | 9 | 2015-01-26 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 2 | 10 | ||
| 3 | python.el: New non-global state dependent indentation engine. | 11 | python.el: New non-global state dependent indentation engine. |
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 160d9fb4cdf..7cf54c6d28a 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el | |||
| @@ -106,17 +106,21 @@ | |||
| 106 | (defvar reftex-syntax-table nil) | 106 | (defvar reftex-syntax-table nil) |
| 107 | (defvar reftex-syntax-table-for-bib nil) | 107 | (defvar reftex-syntax-table-for-bib nil) |
| 108 | 108 | ||
| 109 | (unless reftex-syntax-table | 109 | (defun reftex--prepare-syntax-tables () |
| 110 | (setq reftex-syntax-table (copy-syntax-table)) | 110 | (setq reftex-syntax-table (copy-syntax-table)) |
| 111 | (modify-syntax-entry ?\( "." reftex-syntax-table) | 111 | (modify-syntax-entry ?\( "." reftex-syntax-table) |
| 112 | (modify-syntax-entry ?\) "." reftex-syntax-table)) | 112 | (modify-syntax-entry ?\) "." reftex-syntax-table) |
| 113 | 113 | ||
| 114 | (unless reftex-syntax-table-for-bib | ||
| 115 | (setq reftex-syntax-table-for-bib (copy-syntax-table)) | 114 | (setq reftex-syntax-table-for-bib (copy-syntax-table)) |
| 116 | (modify-syntax-entry ?\' "." reftex-syntax-table-for-bib) | 115 | (modify-syntax-entry ?\' "." reftex-syntax-table-for-bib) |
| 117 | (modify-syntax-entry ?\" "." reftex-syntax-table-for-bib) | 116 | (modify-syntax-entry ?\" "." reftex-syntax-table-for-bib) |
| 118 | (modify-syntax-entry ?\[ "." reftex-syntax-table-for-bib) | 117 | (modify-syntax-entry ?\[ "." reftex-syntax-table-for-bib) |
| 119 | (modify-syntax-entry ?\] "." reftex-syntax-table-for-bib)) | 118 | (modify-syntax-entry ?\] "." reftex-syntax-table-for-bib) |
| 119 | (modify-syntax-entry ?\( "." reftex-syntax-table-for-bib) | ||
| 120 | (modify-syntax-entry ?\) "." reftex-syntax-table-for-bib)) | ||
| 121 | |||
| 122 | (unless (and reftex-syntax-table reftex-syntax-table-for-bib) | ||
| 123 | (reftex--prepare-syntax-tables)) | ||
| 120 | 124 | ||
| 121 | ;; The following definitions are out of place, but I need them here | 125 | ;; The following definitions are out of place, but I need them here |
| 122 | ;; to make the compilation of reftex-mode not complain. | 126 | ;; to make the compilation of reftex-mode not complain. |
| @@ -180,15 +184,7 @@ on the menu bar. | |||
| 180 | (put 'reftex-auto-recenter-toc 'initialized t)) | 184 | (put 'reftex-auto-recenter-toc 'initialized t)) |
| 181 | 185 | ||
| 182 | ;; Prepare the special syntax tables. | 186 | ;; Prepare the special syntax tables. |
| 183 | (setq reftex-syntax-table (copy-syntax-table (syntax-table))) | 187 | (reftex--prepare-syntax-tables) |
| 184 | (modify-syntax-entry ?\( "." reftex-syntax-table) | ||
| 185 | (modify-syntax-entry ?\) "." reftex-syntax-table) | ||
| 186 | |||
| 187 | (setq reftex-syntax-table-for-bib (copy-syntax-table)) | ||
| 188 | (modify-syntax-entry ?\' "." reftex-syntax-table-for-bib) | ||
| 189 | (modify-syntax-entry ?\" "." reftex-syntax-table-for-bib) | ||
| 190 | (modify-syntax-entry ?\[ "." reftex-syntax-table-for-bib) | ||
| 191 | (modify-syntax-entry ?\] "." reftex-syntax-table-for-bib) | ||
| 192 | 188 | ||
| 193 | (run-hooks 'reftex-mode-hook)) | 189 | (run-hooks 'reftex-mode-hook)) |
| 194 | ;; Mode was turned off | 190 | ;; Mode was turned off |