Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / gnus-diary.el

diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index af278b4427d5bb6d5124206ab3c90e3e670cf275..4dc4f7a022bada6705d2aca3b7172c78b3a6153e 100644 (file)
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -50,19 +50,19 @@
   :group 'gnus)
 
 (defcustom gnus-diary-summary-line-format "%U%R%z %uD: %(%s%) (%ud)\n"
-  "*Summary line format for nndiary groups."
+  "Summary line format for nndiary groups."
   :type 'string
   :group 'gnus-diary
   :group 'gnus-summary-format)
 
 (defcustom gnus-diary-time-format "%a, %b %e %y, %H:%M"
-  "*Time format to display appointments in nndiary summary buffers.
+  "Time format to display appointments in nndiary summary buffers.
 Please refer to `format-time-string' for information on possible values."
   :type 'string
   :group 'gnus-diary)
 
 (defcustom gnus-diary-delay-format-function 'gnus-diary-delay-format-english
-  "*Function called to format a diary delay string.
+  "Function called to format a diary delay string.
 It is passed two arguments.  The first one is non-nil if the delay is in
 the past.  The second one is of the form ((NUM . UNIT) ...) where NUM is
 an integer and UNIT is one of 'year 'month 'week 'day 'hour or 'minute.
@@ -161,7 +161,7 @@ There are currently two built-in format functions:
         (sched (gnus-diary-header-schedule extras))
         (occur (nndiary-next-occurence sched (current-time)))
         (now (current-time))
-        (real-time (subtract-time occur now)))
+        (real-time (time-subtract occur now)))
     (if (null real-time)
        "?????"
       (let* ((sec (+ (* (float (car real-time)) 65536) (cadr real-time)))