From: Glenn Morris <rgm@gnu.org>
Date: Tue, 16 Feb 2010 02:42:03 +0000 (-0800)
Subject: Close bug#5562.
X-Git-Tag: emacs-pretest-23.1.93~56^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=88fd78aeffa757f9fb97da205f0723e8723ce4cf;p=emacs.git

Close bug#5562.

* textmodes/tex-mode.el (tex-bibtex-file): Expand the result of
tex-main-file before using it.  (Bug#5562)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2cf0e271bf..f48940f27dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-16  Glenn Morris  <rgm@gnu.org>
+
+	* textmodes/tex-mode.el (tex-bibtex-file): Expand the result of
+	tex-main-file before using it.  (Bug#5562)
+
 2010-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/advice.el (ad-compile-function): Suppress byte-compiler
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index f2367caf66e..38698af7885 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -921,8 +921,8 @@ Inherits `shell-mode-map' with a few additions.")
 ;; remaining warning from byte-compiling all of Emacs...
 (eval-when-compile
   (setq byte-compile-function-environment
-        (delq (assq 'tex-mode byte-compile-function-environment)
-              byte-compile-function-environment)))
+	(delq (assq 'tex-mode byte-compile-function-environment)
+	      byte-compile-function-environment)))
 
 ;;;###autoload
 (defun tex-mode ()
@@ -2643,7 +2643,7 @@ Runs the shell command defined by `tex-show-queue-command'."
       (tex-kill-job)
     (tex-start-shell))
   (let* (shell-dirtrack-verbose
-         (source-file (tex-main-file))
+         (source-file (expand-file-name (tex-main-file)))
          (tex-out-file
           (tex-append (file-name-nondirectory source-file) ""))
          (file-dir (file-name-directory source-file)))