(sc-cite-original): Add autoload.

[bpt/emacs.git] / lisp / time.el

diff --git a/lisp/time.el b/lisp/time.el
index 3e61e78..413783d 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,6 +1,6 @@
 ;;; time.el --- display time and load in mode line of Emacs.
 
-;; Copyright (C) 1985, 1986, 1987, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1993, 1994 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -72,10 +72,13 @@ After each update, `display-time-hook' is run with `run-hooks'."
              (setq global-mode-string
                    (append global-mode-string '(display-time-string))))
          (setq display-time-string "")
-         (setq display-time-process
-               (start-process "display-time" nil
-                              (expand-file-name "wakeup" exec-directory)
-                              (int-to-string display-time-interval)))
+         ;; Using a pty is wasteful, and the separate session causes
+         ;; annoyance sometimes (some systems kill idle sessions).
+         (let ((process-connection-type nil))
+           (setq display-time-process
+                 (start-process "display-time" nil
+                                (expand-file-name "wakeup" exec-directory)
+                                (int-to-string display-time-interval))))
          (process-kill-without-query display-time-process)
          (set-process-sentinel display-time-process 'display-time-sentinel)
          (set-process-filter display-time-process 'display-time-filter)))))
@@ -98,9 +101,7 @@ After each update, `display-time-hook' is run with `run-hooks'."
        (mail-spool-file (or display-time-mail-file
                             (getenv "MAIL")
                             (concat rmail-spool-directory
-                                    (or (getenv "LOGNAME")
-                                        (getenv "USER")
-                                        (user-login-name)))))
+                                    (user-login-name))))
        hour am-pm-flag mail-flag)
     (setq hour (read (substring time 11 13)))
     (if (not display-time-24hr-format)