# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1207106154 0
# Node ID aa0e26f1d3aec01778e7476866ca502abc9df63d
# Parent  38ab23c0b8ad561e77a8b17c153c3cde14dd2313
(holiday-chinese-new-year): Use a single let.

diff -r 38ab23c0b8ad -r aa0e26f1d3ae lisp/calendar/cal-china.el
--- a/lisp/calendar/cal-china.el	Tue Apr 01 21:27:07 2008 +0000
+++ b/lisp/calendar/cal-china.el	Wed Apr 02 03:15:54 2008 +0000
@@ -422,22 +422,21 @@
   "Date of Chinese New Year, if visible in calendar.
 Returns (((MONTH DAY YEAR) TEXT)), where the date is Gregorian."
   (let ((m displayed-month)
-        (y displayed-year))
+        (y displayed-year)
+        chinese-new-year)
     ;; In the Gregorian calendar, CNY falls between Jan 21 and Feb 20.
     ;; Jan is visible if displayed-month = 12, 1, 2; Feb if d-m = 1, 2, 3.
     ;; If we shift the calendar forward one month, we can do a
     ;; one-sided test, namely: d-m <= 4 means CNY might be visible.
     (increment-calendar-month m y 1)    ; shift forward a month
-    (if (< m 5)
-        (let ((chinese-new-year
-               (calendar-gregorian-from-absolute
-                (cadr (assoc 1 (chinese-year y))))))
-          (if (calendar-date-is-visible-p chinese-new-year)
-              (list
-               (list chinese-new-year
-                     (format "Chinese New Year (%s)"
-                             (calendar-chinese-sexagesimal-name
-                              (+ y 57))))))))))
+    (and (< m 5)
+         (calendar-date-is-visible-p (setq chinese-new-year
+                                           (calendar-gregorian-from-absolute
+                                            (cadr (assoc 1 (chinese-year y))))))
+         (list
+          (list chinese-new-year
+                (format "Chinese New Year (%s)"
+                        (calendar-chinese-sexagesimal-name (+ y 57))))))))
 
 ;;;###cal-autoload
 (defun calendar-chinese-date-string (&optional date)