From 09fece5722f6a6235936526991092fa444e0bd8c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 29 Mar 2023 21:27:09 +0300 Subject: [PATCH] Fix duplicate defcustom in eww.el * lisp/net/eww.el (eww-default-download-directory): Renamed back from 'eww-download-directory'; all users changed. Doc fix. (Bug#62531) --- lisp/net/eww.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 9451083f396..bc5f3e38ed5 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -64,8 +64,9 @@ The action to be taken can be further customized via :version "28.1" :type 'regexp) -(defcustom eww-download-directory "~/Downloads/" - "Default directory where `eww' saves downloaded files." +(defcustom eww-default-download-directory "~/Downloads/" + "Default directory where `eww' saves downloaded files. +Used by `eww--download-directory', which see." :version "29.1" :group 'eww :type 'directory) @@ -76,10 +77,10 @@ The default is specified by `eww-download-directory'; however, if that directory doesn't exist and the DOWNLOAD XDG user directory is defined, use the latter instead." (or (and (file-exists-p eww-download-directory) - eww-download-directory) + eww-default-download-directory) (when-let ((dir (xdg-user-dir "DOWNLOAD"))) (file-name-as-directory dir)) - eww-download-directory)) + eww-default-download-directory)) (defcustom eww-download-directory 'eww--download-directory "Directory where files will downloaded.