Mercurial > emacs
comparison lisp/image.el @ 110000:757182d1d4cb
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 19 Aug 2010 22:47:51 +0000 |
| parents | 832428782d9f |
| children | 280c8ae2476d |
comparison
equal
deleted
inserted
replaced
| 109999:6e14b22d0a49 | 110000:757182d1d4cb |
|---|---|
| 692 (when tmo | 692 (when tmo |
| 693 (if (eq tmo 0) (setq tmo 10)) | 693 (if (eq tmo 0) (setq tmo 10)) |
| 694 (cons images tmo)))))) | 694 (cons images tmo)))))) |
| 695 | 695 |
| 696 | 696 |
| 697 (defcustom imagemagick-types-inhibit | |
| 698 '(C HTML HTM TXT PDF) | |
| 699 "Types the imagemagick loader should not try to handle.") | |
| 700 | |
| 701 ;;;###autoload | |
| 702 (defun imagemagick-register-types () | |
| 703 "Register file types that imagemagick is able to handle." | |
| 704 (let ((im-types (imagemagick-types))) | |
| 705 (dolist (im-inhibit imagemagick-types-inhibit) | |
| 706 (setq im-types (remove im-inhibit im-types))) | |
| 707 (dolist (im-type im-types) | |
| 708 (let ((extension (downcase (symbol-name im-type)))) | |
| 709 (push | |
| 710 (cons (concat "\\." extension "\\'") 'image-mode) | |
| 711 auto-mode-alist) | |
| 712 (push | |
| 713 (cons (concat "\\." extension "\\'") 'imagemagick) | |
| 714 image-type-file-name-regexps))))) | |
| 715 | |
| 716 | |
| 717 | |
| 697 (provide 'image) | 718 (provide 'image) |
| 698 | 719 |
| 699 ;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3 | 720 ;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3 |
| 700 ;;; image.el ends here | 721 ;;; image.el ends here |