Mercurial > emacs
comparison lisp/image-file.el @ 90116:29e773288013
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-23
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0 (patch 150-165)
- Update from CVS
- Merge from gnus--rel--5.10
- Add info/dir to arch branch
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 34-37)
- Merge from emacs--cvs-trunk--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 09 Mar 2005 00:09:34 +0000 |
| parents | 68c22ea6027c 2fa021a3a2fb |
| children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
| 90115:fb290921b93c | 90116:29e773288013 |
|---|---|
| 133 ;; This just makes the arrow displayed in the right fringe | 133 ;; This just makes the arrow displayed in the right fringe |
| 134 ;; area look correct when the image is wider than the window. | 134 ;; area look correct when the image is wider than the window. |
| 135 (setq truncate-lines t)))) | 135 (setq truncate-lines t)))) |
| 136 rval)) | 136 rval)) |
| 137 | 137 |
| 138 (put 'image-file-handler 'safe-magic t) | |
| 138 (defun image-file-handler (operation &rest args) | 139 (defun image-file-handler (operation &rest args) |
| 139 "Filename handler for inserting image files. | 140 "Filename handler for inserting image files. |
| 140 OPERATION is the operation to perform, on ARGS. | 141 OPERATION is the operation to perform, on ARGS. |
| 141 See `file-name-handler-alist' for details." | 142 See `file-name-handler-alist' for details." |
| 142 (if (and (eq operation 'insert-file-contents) | 143 (if (and (eq operation 'insert-file-contents) |