aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTassilo Horn2015-01-28 10:32:50 +0100
committerTassilo Horn2015-01-28 10:45:06 +0100
commitba10f4b56081d0f5069720c9ce0871e819b904f5 (patch)
tree354cbb727c8d4af778aad9dca672103d28d4d491
parent9664defd262252faf037c5fe1ea095f1cc4b308b (diff)
downloademacs-ba10f4b56081d0f5069720c9ce0871e819b904f5.tar.gz
emacs-ba10f4b56081d0f5069720c9ce0871e819b904f5.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. [backport from trunk]
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/textmodes/reftex.el22
2 files changed, 17 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3bedaaffa9..2c852f9a40a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12015-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
12015-01-26 Fabián Ezequiel Gallina <fgallina@gnu.org> 92015-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 97dd36ae9e8..2930b7cb811 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -221,17 +221,21 @@
221(defvar reftex-syntax-table nil) 221(defvar reftex-syntax-table nil)
222(defvar reftex-syntax-table-for-bib nil) 222(defvar reftex-syntax-table-for-bib nil)
223 223
224(unless reftex-syntax-table 224(defun reftex--prepare-syntax-tables ()
225 (setq reftex-syntax-table (copy-syntax-table)) 225 (setq reftex-syntax-table (copy-syntax-table))
226 (modify-syntax-entry ?\( "." reftex-syntax-table) 226 (modify-syntax-entry ?\( "." reftex-syntax-table)
227 (modify-syntax-entry ?\) "." reftex-syntax-table)) 227 (modify-syntax-entry ?\) "." reftex-syntax-table)
228 228
229(unless reftex-syntax-table-for-bib
230 (setq reftex-syntax-table-for-bib (copy-syntax-table)) 229 (setq reftex-syntax-table-for-bib (copy-syntax-table))
231 (modify-syntax-entry ?\' "." reftex-syntax-table-for-bib) 230 (modify-syntax-entry ?\' "." reftex-syntax-table-for-bib)
232 (modify-syntax-entry ?\" "." reftex-syntax-table-for-bib) 231 (modify-syntax-entry ?\" "." reftex-syntax-table-for-bib)
233 (modify-syntax-entry ?\[ "." reftex-syntax-table-for-bib) 232 (modify-syntax-entry ?\[ "." reftex-syntax-table-for-bib)
234 (modify-syntax-entry ?\] "." reftex-syntax-table-for-bib)) 233 (modify-syntax-entry ?\] "." reftex-syntax-table-for-bib)
234 (modify-syntax-entry ?\( "." reftex-syntax-table-for-bib)
235 (modify-syntax-entry ?\) "." reftex-syntax-table-for-bib))
236
237(unless (and reftex-syntax-table reftex-syntax-table-for-bib)
238 (reftex--prepare-syntax-tables))
235 239
236;; The following definitions are out of place, but I need them here 240;; The following definitions are out of place, but I need them here
237;; to make the compilation of reftex-mode not complain. 241;; to make the compilation of reftex-mode not complain.
@@ -295,15 +299,7 @@ on the menu bar.
295 (put 'reftex-auto-recenter-toc 'initialized t)) 299 (put 'reftex-auto-recenter-toc 'initialized t))
296 300
297 ;; Prepare the special syntax tables. 301 ;; Prepare the special syntax tables.
298 (setq reftex-syntax-table (copy-syntax-table (syntax-table))) 302 (reftex--prepare-syntax-tables)
299 (modify-syntax-entry ?\( "." reftex-syntax-table)
300 (modify-syntax-entry ?\) "." reftex-syntax-table)
301
302 (setq reftex-syntax-table-for-bib (copy-syntax-table))
303 (modify-syntax-entry ?\' "." reftex-syntax-table-for-bib)
304 (modify-syntax-entry ?\" "." reftex-syntax-table-for-bib)
305 (modify-syntax-entry ?\[ "." reftex-syntax-table-for-bib)
306 (modify-syntax-entry ?\] "." reftex-syntax-table-for-bib)
307 303
308 (run-hooks 'reftex-mode-hook)) 304 (run-hooks 'reftex-mode-hook))
309 ;; Mode was turned off 305 ;; Mode was turned off