aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2014-01-12 22:25:10 +0800
committerXue Fuqiao2014-01-12 22:25:10 +0800
commite6344e177a536368b1a4506acb53b24f5f166aef (patch)
treef7f31cde2e4a2e46d0f40f17c952751fd8022681
parent1f0d4409595ddc25962fa857ebc593a16a289c0d (diff)
downloademacs-e6344e177a536368b1a4506acb53b24f5f166aef.tar.gz
emacs-e6344e177a536368b1a4506acb53b24f5f166aef.zip
Rename eww-download-path to eww-download-directory.
* lisp/net/eww.el (eww-download-directory): Rename from `eww-download-path' (Bug#16419). * doc/misc/eww.texi (Basics): Use "directory" instead of "path" (Bug#16419).
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/eww.texi8
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/eww.el4
4 files changed, 15 insertions, 6 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a036a60d208..54a2a5de146 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12014-01-12 Xue Fuqiao <xfq.free@gmail.com>
2
3 * eww.texi (Basics): Use "directory" instead of "path" (Bug#16419).
4
12014-01-12 Glenn Morris <rgm@gnu.org> 52014-01-12 Glenn Morris <rgm@gnu.org>
2 6
3 * efaq.texi (Guidelines for newsgroup postings) 7 * efaq.texi (Guidelines for newsgroup postings)
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index b84de7509da..6fc344d8465 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -83,8 +83,8 @@ However a GNU Emacs with @code{libxml2} support is required.
83If the input doesn't look like a URL or domain name the web will be 83If the input doesn't look like a URL or domain name the web will be
84searched via @code{eww-search-prefix}. The default search engine is 84searched via @code{eww-search-prefix}. The default search engine is
85@url{https://duckduckgo.com, DuckDuckGo}. If you want to open a file 85@url{https://duckduckgo.com, DuckDuckGo}. If you want to open a file
86either prefix the path with @code{file://} or use the command @kbd{M-x 86either prefix the file name with @code{file://} or use the command
87eww-open-file}. 87@kbd{M-x eww-open-file}.
88 88
89@findex eww-quit 89@findex eww-quit
90@findex eww-reload 90@findex eww-reload
@@ -99,12 +99,12 @@ web page hit @kbd{g} (@code{eww-reload}). Pressing @kbd{w}
99(@code{eww-copy-page-url}) will copy the current URL to the kill ring. 99(@code{eww-copy-page-url}) will copy the current URL to the kill ring.
100 100
101@findex eww-download 101@findex eww-download
102@vindex eww-download-path 102@vindex eww-download-directory
103@kindex d 103@kindex d
104@cindex Download 104@cindex Download
105 A URL under the point can be downloaded with @kbd{d} 105 A URL under the point can be downloaded with @kbd{d}
106(@code{eww-download}). The file will be written to the directory 106(@code{eww-download}). The file will be written to the directory
107specified in @code{eww-download-path} (Default: @file{~/Downloads/}). 107specified in @code{eww-download-directory} (Default: @file{~/Downloads/}).
108 108
109@findex eww-back-url 109@findex eww-back-url
110@findex eww-forward-url 110@findex eww-forward-url
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7abcbee02b2..2b6065b7630 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-01-12 Xue Fuqiao <xfq.free@gmail.com>
2
3 * net/eww.el (eww-download-directory): Rename from
4 `eww-download-path' (Bug#16419).
5
12014-01-12 Leo Liu <sdl.web@gmail.com> 62014-01-12 Leo Liu <sdl.web@gmail.com>
2 7
3 * dired-x.el (dired-mode-map): Fix last change. 8 * dired-x.el (dired-mode-map): Fix last change.
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 38726fd7dcc..4375a31bd36 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -50,8 +50,8 @@
50 :group 'eww 50 :group 'eww
51 :type 'string) 51 :type 'string)
52 52
53(defcustom eww-download-path "~/Downloads/" 53(defcustom eww-download-directory "~/Downloads/"
54 "Path where files will downloaded." 54 "Directory where files will downloaded."
55 :version "24.4" 55 :version "24.4"
56 :group 'eww 56 :group 'eww
57 :type 'string) 57 :type 'string)