Remove useless unwind-protect forms, or make them useful as intended

* lisp/imenu.el (imenu--generic-function):
* lisp/mail/yenc.el (yenc-decode-region):
* lisp/textmodes/table.el (table-recognize-region):
* test/lisp/dired-tests.el (dired-test-directory-files):
* test/lisp/hl-line-tests.el (hl-line-tests-sticky):
Fix unwind-protect bracketing mistakes that caused the unwind code to
be misplaced.
* lisp/strokes.el (strokes-read-stroke): Fix a bracketing mistake that
misplaced the unwind code, and another one that misplaced the
else-clause of an `if` form.
* test/lisp/gnus/mml-sec-tests.el (mml-secure-test-fixture): Fix a
bracketing mistake that misplaced the unwind code, and remove
superfluous condition-case.

* lisp/mwheel.el (mouse-wheel-global-text-scale):
* lisp/speedbar.el (speedbar-stealthy-updates)
(speedbar-fetch-dynamic-etags):
* lisp/emacs-lisp/edebug.el (edebug--recursive-edit):
* lisp/emacs-lisp/package.el (package--read-pkg-desc):
* lisp/cedet/semantic.el (semantic-refresh-tags-safe):
* lisp/emulation/viper-cmd.el (viper-escape-to-state):
* lisp/emulation/viper-cmd.el (viper-file-add-suffix):
* lisp/gnus/mail-source.el (mail-source-movemail):
* lisp/mail/feedmail.el (feedmail-send-it-immediately)
(feedmail-deduce-address-list):
* lisp/mail/mailclient.el (mailclient-send-it):
* lisp/mail/smtpmail.el (smtpmail-deduce-address-list):
* lisp/mh-e/mh-print.el (mh-ps-print-range):
* lisp/textmodes/reftex-index.el (reftex-index-this-phrase):
* test/lisp/emacs-lisp/ert-tests.el (ert-test-run-tests-batch):
(ert-test-run-tests-batch-expensive):
Remove unwind-protect forms that are apparently useless, some since a
prior edit that removed their purpose, some since their first
appearance.

* test/lisp/subr-tests.el (subr-test--frames-2):
Insert dummy unwind form in backtrace test code.

1 files changed, 23 insertions, 28 deletions

diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el
index 37e84c148af..a5dadf21c8c 100644
--- a/test/lisp/gnus/mml-sec-tests.el
+++ b/test/lisp/gnus/mml-sec-tests.el
@@ -66,34 +66,29 @@ This fixture temporarily unsets GPG_AGENT_INFO to enable passphrase tests,
 which will neither work with gpgsm nor GnuPG 2.1 any longer, I guess.
 Actually, I'm not sure why people would want to cache passwords in Emacs
 instead of gpg-agent."
-  (unwind-protect
-      (let ((agent-info (getenv "GPG_AGENT_INFO"))
-            (gpghome (getenv "GNUPGHOME")))
-        (condition-case error
-            (let ((epg-gpg-home-directory (ert-resource-directory))
-                  (mml-smime-use 'epg)
-                  ;; Create debug output in empty epg-debug-buffer.
-                  (epg-debug t)
-                  (epg-debug-buffer (get-buffer-create " *epg-test*"))
-                  (mml-secure-fail-when-key-problem (not interactive)))
-              (with-current-buffer epg-debug-buffer
-                (erase-buffer))
-              ;; Unset GPG_AGENT_INFO to enable passphrase caching inside Emacs.
-              ;; Just for testing.  Jens does not recommend this for daily use.
-              (setenv "GPG_AGENT_INFO")
-              ;; Set GNUPGHOME as gpg-agent started by gpgsm does
-              ;; not look in the proper places otherwise, see:
-              ;; https://bugs.gnupg.org/gnupg/issue2126
-              (setenv "GNUPGHOME" epg-gpg-home-directory)
-              (unwind-protect
-                  (funcall body)
-                (mml-sec-test--kill-gpg-agent)))
-          (error
-           (setenv "GPG_AGENT_INFO" agent-info)
-           (setenv "GNUPGHOME" gpghome)
-           (signal (car error) (cdr error))))
-        (setenv "GPG_AGENT_INFO" agent-info)
-        (setenv "GNUPGHOME" gpghome))))
+  (let ((agent-info (getenv "GPG_AGENT_INFO"))
+        (gpghome (getenv "GNUPGHOME")))
+    (unwind-protect
+        (let ((epg-gpg-home-directory (ert-resource-directory))
+              (mml-smime-use 'epg)
+              ;; Create debug output in empty epg-debug-buffer.
+              (epg-debug t)
+              (epg-debug-buffer (get-buffer-create " *epg-test*"))
+              (mml-secure-fail-when-key-problem (not interactive)))
+          (with-current-buffer epg-debug-buffer
+            (erase-buffer))
+          ;; Unset GPG_AGENT_INFO to enable passphrase caching inside Emacs.
+          ;; Just for testing.  Jens does not recommend this for daily use.
+          (setenv "GPG_AGENT_INFO")
+          ;; Set GNUPGHOME as gpg-agent started by gpgsm does
+          ;; not look in the proper places otherwise, see:
+          ;; https://bugs.gnupg.org/gnupg/issue2126
+          (setenv "GNUPGHOME" epg-gpg-home-directory)
+          (unwind-protect
+              (funcall body)
+            (mml-sec-test--kill-gpg-agent)))
+      (setenv "GPG_AGENT_INFO" agent-info)
+      (setenv "GNUPGHOME" gpghome))))
 
 (defun mml-secure-test-message-setup (method to from &optional text bcc)
   "Setup a buffer with MML METHOD, TO, and FROM headers.