2 files changed, 16 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e99950276d8..eecc10efbb9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-01  Claudio Bley  <claudio.bley@googlemail.com>
+
+        * term/w32-win.el (dynamic-library-alist): Support newer versions
+        of libjpeg starting with v7: look only for the DLL from the
+        version against which Emacs was built.
+
 2013-11-01  Bozhidar Batsov  <bozhidar@batsov.com>
 
         * progmodes/ruby-mode.el (ruby-indent-tabs-mode)
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 9690a5a7d75..bf5f1b6435c 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -221,8 +221,17 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
          '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
                ;; these are libpng 1.2.8 from GTK+
                "libpng13d.dll" "libpng13.dll"))
-       '(jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
        '(tiff "libtiff3.dll" "libtiff.dll")
+       (if (> libjpeg-version 62)
+           ;; Versions of libjpeg after 6b are incompatible with
+           ;; earlier versions, and each of versions 7, 8, and 9 is
+           ;; also incompatible with the preceding ones (the core data
+           ;; structures used for communications with the library
+           ;; gained additional members with each new version).  So we
+           ;; must use only the version of the library which Emacs was
+           ;; compiled against.
+           (list 'jpeg (format "libjpeg-%d.dll" (/ libjpeg-version 10)))
+         '(jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll"))
        ;; Versions of giflib 5.0.0 and later changed signatures of
        ;; several functions used by Emacs, which makes those versions
        ;; incompatible with previous ones.  We select the correct