From: "lux" <lx@shellcodes.org>
To: 62435@debbugs.gnu.org
Subject: bug#62435: [PATCH] 29.0 Fix eww--download-directory on MS-Windows
Date: Sat, 25 Mar 2023 19:56:43 +0800 [thread overview]
Message-ID: <tencent_063B041F701ACE10D6C0D4CCDC81CACB870A@qq.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 130 bytes --]
The eww--download-directory hardcodes the download path, so it does not
work on MS-Windows, I fixed it, and tested on MS-Windows.
[-- Attachment #1.2: Type: text/html, Size: 136 bytes --]
[-- Attachment #2: 0001-Fix-eww-download-directory-on-Windows.patch --]
[-- Type: application/octet-stream, Size: 1610 bytes --]
From b4c5ed1d8fee7b69a079ee883344bf483faf7a52 Mon Sep 17 00:00:00 2001
From: Xi Lu <lx@shellcodes.org>
Date: Sat, 25 Mar 2023 14:44:35 +0800
Subject: [PATCH] Fix eww--download-directory on Windows.
* lisp/net/eww.el: Add get the download directory on MS-Windows.
---
lisp/net/eww.el | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 859a9b44bcb..ac3af4677b5 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -66,14 +66,17 @@ eww-use-browse-url
(defun eww--download-directory ()
"Return the name of the download directory.
-If ~/Downloads/ exists, that will be used, and if not, the
-DOWNLOAD XDG user directory will be returned. If that's
+If ~/Downloads/ or %USERPROFILE% on Windows exists, that will be used,
+and if not, the DOWNLOAD XDG user directory will be returned. If that's
undefined, ~/Downloads/ is returned anyway."
- (or (and (file-exists-p "~/Downloads/")
- "~/Downloads/")
- (when-let ((dir (xdg-user-dir "DOWNLOAD")))
- (file-name-as-directory dir))
- "~/Downloads/"))
+ (let ((download-dir (if (eq system-type 'windows-nt)
+ (concat (getenv "USERPROFILE") "\\Downloads\\")
+ (concat (getenv "HOME") "/Downloads/"))))
+ (or (and (file-exists-p download-dir)
+ download-dir)
+ (when-let ((dir (xdg-user-dir "DOWNLOAD")))
+ (file-name-as-directory dir))
+ download-dir)))
(defcustom eww-download-directory 'eww--download-directory
"Directory where files will downloaded.
--
2.39.2
next reply other threads:[~2023-03-25 11:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-25 11:56 lux [this message]
2023-03-25 13:25 ` bug#62435: [PATCH] 29.0 Fix eww--download-directory on MS-Windows Eli Zaretskii
2023-03-25 13:42 ` lux
2023-03-25 14:05 ` Eli Zaretskii
2023-03-25 14:17 ` lux
2023-03-26 11:59 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_063B041F701ACE10D6C0D4CCDC81CACB870A@qq.com \
--to=lx@shellcodes.org \
--cc=62435@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).