diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-10-31 06:28:09 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-10-31 06:28:09 +0000 |
| commit | 91dd4dc44291d513b64ee95736c0b1dbd519bd82 (patch) | |
| tree | 254c41df95ab1b66ba0c8aefdf275e5b50869355 /lisp/iimage.el | |
| parent | 2c3a09b1ac5070ffe0371c7ca9ea1bcf4f462237 (diff) | |
| download | emacs-91dd4dc44291d513b64ee95736c0b1dbd519bd82.tar.gz | |
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
Diffstat (limited to 'lisp/iimage.el')
| -rw-r--r-- | lisp/iimage.el | 6 |
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. |