Re: [Emacs-diffs] master 58e6235: * lisp/image-mode.el: Support encrypted file

[Eli Zaretskii <eliz@gnu.org>]

> From: Stefan Monnier <monnier@IRO.UMontreal.CA>
> Date: Mon, 16 Nov 2015 23:56:34 -0500
> Cc: Daiki Ueno <ueno@gnu.org>
> 
> > @@ -658,7 +658,12 @@ was inserted."
> >  			   (not (and (boundp 'archive-superior-buffer)
> >  				     archive-superior-buffer))
> >  			   (not (and (boundp 'tar-superior-buffer)
> > -				     tar-superior-buffer)))))
> > +				     tar-superior-buffer))
> > +                           ;; This means the buffer holds the
> > +                           ;; decrypted content (bug#21870).
> > +                           (not (and (boundp 'epa-file-encrypt-to)
> > +                                     (local-variable-p
> > +                                      'epa-file-encrypt-to))))))
> >  	 (file-or-data (if data-p
> >  			   (string-make-unibyte
> >  			    (buffer-substring-no-properties (point-min) (point-max)))
> 
> Clearly, image-mode should not need to know about tar-mode,
> archive-mode, nor epa-mode, and instead there should be a way for those
> to indicate that the buffer's content is not available in the file via
> normal syscalls.

If that can be done with a localized, safe change, it should be okay
to do that on the emacs-25 branch.  Failing that, the branch will have
to live with the above, and the better solution should go to master.

P.S. This code is there since 6 years ago.