lisp/gnus/shr.el (shr-tag-table-1): Mark the preliminary table renderings instead...

lisp/gnus/eww.el (eww-submit): Compute the submission URL correctly

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1b17819fa7ea3307c6a3cda82b5400243a55314e..87256adec0c9b724546d7545e77473253794d01b 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * 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  <monnier@iro.umontreal.ca>
 
        * sieve-manage.el (sieve-manage-open-server): Don't quote lambda.

diff --git a/lisp/gnus/eww.el b/lisp/gnus/eww.el
index d4dd178fb706cf22498af3165aa9e5f43d41b9c1..4a8549c80f0449ab0d5120f056a19be8daa3a7f0 100644 (file)
--- a/lisp/gnus/eww.el
+++ b/lisp/gnus/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/gnus/shr.el b/lisp/gnus/shr.el
index 8cb16634e2b3e07cd8ad968b91e758fe97c348f1..b5e3b4246a3354a0b314650d08d2a888759aeccb 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/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.