[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100545: Image mode doc fixes (Bug#8098).

[Chong Yidong]

------------------------------------------------------------
revno: 100545
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2011-04-09 15:57:47 -0400
message:
  Image mode doc fixes (Bug#8098).
  
  * lisp/image-mode.el (image-type, image-mode-map, image-minor-mode-map)
  (image-toggle-display): Doc fixes.
modified:
  lisp/ChangeLog
  lisp/image-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-09 17:37:33 +0000
+++ b/lisp/ChangeLog    2011-04-09 19:57:47 +0000
@@ -1,3 +1,8 @@
+2011-04-09  Chong Yidong  <address@hidden>
+
+       * image-mode.el (image-type, image-mode-map, image-minor-mode-map)
+       (image-toggle-display):
+
 2011-04-06  Juanma Barranquero  <address@hidden>
 
        Backport revno:103823 and revno:103824 from trunk.

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2011-02-18 17:51:15 +0000
+++ b/lisp/image-mode.el        2011-04-09 19:57:47 +0000
@@ -304,8 +304,7 @@
 ;;; Image Mode setup
 
 (defvar image-type nil
-  "Current image type.
-This variable is used to display the current image type in the mode line.")
+  "The image type for the current Image mode buffer.")
 (make-variable-buffer-local 'image-type)
 
 (defvar image-mode-previous-major-mode nil
@@ -329,13 +328,13 @@
     (define-key map [remap beginning-of-buffer] 'image-bob)
     (define-key map [remap end-of-buffer] 'image-eob)
     map)
-  "Major mode keymap for viewing images in Image mode.")
+  "Mode keymap for `image-mode'.")
 
 (defvar image-minor-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\C-c\C-c" 'image-toggle-display)
     map)
-  "Minor mode keymap for viewing images as text in Image mode.")
+  "Mode keymap for `image-minor-mode'.")
 
 (defvar bookmark-make-record-function)
 
@@ -521,9 +520,10 @@
        (message "Repeat this command to go back to displaying the file as 
text"))))
 
 (defun image-toggle-display ()
-  "Start or stop displaying an image file as the actual image.
-This command toggles between `image-mode-as-text' showing the text of
-the image file and `image-mode' showing the image as an image."
+  "Toggle between image and text display.
+If the current buffer is displaying an image file as an image,
+call `image-mode-as-text' to switch to text.  Otherwise, display
+the image by calling `image-mode'."
   (interactive)
   (if (image-get-display-property)
       (image-mode-as-text)