From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Oct 2020 13:59:37 +0000 (+0300)
Subject: Remove most of charset markup from etc/HELLO
X-Git-Tag: emacs-28.0.90~5466
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4a92e2f95e80787f0eaa6ba7392641b6020dd5cd;p=emacs.git

Remove most of charset markup from etc/HELLO

For the reasons, see the discussion that started in
https://lists.gnu.org/archive/html/emacs-devel/2018-12/msg00407.html
and its conclusion in
https://lists.gnu.org/archive/html/emacs-devel/2019-01/msg00144.html.
The only markup left is in the preamble, just to show the example
of this facility.
---

diff --git a/etc/HELLO b/etc/HELLO
index 3c1fd63fb71..fcc907536e3 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -7,89 +7,89 @@ some of the character sets that Emacs supports.
 
 
 Non-ASCII examples:
-  Europe: <x-charset><param>latin-iso8859-1</param>¡Hola!, Grüß Gott, Hyvää päivää,</x-charset><x-charset><param>latin-iso8859-15</param> Tere õhtust,</x-charset><x-charset><param>latin-iso8859-3</param> Bonġu
-          Cześć!,</x-charset><x-charset><param>latin-iso8859-2</param> Dobrý den,</x-charset><x-charset><param>cyrillic-iso8859-5</param> Здравствуйте!,</x-charset><x-charset><param>greek-iso8859-7</param> Γειά σας,</x-charset><x-charset><param>mule-unicode-0100-24ff</param> გამარჯობა</x-charset>
-  Africa:<x-charset><param>mule-unicode-0100-24ff</param> </x-charset><x-charset><param>ethiopic</param>ሠላም</x-charset>
-  Middle/Near East:<x-charset><param>hebrew-iso8859-8</param> שָׁלוֹם,</x-charset><x-charset><param>mule-unicode-0100-24ff</param> السّلام عليكم</x-charset>
-  South Asia:<x-charset><param>mule-unicode-0100-24ff</param> નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ଶୁଣିବେ,
-              ආයුබෝවන්, வணக்கம், నమస్కారం,</x-charset><x-charset><param>tibetan</param> བཀྲ་ཤིས་བདེ་ལེགས༎</x-charset>
-  South East Asia:<x-charset><param>mule-unicode-0100-24ff</param> ជំរាបសួរ,</x-charset><x-charset><param>lao</param> ສະບາຍດີ,</x-charset><x-charset><param>mule-unicode-0100-24ff</param> မင်္ဂလာပါ,</x-charset><x-charset><param>thai-tis620</param> สวัสดีครับ,</x-charset><x-charset><param>vietnamese-viscii-lower</param> </x-charset><x-charset><param>vietnamese-viscii-upper</param>C</x-charset><x-charset><param>vietnamese-viscii-lower</param>hào bạn</x-charset>
+  Europe: <x-charset><param>latin-iso8859-1</param>¡Hola!, Grüß Gott, Hyvää päivää,</x-charset> Tere õhtust,<x-charset><param>latin-iso8859-3</param> Bonġu
+          Cześć!,</x-charset><x-charset><param>latin-iso8859-2</param> Dobrý den,</x-charset><x-charset><param>cyrillic-iso8859-5</param> Здравствуйте!,</x-charset><x-charset><param>greek-iso8859-7</param> Γειά σας,</x-charset> გამარჯობა
+  Africa: <x-charset><param>ethiopic</param>ሠላም</x-charset>
+  Middle/Near East:<x-charset><param>hebrew-iso8859-8</param> שָׁלוֹם,</x-charset> السّلام عليكم
+  South Asia: નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ଶୁଣିବେ,
+              ආයුබෝවන්, வணக்கம், నమస్కారం,<x-charset><param>tibetan</param> བཀྲ་ཤིས་བདེ་ལེགས༎</x-charset>
+  South East Asia: ជំរាបសួរ,<x-charset><param>lao</param> ສະບາຍດີ,</x-charset> မင်္ဂလာပါ,<x-charset><param>thai-tis620</param> สวัสดีครับ,</x-charset><x-charset><param>vietnamese-viscii-lower</param> </x-charset><x-charset><param>vietnamese-viscii-upper</param>C</x-charset><x-charset><param>vietnamese-viscii-lower</param>hào bạn</x-charset>
   East Asia:<x-charset><param>chinese-gb2312</param> 你好,</x-charset><x-charset><param>chinese-big5-1</param> 早晨,</x-charset><x-charset><param>japanese-jisx0208</param> こんにちは,</x-charset><x-charset><param>korean-ksc5601</param> 안녕하세요</x-charset>
-  Misc:<x-charset><param>latin-iso8859-3</param> Eĥoŝanĝo ĉiuĵaŭde,</x-charset><x-charset><param>mule-unicode-2500-33ff</param> ⠓⠑⠇⠇⠕,</x-charset><x-charset><param>mule-unicode-0100-24ff</param> ∀ p ∈ world • hello p  </x-charset><x-charset><param>mule-unicode-2500-33ff</param>□</x-charset>
+  Misc:<x-charset><param>latin-iso8859-3</param> Eĥoŝanĝo ĉiuĵaŭde,</x-charset> ⠓⠑⠇⠇⠕, ∀ p ∈ world • hello p  □
   CJK variety:<x-charset><param>chinese-gb2312</param> GB(元气,开发),</x-charset><x-charset><param>chinese-big5-1</param> BIG5(元氣,開發),</x-charset><x-charset><param>japanese-jisx0208</param> JIS(元気,開発),</x-charset><x-charset><param>korean-ksc5601</param> KSC(元氣,開發)</x-charset>
   Unicode charset:<x-charset><param>unicode</param> Eĥoŝanĝo ĉiuĵaŭde, Γειά σας, שלום, Здравствуйте!</x-charset>
 
 
 LANGUAGE (NATIVE NAME)	HELLO
 ----------------------	-----
-<x-charset><param>mule-unicode-0100-24ff</param>Amharic (አማርኛ)	ሠላም
+Amharic (አማርኛ)	ሠላም
 Arabic (العربيّة)	السّلام عليكم
 Armenian (հայերեն)	Բարև ձեզ
-</x-charset><x-charset><param>cyrillic-iso8859-5</param>Belarusian (беларуская)	Прывітанне
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Bengali (বাংলা)	নমস্কার
-</x-charset><x-charset><param>mule-unicode-2500-33ff</param>Braille	⠓⠑⠇⠇⠕
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Burmese (မြန်မာ)	မင်္ဂလာပါ
-</x-charset>C	printf ("Hello, world!\n");
-<x-charset><param>unicode</param>Cherokee (ᏣᎳᎩ ᎦᏬᏂᎯᏍᏗ)	ᎣᏏᏲ / ᏏᏲ
+Belarusian (беларуская)	Прывітанне
+Bengali (বাংলা)	নমস্কার
+Braille	⠓⠑⠇⠇⠕
+Burmese (မြန်မာ)	မင်္ဂလာပါ
+C	printf ("Hello, world!\n");
+Cherokee (ᏣᎳᎩ ᎦᏬᏂᎯᏍᏗ)	ᎣᏏᏲ / ᏏᏲ
 Comanche /kəˈmæntʃiː/	Haa marʉ́awe
 
 Cree (ᓀᐦᐃᔭᐍᐏᐣ)	ᑕᓂᓯ / ᐙᒋᔮ
 
-</x-charset><x-charset><param>latin-iso8859-2</param>Czech (čeština)	Dobrý den
-</x-charset><x-charset><param>latin-iso8859-1</param>Danish (dansk)	Hej / Goddag / Halløj
+Czech (čeština)	Dobrý den
+Danish (dansk)	Hej / Goddag / Halløj
 Dutch (Nederlands)	Hallo / Dag
-</x-charset><x-charset><param>unicode</param>Efik  /ˈɛfɪk/	Mɔkɔm
+Efik  /ˈɛfɪk/	Mɔkɔm
 
 Emacs	emacs --no-splash -f view-hello-file
 
 Emoji	👋
-</x-charset>English <x-charset><param>ipa</param>/ˈɪŋɡlɪʃ/</x-charset>	Hello
-<x-charset><param>latin-iso8859-3</param>Esperanto	Saluton (Eĥoŝanĝo ĉiuĵaŭde)
-</x-charset><x-charset><param>latin-iso8859-15</param>Estonian (eesti keel)	Tere päevast / Tere õhtust
-</x-charset><x-charset><param>latin-iso8859-1</param>Finnish (suomi)	Hei / Hyvää päivää
+English /ˈɪŋɡlɪʃ/	Hello
+Esperanto	Saluton (Eĥoŝanĝo ĉiuĵaŭde)
+Estonian (eesti keel)	Tere päevast / Tere õhtust
+Finnish (suomi)	Hei / Hyvää päivää
 French (français)	Bonjour / Salut
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Georgian (ქართული)	გამარჯობა
-</x-charset><x-charset><param>latin-iso8859-1</param>German (Deutsch)	Guten Tag / Grüß Gott
-</x-charset><x-charset><param>greek-iso8859-7</param>Greek (ελληνικά)	Γειά σας
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Greek, ancient (ἑλληνική)	Οὖλέ τε καὶ μέγα χαῖρε
+Georgian (ქართული)	გამარჯობა
+German (Deutsch)	Guten Tag / Grüß Gott
+Greek (ελληνικά)	Γειά σας
+Greek, ancient (ἑλληνική)	Οὖλέ τε καὶ μέγα χαῖρε
 Gujarati (ગુજરાતી)	નમસ્તે
-</x-charset><x-charset><param>hebrew-iso8859-8</param>Hebrew (עִבְרִית)	שָׁלוֹם
-</x-charset><x-charset><param>latin-iso8859-2</param>Hungarian (magyar)	Szép jó napot!
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Hindi (हिंदी)	नमस्ते / नमस्कार ।
-</x-charset><x-charset><param>unicode</param>Inuktitut (ᐃᓄᒃᑎᑐᑦ)	ᐊᐃ
-
-</x-charset><x-charset><param>latin-iso8859-1</param>Italian (italiano)	Ciao / Buon giorno
-</x-charset><x-charset><param>unicode</param>Javanese (ꦧꦱꦗꦮ)	console.log("ꦱꦸꦒꦼꦁꦱꦶꦪꦁ");
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Kannada (ಕನ್ನಡ)	ನಮಸ್ಕಾರ
+Hebrew (עִבְרִית)	שָׁלוֹם
+Hungarian (magyar)	Szép jó napot!
+Hindi (हिंदी)	नमस्ते / नमस्कार ।
+Inuktitut (ᐃᓄᒃᑎᑐᑦ)	ᐊᐃ
+
+Italian (italiano)	Ciao / Buon giorno
+Javanese (ꦧꦱꦗꦮ)	console.log("ꦱꦸꦒꦼꦁꦱꦶꦪꦁ");
+Kannada (ಕನ್ನಡ)	ನಮಸ್ಕಾರ
 Khmer (ភាសាខ្មែរ)	ជំរាបសួរ
-</x-charset><x-charset><param>lao</param>Lao (ພາສາລາວ)	ສະບາຍດີ / ຂໍໃຫ້ໂຊກດີ
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Malayalam (മലയാളം)	നമസ്കാരം
-</x-charset><x-charset><param>unicode</param>Maldivian (ދިވެހި)	އައްސަލާމު ޢަލައިކުމް / ކިހިނެހް؟
-
-</x-charset><x-charset><param>latin-iso8859-3</param>Maltese (il-Malti)	Bonġu / Saħħa
-</x-charset><x-charset><param>unicode</param>Mathematics	∀ p ∈ world • hello p  □
-</x-charset><x-charset><param>cyrillic-iso8859-5</param>Mongolian (монгол хэл)	Сайн байна уу?
-</x-charset><x-charset><param>latin-iso8859-1</param>Norwegian (norsk)	Hei / God dag
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Oriya (ଓଡ଼ିଆ)	ଶୁଣିବେ
-</x-charset><x-charset><param>latin-iso8859-2</param>Polish  (język polski)	Dzień dobry! / Cześć!
-</x-charset><x-charset><param>cyrillic-iso8859-5</param>Russian (русский)	Здра́вствуйте!
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Sinhala (සිංහල)	ආයුබෝවන්
-</x-charset><x-charset><param>latin-iso8859-2</param>Slovak (slovenčina)	Dobrý deň
+Lao (ພາສາລາວ)	ສະບາຍດີ / ຂໍໃຫ້ໂຊກດີ
+Malayalam (മലയാളം)	നമസ്കാരം
+Maldivian (ދިވެހި)	އައްސަލާމު ޢަލައިކުމް / ކިހިނެހް؟
+
+Maltese (il-Malti)	Bonġu / Saħħa
+Mathematics	∀ p ∈ world • hello p  □
+Mongolian (монгол хэл)	Сайн байна уу?
+Norwegian (norsk)	Hei / God dag
+Oriya (ଓଡ଼ିଆ)	ଶୁଣିବେ
+Polish  (język polski)	Dzień dobry! / Cześć!
+Russian (русский)	Здра́вствуйте!
+Sinhala (සිංහල)	ආයුබෝවන්
+Slovak (slovenčina)	Dobrý deň
 Slovenian (slovenščina)	Pozdravljeni!
-Spanish (espa</x-charset><x-charset><param>latin-iso8859-1</param>ñol)	¡Hola!
+Spanish (español)	¡Hola!
 Swedish (svenska)	Hej / Goddag / Hallå
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Tamil (தமிழ்)	வணக்கம்
+Tamil (தமிழ்)	வணக்கம்
 Telugu (తెలుగు)	నమస్కారం
-</x-charset>TaiViet (ꪁꪫꪱꪣ ꪼꪕ)	ꪅꪰꪙꫂ ꪨꪮꫂ ꪁꪫꪱ / ꪅꪽ ꪨꪷ ꪁꪫꪱ
+TaiViet (ꪁꪫꪱꪣ ꪼꪕ)	ꪅꪰꪙꫂ ꪨꪮꫂ ꪁꪫꪱ / ꪅꪽ ꪨꪷ ꪁꪫꪱ
+
+Thai (ภาษาไทย)	สวัสดีครับ / สวัสดีค่ะ
+Tibetan (བོད་སྐད་)	བཀྲ་ཤིས་བདེ་ལེགས༎
+Tigrigna (ትግርኛ)	ሰላማት
+Turkish (Türkçe)	Merhaba
+Ukrainian (українська)	Вітаю
+Vietnamese (tiếng Việt)	Chào bạn
 
-<x-charset><param>thai-tis620</param>Thai (ภาษาไทย)	สวัสดีครับ / สวัสดีค่ะ
-</x-charset><x-charset><param>tibetan</param>Tibetan (བོད་སྐད་)	བཀྲ་ཤིས་བདེ་ལེགས༎
-</x-charset><x-charset><param>mule-unicode-0100-24ff</param>Tigrigna (ትግርኛ)	ሰላማት
-</x-charset><x-charset><param>latin-iso8859-9</param>Turkish (Türkçe)	Merhaba
-</x-charset><x-charset><param>cyrillic-iso8859-5</param>Ukrainian (українська)	Вітаю
-</x-charset><x-charset><param>vietnamese-viscii-lower</param>Vietnamese (tiếng </x-charset><x-charset><param>vietnamese-viscii-upper</param>V</x-charset><x-charset><param>vietnamese-viscii-lower</param>iệt)	</x-charset><x-charset><param>vietnamese-viscii-upper</param>Chào bạn
 
-</x-charset>
 
 <x-charset><param>japanese-jisx0208</param>Japanese (日本語)	こんにちは</x-charset> <x-charset><param>katakana-jisx0201</param>/ ｺﾝﾆﾁﾊ
 </x-charset><x-charset><param>chinese-gb2312</param>Chinese (中文,普通话,汉语)	你好
@@ -98,7 +98,7 @@ Telugu (తెలుగు)	నమస్కారం
 
 </x-charset>
 
-<x-charset><param>unicode</param>
+
 
 
 Copyright (C) 2001-2020 Free Software Foundation, Inc.
@@ -128,4 +128,4 @@ along with GNU Emacs.  If not, see <<https://www.gnu.org/licenses/>.
 ;;; bidi-display-reordering: t
 ;;; coding: utf-8
 ;;; inhibit-compacting-font-caches: t
-;;; End:</x-charset>
+;;; End: