summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2024-03-16 15:15:10 +0800
committerPo Lu <luangruo@yahoo.com>2024-03-16 15:16:00 +0800
commit28e481bf7af873cdaf016e25855a8e0ebc424fe7 (patch)
tree48ffdfe04268e762a66829951c69a701cdea22c8 /src
parent658529921614b8d5498c267a7ffc786c25d2d26f (diff)
downloademacs-28e481bf7af873cdaf016e25855a8e0ebc424fe7.tar.gz
Respond to default action from Gnus notifications
* lisp/gnus/gnus-notifications.el (gnus-notifications-action): Consider default equivalent to read.
Diffstat (limited to 'src')
-rw-r--r--src/androidterm.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/androidterm.c b/src/androidterm.c
index 9948a2919d8..ba9b6d3b8a9 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -376,11 +376,11 @@ android_android_to_emacs_modifiers (struct android_display_info *dpyinfo,
tem = Fget (Vx_super_keysym, Qmodifier_value);
if (FIXNUMP (tem)) mod_super = XFIXNUM (tem) & INT_MAX;
- return (((state & ANDROID_CONTROL_MASK) ? mod_ctrl : 0)
- | ((state & ANDROID_SHIFT_MASK) ? mod_shift : 0)
- | ((state & ANDROID_ALT_MASK) ? mod_meta : 0)
- | ((state & ANDROID_SUPER_MASK) ? mod_super : 0)
- | ((state & ANDROID_META_MASK) ? mod_alt : 0));
+ return (((state & ANDROID_CONTROL_MASK) ? mod_ctrl : 0)
+ | ((state & ANDROID_SHIFT_MASK) ? shift_modifier : 0)
+ | ((state & ANDROID_ALT_MASK) ? mod_meta : 0)
+ | ((state & ANDROID_SUPER_MASK) ? mod_super : 0)
+ | ((state & ANDROID_META_MASK) ? mod_alt : 0));
}
static int
@@ -402,11 +402,11 @@ android_emacs_to_android_modifiers (struct android_display_info *dpyinfo,
tem = Fget (Vx_super_keysym, Qmodifier_value);
if (FIXNUMP (tem)) mod_super = XFIXNUM (tem);
- return (((state & mod_ctrl) ? ANDROID_CONTROL_MASK : 0)
- | ((state & mod_shift) ? ANDROID_SHIFT_MASK : 0)
- | ((state & mod_meta) ? ANDROID_ALT_MASK : 0)
- | ((state & mod_super) ? ANDROID_SUPER_MASK : 0)
- | ((state & mod_alt) ? ANDROID_META_MASK : 0));
+ return (((state & mod_ctrl) ? ANDROID_CONTROL_MASK : 0)
+ | ((state & shift_modifier) ? ANDROID_SHIFT_MASK : 0)
+ | ((state & mod_meta) ? ANDROID_ALT_MASK : 0)
+ | ((state & mod_super) ? ANDROID_SUPER_MASK : 0)
+ | ((state & mod_alt) ? ANDROID_META_MASK : 0));
}
static void android_frame_rehighlight (struct android_display_info *);