aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRüdiger Sonderfeld2015-03-04 12:34:48 +0100
committerRüdiger Sonderfeld2015-03-04 12:38:22 +0100
commit6c0a602fb8f0ac54d05e8aa13fdb1d478370c123 (patch)
treeafcbcbc94a96ded66de83d3c616e13f644d18df4
parentb209a4bf1b3686a892b04c66713a345d6c932ffc (diff)
downloademacs-6c0a602fb8f0ac54d05e8aa13fdb1d478370c123.tar.gz
emacs-6c0a602fb8f0ac54d05e8aa13fdb1d478370c123.zip
eww: Fix some docstrings/error message.
* net/eww.el (eww-search-prefix, eww-open-file, eww-search-words) (eww-same-page-p,eww-set-character-encoding): Fix docstring. (eww): Do not end error messages with a period.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/net/eww.el13
2 files changed, 13 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69c9e3cbea7..5c04663f9e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12015-03-04 Rüdiger Sonderfeld <ruediger@c-plusplus.net>
2
3 * net/eww.el (eww-search-prefix, eww-open-file, eww-search-words)
4 (eww-same-page-p,eww-set-character-encoding): Fix docstring.
5 (eww): Do not end error messages with a period.
6
12015-03-04 Zhongwei Yao <ashi08104@gmail.com> 72015-03-04 Zhongwei Yao <ashi08104@gmail.com>
2 8
3 * net/tramp-adb.el (tramp-adb-connect-if-not-connected): 9 * net/tramp-adb.el (tramp-adb-connect-if-not-connected):
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index b7ee0650d70..577cd41e30a 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -49,7 +49,7 @@
49 :type 'string) 49 :type 'string)
50 50
51(defcustom eww-search-prefix "https://duckduckgo.com/html/?q=" 51(defcustom eww-search-prefix "https://duckduckgo.com/html/?q="
52 "Prefix URL to search engine" 52 "Prefix URL to search engine."
53 :version "24.4" 53 :version "24.4"
54 :group 'eww 54 :group 'eww
55 :type 'string) 55 :type 'string)
@@ -254,7 +254,7 @@ word(s) will be searched for via `eww-search-prefix'."
254 (cond ((string-match-p "\\`file:/" url)) 254 (cond ((string-match-p "\\`file:/" url))
255 ;; Don't mangle file: URLs at all. 255 ;; Don't mangle file: URLs at all.
256 ((string-match-p "\\`ftp://" url) 256 ((string-match-p "\\`ftp://" url)
257 (user-error "FTP is not supported.")) 257 (user-error "FTP is not supported"))
258 (t 258 (t
259 ;; Anything that starts with something that vaguely looks 259 ;; Anything that starts with something that vaguely looks
260 ;; like a protocol designator is interpreted as a full URL. 260 ;; like a protocol designator is interpreted as a full URL.
@@ -292,7 +292,7 @@ word(s) will be searched for via `eww-search-prefix'."
292 292
293;;;###autoload 293;;;###autoload
294(defun eww-open-file (file) 294(defun eww-open-file (file)
295 "Render a file using EWW." 295 "Render FILE using EWW."
296 (interactive "fFile: ") 296 (interactive "fFile: ")
297 (eww (concat "file://" 297 (eww (concat "file://"
298 (and (memq system-type '(windows-nt ms-dos)) 298 (and (memq system-type '(windows-nt ms-dos))
@@ -301,7 +301,7 @@ word(s) will be searched for via `eww-search-prefix'."
301 301
302;;;###autoload 302;;;###autoload
303(defun eww-search-words (&optional beg end) 303(defun eww-search-words (&optional beg end)
304 "Search the web for the text between the point and marker. 304 "Search the web for the text between BEG and END.
305See the `eww-search-prefix' variable for the search engine used." 305See the `eww-search-prefix' variable for the search engine used."
306 (interactive "r") 306 (interactive "r")
307 (eww (buffer-substring beg end))) 307 (eww (buffer-substring beg end)))
@@ -1363,7 +1363,7 @@ If EXTERNAL is double prefix, browse in new buffer."
1363 (eww-browse-url url external))))) 1363 (eww-browse-url url external)))))
1364 1364
1365(defun eww-same-page-p (url1 url2) 1365(defun eww-same-page-p (url1 url2)
1366 "Return non-nil if both URLs represent the same page. 1366 "Return non-nil if URL1 and URL2 represent the same page.
1367Differences in #targets are ignored." 1367Differences in #targets are ignored."
1368 (let ((obj1 (url-generic-parse-url url1)) 1368 (let ((obj1 (url-generic-parse-url url1))
1369 (obj2 (url-generic-parse-url url2))) 1369 (obj2 (url-generic-parse-url url2)))
@@ -1413,7 +1413,8 @@ Differences in #targets are ignored."
1413 (expand-file-name file directory))) 1413 (expand-file-name file directory)))
1414 1414
1415(defun eww-set-character-encoding (charset) 1415(defun eww-set-character-encoding (charset)
1416 "Set character encoding." 1416 "Set character encoding to CHARSET.
1417If CHARSET is nil then use UTF-8."
1417 (interactive "zUse character set (default utf-8): ") 1418 (interactive "zUse character set (default utf-8): ")
1418 (if (null charset) 1419 (if (null charset)
1419 (eww-reload nil 'utf-8) 1420 (eww-reload nil 'utf-8)