Mercurial > emacs
comparison lisp/image-mode.el @ 109853:fe07c47cf7a7
merge and fixes
| author | Joakim <joakim@localhost.localdomain> |
|---|---|
| date | Thu, 13 May 2010 15:13:52 +0200 |
| parents | 973b5bc5fcfe |
| children | 24d486687f54 |
comparison
equal
deleted
inserted
replaced
| 109852:e56f669f17ce | 109853:fe07c47cf7a7 |
|---|---|
| 390 displays an image file as text. `image-minor-mode' provides the key | 390 displays an image file as text. `image-minor-mode' provides the key |
| 391 \\<image-mode-map>\\[image-toggle-display] to switch back to `image-mode' | 391 \\<image-mode-map>\\[image-toggle-display] to switch back to `image-mode' |
| 392 to display an image file as the actual image. | 392 to display an image file as the actual image. |
| 393 | 393 |
| 394 You can use `image-mode-as-text' in `auto-mode-alist' when you want | 394 You can use `image-mode-as-text' in `auto-mode-alist' when you want |
| 395 to display an image file as text inititally. | 395 to display an image file as text initially. |
| 396 | 396 |
| 397 See commands `image-mode' and `image-minor-mode' for more information | 397 See commands `image-mode' and `image-minor-mode' for more information |
| 398 on these modes." | 398 on these modes." |
| 399 (interactive) | 399 (interactive) |
| 400 ;; image-mode-as-text = normal-mode + image-minor-mode | 400 ;; image-mode-as-text = normal-mode + image-minor-mode |