bug#51700: 29.0.50; [PATCH]: Fix earlier changes in xwidget.el

bug#51700: 29.0.50; [PATCH]: Fix earlier changes in xwidget.el

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

The test suite I was working on have already proved their utility, nice.

Unfortunately I haven't been able to get some of the tests to work
reliably, and as such don't wish to publish them right now.  Please bear
with me, thanks.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Make-xwidget-tests-pass-again.patch --]
[-- Type: text/x-patch, Size: 2615 bytes --]

From 40ea895cbf15849757abc445791b891112064eda Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Tue, 9 Nov 2021 13:33:49 +0800
Subject: [PATCH] Make xwidget-tests pass again

* lisp/xwidget.el (xwidget-webkit-buffer-name-prefix): Remove extra
space.
(xwidget-webkit-callback): Add trailing "*" to buffer name.
(xwidget-webkit-new-session, xwidget-webkit-import-widget): Always use
existing buffer name.
---
 lisp/xwidget.el | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 91d02e8fce..c2b3826733 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -95,7 +95,7 @@ xwidget-webkit
   :group 'web
   :prefix "xwidget-webkit-")
 
-(defcustom xwidget-webkit-buffer-name-prefix "* xwidget-webkit: "
+(defcustom xwidget-webkit-buffer-name-prefix "*xwidget-webkit: "
   "Buffer name prefix used by `xwidget-webkit' buffers."
   :type 'string
   :version "29.1")
@@ -370,7 +370,7 @@ xwidget-webkit-callback
                  ;; selected window can be the mini-buffer window
                  ;; unwantedly.
                  (rename-buffer (concat xwidget-webkit-buffer-name-prefix
-                                        title)
+                                        title "*")
                                 t)))))
           ((eq xwidget-event-type 'decide-policy)
            (let ((strarg  (nth 3 last-input-event)))
@@ -705,8 +705,7 @@ xwidget-webkit-new-session
           ;; will be renamed by `xwidget-webkit-callback' in the
           ;; future. This approach can limit flicker of buffer-name in
           ;; mode-line.
-          (concat xwidget-webkit-buffer-name-prefix
-                  (generate-new-buffer-name (buffer-name))))
+          (generate-new-buffer-name (buffer-name)))
          (callback (or callback #'xwidget-webkit-callback))
          (current-session (xwidget-webkit-current-session))
          xw)
@@ -735,11 +734,7 @@ xwidget-webkit-import-widget
           ;; will be renamed by `xwidget-webkit-callback' in the
           ;; future. This approach can limit flicker of buffer-name in
           ;; mode-line.
-          (if (string-prefix-p xwidget-webkit-buffer-name-prefix
-                               (buffer-name))
-              (generate-new-buffer-name (buffer-name))
-            (concat xwidget-webkit-buffer-name-prefix
-                    (generate-new-buffer-name (buffer-name)))))
+          (generate-new-buffer-name (buffer-name)))
          (callback #'xwidget-webkit-callback)
          (buffer (get-buffer-create bufname)))
     (with-current-buffer buffer
-- 
2.31.1

bug#51700: 29.0.50; [PATCH]: Fix earlier changes in xwidget.el

[Lars Ingebrigtsen]

Po Lu <luangruo@yahoo.com> writes:

> The test suite I was working on have already proved their utility, nice.
>
> Unfortunately I haven't been able to get some of the tests to work
> reliably, and as such don't wish to publish them right now.  Please bear
> with me, thanks.

Thanks; applied to Emacs 29.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no