summaryrefslogtreecommitdiff
path: root/lisp/iimage.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-11-11 00:56:44 +0000
committerMiles Bader <miles@gnu.org>2007-11-11 00:56:44 +0000
commitf23d76bdefbd4c06e14d69e99e50d35ce91c8226 (patch)
treeded28d1da6df2d0135514bac83074f4ca1c9099a /lisp/iimage.el
parente2d092da5980a7d05a5428074f8eb4925fa801e8 (diff)
parenta457417ee5ba797ab1c91d35ee957bb7a7f8d4b6 (diff)
downloademacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.gz
emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.bz2
emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.zip
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
Diffstat (limited to 'lisp/iimage.el')
-rw-r--r--lisp/iimage.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/iimage.el b/lisp/iimage.el
index 29d98cbda69..f662d9f1042 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -109,11 +109,7 @@ Examples of image filename regexps:
(interactive)
(iimage-mode 0))
-;; Emacs21.3 or earlier does not heve locate-file.
-(if (fboundp 'locate-file)
- (defalias 'iimage-locate-file 'locate-file)
- (defun iimage-locate-file (filename path)
- (locate-library filename t path)))
+(defalias 'iimage-locate-file 'locate-file)
(defun iimage-mode-buffer (arg)
"Display/undisplay images.