diff options
| author | Stefan Monnier <[email protected]> | 2005-06-06 18:13:21 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2005-06-06 18:13:21 +0000 |
| commit | ed975fa61af284173b5490cdc119484c6a200ce3 (patch) | |
| tree | 71187875bb664552b3a5a9fd0d3536a1161e8546 | |
| parent | e43cbeae69c62d0fd1de362cdf154623322ad059 (diff) | |
(latexenc-find-file-coding-system):
Undo part of last patch, to turn off a compiler warning.
| -rw-r--r-- | lisp/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/international/latexenc.el | 9 |
2 files changed, 14 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d6996b2f5..8c0c26c09f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-06-06 Stefan Monnier <[email protected]> + + * international/latexenc.el (latexenc-find-file-coding-system): + Undo part of last patch, to turn off a compiler warning. + 2005-06-06 Juri Linkov <[email protected]> * tmm.el (tmm-inactive, tmm-remove-inactive-mouse-face): @@ -12,8 +17,8 @@ * emulation/cua-base.el (cua-rectangle, cua-rectangle-noselect) (cua-global-mark): Remove -face suffix from face names. - * emulation/cua-gmrk.el (cua--init-global-mark): Remove - cua-global-mark face setup. + * emulation/cua-gmrk.el (cua--init-global-mark): + Remove cua-global-mark face setup. 2005-06-06 Richard M. Stallman <[email protected]> @@ -132,7 +137,7 @@ (iswitchb-current-match-face, iswitchb-virtual-matches-face) (iswitchb-invalid-regexp-face): New faces. (iswitchb-completions): Use them. - (iswitchb-use-faces): Renamed from iswitchb-use-fonts, which is + (iswitchb-use-faces): Rename from iswitchb-use-fonts, which is now marked as an obsolete alias. (iswitchb-read-buffer): Remove check for bound font variables. (iswitchb-invalid-regexp): New free variable. @@ -239,8 +244,7 @@ (gdb-info-breakpoints-custom, gdb-delete-breakpoint) (gdb-goto-breakpoint, gdb-source-info, gdb-get-location) (gdb-assembler-custom): Improve regexps. - (def-gdb-auto-update-handler): Use window point to preserve - point. + (def-gdb-auto-update-handler): Use window point to preserve point. 2005-05-31 Stefan Monnier <[email protected]> diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el index 24f7ebc600..7568c4aa39 100644 --- a/lisp/international/latexenc.el +++ b/lisp/international/latexenc.el @@ -159,10 +159,11 @@ coding system names is determined from `latex-inputenc-coding-alist'." (setq latexenc-main-file (concat file ext))))))) ;; try tex-modes tex-guess-main-file (when (and (not latexenc-dont-use-tex-guess-main-file-flag) - (not latexenc-main-file) - (fboundp 'tex-guess-main-file)) - (let ((tex-start-of-header "\\\\document\\(style\\|class\\)")) - (setq latexenc-main-file (tex-guess-main-file)))) + (not latexenc-main-file)) + ;; Use a separate `when' so the byte-compiler sees the fboundp. + (when (fboundp 'tex-guess-main-file) + (let ((tex-start-of-header "\\\\document\\(style\\|class\\)")) + (setq latexenc-main-file (tex-guess-main-file))))) ;; if we found a master/main file get the coding system from it (if (and latexenc-main-file (file-readable-p latexenc-main-file)) |