From: Juri Linkov Date: Fri, 25 Mar 2005 21:45:47 +0000 (+0000) Subject: (image-minor-mode): Set `cursor-type' and `truncate-lines' if the X-Git-Tag: ttn-vms-21-2-B4~1522 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90d0be7d3f78333787e7e439a678542100490ae2;p=emacs.git (image-minor-mode): Set `cursor-type' and `truncate-lines' if the image is already displayed. Add turning image-minor-mode off to `change-major-mode-hook'. Add message. Call `image-toggle-display-text' after turning image-minor-mode off. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a58694f447f..99796ca77ae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -18,8 +18,10 @@ (image-toggle-display): Use called-interactively-p. Let-bind `inhibit-read-only' to t. - * image-file.el (image-file-name-extensions): Remove .xbm and .xpm - associated with c-mode in `auto-mode-alist'. + * image-mode.el (image-minor-mode): Set `cursor-type' and + `truncate-lines' if the image is already displayed. Add turning + image-minor-mode off to `change-major-mode-hook'. Add message. + Call `image-toggle-display-text' after turning image-minor-mode off. 2005-03-25 Stefan Monnier diff --git a/lisp/image-mode.el b/lisp/image-mode.el index c955a432148..b29027fcf42 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -79,8 +79,15 @@ 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))) + (if (not image-minor-mode) + (image-toggle-display-text) + (if (get-text-property (point-min) 'display) + (setq cursor-type nil truncate-lines t)) + (add-hook 'change-major-mode-hook (lambda () (image-minor-mode -1)) nil t) + (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 (defun image-mode-maybe ()