From: Adam Spiers <emacs@adamspiers.org>
Date: Tue, 6 Mar 2012 02:18:29 +0000 (-0500)
Subject: calendar-set-mode-line fix (tiny change)
X-Git-Tag: emacs-pretest-24.0.05~160
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2467932310c83a430164c4f19e29d1115fa24aea;p=emacs.git

calendar-set-mode-line fix (tiny change)

* lisp/calendar/calendar.el (calendar-set-mode-line):
`getenv' returns a string.

Fixes: debbugs:10951
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 394e082ecc8..7bf2ba1bcc2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-06  Adam Spiers  <emacs@adamspiers.org>  (tiny change)
+
+	* calendar/calendar.el (calendar-set-mode-line):
+	`getenv' returns a string.  (Bug#10951)
+
 2012-03-05  Leo Liu  <sdl.web@gmail.com>
 
 	* simple.el (backward-delete-char-untabify): Constrain point to
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 24c284350a3..0c351c6072f 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2602,7 +2602,7 @@ If called by a mouse-event, pops up a menu with the result."
     ;; If no frame exists yet, we have no idea what width to use.
     (and (= width 10)
          (not window-system)
-         (setq width (or (getenv "COLUMNS") 80)))
+         (setq width (string-to-number (or (getenv "COLUMNS") "80"))))
     (setq mode-line-format
           (if buffer-file-name
               `("-" mode-line-modified