[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d4dffae72c 2/2: ; Change parent language-environment of Kharoshth
From: |
Eli Zaretskii |
Subject: |
master d4dffae72c 2/2: ; Change parent language-environment of Kharoshthi |
Date: |
Sun, 30 Oct 2022 07:17:37 -0400 (EDT) |
branch: master
commit d4dffae72c9042b10e73ff418b33faa8bf3a6b44
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
; Change parent language-environment of Kharoshthi
* lisp/language/misc-lang.el ("Kharoshthi"): Change its parent to
"Indian". (Bug#58376)
* lisp/international/mule-cmds.el (set-language-info-alist): Fix
indentation.
---
lisp/international/mule-cmds.el | 25 ++++++++++++++++---------
lisp/language/misc-lang.el | 2 +-
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index dfd2e1438e..61a26b504c 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1238,7 +1238,8 @@ in the European submenu in each of those two menus."
(if (symbolp (setq parent-symbol (car parents)))
(setq parent (symbol-name parent))
(setq parent parent-symbol parent-symbol (intern parent)))
- (setq describe-map (lookup-key describe-language-environment-map
(vector parent-symbol)))
+ (setq describe-map (lookup-key describe-language-environment-map
+ (vector parent-symbol)))
;; This prompt string is for define-prefix-command, so
;; that the map it creates will be suitable for a menu.
(or describe-map (setq prompt (format "%s Environment" parent)))
@@ -1246,19 +1247,25 @@ in the European submenu in each of those two menus."
(setq describe-map (intern (format "describe-%s-environment-map"
(downcase parent))))
(define-prefix-command describe-map nil prompt)
- (define-key-after describe-language-environment-map (vector
parent-symbol)
- (cons parent describe-map)))
- (setq setup-map (lookup-key setup-language-environment-map (vector
parent-symbol)))
+ (define-key-after
+ describe-language-environment-map
+ (vector parent-symbol) (cons parent describe-map)))
+ (setq setup-map (lookup-key setup-language-environment-map
+ (vector parent-symbol)))
(unless setup-map
(setq setup-map (intern (format "setup-%s-environment-map"
(downcase parent))))
(define-prefix-command setup-map nil prompt)
- (define-key-after setup-language-environment-map (vector
parent-symbol)
- (cons parent setup-map)))
+ (define-key-after
+ setup-language-environment-map
+ (vector parent-symbol) (cons parent setup-map)))
(setq parents (cdr parents))
- (set-language-info-setup-keymap lang-env alist (symbol-value
describe-map) (symbol-value setup-map))))
- (set-language-info-setup-keymap lang-env alist
- describe-language-environment-map
setup-language-environment-map))
+ (set-language-info-setup-keymap
+ lang-env alist
+ (symbol-value describe-map) (symbol-value setup-map))))
+ (set-language-info-setup-keymap
+ lang-env alist
+ describe-language-environment-map setup-language-environment-map))
(dolist (elt alist)
(set-language-info-internal lang-env (car elt) (cdr elt)))
(if (equal lang-env current-language-environment)
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index c34017d9b3..230db3b100 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -253,7 +253,7 @@ in this language environment."))
(documentation . "\
Language environment for Gāndhārī, Sanskrit, and other languages
using the Kharoṣṭhī script."))
- '("Misc"))
+ '("Indian"))
(let ((consonant "[\U00010A00\U00010A10-\U00010A35]")
(vowel "[\U00010A01-\U00010A06]")