[nongnu] elpa/vm fa1a0efada 2/2: Merge branch '484-preserve-return-value-in-pgg' into 'main'

[ELPA Syncer]

branch: elpa/vm
commit fa1a0efadae9ab4264379001e505ec442d7ca55d
Merge: 36053c892f 433d978691
Author: Stefan <monnier@iro.umontreal.ca>
Commit: Stefan <monnier@iro.umontreal.ca>

    Merge branch '484-preserve-return-value-in-pgg' into 'main'
    
    Preserve return value from vm-mime-display-internal-text/plain in pgg 
advice.
    
    Closes #484
    
    See merge request emacs-vm/vm!27
---
 lisp/vm-pgg.el | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index 321cd29e61..6e26cb1f94 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -691,14 +691,15 @@ cleanup here after verification and decoding took place."
   (let ((vm-pgg-cleartext-state nil)
         (start (point))
         end)
-    (apply orig-fun args)
-    (when vm-pgg-cleartext-state
-      (setq end (point))
-      (save-restriction
-        (narrow-to-region start end)
-        (goto-char (point-min))
-        (vm-pgg-cleartext-cleanup vm-pgg-cleartext-state)
-        (widen)))))
+    (let ((ret (apply orig-fun args)))
+      (when vm-pgg-cleartext-state
+       (setq end (point))
+       (save-restriction
+          (narrow-to-region start end)
+          (goto-char (point-min))
+          (vm-pgg-cleartext-cleanup vm-pgg-cleartext-state)
+          (widen)))
+      ret)))
     
 ;;; ###autoload
 (defun vm-pgg-cleartext-verify ()