minor conflict between upstream and local

[gnu-emacs] / lisp / iimage.el

diff --git a/lisp/iimage.el b/lisp/iimage.el
index 674e885a243bcdf6cc97010b6d5d7b0c2f9d4282..a6180b263c7c273c2eae0a56fadfb658062e719a 100644 (file)
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -137,8 +137,7 @@ Examples of image filename patterns to match:
                                         '(display modification-hooks))))))))))
 
 ;;;###autoload
-(define-minor-mode iimage-mode
-  "Toggle inline image minor mode."
+(define-minor-mode iimage-mode nil
   :group 'iimage :lighter " iImg" :keymap iimage-mode-map
   (iimage-mode-buffer iimage-mode))