aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2025-02-17 11:36:41 +0800
committerPo Lu2025-02-17 11:36:41 +0800
commit718a227f0fb926864c5224b5664b4b76c631039f (patch)
treede947fefceafa5b02dc33a3e3a8e8edc91dea6c6 /src
parent25b25fce759d254f5d1ddfb0964e9e0c90869f18 (diff)
downloademacs-718a227f0fb926864c5224b5664b4b76c631039f.tar.gz
emacs-718a227f0fb926864c5224b5664b4b76c631039f.zip
; Correct merge errors.
Diffstat (limited to 'src')
-rw-r--r--src/pgtkterm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 9f76e18f128..1cdf7877f60 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -193,9 +193,7 @@ pgtk_enumerate_devices (struct pgtk_display_info *dpyinfo,
193 rec->device = GDK_DEVICE (t1->data); 193 rec->device = GDK_DEVICE (t1->data);
194 source = gdk_device_get_source (rec->device); 194 source = gdk_device_get_source (rec->device);
195 name = gdk_device_get_name (rec->device); 195 name = gdk_device_get_name (rec->device);
196 rec->name = (make_formatted_string ("%u:%s", source, name); 196 rec->name = make_formatted_string ("%u:%s", source, name);
197
198 rec->name = build_string (printbuf);
199 } 197 }
200 else 198 else
201 { 199 {