summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/international/latexenc.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c6d7a14df8..45c616e87c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-01 Lute Kamstra <lute@gnu.org>
+
+ * international/latexenc.el (latexenc-find-file-coding-system):
+ Fix regular expressions. Suggested by David Kastrup <dak@gnu.org>
+ and Stefan Monnier <monnier@iro.umontreal.ca>.
+
2005-05-01 Nick Roberts <nickrob@snap.net.nz>
* subr.el (string-to-int): Make obsolete.
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index efd29177b42..1fd04b55919 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -121,8 +121,8 @@ coding system names is determined from `latex-inputenc-coding-alist'."
;; try to find the coding system in this file
(goto-char (point-min))
(if (or
- (re-search-forward "^[^%$]*\\inputencoding{\\(.*\\)}" nil t)
- (re-search-forward "^[^%$]*\\usepackage\\[\\(.*\\)\\]{inputenc}" nil t))
+ (re-search-forward "^[^%\n]*\\\\inputencoding{\\(.*\\)}" nil t)
+ (re-search-forward "^[^%\n]*\\\\usepackage\\[\\(.*\\)\\]{inputenc}" nil t))
(let* ((match (match-string 1))
(sym (intern match)))
(when (latexenc-inputenc-to-coding-system match)