(latexenc-find-file-coding-system): Fix regular expressions.

Suggested by David Kastrup <dak@gnu.org> and Stefan Monnier
<monnier@iro.umontreal.ca>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c6d7a14df8e7f490a138fcd06339c396e1f35fe..45c616e87c5969fe654c715ab114bec6a2d8ae0b 100644 (file)
--- 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 efd29177b42e6f597502d8f4b42abd4ca76796a0..1fd04b559194f4479550f68069fddc0d608942d9 100644 (file)
--- 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)