aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2016-01-04 23:28:23 +0100
committerMichael Albinus2016-01-04 23:28:23 +0100
commit31a97acf43b7eb95f3ddc6ceca1682b35a5b1945 (patch)
tree6590ed1a51cfc2ff3845127627ee50ac20c2fbf5
parent4e62197a64e6386e24b328c40d6020412ea3031d (diff)
parent9fb185aff7b1f36c30bd157ec446d9bad104d1ee (diff)
downloademacs-31a97acf43b7eb95f3ddc6ceca1682b35a5b1945.tar.gz
emacs-31a97acf43b7eb95f3ddc6ceca1682b35a5b1945.zip
Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
-rw-r--r--lisp/net/shr.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 979b0caeea5..0703171a436 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1361,7 +1361,7 @@ The preference is a float determined from `shr-prefer-media-type'."
1361 (start (point))) 1361 (start (point)))
1362 (unless url 1362 (unless url
1363 (setq url (car (shr--extract-best-source dom)))) 1363 (setq url (car (shr--extract-best-source dom))))
1364 (if image 1364 (if (> (length image) 0)
1365 (shr-tag-img nil image) 1365 (shr-tag-img nil image)
1366 (shr-insert " [video] ")) 1366 (shr-insert " [video] "))
1367 (shr-urlify start (shr-expand-url url)))) 1367 (shr-urlify start (shr-expand-url url))))