diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/newst-backend.el | 16 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 6 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 00d595c977f..ba100534085 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -757,7 +757,7 @@ from." ) ((eq status-type :error) (message "%s: Error while retrieving news from %s: %s: \"%s\"" - (format-time-string "%A, %H:%M" (current-time)) + (format-time-string "%A, %H:%M") feed-name (car status-details) (cdr status-details)))))))) @@ -787,7 +787,7 @@ See `newsticker-get-news'." FEED-NAME must be a string which occurs as the label (i.e. the first element) in an element of `newsticker-url-list' or `newsticker-url-list-defaults'." (newsticker--debug-msg "%s: Getting news for %s" - (format-time-string "%A, %H:%M" (current-time)) + (format-time-string "%A, %H:%M") feed-name) (let* ((item (or (assoc feed-name newsticker-url-list) (assoc feed-name newsticker-url-list-defaults) @@ -845,14 +845,14 @@ Argument BUFFER is the buffer of the retrieval process." (concat "%s: Newsticker could not retrieve news from %s.\n" "Return status: `%s'\n" "Command was `%s'") - (format-time-string "%A, %H:%M" (current-time)) + (format-time-string "%A, %H:%M") feed-name event command) "" (current-time) 'new 0 nil)) (message "%s: Error while retrieving news from %s" - (format-time-string "%A, %H:%M" (current-time)) + (format-time-string "%A, %H:%M") feed-name) (throw 'oops nil)) (let* ((coding-system 'utf-8) @@ -1020,7 +1020,7 @@ Argument BUFFER is the buffer of the retrieval process." (defun newsticker--do-xml-workarounds () "Fix all issues which `xml-parse-region' could be choking on." - + ;; a very very dirty workaround to overcome the ;; problems with the newest (20030621) xml.el: ;; remove all unnecessary whitespace @@ -1808,11 +1808,11 @@ download it from URL first." (time-add (nth 5 (file-attributes image-name)) (seconds-to-time 86400)))) (newsticker--debug-msg "%s: Getting image for %s skipped" - (format-time-string "%A, %H:%M" (current-time)) + (format-time-string "%A, %H:%M") feed-name) ;; download (newsticker--debug-msg "%s: Getting image for %s" - (format-time-string "%A, %H:%M" (current-time)) + (format-time-string "%A, %H:%M") feed-name) (if (eq newsticker-retrieval-method 'intern) (newsticker--image-download-by-url feed-name filename directory url) @@ -1859,7 +1859,7 @@ Save image as FILENAME in DIRECTORY, download it from URL." (unless (and (eq p-status 'exit) (= exit-status 0)) (message "%s: Error while retrieving image from %s" - (format-time-string "%A, %H:%M" (current-time)) + (format-time-string "%A, %H:%M") feed-name) (newsticker--image-remove directory feed-name) (throw 'oops nil)) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 388c2b2879c..858fad4c060 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -599,10 +599,10 @@ If ARG is non-nil, instead prompt for connection parameters." `(with-current-buffer rcirc-server-buffer ,@body)) -(defun rcirc-float-time () +(defalias 'rcirc-float-time (if (featurep 'xemacs) - (time-to-seconds (current-time)) - (float-time))) + 'time-to-seconds + 'float-time)) (defun rcirc-prompt-for-encryption (server-plist) "Prompt the user for the encryption method to use. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index ce5e2faff50..1976e0e7f66 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -5213,7 +5213,7 @@ Return ATTR." (format "%s -t %s %s" result - (format-time-string "%Y%m%d%H%M.%S" (current-time)) + (format-time-string "%Y%m%d%H%M.%S") (tramp-file-name-handler 'file-remote-p tmpfile 'localname)))) (delete-file tmpfile)) result))) |