[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/image-mode.el
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/image-mode.el |
Date: |
Fri, 25 Mar 2005 14:57:21 -0500 |
Index: emacs/lisp/image-mode.el
diff -c emacs/lisp/image-mode.el:1.3 emacs/lisp/image-mode.el:1.4
*** emacs/lisp/image-mode.el:1.3 Mon Mar 21 17:42:36 2005
--- emacs/lisp/image-mode.el Fri Mar 25 19:57:21 2005
***************
*** 36,53 ****
(require 'image)
! ;;;###autoload (push '("\\.jpg\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.jpeg\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.gif\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.png\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.tiff\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.tif\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.xbm\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.xpm\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.pbm\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.pgm\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.ppm\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.pnm\\'" . image-mode) auto-mode-alist)
(defvar image-mode-map
(let ((map (make-sparse-keymap)))
--- 36,47 ----
(require 'image)
! ;;;###autoload (push '("\\.jpe?g\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.png\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.gif\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.tiff?\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.p[bpgn]m\\'" . image-mode) auto-mode-alist)
! ;;;###autoload (push '("\\.x[bp]m\\'" . image-mode-maybe) auto-mode-alist)
(defvar image-mode-map
(let ((map (make-sparse-keymap)))
***************
*** 65,73 ****
(setq mode-name "Image")
(setq major-mode 'image-mode)
(use-local-map image-mode-map)
(run-mode-hooks 'image-mode-hook)
! (message (substitute-command-keys
! "Type \\[image-toggle-display] to view the image as an image.")))
(defun image-toggle-display ()
"Start or stop displaying an image file as the actual image.
--- 59,115 ----
(setq mode-name "Image")
(setq major-mode 'image-mode)
(use-local-map image-mode-map)
+ (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
+ (if (not (get-text-property (point-min) 'display))
+ (image-toggle-display)
+ ;; Set next vars when image is already displayed but local
+ ;; variables were cleared by kill-all-local-variables
+ (setq cursor-type nil truncate-lines t))
(run-mode-hooks 'image-mode-hook)
! (message (concat (substitute-command-keys
! "Type \\[image-toggle-display] to view the image as ")
! (if (get-text-property (point-min) 'display)
! "text" "an image") ".")))
!
! ;;;###autoload
! (define-minor-mode image-minor-mode
! "Toggle Image minor mode.
! With arg, turn Image minor mode on if arg is positive, off otherwise.
! See the command `image-mode' for more information on this mode."
! nil " Image" image-mode-map
! :group 'image
! :version "22.1"
! (unless (or (eq major-mode 'image-mode) image-minor-mode)
! (use-local-map image-mode-map)))
!
! ;;;###autoload
! (defun image-mode-maybe ()
! "Set major or minor mode for image files.
! Set Image major mode only when there are no other major modes
! associated with a filename in `auto-mode-alist'. When an image
! filename matches another major mode in `auto-mode-alist' then
! set that major mode and Image minor mode.
!
! See commands `image-mode' and `image-minor-mode' for more
! information on these modes."
! (interactive)
! (let* ((mode-alist
! (delq nil (mapcar
! (lambda (elt)
! (unless (memq (or (car-safe (cdr elt)) (cdr elt))
! '(image-mode image-mode-maybe))
! elt))
! auto-mode-alist))))
! (if (assoc-default buffer-file-name mode-alist 'string-match)
! (let ((auto-mode-alist mode-alist))
! (set-auto-mode)
! (image-minor-mode t))
! (image-mode))))
!
! (defun image-toggle-display-text ()
! "Showing the text of the image file."
! (if (get-text-property (point-min) 'display)
! (image-toggle-display)))
(defun image-toggle-display ()
"Start or stop displaying an image file as the actual image.
***************
*** 84,90 ****
(set-buffer-modified-p modified)
(kill-local-variable 'cursor-type)
(kill-local-variable 'truncate-lines)
! (message "Repeat this command to go back to displaying the image"))
;; Turn the image data into a real image, but only if the whole file
;; was inserted
(let* ((data
--- 126,133 ----
(set-buffer-modified-p modified)
(kill-local-variable 'cursor-type)
(kill-local-variable 'truncate-lines)
! (if (called-interactively-p)
! (message "Repeat this command to go back to displaying the image")))
;; Turn the image data into a real image, but only if the whole file
;; was inserted
(let* ((data
***************
*** 100,105 ****
--- 143,149 ----
;; read-only when we're visiting the file (as
;; opposed to just inserting it).
read-only t front-sticky (read-only)))
+ (inhibit-read-only t)
(buffer-undo-list t)
(modified (buffer-modified-p)))
(add-text-properties (point-min) (point-max) props)
***************
*** 110,116 ****
;; This just makes the arrow displayed in the right fringe
;; area look correct when the image is wider than the window.
(setq truncate-lines t)
! (message "Repeat this command to go back to displaying the file as
text"))))
(provide 'image-mode)
--- 154,161 ----
;; This just makes the arrow displayed in the right fringe
;; area look correct when the image is wider than the window.
(setq truncate-lines t)
! (if (called-interactively-p)
! (message "Repeat this command to go back to displaying the file as
text")))))
(provide 'image-mode)