Re:Re: [PATCH] xwidget: Add xwidget-webkit-buffer-name-format (Re:Re: About rename xwidget-webkit-buffer-name-prefix)

[tumashu <tumashu@163.com>]

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


















At 2021-11-10 21:54:21, "Eli Zaretskii" <eliz@gnu.org> wrote:
>> Date: Wed, 10 Nov 2021 17:49:04 +0800 (CST)
>> From: tumashu  <tumashu@163.com>
>> Cc: "emacs-devel@gnu.org" <emacs-devel@gnu.org>
>> 
>> -*** New user option 'xwidget-webkit-buffer-name-prefix'.
>> +*** New user option 'xwidget-webkit-buffer-name-format'.
>>  This allows the user to change the webkit buffer names.
>
>  Using this option you can control how the xwidget-webkit buffers are
>  named.

changed.

>
>> +(defcustom xwidget-webkit-buffer-name-format "*xwidget-webkit: %T*"
>> +  "Buffer name format used by `xwidget-webkit' buffers.
>
>    Template for naming `xwidget-webkit' buffers.
>  It can use the following special constructs:
>
>    %T -- the title of the Web page loaded by the xwidget.

changed.

>
>> +                 (rename-buffer
>> +                  (format-spec
>> +                   xwidget-webkit-buffer-name-format
>> +                   `((?T . ,title)))
>> +                  t)))))
>
>Hmmm... does this mean that the format spec _must_ contain %T?
>Because otherwise all the buffers will have the same name, no?
>Which would mean this change introduces a regression wrt how this
>worked previously, right?

I have tested without %T, it will like  *xwidget-webkit:*<2> ,*xwidget-webkit:*<3> ...
so I think some user will like this and set without %T.



[-- Attachment #2: 0001-xwidget-Add-xwidget-webkit-buffer-name-format.patch --]
[-- Type: application/octet-stream, Size: 2650 bytes --]

From efc593fc70f61879556a0a05469b162800eebb2e Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Wed, 10 Nov 2021 16:10:37 +0800
Subject: [PATCH] xwidget: Add xwidget-webkit-buffer-name-format.

* lisp/xwidget.el (xwidget-webkit-buffer-name-prefix): Rename from ...
(xwidget-webkit-buffer-name-format):  to this.
(xwidget-webkit-callback): Use xwidget-webkit-buffer-name-format instead.
(format-spec): required.

* etc/NEWS: Note xwidget-webkit-buffer-name-format.
---
 etc/NEWS        |  5 +++--
 lisp/xwidget.el | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index b403be65da..d53869e245 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -443,8 +443,9 @@ This is a convenience function to extract the field data from
 ** Xwidgets
 
 ---
-*** New user option 'xwidget-webkit-buffer-name-prefix'.
-This allows the user to change the webkit buffer names.
+*** New user option 'xwidget-webkit-buffer-name-format'.
+Using this option you can control how the xwidget-webkit buffers are
+named.
 
 +++
 *** New minor mode 'xwidget-webkit-edit-mode'.
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index cc149cf197..1b3fb932ba 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -33,6 +33,7 @@
 
 (require 'cl-lib)
 (require 'bookmark)
+(require 'format-spec)
 
 (declare-function make-xwidget "xwidget.c"
                   (type title width height arguments &optional buffer related))
@@ -95,8 +96,11 @@ xwidget-webkit
   :group 'web
   :prefix "xwidget-webkit-")
 
-(defcustom xwidget-webkit-buffer-name-prefix "*xwidget-webkit: "
-  "Buffer name prefix used by `xwidget-webkit' buffers."
+(defcustom xwidget-webkit-buffer-name-format "*xwidget-webkit: %T*"
+  "Template for naming `xwidget-webkit' buffers.
+It can use the following special constructs:
+
+   %T -- the title of the Web page loaded by the xwidget."
   :type 'string
   :version "29.1")
 
@@ -372,9 +376,11 @@ xwidget-webkit-callback
                  ;; Do not adjust webkit size to window here, the
                  ;; selected window can be the mini-buffer window
                  ;; unwantedly.
-                 (rename-buffer (concat xwidget-webkit-buffer-name-prefix
-                                        title "*")
-                                t)))))
+                 (rename-buffer
+                  (format-spec
+                   xwidget-webkit-buffer-name-format
+                   `((?T . ,title)))
+                  t)))))
           ((eq xwidget-event-type 'decide-policy)
            (let ((strarg  (nth 3 last-input-event)))
              (if (string-match ".*#\\(.*\\)" strarg)
-- 
2.30.2