From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 13 05:49:03 2014 Received: (at submit) by debbugs.gnu.org; 13 Sep 2014 09:49:03 +0000 Received: from localhost ([127.0.0.1]:39911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XSjx0-0004d5-Ll for submit@debbugs.gnu.org; Sat, 13 Sep 2014 05:49:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46240) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XSjwx-0004cf-CZ for submit@debbugs.gnu.org; Sat, 13 Sep 2014 05:49:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSjws-0004K5-HM for submit@debbugs.gnu.org; Sat, 13 Sep 2014 05:48:59 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:54072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSjws-0004Jy-FH for submit@debbugs.gnu.org; Sat, 13 Sep 2014 05:48:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSjwo-0001v9-5w for bug-gnu-emacs@gnu.org; Sat, 13 Sep 2014 05:48:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSjwj-0004IO-SS for bug-gnu-emacs@gnu.org; Sat, 13 Sep 2014 05:48:50 -0400 Received: from ristopher.com ([81.4.108.209]:54138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSjwj-0004I0-Ll for bug-gnu-emacs@gnu.org; Sat, 13 Sep 2014 05:48:45 -0400 Received: by ristopher.com (Postfix, from userid 0) id 3506520652; Sat, 13 Sep 2014 05:48:41 -0400 (EDT) From: Christopher Schmidt To: bug-gnu-emacs@gnu.org Subject: 24.4.50; calendar-update-mode-line: Do not overwrite mode-line-format unconditionally Message-ID: <874mwbsvf1@ristopher.com> Mail-Followup-To: bug-gnu-emacs@gnu.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Date: Sat, 13 Sep 2014 05:48:40 -0400 (EDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --=-=-= Content-Type: text/plain severity: wishlist --=-=-= Content-Type: text/x-diff Content-Disposition: inline --- lisp/ChangeLog +++ lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-09-13 Christopher Schmidt + + * calendar/calendar.el (calendar-update-mode-line): + Do not overwrite mode-line-format if calendar-mode-line-format is + nil. (Bug##) + 2014-09-13 Eli Zaretskii * mail/rmailmm.el (rmail-mime-insert-html): Decode the HTML part --- lisp/calendar/calendar.el +++ lisp/calendar/calendar.el @@ -1804,14 +1804,18 @@ nil "today")) '(calendar-date-string (calendar-current-date) t) (calendar-mode-line-entry 'calendar-scroll-left "next month" ">")) - "The mode line of the calendar buffer. + "If non-nil, the mode line of the calendar buffer. This is a list of items that evaluate to strings. The elements are evaluated and concatenated, evenly separated by blanks. During evaluation, the variable `date' is available as the date nearest the cursor (or today's date if that fails). To update -the mode-line as the cursor moves, add `calendar-update-mode-line' -to `calendar-move-hook'. Here is an example that has the Hebrew date, -the day number/days remaining in the year, and the ISO week/year numbers: +the mode-line as the cursor moves, add +`calendar-update-mode-line' to `calendar-move-hook'. + +If nil, do not modify the mode line at all. + +Here is an example that has the Hebrew date, the day number/days +remaining in the year, and the ISO week/year numbers: (list \"\" @@ -1889,7 +1893,8 @@ (defun calendar-update-mode-line () "Update the calendar mode line with the current date and date style." - (if (bufferp (get-buffer calendar-buffer)) + (if (and calendar-mode-line-format + (bufferp (get-buffer calendar-buffer))) (with-current-buffer calendar-buffer (let ((start (- calendar-left-margin 2)) (date (condition-case nil --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 13 12:48:27 2014 Received: (at 18467) by debbugs.gnu.org; 13 Sep 2014 16:48:28 +0000 Received: from localhost ([127.0.0.1]:40362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XSqUt-0007it-CK for submit@debbugs.gnu.org; Sat, 13 Sep 2014 12:48:27 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:43920) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XSqUq-0007ik-Ux for 18467@debbugs.gnu.org; Sat, 13 Sep 2014 12:48:25 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XSqUq-0008Lg-HF for 18467@debbugs.gnu.org; Sat, 13 Sep 2014 12:48:24 -0400 Resent-Message-ID: <21524.30040.141186.958105@gnu.org> Resent-Date: Sat, 13 Sep 2014 12:48:24 -0400 Resent-From: Glenn Morris Resent-To: 18467@debbugs.gnu.org References: <874mwbsvf1@ristopher.com> X-Ran: r4S5->*-}Qr$'y2MR0Dw/G9EPP5}e#q|2IP'Yv#+3v1amm4$vyo(N<<$$to*;?bso#m)*m X-Hue: white X-Debbugs-No-Ack: yes X-Attribution: GM In-Reply-To: <874mwbsvf1@ristopher.com> (Christopher Schmidt's message of "Sat, 13 Sep 2014 05:48:40 -0400 (EDT)") Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 13 Sep 2014 12:42:05 -0400 From: Glenn Morris To: Christopher Schmidt Subject: Re: bug#18467: 24.4.50; calendar-update-mode-line: Do not overwrite mode-line-format unconditionally X-Spook: Mossad PET Sundevil Honduras industrial espionage User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-Spam-Score: -7.5 (-------) X-Debbugs-Envelope-To: 18467 Cc: 18467@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -7.5 (-------) Fine by me; please apply to trunk, maybe with a 1-line mention in NEWS? Thanks. From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 13 13:54:58 2014 Received: (at 18467-done) by debbugs.gnu.org; 13 Sep 2014 17:54:58 +0000 Received: from localhost ([127.0.0.1]:40374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XSrXG-000269-76 for submit@debbugs.gnu.org; Sat, 13 Sep 2014 13:54:58 -0400 Received: from ristopher.com ([81.4.108.209]:39342) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XSrXE-000261-2E for 18467-done@debbugs.gnu.org; Sat, 13 Sep 2014 13:54:56 -0400 Received: by ristopher.com (Postfix, from userid 0) id D078120650; Sat, 13 Sep 2014 13:54:53 -0400 (EDT) From: Christopher Schmidt To: 18467-done@debbugs.gnu.org Subject: Re: bug#18467: 24.4.50; calendar-update-mode-line: Do not overwrite mode-line-format unconditionally In-Reply-To: (Glenn Morris's message of "Sat, 13 Sep 2014 12:42:05 -0400") Message-ID: <87a963quci@ristopher.com> References: <874mwbsvf1@ristopher.com> MIME-Version: 1.0 Content-Type: text/plain Date: Sat, 13 Sep 2014 13:54:53 -0400 (EDT) X-Spam-Score: -2.5 (--) X-Debbugs-Envelope-To: 18467-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.5 (--) Glenn Morris writes: > Fine by me; please apply to trunk, maybe with a 1-line mention in > NEWS? Thanks. Thanks; done. From unknown Fri Aug 15 04:04:45 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 12 Oct 2014 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator