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

2 files changed, 12 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5725c838cb7..762dae385b5 100644
--- 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 0265f4b5ffa..979120a1929 100644
--- 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)))