Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25

This commit is contained in:
Michael Albinus 2016-01-04 23:28:23 +01:00
commit 31a97acf43

View file

@ -1361,7 +1361,7 @@ The preference is a float determined from `shr-prefer-media-type'."
(start (point)))
(unless url
(setq url (car (shr--extract-best-source dom))))
(if image
(if (> (length image) 0)
(shr-tag-img nil image)
(shr-insert " [video] "))
(shr-urlify start (shr-expand-url url))))