diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
| commit | 650c20f1ca4e07591a727e1cfcc74b3363d15985 (patch) | |
| tree | 85d11f6437cde22f410c25e0e5f71a3131ebd07d /lisp/language/cyril-util.el | |
| parent | 8869332684c2302b5ba1ead4568bbc7ba1c0183e (diff) | |
| parent | 4b85ae6a24380fb67a3315eaec9233f17a872473 (diff) | |
| download | emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.gz emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.bz2 emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.zip | |
Merge 'master' into noverlay
Diffstat (limited to 'lisp/language/cyril-util.el')
| -rw-r--r-- | lisp/language/cyril-util.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el index 7644064c5a0..5482b3ea306 100644 --- a/lisp/language/cyril-util.el +++ b/lisp/language/cyril-util.el @@ -1,6 +1,6 @@ -;;; cyril-util.el --- utilities for Cyrillic scripts +;;; cyril-util.el --- utilities for Cyrillic scripts -*- lexical-binding: t; -*- -;; Copyright (C) 1997-1998, 2001-2017 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2022 Free Software Foundation, Inc. ;; Keywords: mule, multilingual, Cyrillic @@ -47,7 +47,7 @@ ;;;###autoload (defun standard-display-cyrillic-translit (&optional cyrillic-language) - "Display a cyrillic buffer using a transliteration. + "Display a Cyrillic buffer using a transliteration. For readability, the table is slightly different from the one used for the input method `cyrillic-translit'. @@ -60,7 +60,7 @@ If the argument is nil, we return the display table to its standard state." (list (let* ((completion-ignore-case t)) (completing-read - "Cyrillic language (default nil): " + (format-prompt "Cyrillic language" "nil") cyrillic-language-alist nil t nil nil nil)))) (or standard-display-table @@ -152,6 +152,7 @@ If the argument is nil, we return the display table to its standard state." (aset standard-display-table ?љ [?l ?j]) (aset standard-display-table ?њ [?n ?j]) (aset standard-display-table ?џ [?d ?z]) + (aset standard-display-table ?ґ [?g]) (aset standard-display-table ?Є [?Y ?e]) (aset standard-display-table ?Ї [?Y ?i]) @@ -166,6 +167,7 @@ If the argument is nil, we return the display table to its standard state." (aset standard-display-table ?Љ [?L ?j]) (aset standard-display-table ?Њ [?N ?j]) (aset standard-display-table ?Џ [?D ?j]) + (aset standard-display-table ?Ґ [?G]) (when (equal cyrillic-language "Bulgarian") (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." (aset standard-display-table ?й [?i]) (aset standard-display-table ?Й [?Y]) (aset standard-display-table ?ю [?i ?u]) - (aset standard-display-table ?я [?i ?a])))) + (aset standard-display-table ?я [?i ?a]) + (aset standard-display-table ?г [?h]) + (aset standard-display-table ?Г [?H])))) ;; (provide 'cyril-util) |