[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r112981: lisp/gnus/shr.el (shr-tag-table-1): Mark th
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] trunk r112981: lisp/gnus/shr.el (shr-tag-table-1): Mark the preliminary table renderings instead of the final one so that we can more easily distinguish them |
Date: |
Fri, 14 Jun 2013 03:22:34 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112981
revision-id: address@hidden
parent: address@hidden
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2013-06-14 03:22:26 +0000
message:
lisp/gnus/shr.el (shr-tag-table-1): Mark the preliminary table renderings
instead of the final one so that we can more easily distinguish them
lisp/gnus/eww.el (eww-submit): Compute the submission URL correctly
modified:
lisp/gnus/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1433
lisp/gnus/eww.el eww.el-20130610114603-80ap3gwnw4x4m5ix-1
lisp/gnus/shr.el shr.el-20101002102929-yfzewk55rsg0mn93-1
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2013-06-13 17:05:22 +0000
+++ b/lisp/gnus/ChangeLog 2013-06-14 03:22:26 +0000
@@ -1,3 +1,10 @@
+2013-06-13 Lars Magne Ingebrigtsen <address@hidden>
+
+ * 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 <address@hidden>
* sieve-manage.el (sieve-manage-open-server): Don't quote lambda.
=== modified file 'lisp/gnus/eww.el'
--- a/lisp/gnus/eww.el 2013-06-13 14:31:52 +0000
+++ b/lisp/gnus/eww.el 2013-06-14 03:22:26 +0000
@@ -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)))
=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el 2013-06-13 14:31:52 +0000
+++ b/lisp/gnus/shr.el 2013-06-14 03:22:26 +0000
@@ -115,7 +115,7 @@
(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 @@
(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 @@
(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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r112981: lisp/gnus/shr.el (shr-tag-table-1): Mark the preliminary table renderings instead of the final one so that we can more easily distinguish them,
Katsumi Yamaoka <=