Fix last tty-select-active-regions change

* lisp/frame.el (tty-select-active-regions): Pacify warning about
missing defcustom :group by specifying the same group as
select-active-regions, as well as the frames group.
* src/keyboard.c (command_loop_1, syms_of_keyboard): Rename last
occurrences of xterm-select-active-regions to
tty-select-active-regions (bug#55883).

diff --git a/lisp/frame.el b/lisp/frame.el
index a6aa4475dd938e868ac3fb94a0b302b4a286e2ce..6996bb2e9c6bf84992bd9493be3c730125212784 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2155,6 +2155,8 @@ On a text-mode terminal that supports setSelection command, if
 this variable is non-nil, Emacs will set the PRIMARY selection
 from the active region, according to `select-active-regions'.
 This is currently supported only on xterm."
+  :group 'frames
+  :group 'killing
   :version "29.1"
   :type 'boolean)
 

diff --git a/src/keyboard.c b/src/keyboard.c
index cd92cf8d4acc66fa1133f8d2eff7391c42b6c375..e62b2e56d3d507ab37162cc2e206225ae7ec0778 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1572,7 +1572,7 @@ command_loop_1 (void)
                 `select-active-regions' is non-nil.  */
              if ((!NILP (Fwindow_system (Qnil))
                   || ((symval =
-                       find_symbol_value (Qxterm_select_active_regions),
+                       find_symbol_value (Qtty_select_active_regions),
                        (!EQ (symval, Qunbound) && !NILP (symval)))
                       && !NILP (Fterminal_parameter (Qnil,
                                                      Qxterm__set_selection))))
@@ -12170,7 +12170,7 @@ syms_of_keyboard (void)
 
   DEFSYM (Qgui_set_selection, "gui-set-selection");
   DEFSYM (Qxterm__set_selection, "xterm--set-selection");
-  DEFSYM (Qxterm_select_active_regions, "xterm-select-active-regions");
+  DEFSYM (Qtty_select_active_regions, "tty-select-active-regions");
 
   /* The primary selection.  */
   DEFSYM (QPRIMARY, "PRIMARY");