Merge from mainline.

6 files changed, 33 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index a63fbc96bff..6a3b1701726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-20  Ken Brown  <kbrown@cornell.edu>
+
+        * configure.in (use_mmap_for_buffers): Set to yes on Cygwin.
+
 2011-04-12  Glenn Morris  <rgm@gnu.org>
 
         * configure.in: Require ImageMagick >= 6.2.8.  (Bug#7955)
diff --git a/configure.in b/configure.in
index 3d99873eabb..d20dee81e5b 100644
--- a/configure.in
+++ b/configure.in
@@ -1631,7 +1631,7 @@ fi
 
 use_mmap_for_buffers=no
 case "$opsys" in
-  freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+  cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
 esac
 
 AC_FUNC_MMAP
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66f854da5e3..867d7f9aa23 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-20  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/solar.el (solar-horizontal-coordinates):
+        Use the longitude argument rather than `calendar-longitude'.
+        (solar-date-next-longitude): Remove unused locals.
+
 2011-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/octave-mod.el (octave-in-comment-p, octave-in-string-p)
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 31aed0484d7..84a1544d709 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -453,7 +453,7 @@ height (between -180 and 180) are both in degrees."
          (st (+ solar-sidereal-time-greenwich-midnight
                 (* ut 1.00273790935)))
          ;; Hour angle (in degrees).
-         (ah (- (* st 15) (* 15 (car ec)) (* -1 (calendar-longitude))))
+         (ah (- (* st 15) (* 15 (car ec)) (* -1 longitude)))
          (de (cadr ec))
          (azimuth (solar-atn2 (- (* (solar-cosine-degrees ah)
                                     (solar-sin-degrees latitude))
@@ -771,26 +771,22 @@ day numbers.  The values of `calendar-daylight-savings-starts',
 `calendar-daylight-savings-starts-time', `calendar-daylight-savings-ends',
 `calendar-daylight-savings-ends-time', `calendar-daylight-time-offset',
 and `calendar-time-zone' are used to interpret local time."
-  (let* ((long)
-         (start d)
-         (start-long (solar-longitude d))
-         (next (mod (* l (1+ (floor (/ start-long l)))) 360))
-         (end (+ d (* (/ l 360.0) 400)))
-         (end-long (solar-longitude end)))
-    (while                       ; bisection search for nearest minute
-        (< 0.00001 (- end start))
-      ;; start   <= d    < end
+  (let ((start d)
+        (next (mod (* l (1+ (floor (/ (solar-longitude d) l)))) 360))
+        (end (+ d (* (/ l 360.0) 400)))
+        long)
+    ;; Bisection search for nearest minute.
+    (while (< 0.00001 (- end start))
+      ;; start <= d < end
       ;; start-long <= next < end-long when next != 0
-      ;; when next = 0, we look for the discontinuity (start-long is near 360
-      ;;                and end-long is small (less than l).
+      ;; when next = 0, look for the discontinuity (start-long is near 360
+      ;; and end-long is small (less than l)).
       (setq d (/ (+ start end) 2.0)
             long (solar-longitude d))
       (if (or (and (not (zerop next)) (< long next))
               (and (zerop next) (< l long)))
-          (setq start d
-                start-long long)
-        (setq end d
-              end-long long)))
+          (setq start d)
+        (setq end d)))
     (/ (+ start end) 2.0)))
 
 ;; FIXME but there already is solar-sunrise-sunset.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8417d37cadf..35531df0ad2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-registry.el (gnus-registry-action)
+        (gnus-registry-fetch-header-fast):
+        Don't use mail-header that looks an internal function of mailheader.el.
+
 2011-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-registry.el: Eliminate cl functions.
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 697dc373b1f..009786dec80 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -304,8 +304,8 @@ This is not required after changing `gnus-registry-cache-file'."
   (let* ((id (mail-header-id data-header))
          (subject (mail-header-subject data-header))
          (recipients (gnus-registry-sort-addresses
-                      (or (ignore-errors (mail-header "Cc" data-header)) "")
-                      (or (ignore-errors (mail-header "To" data-header)) "")))
+                      (or (cdr (assq "Cc" data-header)) "")
+                      (or (cdr (assq "To" data-header)) "")))
          (sender (nth 0 (gnus-registry-extract-addresses
                          (mail-header-from data-header))))
          (from (gnus-group-guess-full-name-from-command-method from))
@@ -742,8 +742,8 @@ Addresses without a name will say \"noname\"."
   (if (and (numberp article)
            (assoc article (gnus-data-list nil)))
       (gnus-string-remove-all-properties
-       (mail-header header (gnus-data-header
-                            (assoc article (gnus-data-list nil)))))
+       (cdr (assq header (gnus-data-header
+                          (assoc article (gnus-data-list nil))))))
     nil))
 
 ;; registry marks glue