[Emacs-diffs] /srv/bzr/emacs/trunk r107512: calendar-set-mode-line fix (tiny change)

[Glenn Morris]

------------------------------------------------------------
revno: 107512
fixes bug(s): http://debbugs.gnu.org/10951
author: Adam Spiers <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-03-05 21:18:29 -0500
message:
  calendar-set-mode-line fix (tiny change)
  
  * lisp/calendar/calendar.el (calendar-set-mode-line):
  `getenv' returns a string.
modified:
  lisp/ChangeLog
  lisp/calendar/calendar.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-05 15:53:34 +0000
+++ b/lisp/ChangeLog    2012-03-06 02:18:29 +0000
@@ -1,3 +1,8 @@
+2012-03-06  Adam Spiers  <address@hidden>  (tiny change)
+
+       * calendar/calendar.el (calendar-set-mode-line):
+       `getenv' returns a string.  (Bug#10951)
+
 2012-03-05  Leo Liu  <address@hidden>
 
        * simple.el (backward-delete-char-untabify): Constrain point to

=== modified file 'lisp/calendar/calendar.el'
--- a/lisp/calendar/calendar.el 2012-02-18 03:08:15 +0000
+++ b/lisp/calendar/calendar.el 2012-03-06 02:18:29 +0000
@@ -2602,7 +2602,7 @@
     ;; 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