diff options
| author | Glenn Morris | 2020-06-07 09:03:59 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-06-07 09:03:59 -0700 |
| commit | fa6d56529f9ebaedaf62ecbf8887ffecca7dce12 (patch) | |
| tree | 922e12ffbf813534647a96788b9a5fb77b4f2288 /lisp/language | |
| parent | 6cb557e7a58d7f1c2e9afceeba45d0ced2aff214 (diff) | |
| parent | 35661ef943d261f6c43e93e475ddd8516f4a4b62 (diff) | |
| download | emacs-fa6d56529f9ebaedaf62ecbf8887ffecca7dce12.tar.gz emacs-fa6d56529f9ebaedaf62ecbf8887ffecca7dce12.zip | |
Merge from origin/emacs-27
35661ef943 (origin/emacs-27) Fix typo in "(elisp) Type Keywords"
1af0e95fec Gnus nnir-summary-line-format has no effect
dd366b5d3b Improve documentation of 'window-text-pixel-size'
fbd49f969e * src/xdisp.c (Fwindow_text_pixel_size): Doc fix. (Bug#41...
d8593fd19f Minor improvements to EDE and EIEIO manuals
3916e63f9e Have Fido mode also imitate Ido mode in ignore-case options
cc35b197c7 Update package-menu-quick-help
bf09106256 Improve documentation of 'sort-subr'
73749efa13 Update Ukrainian transliteration
30a7ee505a Fix Arabic shaping when eww/shr fill the text to be rendered
7d323f07c0 Silence some byte-compiler warnings in tests
cf473e742f * test/lisp/battery-tests.el: New file.
b07e3b1d97 Improve format-spec documentation (bug#41571)
# Conflicts:
# test/lisp/emacs-lisp/package-tests.el
Diffstat (limited to 'lisp/language')
| -rw-r--r-- | lisp/language/cyril-util.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el index e7a12675905..a3a6f3fdd94 100644 --- a/lisp/language/cyril-util.el +++ b/lisp/language/cyril-util.el | |||
| @@ -152,6 +152,7 @@ If the argument is nil, we return the display table to its standard state." | |||
| 152 | (aset standard-display-table ?љ [?l ?j]) | 152 | (aset standard-display-table ?љ [?l ?j]) |
| 153 | (aset standard-display-table ?њ [?n ?j]) | 153 | (aset standard-display-table ?њ [?n ?j]) |
| 154 | (aset standard-display-table ?џ [?d ?z]) | 154 | (aset standard-display-table ?џ [?d ?z]) |
| 155 | (aset standard-display-table ?ґ [?g]) | ||
| 155 | 156 | ||
| 156 | (aset standard-display-table ?Є [?Y ?e]) | 157 | (aset standard-display-table ?Є [?Y ?e]) |
| 157 | (aset standard-display-table ?Ї [?Y ?i]) | 158 | (aset standard-display-table ?Ї [?Y ?i]) |
| @@ -166,6 +167,7 @@ If the argument is nil, we return the display table to its standard state." | |||
| 166 | (aset standard-display-table ?Љ [?L ?j]) | 167 | (aset standard-display-table ?Љ [?L ?j]) |
| 167 | (aset standard-display-table ?Њ [?N ?j]) | 168 | (aset standard-display-table ?Њ [?N ?j]) |
| 168 | (aset standard-display-table ?Џ [?D ?j]) | 169 | (aset standard-display-table ?Џ [?D ?j]) |
| 170 | (aset standard-display-table ?Ґ [?G]) | ||
| 169 | 171 | ||
| 170 | (when (equal cyrillic-language "Bulgarian") | 172 | (when (equal cyrillic-language "Bulgarian") |
| 171 | (aset standard-display-table ?щ [?s ?h ?t]) | 173 | (aset standard-display-table ?щ [?s ?h ?t]) |
| @@ -182,7 +184,9 @@ If the argument is nil, we return the display table to its standard state." | |||
| 182 | (aset standard-display-table ?й [?i]) | 184 | (aset standard-display-table ?й [?i]) |
| 183 | (aset standard-display-table ?Й [?Y]) | 185 | (aset standard-display-table ?Й [?Y]) |
| 184 | (aset standard-display-table ?ю [?i ?u]) | 186 | (aset standard-display-table ?ю [?i ?u]) |
| 185 | (aset standard-display-table ?я [?i ?a])))) | 187 | (aset standard-display-table ?я [?i ?a]) |
| 188 | (aset standard-display-table ?г [?h]) | ||
| 189 | (aset standard-display-table ?Г [?H])))) | ||
| 186 | 190 | ||
| 187 | ;; | 191 | ;; |
| 188 | (provide 'cyril-util) | 192 | (provide 'cyril-util) |