martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eww: jump to next select field easier and better ftp error

Browse Source 
* net/eww.el (eww-tag-select): Add text-property to jump to next
select field.
(eww) : Add non-supported ftp error.
This commit is contained in:
Kenjiro NAKAYAMA
2013-12-22 17:40:35 -05:00
committed by Ted Zlatanov
parent 1f87a56cc7
commit 56890ecdb8
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@@ -1,3 +1,9 @@
2013-12-22 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com>
* net/eww.el (eww-tag-select): Add text-property to jump to next
select field.
(eww) : Add non-supported ftp error.
2013-12-22 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby--electric-indent-p): Improve the

30
lisp/net/eww.el
View File

@@ -144,19 +144,21 @@ See also `eww-form-checkbox-selected-symbol'."
If the input doesn't look like an URL or a domain name, the
word(s) will be searched for via `eww-search-prefix'."
(interactive "sEnter URL or keywords: ")
(cond ((string-match-p "\\`file:" url))
(t
(if (and (= (length (split-string url)) 1)
(or (> (length (split-string url "\\.")) 1)
(string-match eww-local-regex url)))
(progn
(unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url)
(setq url (concat "http://" url)))
;; some site don't redirect final /
(when (string= (url-filename (url-generic-parse-url url)) "")
(setq url (concat url "/"))))
(setq url (concat eww-search-prefix
(replace-regexp-in-string " " "+" url))))))
(cond ((string-match-p "\\`file://" url))
((string-match-p "\\`ftp://" url)
(user-error "FTP is not supported."))
(t
(if (and (= (length (split-string url)) 1)
(or (> (length (split-string url "\\.")) 1)
(string-match eww-local-regex url)))
(progn
(unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url)
(setq url (concat "http://" url)))
;; some site don't redirect final /
(when (string= (url-filename (url-generic-parse-url url)) "")
(setq url (concat url "/"))))
(setq url (concat eww-search-prefix
(replace-regexp-in-string " " "+" url))))))
(url-retrieve url 'eww-render (list url)))
;;;###autoload (defalias 'browse-web 'eww)
@@ -847,6 +849,8 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.")
(put-text-property start (point) 'eww-form menu)
(add-face-text-property start (point) 'eww-form-select)
(put-text-property start (point) 'keymap eww-select-map)
(unless (= start (point))
(put-text-property start (1+ start) 'help-echo "select field"))
(shr-ensure-paragraph))))
(defun eww-select-display (select)