From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 17 Apr 2018 23:22:49 +0000 (+0200)
Subject: (sql-stop): Don't bug out if the SQL buffer is killed
X-Git-Tag: emacs-27.0.90~5146
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2457d10ebfedbd24040e30e70cca90c6e523afe0;p=emacs.git

(sql-stop): Don't bug out if the SQL buffer is killed

* lisp/progmodes/sql.el (sql-stop): Don't bug out if the SQL
buffer is killed (bug#30244).
---

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index f907a01d8cf..ebbef8d89ee 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4031,15 +4031,16 @@ Writes the input history to a history file using
 
 This function is a sentinel watching the SQL interpreter process.
 Sentinels will always get the two parameters PROCESS and EVENT."
-  (with-current-buffer (process-buffer process)
-    (let
-        ((comint-input-ring-separator sql-input-ring-separator)
-         (comint-input-ring-file-name sql-input-ring-file-name))
-      (comint-write-input-ring))
-
-    (if (not buffer-read-only)
-        (insert (format "\nProcess %s %s\n" process event))
-      (message "Process %s %s" process event))))
+  (when (buffer-live-p (process-buffer process))
+    (with-current-buffer (process-buffer process)
+      (let
+          ((comint-input-ring-separator sql-input-ring-separator)
+           (comint-input-ring-file-name sql-input-ring-file-name))
+        (comint-write-input-ring))
+
+      (if (not buffer-read-only)
+          (insert (format "\nProcess %s %s\n" process event))
+        (message "Process %s %s" process event)))))