Re: update of the EasyPG integration patch (Re: minor fixes for EasyPG

[Daiki Ueno]

Glenn Morris <address@hidden> writes:

>> --- a/lisp/epa-file.el
>> +++ b/lisp/epa-file.el
>> @@ -126,7 +126,10 @@ May either be a string or a list of strings.")
>>  (defun epa-file-handler (operation &rest args)
>>    (save-match-data
>>      (let ((op (get operation 'epa-file)))
>> -      (if op
>> +      (if (and op
>> +           (if (and (eq operation 'insert-file-contents)
>> +                    
>> +                    (y-or-n-p ""
>>        (apply op args)
>>      (epa-file-run-real-handler operation args)))))
>
> This is broken.

Oops, I'm sorry.  That is a wreck of a hack which reverted before
sending the patch.

Could you please apply the following fix (diff from the current trunk)?

Index: lisp/epa-file.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa-file.el,v
retrieving revision 1.7
diff -r1.7 epa-file.el
127,135c127,132
<   ;; (save-match-data
<   ;;   (let ((op (get operation 'epa-file)))
<   ;;     (if (and op
<   ;;         (if (and (eq operation 'insert-file-contents)
<                       
<   ;;                  (y-or-n-p ""
<   ;;    (apply op args)
<   ;;  (epa-file-run-real-handler operation args)))))
<   nil)
---
>   (save-match-data
>     (let ((op (get operation 'epa-file)))
>       (if op
>         (apply op args)
>       (epa-file-run-real-handler operation args)))))
> 

Regards,
-- 
Daiki Ueno