summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/textmodes/reftex-parse.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ce15a3c8b6..6d73731feaa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-24 Leonard Randall <leonard.a.randall@gmail.com>
+
+ * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search
+ for comment lines non-greedy and stopping at newlines to fix stack
+ overflows with large files.
+
2014-06-24 Eli Barzilay <eli@barzilay.org>
* calculator.el (calculator-last-input): drop 'ascii-character property
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 5b0433475b6..ce73939ac32 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -363,7 +363,7 @@ of master file."
(member "biblatex" TeX-active-styles)
;; poor-man's check...
(save-excursion
- (re-search-forward "^[^%]*\\\\usepackage.*{biblatex}" nil t))))
+ (re-search-forward "^[^%\n]*?\\\\usepackage.*{biblatex}" nil t))))
;;;###autoload
(defun reftex-locate-bibliography-files (master-dir &optional files)