aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Spiers2012-03-05 21:18:29 -0500
committerGlenn Morris2012-03-05 21:18:29 -0500
commit2467932310c83a430164c4f19e29d1115fa24aea (patch)
treeca2f1988e9a4a7b68ff7df1c7c8e1d3f6f684426
parent109aa8a95ecbbb2d7c62c2c98c10132885b1115f (diff)
downloademacs-2467932310c83a430164c4f19e29d1115fa24aea.tar.gz
emacs-2467932310c83a430164c4f19e29d1115fa24aea.zip
calendar-set-mode-line fix (tiny change)
* lisp/calendar/calendar.el (calendar-set-mode-line): `getenv' returns a string. Fixes: debbugs:10951
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/calendar.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 394e082ecc8..7bf2ba1bcc2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-03-06 Adam Spiers <emacs@adamspiers.org> (tiny change)
2
3 * calendar/calendar.el (calendar-set-mode-line):
4 `getenv' returns a string. (Bug#10951)
5
12012-03-05 Leo Liu <sdl.web@gmail.com> 62012-03-05 Leo Liu <sdl.web@gmail.com>
2 7
3 * simple.el (backward-delete-char-untabify): Constrain point to 8 * 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."
2602 ;; If no frame exists yet, we have no idea what width to use. 2602 ;; If no frame exists yet, we have no idea what width to use.
2603 (and (= width 10) 2603 (and (= width 10)
2604 (not window-system) 2604 (not window-system)
2605 (setq width (or (getenv "COLUMNS") 80))) 2605 (setq width (string-to-number (or (getenv "COLUMNS") "80"))))
2606 (setq mode-line-format 2606 (setq mode-line-format
2607 (if buffer-file-name 2607 (if buffer-file-name
2608 `("-" mode-line-modified 2608 `("-" mode-line-modified