aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-09-18 16:21:44 +0200
committerMarius Bakke <marius@gnu.org>2022-09-18 16:21:44 +0200
commit51482db4da0104928d4f95fcce808687dc9b0334 (patch)
tree9525a6f3f5ed8b5f8b130d5dc46a37d29f25d336 /gnu/packages/patches
parentd4ebf063f1fd2bd783246266719e12089658d6f8 (diff)
parentce3b51a4c6bef22e35ca04a945917510627fc3a7 (diff)
downloadguix-51482db4da0104928d4f95fcce808687dc9b0334.tar.gz
guix-51482db4da0104928d4f95fcce808687dc9b0334.zip
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/emacs-pgtk-super-key-fix.patch49
-rw-r--r--gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch37
2 files changed, 86 insertions, 0 deletions
diff --git a/gnu/packages/patches/emacs-pgtk-super-key-fix.patch b/gnu/packages/patches/emacs-pgtk-super-key-fix.patch
new file mode 100644
index 0000000000..a58c448af9
--- /dev/null
+++ b/gnu/packages/patches/emacs-pgtk-super-key-fix.patch
@@ -0,0 +1,49 @@
+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
diff --git a/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch b/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch
new file mode 100644
index 0000000000..77a8452c2a
--- /dev/null
+++ b/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch
@@ -0,0 +1,37 @@
+From 8b83fa772a71efc9dc030c43db2cba944e4338c1 Mon Sep 17 00:00:00 2001
+From: Kien Nguyen <kien.n.quang@gmail.com>
+Date: Wed, 19 May 2021 23:15:01 +0900
+Subject: [PATCH] Fix using of temporary lexical variable causes error in
+ native compiling
+
+---
+ polymode-core.el | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/polymode-core.el b/polymode-core.el
+index e7d40be..ef316f8 100644
+--- a/polymode-core.el
++++ b/polymode-core.el
+@@ -2088,14 +2088,14 @@ Elements of LIST can be either strings or symbols."
+ (stringp pm--output-file)
+ (pm--file-mod-time pm--output-file)))
+ (imt (and omt (pm--file-mod-time pm--input-file)))
+- (action (if is-exporter "exporting" "weaving"))
+ (ofile (if (and imt (time-less-p imt omt))
+ (progn
+ (message "Not re-%s as input file '%s' hasn't changed"
+- (file-name-nondirectory ifile) action)
++ (if is-exporter "exporting" "weaving")
++ (file-name-nondirectory ifile))
+ pm--output-file)
+ (message "%s '%s' with '%s' ..."
+- (capitalize action)
++ (if is-exporter "EXPORTING" "WEAVING")
+ (file-name-nondirectory ifile)
+ (eieio-object-name processor))
+ (let ((fn (with-no-warnings
+
+base-commit: 44265e35161d77f6eaa09388ea2256b89bd5dcc8
+--
+2.37.2
+