Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu

[gnu-emacs] / lisp / midnight.el

diff --git a/lisp/midnight.el b/lisp/midnight.el
index 710c9fafe0b3ad97ce43855615763271507c92a3..9a6b162e986776b6db526bec8924dd6c4d4c0c8a 100644 (file)
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -1,10 +1,9 @@
 ;;; midnight.el --- run something every midnight, e.g., kill old buffers
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2011 Free Software Foundation, Inc.
 
-;; Author: Sam Steingold <sds@usa.net>
-;; Maintainer: Sam Steingold <sds@usa.net>
+;; Author: Sam Steingold <sds@gnu.org>
+;; Maintainer: Sam Steingold <sds@gnu.org>
 ;; Created: 1998-05-18
 ;; Keywords: utilities
 
@@ -126,7 +125,7 @@ See also `clean-buffer-list-kill-regexps',
   :group 'midnight)
 
 (defcustom clean-buffer-list-kill-never-buffer-names
-    '("*scratch*" "*Messages*" "*server*")
+    '("*scratch*" "*Messages*")
   "List of buffer names which will never be killed by `clean-buffer-list'.
 See also `clean-buffer-list-kill-never-regexps'.
 Note that this does override `clean-buffer-list-kill-regexps' and
@@ -205,7 +204,8 @@ The default value is `clean-buffer-list'."
 
 (defun midnight-next ()
   "Return the number of seconds till the next midnight."
-  (multiple-value-bind (sec min hrs) (decode-time)
+  (multiple-value-bind (sec min hrs)
+      (values-list (decode-time))
     (- (* 24 60 60) (* 60 60 hrs) (* 60 min) sec)))
 
 ;;;###autoload
@@ -233,5 +233,4 @@ first argument to `run-at-time'."
 
 (provide 'midnight)
 
-;; arch-tag: a5979be9-2890-46a3-ba84-791f0a4a6e80
 ;;; midnight.el ends here