Allow multiple cal-tex-buffer buffers to exist

* lisp/calendar/cal-tex.el (cal-tex-preamble): Generate new buffers.
(cal-tex-end-document): Don't rely on buffer name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a843fd0f5aaf5b44b28a24b1fbdcdf24dd049d1..1d249cfa30f433dab82fe33207004978ee7bfda1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-08-21  Glenn Morris  <rgm@gnu.org>
 
+       * calendar/cal-tex.el (cal-tex-preamble): Generate new buffers.
+       (cal-tex-end-document): Don't rely on buffer name.
+
        * calendar/cal-tex.el (cal-tex-cursor-filofax-year):
        Use cal-tex-vspace.
        (cal-tex-vspace, cal-tex-hspace, cal-tex-em, cal-tex-bf)

diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 5fbb20bac3b8612d0897bbfe419ec24e8ec9345c..d891c9e639ca8e25530b43af1f2a646b81f069fc 100644 (file)
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -253,8 +253,7 @@ This definition is the heart of the calendar!")
   "Insert the LaTeX calendar preamble into `cal-tex-buffer'.
 Preamble includes initial definitions for various LaTeX commands.
 Optional string ARGS are included as options for the article document class."
-  ;; FIXME use generate-new-buffer, and adjust cal-tex-end-document.
-  (set-buffer (get-buffer-create cal-tex-buffer))
+  (set-buffer (generate-new-buffer cal-tex-buffer))
   (insert (format "\\documentclass%s{article}\n"
                   (if (stringp args)
                       (format "[%s]" args)
@@ -1712,7 +1711,7 @@ informative header, and run HOOK."
           ;; FIXME latin1 might not always be right.
           (insert "\\usepackage[latin1]{inputenc}\n"))))
   (latex-mode)
-  (pop-to-buffer cal-tex-buffer)
+  (pop-to-buffer (current-buffer))
   (goto-char (point-min))
   ;; FIXME auctex equivalents?
   (cal-tex-comment