(image-file-name-regexp): image-file-regexps -> image-file-name-regexps.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5725c838cb7eb1ad9589ed67b94735a5c00f5232..762dae385b5f59ad8f6f22e090b6e99903efa96f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,19 @@
+2000-10-06  Dave Love  <fx@gnu.org>
+
+       * image-file.el (image-file-name-regexp): image-file-regexps ->
+       image-file-name-regexps.
+
 2000-10-06  Gerd Moellmann  <gerd@gnu.org>
 
        * loadup.el (toplevel): Load `loaddefs' before `help' because the
        latter needs the autoloaded define-minor-mode macro during the
        bootstrap.
 
+2000-10-06  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * simple.el (shell-command-on-region): If the output is short
+       enough to display in an expanded echo area, show it here.
+
        * startup.el (command-line): For now, activate tool-bar-mode only
        if XPM images are supported.
 

diff --git a/lisp/image-file.el b/lisp/image-file.el
index 0265f4b5ffac1bfc9b064e04c0567dbf6bc501b9..979120a1929518dbc40d18f81f950ce357e9b739 100644 (file)
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -85,8 +85,8 @@ variable is set using \\[customize]."
     (if image-file-name-regexps
        (mapconcat 'identity
                   (if exts-regexp
-                      (cons exts-regexp image-file-regexps)
-                    image-file-regexps)
+                      (cons exts-regexp image-file-name-regexps)
+                    image-file-name-regexps)
                   "\\|")
       exts-regexp)))