diff options
| author | David Aspinall | 1998-11-25 12:46:53 +0000 |
|---|---|---|
| committer | David Aspinall | 1998-11-25 12:46:53 +0000 |
| commit | 50035e0a85a8d3adfaad4689049cffd25fef9dfa (patch) | |
| tree | 01caf30a60d2d0475b11b75d06c907c69cbbfd0a /generic/proof-script.el | |
| parent | d37b534a1d29315488b04e066701fe7188550781 (diff) | |
Improved error handling in proof-deactivate-scripting since
it's used in a kill hook.
Diffstat (limited to 'generic/proof-script.el')
| -rw-r--r-- | generic/proof-script.el | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/generic/proof-script.el b/generic/proof-script.el index c08f0c65..37d09f30 100644 --- a/generic/proof-script.el +++ b/generic/proof-script.el @@ -477,23 +477,27 @@ If the locked region doesn't cover the entire file, retract it." (if (eq (current-buffer) proof-script-buffer) (let ((bname (buffer-name proof-script-buffer))) (message "Turning off scripting in %s..." bname) - (unwind-protect - ;; If the buffer is not fully processed, - ;; ensure it's removed from the list of included files - ;; and retract it. - (unless (proof-locked-region-full-p) - (goto-char (point-min)) - (proof-unregister-buffer-file-name) - (proof-retract-until-point)) - ;; In any case, make some cleanup attempts - (proof-restart-buffers (list proof-script-buffer)) - ;; And turn off the fake minor mode - (setq proof-active-buffer-fake-minor-mode nil) - ;; Make status of active scripting buffer show up - (if (fboundp 'redraw-modeline) - (redraw-modeline) - (force-mode-line-update)) - (message "Turning off scripting in %s... done." bname))))) + ;; If the buffer is not fully processed, + ;; ensure it's removed from the list of included files + ;; and retract it if the locked region is non-empty. + (unless (proof-locked-region-full-p) + (goto-char (point-min)) + (proof-unregister-buffer-file-name) + (unless (proof-locked-region-empty-p) + (condition-case nil + (proof-retract-until-point) + (error nil)))) + ;; In any case, make some cleanup attempts + (proof-restart-buffers (list proof-script-buffer)) + ;; And turn off the fake minor mode + (setq proof-active-buffer-fake-minor-mode nil) + ;; Make status of active scripting buffer show up + ;; FIXME da: + ;; not really necessary when called by kill buffer, at least. + (if (fboundp 'redraw-modeline) + (redraw-modeline) + (force-mode-line-update)) + (message "Turning off scripting in %s... done." bname)))) |