[Emacs-diffs] trunk r117695: Allow resetting image transform options

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 117695
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2014-08-12 16:16:45 +0200
message:
  Allow resetting image transform options
  
  * image-mode.el (image-transform-reset): New command and menu item.
  (image-mode-map): Rearrange the menu items to put presumably more
  obscure items at the end.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/image-mode.el             
imagemode.el-20091113204419-o5vbwnq5f7feedwu-3391

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-12 06:51:21 +0000
+++ b/lisp/ChangeLog    2014-08-12 14:16:45 +0000
@@ -1,3 +1,9 @@
+2014-08-12  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * image-mode.el (image-transform-reset): New command and menu item.
+       (image-mode-map): Rearrange the menu items to put presumably more
+       obscure items at the end.
+
 2014-08-12  Juri Linkov  <address@hidden>
 
        * vc/vc-annotate.el (vc-annotate-background-mode):

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2014-08-05 18:18:39 +0000
+++ b/lisp/image-mode.el        2014-08-12 14:16:45 +0000
@@ -379,8 +379,6 @@
        ["Show as Text" image-toggle-display :active t
         :help "Show image as text"]
        "--"
-       ["Fit Frame to Image" image-mode-fit-frame :active t
-        :help "Resize frame to match image"]
        ["Fit to Window Height" image-transform-fit-to-height
         :visible (eq image-type 'imagemagick)
         :help "Resize image to match the window height"]
@@ -390,6 +388,9 @@
        ["Rotate Image..." image-transform-set-rotation
         :visible (eq image-type 'imagemagick)
         :help "Rotate the image"]
+       ["Reset Transformations" image-transform-reset
+        :visible (eq image-type 'imagemagick)
+        :help "Reset all image transformations"]
        "--"
        ["Show Thumbnails"
         (lambda ()
@@ -402,6 +403,9 @@
        ["Previous Image" image-previous-file :active buffer-file-name
          :help "Move to previous image in this directory"]
        "--"
+       ["Fit Frame to Image" image-mode-fit-frame :active t
+        :help "Resize frame to match image"]
+       "--"
        ["Animate Image" image-toggle-animation :style toggle
         :selected (let ((image (image-get-display-property)))
                     (and image (image-animate-timer image)))
@@ -1097,6 +1101,16 @@
   (setq image-transform-rotation (float (mod rotation 360)))
   (image-toggle-display-image))
 
+(defun image-transform-reset ()
+  "Display the current image with the default size and rotation.
+This command has no effect unless Emacs is compiled with
+ImageMagick support."
+  (interactive)
+  (setq image-transform-resize nil
+       image-transform-rotation 0.0
+       image-transform-scale 1)
+  (image-toggle-display-image))
+
 (provide 'image-mode)
 
 ;;; image-mode.el ends here