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 394e082ecc89589f78ee1751b48e2b1407beda36..7bf2ba1bcc2f31ef3c4a06c8c3328571cff6ef9c 100644 (file)
--- 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 24c284350a32ce4a8e92d91baada1f975e4fad03..0c351c6072f94bfc4059d1094d8e501d6acd24c4 100644 (file)
--- 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