diff options
| author | Morgan Smith <Morgan.J.Smith@outlook.com> | 2026-02-11 17:20:09 -0500 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2026-03-01 17:38:53 +0100 |
| commit | 4b0ba1ec86edef80423e7ffe5ba9c2196961d416 (patch) | |
| tree | 4578a71ee7feb9d484b1937f085ad19c5896e13b /gnu | |
| parent | 33e6f15c7459d1cf3a881d53cb43680dcb021cbb (diff) | |
gnu: emacs: Remove super-key patch.
The issue this patch solves got fixed in GTK 3.23.37.
* gnu/packages/patches/emacs-pgtk-super-key-fix.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/emacs.scm (emacs-minimal, emacs-next-minimal): Do not use the
super-key patch.
Change-Id: I5a1098ce0a4709aa8f05a5a82e2b78866b48a87f
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/emacs.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/patches/emacs-pgtk-super-key-fix.patch | 49 |
3 files changed, 0 insertions, 52 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 9c86934fa9b..0b375fde2c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1245,7 +1245,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ - %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 11d8ce5272d..ac083af36af 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -159,7 +159,6 @@ "emacs-native-comp-driver-options.patch" "emacs-native-comp-fix-filenames.patch" "emacs-native-comp-pin-packages.patch" - "emacs-pgtk-super-key-fix.patch" "emacs-zoom-image-test-fix.patch")) (modules '((guix build utils))) (snippet @@ -687,7 +686,6 @@ editor (with wide ints)" ) "emacs-native-comp-driver-options.patch" "emacs-next-native-comp-fix-filenames.patch" "emacs-native-comp-pin-packages.patch" - "emacs-pgtk-super-key-fix.patch" ;; XXX This commit should already be on 31.0 but ;; without this emacs-next will fail a test. "emacs-zoom-image-test-fix.patch"))))))) diff --git a/gnu/packages/patches/emacs-pgtk-super-key-fix.patch b/gnu/packages/patches/emacs-pgtk-super-key-fix.patch deleted file mode 100644 index a58c448af90..00000000000 --- a/gnu/packages/patches/emacs-pgtk-super-key-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a897516fc5ec380938115ad42023f279d128fc1e Mon Sep 17 00:00:00 2001 -From: Andrew Tropin <andrew@trop.in> -Date: Fri, 16 Sep 2022 15:24:19 +0300 -Subject: [PATCH] Workaround gtk bug for superkey handling - -https://gitlab.gnome.org/GNOME/gtk/-/issues/4913 -https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55362 -Patch based on Thomas Jost's suggestion. - ---- - src/pgtkterm.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/pgtkterm.c b/src/pgtkterm.c -index 491ba33882..d5a9970693 100644 ---- a/src/pgtkterm.c -+++ b/src/pgtkterm.c -@@ -5051,7 +5051,7 @@ pgtk_gtk_to_emacs_modifiers (struct pgtk_display_info *dpyinfo, int state) - mod |= mod_ctrl; - if (state & GDK_META_MASK || state & GDK_MOD1_MASK) - mod |= mod_meta; -- if (state & GDK_SUPER_MASK) -+ if (state & GDK_SUPER_MASK || state & GDK_MOD4_MASK) - mod |= mod_super; - if (state & GDK_HYPER_MASK) - mod |= mod_hyper; -@@ -5184,7 +5184,7 @@ key_press_event (GtkWidget *widget, GdkEvent *event, gpointer *user_data) - /* While super is pressed, the input method will always always - resend the key events ignoring super. As a workaround, don't - filter key events with super or hyper pressed. */ -- if (!(event->key.state & (GDK_SUPER_MASK | GDK_HYPER_MASK))) -+ if (!(event->key.state & (GDK_SUPER_MASK | GDK_MOD4_MASK | GDK_HYPER_MASK))) - { - if (pgtk_im_filter_keypress (f, &event->key)) - return TRUE; -@@ -5199,8 +5199,9 @@ key_press_event (GtkWidget *widget, GdkEvent *event, gpointer *user_data) - /* make_lispy_event turns chars into control chars. - Don't do it here because XLookupString is too eager. */ - state &= ~GDK_CONTROL_MASK; -- state &= ~(GDK_META_MASK -- | GDK_SUPER_MASK | GDK_HYPER_MASK | GDK_MOD1_MASK); -+ state &= ~(GDK_META_MASK | GDK_MOD1_MASK -+ | GDK_SUPER_MASK | GDK_MOD4_MASK -+ | GDK_HYPER_MASK); - - nbytes = event->key.length; - if (nbytes > copy_bufsiz) --- -2.37.3 |