emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 3808cb8: Make xwidget-tests pass again


From: Lars Ingebrigtsen
Subject: master 3808cb8: Make xwidget-tests pass again
Date: Tue, 9 Nov 2021 00:49:49 -0500 (EST)

branch: master
commit 3808cb89c3740b5ba4346c70fe3c7508ad42a11b
Author: Po Lu <luangruo@yahoo.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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 (bug#51700).
---
 lisp/xwidget.el | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index dc1ed2d..fc37798 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -95,7 +95,7 @@ This returns the result of `make-xwidget'."
   :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")
@@ -371,7 +371,7 @@ XWIDGET instance, XWIDGET-EVENT-TYPE depends on the 
originating xwidget."
                  ;; 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)))
@@ -706,8 +706,7 @@ For example, use this to display an anchor."
           ;; 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)
@@ -736,11 +735,7 @@ Return the buffer."
           ;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]