* time.el (display-time-world-mode): Derive from special-mode.

(display-time-world): Use display-buffer.
(display-time-world-mode-map): Variable deleted.

Fixes: debbugs:12708

2 files changed, 10 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b40dbf6458..1ca082a52ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2012-10-24  Chong Yidong  <cyd@gnu.org>
 
+        * 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.
+
+2012-10-24  Chong Yidong  <cyd@gnu.org>
+
         * dired.el (dired-mark, dired-unmark, dired-flag-file-deletion):
         Doc fix.
 
diff --git a/lisp/time.el b/lisp/time.el
index fe3cdbb57be..c08fadd4b4e 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -206,12 +206,6 @@ a string to display as the label of that TIMEZONE's time."
   :type 'integer
   :version "23.1")
 
-(defvar display-time-world-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "q" 'kill-this-buffer)
-    map)
-  "Keymap of Display Time World mode.")
-
 ;;;###autoload
 (defun display-time ()
   "Enable display of time, load level, and mail flag in mode lines.
@@ -523,7 +517,7 @@ runs the normal hook `display-time-hook' after each update."
                  'display-time-event-handler)))
 
 
-(define-derived-mode display-time-world-mode nil "World clock"
+(define-derived-mode display-time-world-mode special-mode "World clock"
   "Major mode for buffer that displays times in various time zones.
 See `display-time-world'."
   (setq show-trailing-whitespace nil))
@@ -562,10 +556,9 @@ To turn off the world time display, go to that window and type `q'."
              (not (get-buffer display-time-world-buffer-name)))
     (run-at-time t display-time-world-timer-second 'display-time-world-timer))
   (with-current-buffer (get-buffer-create display-time-world-buffer-name)
-    (display-time-world-display display-time-world-list))
-  (pop-to-buffer display-time-world-buffer-name)
-  (fit-window-to-buffer)
-  (display-time-world-mode))
+    (display-time-world-display display-time-world-list)
+    (display-buffer display-time-world-buffer-name)
+    (display-time-world-mode)))
 
 (defun display-time-world-timer ()
   (if (get-buffer display-time-world-buffer-name)