[gnus git] branch master updated: m0-7-73-ge7cd5bb =1= * eww.el (eww-submit): Compute the submission URL correctly.
Lars Magne Ingebrigtsen <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via e7cd5bb8056e88e5292bcc7615e88178fcb5ef88 (commit)
from fe3446fb569321acf903491849908c2fdc55f003 (commit)
- Log -----------------------------------------------------------------
commit e7cd5bb8056e88e5292bcc7615e88178fcb5ef88
Author: Lars Magne Ingebrigtsen <[email protected]>
Date: Fri Jun 14 01:19:51 2013 +0200
* eww.el (eww-submit): Compute the submission URL correctly.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cff8daf..a38bbcf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-13 Lars Magne Ingebrigtsen <[email protected]>
+
+ * shr.el (shr-tag-table-1): Mark the preliminary table renderings
+ instead of the final one so that we can more easily distinguish them.
+
+ * eww.el (eww-submit): Compute the submission URL correctly.
+
2013-06-13 Stefan Monnier <[email protected]>
* sieve-manage.el (sieve-manage-open-server): Don't quote lambda.
diff --git a/lisp/eww.el b/lisp/eww.el
index d4dd178..e973f7d 100644
--- a/lisp/eww.el
+++ b/lisp/eww.el
@@ -192,7 +192,9 @@
(start (point)))
(shr-ensure-paragraph)
(shr-generic cont)
- (shr-ensure-paragraph)
+ (unless (bolp)
+ (insert "\n"))
+ (insert "\n")
(when (> (point) start)
(put-text-property start (1+ start)
'eww-form eww-form))))
@@ -235,11 +237,9 @@
:name (cdr (assq :name cont))
:eww-form eww-form)))))
(if (eq (car widget) 'hidden)
- (when shr-final-table-render
- (nconc eww-form (list widget)))
- (apply 'widget-create widget))
- (put-text-property start (point) 'eww-widget widget)
- (insert " ")))
+ (nconc eww-form (list widget))
+ (apply 'widget-create widget)
+ (put-text-property start (point) 'eww-widget widget))))
(defun eww-tag-select (cont)
(shr-ensure-paragraph)
@@ -331,11 +331,12 @@
(url-request-data (mm-url-encode-www-form-urlencoded values)))
(eww-browse-url (shr-expand-url (cdr (assq :action form)))))
(eww-browse-url
- (shr-expand-url
(concat
- (cdr (assq :action form))
+ (if (cdr (assq :action form))
+ (shr-expand-url (cdr (assq :action form)))
+ eww-current-url)
"?"
- (mm-url-encode-www-form-urlencoded values))))))))
+ (mm-url-encode-www-form-urlencoded values)))))))
(defun eww-convert-widgets ()
(let ((start (point-min))
@@ -353,7 +354,9 @@
(plist-get (overlay-properties overlay) 'field))
(delete-overlay overlay)))
(delete-region start end))
- (apply 'widget-create widget))
+ (when (and widget
+ (not (eq (car widget) 'hidden)))
+ (apply 'widget-create widget)))
(widget-setup)
(eww-fix-widget-keymap)))
diff --git a/lisp/shr.el b/lisp/shr.el
index 8cb1663..b5e3b42 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -115,7 +115,7 @@ cid: URL as the argument.")
(defvar shr-base nil)
(defvar shr-ignore-cache nil)
(defvar shr-external-rendering-functions nil)
-(defvar shr-final-table-render nil)
+(defvar shr-preliminary-table-render nil)
(defvar shr-map
(let ((map (make-sparse-keymap)))
@@ -1167,6 +1167,7 @@ ones, in case fg and bg are nil."
(setq cont (or (cdr (assq 'tbody cont))
cont))
(let* ((shr-inhibit-images t)
+ (shr-preliminary-table-render t)
(shr-table-depth (1+ shr-table-depth))
(shr-kinsoku-shorten t)
;; Find all suggested widths.
@@ -1188,8 +1189,8 @@ ones, in case fg and bg are nil."
(frame-width))
(setq truncate-lines t))
;; Then render the table again with these new "hard" widths.
- (let ((shr-final-table-render t))
- (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths)))
+ (setq shr-preliminary-table-render nil)
+ (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths))
;; Finally, insert all the images after the table. The Emacs buffer
;; model isn't strong enough to allow us to put the images actually
;; into the tables.
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 7 +++++++
lisp/eww.el | 27 +++++++++++++++------------
lisp/shr.el | 7 ++++---
3 files changed, 26 insertions(+), 15 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project