summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/time.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ca082a52ad..a911832a8fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,8 @@
* time.el (display-time-world-mode): Derive from special-mode.
(display-time-world): Use display-buffer (Bug#12708).
(display-time-world-mode-map): Variable deleted.
+ (display-time-world-display): Wrap the final delete-char inside
+ inhibit-read-only.
2012-10-24 Chong Yidong <cyd@gnu.org>
diff --git a/lisp/time.el b/lisp/time.el
index c08fadd4b4e..7473994ffa5 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -543,8 +543,8 @@ See `display-time-world'."
(setenv "TZ" old-tz))
(setq fmt (concat "%-" (int-to-string max-width) "s %s\n"))
(dolist (timedata (nreverse result))
- (insert (format fmt (car timedata) (cdr timedata)))))
- (delete-char -1))
+ (insert (format fmt (car timedata) (cdr timedata))))
+ (delete-char -1)))
;;;###autoload
(defun display-time-world ()