aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Aspinall2004-08-24 16:24:37 +0000
committerDavid Aspinall2004-08-24 16:24:37 +0000
commitfe91b9a67d2b0665af4b0ab93b20f602d6894e90 (patch)
treeb3344b361a4e03b52e2e5fc8d34e82c717ec7640
parente16c30188305b430ae582c2a432482f62276169c (diff)
Don't make proof-shell-insert-hook buffer local.
Protect x-symbol-shell-config against failure of the init-cmd.
-rw-r--r--generic/proof-shell.el13
1 files changed, 6 insertions, 7 deletions
diff --git a/generic/proof-shell.el b/generic/proof-shell.el
index 98a0636b..6e441e73 100644
--- a/generic/proof-shell.el
+++ b/generic/proof-shell.el
@@ -1976,8 +1976,6 @@ usual, unless NOERROR is non-nil."
;; Clear state
(proof-shell-clear-state)
- (make-local-variable 'proof-shell-insert-hook)
-
;; Efficiency: don't keep undo history
(buffer-disable-undo)
@@ -2091,11 +2089,12 @@ processing."
(proof-maybe-askprefs)
;; Now send the init cmd proper.
- (if proof-shell-init-cmd
- (proof-shell-invisible-command proof-shell-init-cmd t))
-
- ;; Configure for x-symbol
- (proof-x-symbol-shell-config))))))
+ (unwind-protect
+ (if proof-shell-init-cmd
+ (proof-shell-invisible-command proof-shell-init-cmd t))
+
+ ;; Configure for x-symbol [even if the init cmd caused some error]
+ (proof-x-symbol-shell-config)))))))
(provide 'proof-shell)