aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReiner Steib2006-01-23 14:26:02 +0000
committerReiner Steib2006-01-23 14:26:02 +0000
commite450a16a1428cc06220a377802d9e7db9d87ce28 (patch)
tree9db077fdd752600602f81cf0156b1bb101e8bc24
parentaf71d4c04d544a18de2e269a7d4981254c07ab63 (diff)
downloademacs-e450a16a1428cc06220a377802d9e7db9d87ce28.tar.gz
emacs-e450a16a1428cc06220a377802d9e7db9d87ce28.zip
(latexenc-find-file-coding-system): Add file-regular-p check.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/latexenc.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b378ae4bbea..3393febf962 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-01-23 Arne J,Ax(Brgensen <arne@arnested.dk>
2
3 * international/latexenc.el (latexenc-find-file-coding-system):
4 Add file-regular-p check.
5
12006-01-22 Stefan Monnier <monnier@iro.umontreal.ca> 62006-01-22 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * simple.el (clone-buffer): Don't show the new buffer in the same 8 * simple.el (clone-buffer): Don't show the new buffer in the same
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index 51d70faf76c..17a9df20843 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -1,6 +1,6 @@
1;;; latexenc.el --- guess correct coding system in LaTeX files 1;;; latexenc.el --- guess correct coding system in LaTeX files
2 2
3;; Copyright (C) 2005 Free Software Foundation, Inc. 3;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
4 4
5;; Author: Arne J,Ax(Brgensen <arne@arnested.dk> 5;; Author: Arne J,Ax(Brgensen <arne@arnested.dk>
6;; Keywords: mule, coding system, latex 6;; Keywords: mule, coding system, latex
@@ -167,6 +167,7 @@ coding system names is determined from `latex-inputenc-coding-alist'."
167 (setq latexenc-main-file (tex-guess-main-file))))) 167 (setq latexenc-main-file (tex-guess-main-file)))))
168 ;; if we found a master/main file get the coding system from it 168 ;; if we found a master/main file get the coding system from it
169 (if (and latexenc-main-file 169 (if (and latexenc-main-file
170 (file-regular-p latexenc-main-file)
170 (file-readable-p latexenc-main-file)) 171 (file-readable-p latexenc-main-file))
171 (let* ((latexenc-dont-use-tex-guess-main-file-flag t) 172 (let* ((latexenc-dont-use-tex-guess-main-file-flag t)
172 (latexenc-dont-use-TeX-master-flag t) 173 (latexenc-dont-use-TeX-master-flag t)