Re: master 6e70b37: When decrypting non-decrypted files, make epa show the raw files

Re: master 6e70b37: When decrypting non-decrypted files, make epa show the raw files

[Herbert J. Skuhra]

On Tue, 04 Aug 2020 21:43:03 +0200, larsi@gnus.org wrote:
> 
> branch: master
> commit 6e70b3793b9cb7730ab8a7132aa6e99f1ca13f98
> Author: Lars Ingebrigtsen <larsi@gnus.org>
> Commit: Lars Ingebrigtsen <larsi@gnus.org>
> 
>     When decrypting non-decrypted files, make epa show the raw files
>     
>     * lisp/epa-file.el (epa-file-insert-file-contents): When trying to
>     decrypt a non-decrypted file, just show the bytes from the file
>     instead (bug#3829).

After this commit running 'C-x C-f ~/newfile.gpg' produces an error:

epa-file-insert-file-contents: Wrong type argument: char-or-string-p, nil

Debugger entered--Lisp error: (wrong-type-argument char-or-string-p nil)
  epa-file-decode-and-insert(nil "/home/herbert/newfile.gpg" t nil nil nil)
  epa-file-insert-file-contents("/home/herbert/newfile.gpg" t nil nil nil)
  apply(epa-file-insert-file-contents ("/home/herbert/newfile.gpg" t nil nil nil))
  epa-file-handler(insert-file-contents "/home/herbert/newfile.gpg" t nil nil nil)
  insert-file-contents("~/newfile.gpg" t)
  find-file-noselect-1(#<buffer newfile.gpg> "~/newfile.gpg" nil nil "~/newfile.gpg" nil)
  find-file-noselect("~/newfile.gpg" nil nil t)
  find-file("~/newfile.gpg" t)
  funcall-interactively(find-file "~/newfile.gpg" t)
  call-interactively(find-file nil nil)
  command-execute(find-file)
  
If I run the command 'find-file' again it works.

--
Herbert

Re: master 6e70b37: When decrypting non-decrypted files, make epa show the raw files

[Herbert J. Skuhra]

On Sun, Aug 23, 2020 at 10:54:27PM +0200, Herbert J. Skuhra wrote:
> On Tue, 04 Aug 2020 21:43:03 +0200, larsi@gnus.org wrote:
> > 
> > branch: master
> > commit 6e70b3793b9cb7730ab8a7132aa6e99f1ca13f98
> > Author: Lars Ingebrigtsen <larsi@gnus.org>
> > Commit: Lars Ingebrigtsen <larsi@gnus.org>
> > 
> >     When decrypting non-decrypted files, make epa show the raw files
> >     
> >     * lisp/epa-file.el (epa-file-insert-file-contents): When trying to
> >     decrypt a non-decrypted file, just show the bytes from the file
> >     instead (bug#3829).
> 
> After this commit running 'C-x C-f ~/newfile.gpg' produces an error:
> 
> epa-file-insert-file-contents: Wrong type argument: char-or-string-p, nil
> 
> Debugger entered--Lisp error: (wrong-type-argument char-or-string-p nil)
>   epa-file-decode-and-insert(nil "/home/herbert/newfile.gpg" t nil nil nil)
>   epa-file-insert-file-contents("/home/herbert/newfile.gpg" t nil nil nil)
>   apply(epa-file-insert-file-contents ("/home/herbert/newfile.gpg" t nil nil nil))
>   epa-file-handler(insert-file-contents "/home/herbert/newfile.gpg" t nil nil nil)
>   insert-file-contents("~/newfile.gpg" t)
>   find-file-noselect-1(#<buffer newfile.gpg> "~/newfile.gpg" nil nil "~/newfile.gpg" nil)
>   find-file-noselect("~/newfile.gpg" nil nil t)
>   find-file("~/newfile.gpg" t)
>   funcall-interactively(find-file "~/newfile.gpg" t)
>   call-interactively(find-file nil nil)
>   command-execute(find-file)
>   
> If I run the command 'find-file' again it works.

But I am not asked to select a gpg key ... only symmetric encryption is
offered!

There is obviously another bug (but unrelated to this commit):

If I revert the above commit and try to create and save an encrypted
file I get: 

Select recipients for encryption.
If no one is selected, symmetric encryption will be performed.  
- ‘m’ to mark a key on the line
- ‘u’ to unmark a key on the line
[Cancel][OK]


How do you proceed with symmetric encryption? Just pressing OK without
selecting a key does not work.

-- 
Herbert

Re: master 6e70b37: When decrypting non-decrypted files, make epa show the raw files

[Herbert J. Skuhra]

On Sun, Aug 23, 2020 at 11:36:51PM +0200, Herbert J. Skuhra wrote:
> On Sun, Aug 23, 2020 at 10:54:27PM +0200, Herbert J. Skuhra wrote:
> > On Tue, 04 Aug 2020 21:43:03 +0200, larsi@gnus.org wrote:
> > > 
> > > branch: master
> > > commit 6e70b3793b9cb7730ab8a7132aa6e99f1ca13f98
> > > Author: Lars Ingebrigtsen <larsi@gnus.org>
> > > Commit: Lars Ingebrigtsen <larsi@gnus.org>
> > > 
> > >     When decrypting non-decrypted files, make epa show the raw files
> > >     
> > >     * lisp/epa-file.el (epa-file-insert-file-contents): When trying to
> > >     decrypt a non-decrypted file, just show the bytes from the file
> > >     instead (bug#3829).
> > 
> > After this commit running 'C-x C-f ~/newfile.gpg' produces an error:
> > 
> > epa-file-insert-file-contents: Wrong type argument: char-or-string-p, nil
> > 
> > Debugger entered--Lisp error: (wrong-type-argument char-or-string-p nil)
> >   epa-file-decode-and-insert(nil "/home/herbert/newfile.gpg" t nil nil nil)
> >   epa-file-insert-file-contents("/home/herbert/newfile.gpg" t nil nil nil)
> >   apply(epa-file-insert-file-contents ("/home/herbert/newfile.gpg" t nil nil nil))
> >   epa-file-handler(insert-file-contents "/home/herbert/newfile.gpg" t nil nil nil)
> >   insert-file-contents("~/newfile.gpg" t)
> >   find-file-noselect-1(#<buffer newfile.gpg> "~/newfile.gpg" nil nil "~/newfile.gpg" nil)
> >   find-file-noselect("~/newfile.gpg" nil nil t)
> >   find-file("~/newfile.gpg" t)
> >   funcall-interactively(find-file "~/newfile.gpg" t)
> >   call-interactively(find-file nil nil)
> >   command-execute(find-file)
> >   
> > If I run the command 'find-file' again it works.
> 
> But I am not asked to select a gpg key ... only symmetric encryption is
> offered!
> 
> There is obviously another bug (but unrelated to this commit):
> 
> If I revert the above commit and try to create and save an encrypted
> file I get: 
> 
> Select recipients for encryption.
> If no one is selected, symmetric encryption will be performed.  
> - ‘m’ to mark a key on the line
> - ‘u’ to unmark a key on the line
> [Cancel][OK]
> 
> 
> How do you proceed with symmetric encryption? Just pressing OK without
> selecting a key does not work.

The second bug is obviously caused by:

commit 7479c11b4e73fcb9aa9d42788012b850ee3245c5 (HEAD)
Author: Sean Whitton <spwhitton@spwhitton.name>
Date:   Fri Jul 24 13:36:39 2020 -0700

-- 
Herbert

Re: master 6e70b37: When decrypting non-decrypted files, make epa show the raw files

[Lars Ingebrigtsen]

"Herbert J. Skuhra" <herbert@gojira.at> writes:

>> How do you proceed with symmetric encryption? Just pressing OK without
>> selecting a key does not work.
>
> The second bug is obviously caused by:
>
> commit 7479c11b4e73fcb9aa9d42788012b850ee3245c5 (HEAD)
> Author: Sean Whitton <spwhitton@spwhitton.name>
> Date:   Fri Jul 24 13:36:39 2020 -0700

Are you sure?  That's a patch that doesn't seem related to choosing an
encryption key...

commit 7479c11b4e73fcb9aa9d42788012b850ee3245c5
Author:     Sean Whitton <spwhitton@spwhitton.name>
AuthorDate: Fri Jul 24 13:36:39 2020 -0700

    Factor out project--read-project-buffer from project-switch-buffer
    
    * lisp/progmodes/project.el (project--read-project-buffer): New
    function extracted from project-switch-buffer.
    * lisp/progmodes/project.el (project-switch-buffer): Instead of
    unconditionally reading a project buffer from the user, add
    buffer-or-name argument, and populate it using
    project--read-project-buffer when called interactively.  Update
    docstring.


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 6e70b37: When decrypting non-decrypted files, make epa show the raw files

[Lars Ingebrigtsen]

It looks like there was some confusion between the widget keymap and the
mode keymap (as usual).  I tried poking at it for a few minutes to see
if it would suddenly start working again, and then remembered the Proper
Way Of Dealing With Widget Code: Rip it out.

So I've now rewritten the key selection buffer to use buttons instead of
widgets.  It seems to work for me; it'd be good if you could give it a
whirl.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 6e70b37: When decrypting non-decrypted files, make epa show the raw files

[Herbert J. Skuhra]

On Mon, 24 Aug 2020 21:56:57 +0200, Lars Ingebrigtsen wrote:
> 
> It looks like there was some confusion between the widget keymap and the
> mode keymap (as usual).  I tried poking at it for a few minutes to see
> if it would suddenly start working again, and then remembered the Proper
> Way Of Dealing With Widget Code: Rip it out.
> 
> So I've now rewritten the key selection buffer to use buttons instead of
> widgets.  It seems to work for me; it'd be good if you could give it a
> whirl.

It's working again. Thanks a lot.

--
Herbert

Re: master 6e70b37: When decrypting non-decrypted files, make epa show the raw files

[Lars Ingebrigtsen]

"Herbert J. Skuhra" <herbert@gojira.at> writes:

> But I am not asked to select a gpg key ... only symmetric encryption is
> offered!
>
> There is obviously another bug (but unrelated to this commit):
>
> If I revert the above commit and try to create and save an encrypted
> file I get: 
>
> Select recipients for encryption.
> If no one is selected, symmetric encryption will be performed.  
> - ‘m’ to mark a key on the line
> - ‘u’ to unmark a key on the line
> [Cancel][OK]
>
> How do you proceed with symmetric encryption? Just pressing OK without
> selecting a key does not work.

Apparently...  hitting `C-c C-c' allows symmetric encryption?
Confusing.  But hitting OK should also work.  I'll poke at it...

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 6e70b37: When decrypting non-decrypted files, make epa show the raw files

[Lars Ingebrigtsen]

"Herbert J. Skuhra" <herbert@gojira.at> writes:

> On Tue, 04 Aug 2020 21:43:03 +0200, larsi@gnus.org wrote:
>> 
>> branch: master
>> commit 6e70b3793b9cb7730ab8a7132aa6e99f1ca13f98
>> Author: Lars Ingebrigtsen <larsi@gnus.org>
>> Commit: Lars Ingebrigtsen <larsi@gnus.org>
>> 
>>     When decrypting non-decrypted files, make epa show the raw files
>>     
>>     * lisp/epa-file.el (epa-file-insert-file-contents): When trying to
>>     decrypt a non-decrypted file, just show the bytes from the file
>>     instead (bug#3829).
>
> After this commit running 'C-x C-f ~/newfile.gpg' produces an error:
>
> epa-file-insert-file-contents: Wrong type argument: char-or-string-p, nil

Yup; typo in that commit (the `when exists' form inadvertently had its
end moved).

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no