diff options
| author | Po Lu | 2025-02-21 13:32:14 +0800 |
|---|---|---|
| committer | Po Lu | 2025-02-21 13:32:14 +0800 |
| commit | 1f2e06283c5ca89105969c676318c4aede97e727 (patch) | |
| tree | b0dc86c529740abed19b15f06a474ab67aca0e21 /src | |
| parent | dd4e96a8254bc78e811d6b38a2b8adf475c1e13c (diff) | |
| parent | 25ba2536091dea39c690169784fa9771296eefec (diff) | |
| download | emacs-1f2e06283c5ca89105969c676318c4aede97e727.tar.gz emacs-1f2e06283c5ca89105969c676318c4aede97e727.zip | |
Merge from savannah/emacs-30
25ba2536091 Fix reported Haiku build error in emacs-30.1-rc1
92e96a11752 ; Delete troff markers from ChangeLog files
Diffstat (limited to 'src')
| -rw-r--r-- | src/haiku_support.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/haiku_support.cc b/src/haiku_support.cc index bfa2cb51456..8669e2f49e7 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc | |||
| @@ -350,7 +350,7 @@ keysym_from_raw_char (int32 raw, int32 key, unsigned *code) | |||
| 350 | #if B_HAIKU_VERSION >= B_HAIKU_VERSION_1_PRE_BETA_6 | 350 | #if B_HAIKU_VERSION >= B_HAIKU_VERSION_1_PRE_BETA_6 |
| 351 | case B_HANGUL_HANJA_KEY: | 351 | case B_HANGUL_HANJA_KEY: |
| 352 | #else /* B_HAIKU_VERSION < B_HAIKU_VERSION_1_PRE_BETA_6 */ | 352 | #else /* B_HAIKU_VERSION < B_HAIKU_VERSION_1_PRE_BETA_6 */ |
| 353 | case B_HANGUL: | 353 | case B_HANGUL_HANJA: |
| 354 | #endif /* B_HAIKU_VERSION >= B_HAIKU_VERSION_1_PRE_BETA_6 */ | 354 | #endif /* B_HAIKU_VERSION >= B_HAIKU_VERSION_1_PRE_BETA_6 */ |
| 355 | *code = KEY_HANGUL_HANJA; | 355 | *code = KEY_HANGUL_HANJA; |
| 356 | break; | 356 | break; |