Merge from savannah/emacs-30

709ce2aff14 Port to Haiku R1/beta5
21efdd5ef31 Fix c++-ts-mode font-lock for latest c++ grammar (bug#73191)
ffc00eac53d ; Set Transient's version and add admin/MAINTAINERS entry
3822a5e5d12 * admin/update-copyright: Print reminder to do manual upd...
43b678d3d26 * admin/notes/years: Update.
38de992a5a3 * etc/TODO: New item "support indentation guides".

# Conflicts:
#	admin/notes/years
#	doc/misc/transient.texi
#	lisp/progmodes/c-ts-mode.el
#	lisp/transient.el

1 files changed, 9 insertions, 1 deletions

diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index 08e7f29685a..4ea5e0884b9 100644
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -340,10 +340,18 @@ keysym_from_raw_char (int32 raw, int32 key, unsigned *code)
 
       break;
 
+#if B_HAIKU_VERSION >= B_HAIKU_VERSION_1_BETA_5
+    case B_HANGUL_KEY:
+#else /* B_HAIKU_VERSION < B_HAIKU_VERSION_1_BETA_5 */
     case B_HANGUL:
+#endif /* B_HAIKU_VERSION >= B_HAIKU_VERSION_1_BETA_5 */
       *code = KEY_HANGUL;
       break;
-    case B_HANGUL_HANJA:
+#if B_HAIKU_VERSION >= B_HAIKU_VERSION_1_BETA_5
+    case B_HANGUL_HANJA_KEY:
+#else /* B_HAIKU_VERSION < B_HAIKU_VERSION_1_BETA_5 */
+    case B_HANGUL:
+#endif /* B_HAIKU_VERSION >= B_HAIKU_VERSION_1_BETA_5 */
       *code = KEY_HANGUL_HANJA;
       break;
     case B_KATAKANA_HIRAGANA: