Mercurial > emacs
annotate lisp/image-mode.el @ 91610:39643299db55
Some tidying post-unicode-merge: typos, tense, simplification, filling.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 07 Feb 2008 06:19:35 +0000 |
parents | d6247c939edc |
children | e788f311729d |
rev | line source |
---|---|
60694 | 1 ;;; image-mode.el --- support for visiting image files |
2 ;; | |
87557 | 3 ;; Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
60694 | 4 ;; |
5 ;; Author: Richard Stallman <rms@gnu.org> | |
6 ;; Keywords: multimedia | |
7 | |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77989
diff
changeset
|
12 ;; the Free Software Foundation; either version 3, or (at your option) |
60694 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64091 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
60694 | 24 |
25 ;;; Commentary: | |
26 | |
27 ;; Defines a major mode for visiting image files | |
28 ;; that allows conversion between viewing the text of the file | |
29 ;; and viewing the file as an image. Viewing the image | |
30 ;; works by putting a `display' text-property on the | |
31 ;; image data, with the image-data still present underneath; if the | |
32 ;; resulting buffer file is saved to another name it will correctly save | |
33 ;; the image data to the new file. | |
34 | |
35 ;;; Code: | |
36 | |
37 (require 'image) | |
38 | |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
39 ;;;###autoload (push '("\\.jpe?g\\'" . image-mode) auto-mode-alist) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
40 ;;;###autoload (push '("\\.png\\'" . image-mode) auto-mode-alist) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
41 ;;;###autoload (push '("\\.gif\\'" . image-mode) auto-mode-alist) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
42 ;;;###autoload (push '("\\.tiff?\\'" . image-mode) auto-mode-alist) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
43 ;;;###autoload (push '("\\.p[bpgn]m\\'" . image-mode) auto-mode-alist) |
82836
4526cbe33367
Add autoloads to put associations in auto-mode-alist:
Juri Linkov <juri@jurta.org>
parents:
82770
diff
changeset
|
44 |
4526cbe33367
Add autoloads to put associations in auto-mode-alist:
Juri Linkov <juri@jurta.org>
parents:
82770
diff
changeset
|
45 ;;;###autoload (push '("\\.x[bp]m\\'" . c-mode) auto-mode-alist) |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
46 ;;;###autoload (push '("\\.x[bp]m\\'" . image-mode-maybe) auto-mode-alist) |
60694 | 47 |
82836
4526cbe33367
Add autoloads to put associations in auto-mode-alist:
Juri Linkov <juri@jurta.org>
parents:
82770
diff
changeset
|
48 ;;;###autoload (push '("\\.svgz?\\'" . xml-mode) auto-mode-alist) |
4526cbe33367
Add autoloads to put associations in auto-mode-alist:
Juri Linkov <juri@jurta.org>
parents:
82770
diff
changeset
|
49 ;;;###autoload (push '("\\.svgz?\\'" . image-mode-maybe) auto-mode-alist) |
4526cbe33367
Add autoloads to put associations in auto-mode-alist:
Juri Linkov <juri@jurta.org>
parents:
82770
diff
changeset
|
50 |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
51 ;;; Image scrolling functions |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
52 |
88062
4ff20f6b1ec8
* image-mode.el (image-mode-current-vscroll)
Tassilo Horn <tassilo@member.fsf.org>
parents:
88057
diff
changeset
|
53 (defvar image-mode-current-vscroll nil |
4ff20f6b1ec8
* image-mode.el (image-mode-current-vscroll)
Tassilo Horn <tassilo@member.fsf.org>
parents:
88057
diff
changeset
|
54 "An alist with elements (WINDOW . VSCROLL).") |
88103
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
55 (make-variable-buffer-local 'image-mode-current-vscroll) |
88062
4ff20f6b1ec8
* image-mode.el (image-mode-current-vscroll)
Tassilo Horn <tassilo@member.fsf.org>
parents:
88057
diff
changeset
|
56 |
4ff20f6b1ec8
* image-mode.el (image-mode-current-vscroll)
Tassilo Horn <tassilo@member.fsf.org>
parents:
88057
diff
changeset
|
57 (defvar image-mode-current-hscroll nil |
4ff20f6b1ec8
* image-mode.el (image-mode-current-vscroll)
Tassilo Horn <tassilo@member.fsf.org>
parents:
88057
diff
changeset
|
58 "An alist with elements (WINDOW . HSCROLL).") |
88103
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
59 (make-variable-buffer-local 'image-mode-current-hscroll) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
60 |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
61 (defun image-set-window-vscroll (window vscroll &optional pixels-p) |
88062
4ff20f6b1ec8
* image-mode.el (image-mode-current-vscroll)
Tassilo Horn <tassilo@member.fsf.org>
parents:
88057
diff
changeset
|
62 (setq image-mode-current-vscroll |
88103
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
63 (cons (cons window vscroll) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
64 (delq (assq window image-mode-current-vscroll) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
65 image-mode-current-vscroll))) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
66 (set-window-vscroll window vscroll pixels-p)) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
67 |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
68 (defun image-set-window-hscroll (window ncol) |
88062
4ff20f6b1ec8
* image-mode.el (image-mode-current-vscroll)
Tassilo Horn <tassilo@member.fsf.org>
parents:
88057
diff
changeset
|
69 (setq image-mode-current-hscroll |
88103
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
70 (cons (cons window ncol) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
71 (delq (assq window image-mode-current-hscroll) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
72 image-mode-current-hscroll))) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
73 (set-window-hscroll window ncol)) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
74 |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
75 (defun image-reset-current-vhscroll () |
88103
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
76 (walk-windows |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
77 (lambda (win) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
78 (with-current-buffer (window-buffer win) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
79 ;; When set-window-buffer, set hscroll and vscroll to what they were |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
80 ;; last time the image was displayed in this window. If it's the first |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
81 ;; time it's displayed in this window, use the most recent setting. |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
82 (when image-mode-current-hscroll |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
83 (set-window-hscroll win (cdr (or (assoc win image-mode-current-hscroll) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
84 (car image-mode-current-hscroll))))) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
85 (when image-mode-current-vscroll |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
86 (set-window-vscroll win (cdr (or (assoc win image-mode-current-vscroll) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
87 (car image-mode-current-vscroll))))))) |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
88 'nomini |
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
89 (selected-frame))) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
90 |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
91 (defun image-forward-hscroll (&optional n) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
92 "Scroll image in current window to the left by N character widths. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
93 Stop if the right edge of the image is reached." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
94 (interactive "p") |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
95 (cond ((= n 0) nil) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
96 ((< n 0) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
97 (image-set-window-hscroll (selected-window) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
98 (max 0 (+ (window-hscroll) n)))) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
99 (t |
85800
0810efbbb396
(image-forward-hscroll, image-next-line, image-eol)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82944
diff
changeset
|
100 (let* ((image (get-char-property (point-min) 'display)) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
101 (edges (window-inside-edges)) |
81063
b3fc5c4daa5f
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
81019
diff
changeset
|
102 (win-width (- (nth 2 edges) (nth 0 edges))) |
b3fc5c4daa5f
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
81019
diff
changeset
|
103 (img-width (ceiling (car (image-size image))))) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
104 (image-set-window-hscroll (selected-window) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
105 (min (max 0 (- img-width win-width)) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
106 (+ n (window-hscroll)))))))) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
107 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
108 (defun image-backward-hscroll (&optional n) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
109 "Scroll image in current window to the right by N character widths. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
110 Stop if the left edge of the image is reached." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
111 (interactive "p") |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
112 (image-forward-hscroll (- n))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
113 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
114 (defun image-next-line (&optional n) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
115 "Scroll image in current window upward by N lines. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
116 Stop if the bottom edge of the image is reached." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
117 (interactive "p") |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
118 (cond ((= n 0) nil) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
119 ((< n 0) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
120 (image-set-window-vscroll (selected-window) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
121 (max 0 (+ (window-vscroll) n)))) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
122 (t |
85800
0810efbbb396
(image-forward-hscroll, image-next-line, image-eol)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82944
diff
changeset
|
123 (let* ((image (get-char-property (point-min) 'display)) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
124 (edges (window-inside-edges)) |
81063
b3fc5c4daa5f
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
81019
diff
changeset
|
125 (win-height (- (nth 3 edges) (nth 1 edges))) |
b3fc5c4daa5f
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
81019
diff
changeset
|
126 (img-height (ceiling (cdr (image-size image))))) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
127 (image-set-window-vscroll (selected-window) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
128 (min (max 0 (- img-height win-height)) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
129 (+ n (window-vscroll)))))))) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
130 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
131 (defun image-previous-line (&optional n) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
132 "Scroll image in current window downward by N lines. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
133 Stop if the top edge of the image is reached." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
134 (interactive "p") |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
135 (image-next-line (- n))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
136 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
137 (defun image-scroll-up (&optional n) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
138 "Scroll image in current window upward by N lines. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
139 Stop if the bottom edge of the image is reached. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
140 If ARG is omitted or nil, scroll upward by a near full screen. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
141 A near full screen is `next-screen-context-lines' less than a full screen. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
142 Negative ARG means scroll downward. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
143 If ARG is the atom `-', scroll downward by nearly full screen. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
144 When calling from a program, supply as argument a number, nil, or `-'." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
145 (interactive "P") |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
146 (cond ((null n) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
147 (let* ((edges (window-inside-edges)) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
148 (win-height (- (nth 3 edges) (nth 1 edges)))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
149 (image-next-line |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
150 (max 0 (- win-height next-screen-context-lines))))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
151 ((eq n '-) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
152 (let* ((edges (window-inside-edges)) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
153 (win-height (- (nth 3 edges) (nth 1 edges)))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
154 (image-next-line |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
155 (min 0 (- next-screen-context-lines win-height))))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
156 (t (image-next-line (prefix-numeric-value n))))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
157 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
158 (defun image-scroll-down (&optional n) |
88103
d6247c939edc
(image-mode-current-vscroll, image-mode-current-hscroll): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
88062
diff
changeset
|
159 "Scroll image in current window downward by N lines. |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
160 Stop if the top edge of the image is reached. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
161 If ARG is omitted or nil, scroll downward by a near full screen. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
162 A near full screen is `next-screen-context-lines' less than a full screen. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
163 Negative ARG means scroll upward. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
164 If ARG is the atom `-', scroll upward by nearly full screen. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
165 When calling from a program, supply as argument a number, nil, or `-'." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
166 (interactive "P") |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
167 (cond ((null n) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
168 (let* ((edges (window-inside-edges)) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
169 (win-height (- (nth 3 edges) (nth 1 edges)))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
170 (image-next-line |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
171 (min 0 (- next-screen-context-lines win-height))))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
172 ((eq n '-) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
173 (let* ((edges (window-inside-edges)) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
174 (win-height (- (nth 3 edges) (nth 1 edges)))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
175 (image-next-line |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
176 (max 0 (- win-height next-screen-context-lines))))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
177 (t (image-next-line (- (prefix-numeric-value n)))))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
178 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
179 (defun image-bol (arg) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
180 "Scroll horizontally to the left edge of the image in the current window. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
181 With argument ARG not nil or 1, move forward ARG - 1 lines first, |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
182 stopping if the top or bottom edge of the image is reached." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
183 (interactive "p") |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
184 (and arg |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
185 (/= (setq arg (prefix-numeric-value arg)) 1) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
186 (image-next-line (- arg 1))) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
187 (image-set-window-hscroll (selected-window) 0)) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
188 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
189 (defun image-eol (arg) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
190 "Scroll horizontally to the right edge of the image in the current window. |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
191 With argument ARG not nil or 1, move forward ARG - 1 lines first, |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
192 stopping if the top or bottom edge of the image is reached." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
193 (interactive "p") |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
194 (and arg |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
195 (/= (setq arg (prefix-numeric-value arg)) 1) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
196 (image-next-line (- arg 1))) |
85800
0810efbbb396
(image-forward-hscroll, image-next-line, image-eol)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82944
diff
changeset
|
197 (let* ((image (get-char-property (point-min) 'display)) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
198 (edges (window-inside-edges)) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
199 (win-width (- (nth 2 edges) (nth 0 edges))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
200 (img-width (ceiling (car (image-size image))))) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
201 (image-set-window-hscroll (selected-window) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
202 (max 0 (- img-width win-width))))) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
203 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
204 (defun image-bob () |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
205 "Scroll to the top-left corner of the image in the current window." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
206 (interactive) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
207 (image-set-window-hscroll (selected-window) 0) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
208 (image-set-window-vscroll (selected-window) 0)) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
209 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
210 (defun image-eob () |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
211 "Scroll to the bottom-right corner of the image in the current window." |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
212 (interactive) |
85800
0810efbbb396
(image-forward-hscroll, image-next-line, image-eol)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82944
diff
changeset
|
213 (let* ((image (get-char-property (point-min) 'display)) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
214 (edges (window-inside-edges)) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
215 (win-width (- (nth 2 edges) (nth 0 edges))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
216 (img-width (ceiling (car (image-size image)))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
217 (win-height (- (nth 3 edges) (nth 1 edges))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
218 (img-height (ceiling (cdr (image-size image))))) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
219 (image-set-window-hscroll (selected-window) (max 0 (- img-width win-width))) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
220 (image-set-window-vscroll (selected-window) (max 0 (- img-height win-height))))) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
221 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
222 ;;; Image Mode setup |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
223 |
82944 | 224 (defvar image-type nil |
225 "Current image type. | |
226 This variable is used to display the current image type in the mode line.") | |
227 (make-variable-buffer-local 'image-type) | |
228 | |
60694 | 229 (defvar image-mode-map |
230 (let ((map (make-sparse-keymap))) | |
231 (define-key map "\C-c\C-c" 'image-toggle-display) | |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
232 (define-key map [remap forward-char] 'image-forward-hscroll) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
233 (define-key map [remap backward-char] 'image-backward-hscroll) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
234 (define-key map [remap previous-line] 'image-previous-line) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
235 (define-key map [remap next-line] 'image-next-line) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
236 (define-key map [remap scroll-up] 'image-scroll-up) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
237 (define-key map [remap scroll-down] 'image-scroll-down) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
238 (define-key map [remap move-beginning-of-line] 'image-bol) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
239 (define-key map [remap move-end-of-line] 'image-eol) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
240 (define-key map [remap beginning-of-buffer] 'image-bob) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
241 (define-key map [remap end-of-buffer] 'image-eob) |
60694 | 242 map) |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
243 "Major mode keymap for viewing images in Image mode.") |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
244 |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
245 (defvar image-mode-text-map |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
246 (let ((map (make-sparse-keymap))) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
247 (define-key map "\C-c\C-c" 'image-toggle-display) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
248 map) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
249 "Major mode keymap for viewing images as text in Image mode.") |
60694 | 250 |
87557 | 251 (defvar bookmark-make-cell-function) |
252 | |
60694 | 253 ;;;###autoload |
254 (defun image-mode () | |
255 "Major mode for image files. | |
256 You can use \\<image-mode-map>\\[image-toggle-display] | |
257 to toggle between display as an image and display as text." | |
258 (interactive) | |
259 (kill-all-local-variables) | |
82944 | 260 (setq mode-name "Image[text]") |
60694 | 261 (setq major-mode 'image-mode) |
87412
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
262 ;; Use our own bookmarking function for images. |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
263 (set (make-local-variable 'bookmark-make-cell-function) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
264 'image-bookmark-make-cell) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
265 |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
266 ;; Keep track of [vh]scroll when switching buffers |
88062
4ff20f6b1ec8
* image-mode.el (image-mode-current-vscroll)
Tassilo Horn <tassilo@member.fsf.org>
parents:
88057
diff
changeset
|
267 (image-set-window-hscroll (selected-window) (window-hscroll)) |
4ff20f6b1ec8
* image-mode.el (image-mode-current-vscroll)
Tassilo Horn <tassilo@member.fsf.org>
parents:
88057
diff
changeset
|
268 (image-set-window-vscroll (selected-window) (window-vscroll)) |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
269 (add-hook 'window-configuration-change-hook |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
270 'image-reset-current-vhscroll nil t) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
271 |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
272 (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t) |
75745
19d4ee6e5621
(image-mode): Revert 2007-01-30 changes.
Chong Yidong <cyd@stupidchicken.com>
parents:
75626
diff
changeset
|
273 (if (and (display-images-p) |
85800
0810efbbb396
(image-forward-hscroll, image-next-line, image-eol)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82944
diff
changeset
|
274 (not (get-char-property (point-min) 'display))) |
75745
19d4ee6e5621
(image-mode): Revert 2007-01-30 changes.
Chong Yidong <cyd@stupidchicken.com>
parents:
75626
diff
changeset
|
275 (image-toggle-display) |
19d4ee6e5621
(image-mode): Revert 2007-01-30 changes.
Chong Yidong <cyd@stupidchicken.com>
parents:
75626
diff
changeset
|
276 ;; Set next vars when image is already displayed but local |
19d4ee6e5621
(image-mode): Revert 2007-01-30 changes.
Chong Yidong <cyd@stupidchicken.com>
parents:
75626
diff
changeset
|
277 ;; variables were cleared by kill-all-local-variables |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
278 (use-local-map image-mode-map) |
75745
19d4ee6e5621
(image-mode): Revert 2007-01-30 changes.
Chong Yidong <cyd@stupidchicken.com>
parents:
75626
diff
changeset
|
279 (setq cursor-type nil truncate-lines t)) |
72570
7011a586dd45
* image-mode.el (image-mode): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
72568
diff
changeset
|
280 (run-mode-hooks 'image-mode-hook) |
7011a586dd45
* image-mode.el (image-mode): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
72568
diff
changeset
|
281 (if (display-images-p) |
7011a586dd45
* image-mode.el (image-mode): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
72568
diff
changeset
|
282 (message "%s" (concat |
7011a586dd45
* image-mode.el (image-mode): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
72568
diff
changeset
|
283 (substitute-command-keys |
75545
4f14c21e4f44
(image-mode): Don't automatically view as image.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
284 "Type \\[image-toggle-display] to view as ") |
85800
0810efbbb396
(image-forward-hscroll, image-next-line, image-eol)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82944
diff
changeset
|
285 (if (get-char-property (point-min) 'display) |
72570
7011a586dd45
* image-mode.el (image-mode): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
72568
diff
changeset
|
286 "text" "an image") ".")))) |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
287 |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
288 ;;;###autoload |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
289 (define-minor-mode image-minor-mode |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
290 "Toggle Image minor mode. |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
291 With arg, turn Image minor mode on if arg is positive, off otherwise. |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
292 See the command `image-mode' for more information on this mode." |
82944 | 293 nil (:eval (format " Image[%s]" image-type)) image-mode-text-map |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
294 :group 'image |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
295 :version "22.1" |
60943
258772850c9a
(image-minor-mode): Set `cursor-type' and `truncate-lines' if the
Juri Linkov <juri@jurta.org>
parents:
60937
diff
changeset
|
296 (if (not image-minor-mode) |
258772850c9a
(image-minor-mode): Set `cursor-type' and `truncate-lines' if the
Juri Linkov <juri@jurta.org>
parents:
60937
diff
changeset
|
297 (image-toggle-display-text) |
85800
0810efbbb396
(image-forward-hscroll, image-next-line, image-eol)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82944
diff
changeset
|
298 (if (get-char-property (point-min) 'display) |
82944 | 299 (setq cursor-type nil truncate-lines t) |
300 (setq image-type "text")) | |
60943
258772850c9a
(image-minor-mode): Set `cursor-type' and `truncate-lines' if the
Juri Linkov <juri@jurta.org>
parents:
60937
diff
changeset
|
301 (add-hook 'change-major-mode-hook (lambda () (image-minor-mode -1)) nil t) |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
64091
diff
changeset
|
302 (message "%s" (concat (substitute-command-keys |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
303 "Type \\[image-toggle-display] to view the image as ") |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
304 (if (get-char-property (point-min) 'display) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
305 "text" "an image") ".")))) |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
306 |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
307 ;;;###autoload |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
308 (defun image-mode-maybe () |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
309 "Set major or minor mode for image files. |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
310 Set Image major mode only when there are no other major modes |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
311 associated with a filename in `auto-mode-alist'. When an image |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
312 filename matches another major mode in `auto-mode-alist' then |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
313 set that major mode and Image minor mode. |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
314 |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
315 See commands `image-mode' and `image-minor-mode' for more |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
316 information on these modes." |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
317 (interactive) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
318 (let* ((mode-alist |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
319 (delq nil (mapcar |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
320 (lambda (elt) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
321 (unless (memq (or (car-safe (cdr elt)) (cdr elt)) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
322 '(image-mode image-mode-maybe)) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
323 elt)) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
324 auto-mode-alist)))) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
325 (if (assoc-default buffer-file-name mode-alist 'string-match) |
75568
146ba0f8974c
(image-mode-maybe): Prevent magic-mode-alist from
Jason Rumney <jasonr@gnu.org>
parents:
75547
diff
changeset
|
326 (let ((auto-mode-alist mode-alist) |
146ba0f8974c
(image-mode-maybe): Prevent magic-mode-alist from
Jason Rumney <jasonr@gnu.org>
parents:
75547
diff
changeset
|
327 (magic-mode-alist nil)) |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
328 (set-auto-mode) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
329 (image-minor-mode t)) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
330 (image-mode)))) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
331 |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
332 (defun image-toggle-display-text () |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
333 "Showing the text of the image file." |
85800
0810efbbb396
(image-forward-hscroll, image-next-line, image-eol)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82944
diff
changeset
|
334 (if (get-char-property (point-min) 'display) |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
335 (image-toggle-display))) |
60694 | 336 |
71939
3c0fceee4b4a
(tar-superior-buffer, archive-superior-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
70943
diff
changeset
|
337 (defvar archive-superior-buffer) |
3c0fceee4b4a
(tar-superior-buffer, archive-superior-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
70943
diff
changeset
|
338 (defvar tar-superior-buffer) |
3c0fceee4b4a
(tar-superior-buffer, archive-superior-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
70943
diff
changeset
|
339 |
60694 | 340 (defun image-toggle-display () |
341 "Start or stop displaying an image file as the actual image. | |
342 This command toggles between showing the text of the image file | |
343 and showing the image as an image." | |
344 (interactive) | |
85800
0810efbbb396
(image-forward-hscroll, image-next-line, image-eol)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82944
diff
changeset
|
345 (if (get-char-property (point-min) 'display) |
60694 | 346 (let ((inhibit-read-only t) |
60780 | 347 (buffer-undo-list t) |
348 (modified (buffer-modified-p))) | |
60694 | 349 (remove-list-of-text-properties (point-min) (point-max) |
350 '(display intangible read-nonsticky | |
351 read-only front-sticky)) | |
60780 | 352 (set-buffer-modified-p modified) |
60694 | 353 (kill-local-variable 'cursor-type) |
354 (kill-local-variable 'truncate-lines) | |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
355 (kill-local-variable 'auto-hscroll-mode) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
356 (use-local-map image-mode-text-map) |
82944 | 357 (setq image-type "text") |
358 (if (eq major-mode 'image-mode) | |
359 (setq mode-name "Image[text]")) | |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
360 (if (called-interactively-p) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
361 (message "Repeat this command to go back to displaying the image"))) |
60694 | 362 ;; Turn the image data into a real image, but only if the whole file |
363 ;; was inserted | |
81019
a1b4792efa5e
(image-toggle-display): Don't clear image cache. Only use filename in
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
364 (let* ((filename (buffer-file-name)) |
82944 | 365 (data-p (not (and filename |
366 (file-readable-p filename) | |
367 (not (file-remote-p filename)) | |
368 (not (buffer-modified-p)) | |
369 (not (and (boundp 'archive-superior-buffer) | |
370 archive-superior-buffer)) | |
371 (not (and (boundp 'tar-superior-buffer) | |
372 tar-superior-buffer))))) | |
373 (file-or-data (if data-p | |
374 (string-make-unibyte | |
375 (buffer-substring-no-properties (point-min) (point-max))) | |
376 filename)) | |
377 (type (image-type file-or-data nil data-p)) | |
378 (image (create-image file-or-data type data-p)) | |
60694 | 379 (props |
380 `(display ,image | |
88057
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
381 intangible ,image |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
382 rear-nonsticky (display intangible) |
1341d54b08e2
2008-01-29 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
87557
diff
changeset
|
383 read-only t front-sticky (read-only))) |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
384 (inhibit-read-only t) |
60780 | 385 (buffer-undo-list t) |
386 (modified (buffer-modified-p))) | |
81019
a1b4792efa5e
(image-toggle-display): Don't clear image cache. Only use filename in
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
387 (image-refresh image) |
60694 | 388 (add-text-properties (point-min) (point-max) props) |
60780 | 389 (set-buffer-modified-p modified) |
60694 | 390 ;; Inhibit the cursor when the buffer contains only an image, |
391 ;; because cursors look very strange on top of images. | |
392 (setq cursor-type nil) | |
393 ;; This just makes the arrow displayed in the right fringe | |
394 ;; area look correct when the image is wider than the window. | |
395 (setq truncate-lines t) | |
77989
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
396 ;; Allow navigation of large images |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
397 (set (make-local-variable 'auto-hscroll-mode) nil) |
6393038dae4d
(image-forward-hscroll, image-backward-hscroll)
Chong Yidong <cyd@stupidchicken.com>
parents:
75745
diff
changeset
|
398 (use-local-map image-mode-map) |
82944 | 399 (setq image-type type) |
400 (if (eq major-mode 'image-mode) | |
401 (setq mode-name (format "Image[%s]" type))) | |
60937
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
402 (if (called-interactively-p) |
ddcbccff39ce
Optimize image filename extension regexps in
Juri Linkov <juri@jurta.org>
parents:
60780
diff
changeset
|
403 (message "Repeat this command to go back to displaying the file as text"))))) |
60694 | 404 |
87412
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
405 ;;; Support for bookmark.el |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
406 |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
407 (defun image-bookmark-make-cell (annotation &rest args) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
408 (let ((the-record |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
409 `((filename . ,(buffer-file-name)) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
410 (image-type . ,image-type) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
411 (position . ,(point)) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
412 (handler . image-bookmark-jump)))) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
413 |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
414 ;; Take no chances with text properties |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
415 (set-text-properties 0 (length annotation) nil annotation) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
416 |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
417 (when annotation |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
418 (nconc the-record (list (cons 'annotation annotation)))) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
419 |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
420 ;; Finally, return the completed record. |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
421 the-record)) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
422 |
87557 | 423 (declare-function bookmark-get-filename "bookmark" (bookmark)) |
424 (declare-function bookmark-get-bookmark-record "bookmark" (bookmark)) | |
425 (declare-function bookmark-get-position "bookmark" (bookmark)) | |
426 | |
87412
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
427 ;;;###autoload |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
428 (defun image-bookmark-jump (bmk) |
87521
0140d3ebb262
Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents:
87412
diff
changeset
|
429 ;; This implements the `handler' function interface for record type |
0140d3ebb262
Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents:
87412
diff
changeset
|
430 ;; returned by `bookmark-make-cell-function', which see. |
87412
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
431 (save-window-excursion |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
432 (let ((filename (bookmark-get-filename bmk)) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
433 (type (cdr (assq 'image-type (bookmark-get-bookmark-record bmk)))) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
434 (pos (bookmark-get-position bmk))) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
435 (find-file filename) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
436 (when (not (string= image-type type)) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
437 (image-toggle-display)) |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
438 (when (string= image-type "text") |
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
439 (goto-char pos)) |
87521
0140d3ebb262
Change a return type, for greater extensibility. See
Karl Fogel <kfogel@red-bean.com>
parents:
87412
diff
changeset
|
440 `((buffer ,(current-buffer)) (position ,(point)))))) |
87412
f6ce12419345
2007-12-26 Tassilo Horn <tassilo@member.fsf.org>
Tassilo Horn <tassilo@member.fsf.org>
parents:
85800
diff
changeset
|
441 |
60694 | 442 (provide 'image-mode) |
443 | |
60697
d9c9ad74e719
Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents:
60694
diff
changeset
|
444 ;; arch-tag: b5b2b7e6-26a7-4b79-96e3-1546b5c4c6cb |
60694 | 445 ;;; image-mode.el ends here |