Commit 970ad972 authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

Merge changes made in Gnus master

2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
* net/eww.el (eww-process-text-input): Display passwords as asterisks.
* net/shr.el (shr-make-table-1): Protect against invalid column-spans.

2013-06-19  Tom Tromey  <tromey@redhat.com>
* net/eww.el (eww-top-url): Remove.
(eww-home-url, eww-start-url, eww-contents-url): New defvars.
(eww-render): Set new variables.  Don't set eww-top-url.
(eww-handle-link): Handle "prev", "home", and "contents".
Downcase the rel text.
(eww-top-url): Choose best top URL.

2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
* net/eww.el: Rewrite to implement form elements "by hand" instead of
relying in widget.el.  Using widget.el leads to too many
user interface inconsistencies.
(eww-self-insert): Implement entering commands in text fields.
(eww-process-text-input): New function to make text input field editing
work.
(eww-submit): Rewrite to use the new-style form methods.
(eww-select-display): Display the correct selected item.
(eww-change-select): Implement changing the select value.
(eww-toggle-checkbox): Implement radio/checkboxes.
(eww-update-field): Fix compilation error.
(eww-tag-textarea): Implement <textarea>.
* net/shr.el (shr-urlify): Use `keymap' instead of `local-map' so that we
don't shadow mode-specific bindings.
* net/eww.el (eww-browse-url): Don't push stuff onto history if there's
nothing to push.
* net/shr.el (shr-map): Bind [down-mouse-1] to browse URLs.
parent c5803bd7
2013-06-19 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/eww.el (eww-process-text-input): Display passwords as asterisks.
* net/shr.el (shr-make-table-1): Protect against invalid column-spans.
2013-06-19 Tom Tromey <tromey@redhat.com>
* net/eww.el (eww-top-url): Remove.
(eww-home-url, eww-start-url, eww-contents-url): New defvars.
(eww-render): Set new variables. Don't set eww-top-url.
(eww-handle-link): Handle "prev", "home", and "contents".
Downcase the rel text.
(eww-top-url): Choose best top URL.
2013-06-19 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/eww.el: Rewrite to implement form elements "by hand" instead of
relying in widget.el. Using widget.el leads to too many
user interface inconsistencies.
(eww-self-insert): Implement entering commands in text fields.
(eww-process-text-input): New function to make text input field editing
work.
(eww-submit): Rewrite to use the new-style form methods.
(eww-select-display): Display the correct selected item.
(eww-change-select): Implement changing the select value.
(eww-toggle-checkbox): Implement radio/checkboxes.
(eww-update-field): Fix compilation error.
(eww-tag-textarea): Implement <textarea>.
* net/shr.el (shr-urlify): Use `keymap' instead of `local-map' so that
we don't shadow mode-specific bindings.
* net/eww.el (eww-browse-url): Don't push stuff onto history if there's
nothing to push.
* net/shr.el (shr-map): Bind [down-mouse-1] to browse URLs.
2013-06-19 Glenn Morris <rgm@fencepost.gnu.org> 2013-06-19 Glenn Morris <rgm@fencepost.gnu.org>
* emacs-lisp/eieio.el (defclass): Make it eval-and-compile once more. * emacs-lisp/eieio.el (defclass): Make it eval-and-compile once more.
......
This diff is collapsed.
...@@ -136,6 +136,7 @@ cid: URL as the argument.") ...@@ -136,6 +136,7 @@ cid: URL as the argument.")
(define-key map "z" 'shr-zoom-image) (define-key map "z" 'shr-zoom-image)
(define-key map [tab] 'shr-next-link) (define-key map [tab] 'shr-next-link)
(define-key map [backtab] 'shr-previous-link) (define-key map [backtab] 'shr-previous-link)
(define-key map [follow-link] 'mouse-face)
(define-key map "I" 'shr-insert-image) (define-key map "I" 'shr-insert-image)
(define-key map "u" 'shr-copy-url) (define-key map "u" 'shr-copy-url)
(define-key map "v" 'shr-browse-url) (define-key map "v" 'shr-browse-url)
...@@ -818,7 +819,7 @@ START, and END. Note that START and END should be markers." ...@@ -818,7 +819,7 @@ START, and END. Note that START and END should be markers."
start (point) start (point)
(list 'shr-url url (list 'shr-url url
'help-echo (if title (format "%s (%s)" url title) url) 'help-echo (if title (format "%s (%s)" url title) url)
'local-map shr-map))) 'keymap shr-map)))
(defun shr-encode-url (url) (defun shr-encode-url (url)
"Encode URL." "Encode URL."
...@@ -1462,6 +1463,9 @@ ones, in case fg and bg are nil." ...@@ -1462,6 +1463,9 @@ ones, in case fg and bg are nil."
(aset rowspans i (+ (aref rowspans i) (aset rowspans i (+ (aref rowspans i)
(1- (string-to-number (1- (string-to-number
(cdr (assq :rowspan (cdr column)))))))) (cdr (assq :rowspan (cdr column))))))))
;; Sanity check for invalid column-spans.
(when (>= width-column (length widths))
(setq width-column 0))
(setq width (setq width
(if column (if column
(aref widths width-column) (aref widths width-column)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment