diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-04-15 13:02:04 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-04-15 13:02:04 -0400 |
| commit | 7191318b716debaca15b56ebf7b13f5a1b07b0f9 (patch) | |
| tree | 010209f880a0076436ef0140ef11883dddd88ad9 /lisp/image.el | |
| parent | febf4467bde3a7d90265f826f7e450a5c0f6ca46 (diff) | |
| parent | 864a4dc236395e441aafd23b9cbca099afdc5324 (diff) | |
| download | emacs-7191318b716debaca15b56ebf7b13f5a1b07b0f9.tar.gz | |
Merge from origin/emacs-29
864a4dc2363 Fix compilation of w32.c with old MinGW system headers
a22eb9ae0f9 ruby-add-log-current-method: Reduce the use of 'nreverse'
17d803d0a75 Fix detection of WebP images by their signature
43290391ce2 ; Eglot: make version parseable by version-to-list
6e6e8b5c974 Add more documentation for the keys of `package-vc-select...
7972b76c2c7 ; vc-checkout: Wrap var lookup in 'bound-and-true-p'
e9fef1d70ff vc-checkout: Try to use the vc-dir's backend first
372e024accd ; Fix wallpaper-tests on XFCE
7055fd8e43e Improve documentation related to 'ispell-complete-word'
61fd017abde * configure.ac: Add -lbsd on Haiku.
05971c4d9a4 Add menu to 'c-ts-mode' and 'c++-ts-mode'
# Conflicts:
# lisp/progmodes/eglot.el
# lisp/progmodes/ruby-mode.el
Diffstat (limited to 'lisp/image.el')
| -rw-r--r-- | lisp/image.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/image.el b/lisp/image.el index a32ff1a35bb..08190cf86bc 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -51,7 +51,7 @@ static \\(unsigned \\)?char \\1_bits" . xbm) ("\\`\\(?:MM\0\\*\\|II\\*\0\\)" . tiff) ("\\`[\t\n\r ]*%!PS" . postscript) ("\\`\xff\xd8" . jpeg) ; used to be (image-jpeg-p . jpeg) - ("\\`RIFF....WEBPVP8" . webp) + ("\\`RIFF[^z-a][^z-a][^z-a][^z-a]WEBPVP8" . webp) (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)"))) (concat "\\(?:<\\?xml[ \t\r\n]+[^>]*>\\)?[ \t\r\n]*<" |