Subject: bug#70230: 30.0.50; [PATCH] * lisp/master.el (master-says): check nil parameter

From: Lin Sun <[email-masked]>
Date: Sat, 6 Apr 2024 00:05:29 +0000

Hi,

The `(master-says)' will trigger an unexpected error message with follow code:

(require 'master)
(master-says)

> Wrong type argument: stringp, nil

The patch tries checking the nil parameter before calling `get-buffer'
to avoid the unexpected err message.

Please help check it. Thanks.

Best regards
Lin
From 7a0dcde5fec2b7b7fdd1c74db1440183c11cfca6 Mon Sep 17 00:00:00 2001
From: Lin Sun <[email-masked]>
Date: Fri, 5 Apr 2024 06:58:07 +0000
Subject: [PATCH] * lisp/master.el (master-says): check nil parameter

---
 lisp/master.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/master.el b/lisp/master.el
index 0caf4d7963..4bdf686111 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -136,7 +136,8 @@ master-says-recenter
 (defun master-says (&optional command arg)
   "Display slave buffer and execute COMMAND with ARG in its window."
   (interactive)
-  (if (null (buffer-live-p (get-buffer master-of)))
+  (if (not (and master-of
+                (buffer-live-p (get-buffer master-of))))
       (error "Slave buffer has disappeared")
     (let ((window  (selected-window)))
       (if (not (eq (window-buffer window) (get-buffer master-of)))
-- 
2.20.5