2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca7226a1443..a4c9827236c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2013-12-01  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
+        * net/shr.el (shr-tag-video): Display content for video if no
+        poster is available.
+
+        * net/eww.el (eww-text-input-types): : New const.
+        (eww-process-text-input): Treat input types in
+        `eww-text-input-types' as text.
+
         * net/shr.el (shr-tag-table): Fix comment typo.
 
 2013-12-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index cc18707c8ae..d4f57ee0bb1 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1100,7 +1100,9 @@ ones, in case fg and bg are nil."
   (let ((image (cdr (assq :poster cont)))
         (url (cdr (assq :src cont)))
         (start (point)))
-    (shr-tag-img nil image)
+    (if image
+        (shr-tag-img nil image)
+      (shr-insert " [video] "))
     (shr-urlify start (shr-expand-url url))))
 
 (defun shr-tag-img (cont &optional url)