2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fc0bece69c..67cb5bd79aa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,10 @@
         * startup.el (command-line-1): Rename -internal-script back to
         -scriptload (reverts previous change).
 
+        * calendar/calendar.el (diary-file): Doc fix.
+        (calendar-buffer-list): Return buffers rather than strings (fixes
+        previous change).
+
         * textmodes/org-irc.el (top-level): CL not required when compiling.
         (org-irc-visit-erc): Replace runtime CL functions.
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index bb0ed3d045c..049d80c45f9 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -335,7 +335,7 @@ with the remainder of the line being the diary entry string for
 that date.  MONTH and DAY are one or two digit numbers, YEAR is a
 number and may be written in full or abbreviated to the final two
 digits (if `abbreviated-calendar-year' is non-nil).  MONTHNAME
-and DAYNAME can be spelt in full (as specified by the variables
+and DAYNAME can be spelled in full (as specified by the variables
 `calendar-month-name-array' and `calendar-day-name-array'),
 abbreviated (as specified by `calendar-month-abbrev-array' and
 `calendar-day-abbrev-array') with or without a period,
@@ -1851,13 +1851,13 @@ the STRINGS are just concatenated and the result truncated."
     list))
 
 (defun calendar-buffer-list ()
-  "List of all calendar-related buffers."
+  "List of all calendar-related buffers (as buffers, not strings)."
   (let (buffs)
     (dolist (b (list cal-hebrew-yahrzeit-buffer lunar-phases-buffer
                      holiday-buffer fancy-diary-buffer
                      (get-file-buffer diary-file)
                      calendar-buffer other-calendars-buffer))
-      (and b (get-buffer b)
+      (and b (setq b (get-buffer b))
            (push b buffs)))
     buffs))