From e1d65b3c2284517ad2cb172ca7b435b8c1475c5e Mon Sep 17 00:00:00 2001 From: Liu Hui Date: Wed, 21 Jan 2026 17:38:17 +0800 Subject: [PATCH] Fix inconsistent definition and usage of 'calendar-buffer' * lisp/calendar/calendar.el (calendar-buffer): Define it as a variable. * lisp/calendar/diary-lib.el (diary-mark-entries): Set 'calendar-buffer' as a string. (bug#79994) --- lisp/calendar/calendar.el | 2 +- lisp/calendar/diary-lib.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 2da45c18880..42fc210c1e1 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1098,7 +1098,7 @@ Otherwise, use symbolic time zones like \"CET\"." (defconst calendar-first-date-row 3 "First row in the calendar with actual dates.") -(defconst calendar-buffer "*Calendar*" +(defvar calendar-buffer "*Calendar*" "Name of the buffer used for the calendar.") (defun calendar-get-buffer () diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index baa361bd707..36f9b0ef13b 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1402,7 +1402,7 @@ marks. This is intended to deal with deleted diary entries." (diary-buffer (find-buffer-visiting diary-file)) ;; Record current calendar buffer in case this function is ;; called in a calendar-mode buffer not named `calendar-buffer'. - (calendar-buffer (calendar-get-buffer)) + (calendar-buffer (buffer-name (calendar-get-buffer))) ;; Dynamically bound in diary-include-files. (d-incp (and (boundp 'diary-including) diary-including)) file-glob-attrs temp-buff)