Merge from emacs-24; up to 117691

[gnu-emacs] / lisp / textmodes / remember.el

diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 95b947481b51e46b716b1f3ae164e28f373fee1b..260e7abfff3c666dbfbbf915a352ffe9b3f6c40d 100644 (file)
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -319,9 +319,7 @@ With a prefix or a visible region, use the region as INITIAL."
 
 (defsubst remember-mail-date (&optional rfc822-p)
   "Return a simple date.  Nothing fancy."
-  (if rfc822-p
-      (format-time-string "%a, %e %b %Y %T %z" (current-time))
-    (format-time-string "%a %b %e %T %Y" (current-time))))
+  (format-time-string (if rfc822-p "%a, %e %b %Y %T %z" "%a %b %e %T %Y")))
 
 (defun remember-buffer-desc ()
   "Using the first line of the current buffer, create a short description."
@@ -461,8 +459,7 @@ Used by `remember-store-in-files'."
   "Store remember data in a file in `remember-data-directory'.
 The file is named by calling `format-time-string' using
 `remember-directory-file-name-format' as the format string."
-  (let ((name (format-time-string
-              remember-directory-file-name-format (current-time)))
+  (let ((name (format-time-string remember-directory-file-name-format))
         (text (buffer-string)))
     (with-temp-buffer
       (insert text)