diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index a62a7bd8b7..d3610a2130 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -1697,11 +1697,13 @@ newsticker--update-process-ids ;; ====================================================================== (defun newsticker--images-dir () "Return directory where feed images are saved." - (concat newsticker-dir "/images/")) + (file-name-as-directory + (expand-file-name "images" newsticker-dir))) (defun newsticker--icons-dir () "Return directory where feed icons are saved." - (concat newsticker-dir "/icons/")) + (file-name-as-directory + (expand-file-name "icons" newsticker-dir))) (defun newsticker--image-get (feed-name filename directory url) "Get image for FEED-NAME by returning FILENAME from DIRECTORY. @@ -2114,7 +2116,8 @@ newsticker--cache-get-feed (defun newsticker--cache-dir () "Return directory for saving cache data." - (concat newsticker-dir "/feeds")) + (file-name-as-directory + (expand-file-name "feeds" newsticker-dir))) (defun newsticker--cache-save () "Save cache data for all feeds." @@ -2125,11 +2128,15 @@ newsticker--cache-save (defun newsticker--cache-save-feed (feed) "Save cache data for FEED." - (let ((dir (concat (newsticker--cache-dir) "/" (symbol-name (car feed))))) + (let ((dir (file-name-as-directory + (expand-file-name (symbol-name (car feed)) + (newsticker--cache-dir)))) + (print-level nil) + (print-length nil)) (unless (file-directory-p dir) (make-directory dir t)) (let ((coding-system-for-write 'utf-8)) - (with-temp-file (concat dir "/data") + (with-temp-file (expand-file-name "data" dir) (insert ";; -*- coding: utf-8 -*-\n") (insert (prin1-to-string (cdr feed))))))) @@ -2141,7 +2148,7 @@ newsticker--cache-read (defun newsticker--cache-read-feed (feed-name) "Read cache data for feed named FEED-NAME." - (let ((file-name (concat (newsticker--cache-dir) "/" feed-name "/data")) + (let ((file-name (expand-file-name "data" (expand-file-name feed-name (newsticker--cache-dir))) (coding-system-for-read 'utf-8)) (when (file-exists-p file-name) (with-temp-buffer @@ -2334,14 +2343,15 @@ newsticker-download-images "Download the first image. If FEEDNAME equals \"imagefeed\" download the first image URL found in the description=contents of ITEM to the directory -\"~/tmp/newsticker/FEEDNAME/TITLE\" where TITLE is the title of +`temporary-file-directory'/newsticker/FEEDNAME/TITLE where TITLE is the title of the item." (when (string= feedname "imagefeed") (let ((title (newsticker--title item)) (desc (newsticker--desc item))) (when (string-match "