]> git.eshelyaron.com Git - emacs.git/commitdiff
Port to Haiku R1/beta5
authorPo Lu <luangruo@yahoo.com>
Sun, 15 Sep 2024 00:52:46 +0000 (08:52 +0800)
committerEshel Yaron <me@eshelyaron.com>
Mon, 16 Sep 2024 10:04:53 +0000 (12:04 +0200)
* src/haiku_support.cc (keysym_from_raw_char): Use revised names
for B_HANGUL and B_HANGUL_HANJA.

(cherry picked from commit 709ce2aff146a8c09c191f818cda70b269902348)

src/haiku_support.cc

index 08e7f29685afdf5d8687e53fd38e3269dfa3e3b2..4ea5e0884b90eb7609ebb0f3a58656ed10de204f 100644 (file)
@@ -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: