[Emacs-diffs] Changes to emacs/lisp/calendar/cal-tex.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/01 02:43:57

Index: cal-tex.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-tex.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- cal-tex.el  15 Mar 2008 02:56:30 -0000      1.39
+++ cal-tex.el  1 Apr 2008 02:43:57 -0000       1.40
@@ -436,12 +436,11 @@
          (d2 (calendar-absolute-from-gregorian
               (list end-month
                     (calendar-last-day-of-month end-month end-year)
-                    end-year))))
+                    end-year)))
+         (diary-list (progn
     (increment-calendar-month end-month end-year (1- n))
-    (let ((diary-list (if cal-tex-diary
-                          (cal-tex-list-diary-entries d1 d2)))
-          (holidays (if cal-tex-holidays
-                        (cal-tex-list-holidays d1 d2)))
+                       (if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
+         (holidays (if cal-tex-holidays (cal-tex-list-holidays d1 d2)))
           other-month other-year small-months-at-start)
       (cal-tex-insert-preamble (cal-tex-number-weeks month year 1) t "12pt")
       (cal-tex-cmd cal-tex-cal-one-month)
@@ -482,9 +481,9 @@
           (increment-calendar-month month year 1)
           (cal-tex-vspace "-2cm")
           (cal-tex-insert-preamble
-           (cal-tex-number-weeks month year 1) t "12pt" t)))
+         (cal-tex-number-weeks month year 1) t "12pt" t))))
       (cal-tex-end-document)
-      (run-hooks 'cal-tex-hook))))
+  (run-hooks 'cal-tex-hook))
 
 ;;;###cal-autoload
 (defun cal-tex-cursor-month (arg)
@@ -494,24 +493,23 @@
 It shows holiday and diary entries if `cal-tex-holidays' and
 `cal-tex-diary', respectively, are non-nil."
   (interactive "p")
-  (let* ((date (calendar-cursor-to-date t))
+  (let* ((n (or arg 1))
+         (date (calendar-cursor-to-date t))
          (month (extract-calendar-month date))
          (year (extract-calendar-year date))
          (end-month month)
          (end-year year)
-         (n (or arg 1))
          (d1 (calendar-absolute-from-gregorian (list month 1 year)))
          (d2 (calendar-absolute-from-gregorian
               (list end-month
                     (calendar-last-day-of-month end-month end-year)
-                    end-year))))
+                    end-year)))
+         (diary-list (progn
     (increment-calendar-month end-month end-year (1- n))
-    (let ((diary-list (if cal-tex-diary
-                          (cal-tex-list-diary-entries d1 d2)))
-          (holidays (if cal-tex-holidays
-                        (cal-tex-list-holidays d1 d2)))
+                       (if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
+         (holidays (if cal-tex-holidays (cal-tex-list-holidays d1 d2)))
           other-month other-year)
-      (cal-tex-insert-preamble (cal-tex-number-weeks month year n) nil"12pt")
+    (cal-tex-insert-preamble (cal-tex-number-weeks month year n) nil "12pt")
       (if (> n 1)
           (cal-tex-cmd cal-tex-cal-multi-month)
         (cal-tex-cmd cal-tex-cal-one-month))
@@ -531,8 +529,8 @@
           (cal-tex-hfill)
           (cal-tex-nl))
         (increment-calendar-month month year 1))
-      (cal-tex-insert-blank-days-at-end end-month end-year cal-tex-day-prefix)
-      (cal-tex-end-document)))
+    (cal-tex-insert-blank-days-at-end end-month end-year cal-tex-day-prefix))
+  (cal-tex-end-document)
   (run-hooks 'cal-tex-hook))
 
 (defun cal-tex-insert-days (month year diary-list holidays day-format)
@@ -1633,14 +1631,15 @@
       ""
     (let ((head "")
           (tail string)
-          (list cal-tex-LaTeX-subst-list))
+          (list cal-tex-LaTeX-subst-list)
+          ch pair)
       (while (not (string-equal tail ""))
-        (let* ((ch (substring-no-properties tail 0 1))
-               (pair (assoc ch list)))
+        (setq ch (substring-no-properties tail 0 1)
+              pair (assoc ch list))
           (if (and pair (string-equal ch "\""))
               (setq list (reverse list))) ; quote changes meaning each time
           (setq tail (substring-no-properties tail 1)
-                head (concat head (if pair (cdr pair) ch)))))
+              head (concat head (if pair (cdr pair) ch))))
       head)))
 
 (defun cal-tex-month-name (month)