From 9a685cf6bdb1636008acaf84ec8c1b3d3e21f419 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 18 Jan 2014 14:23:38 -0800
Subject: [PATCH] * simple.el (password-word-equivalents): Remove duplicates.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Sort, to make this easier next time.
Downcase.  Omit ": " after "jelszó".
---
 lisp/ChangeLog |  6 ++++
 lisp/simple.el | 89 ++++++++++++++++++++++++--------------------------
 2 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83d61f16ce6..798967e09e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* simple.el (password-word-equivalents): Remove duplicates.
+	Sort, to make this easier next time.
+	Downcase.  Omit ": " after "jelszó".
+
 2014-01-18  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* term/common-win.el (saved-region-selection): Defvar it.
diff --git a/lisp/simple.el b/lisp/simple.el
index 62941d01a9e..ef965aa6fe5 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2557,52 +2557,49 @@ which is defined in the `warnings' library.\n")
 
 (defcustom password-word-equivalents
   '("password" "passphrase" "pass phrase"
-    "كلمة السر"    ; ar
-    "গুপ্তশব্দ"        ; as
-    "পাসওয়ার্ড"       ; bn_IN
-    "contrasenya"  ; ca
-    "heslo"        ; cs
-    "adgangskode"  ; da
-    "passwort"     ; de
-    "pasvorto"     ; eo
-    "contraseña"   ; es
-    "pasahitza"    ; eu
-    "salasana"     ; fi
-    "mot de passe" ; fr
-    "પાસવર્ડ"       ; gu
-    "ססמה"         ; he
-    "शब्दकूट"        ; hi
-    "lozinka"      ; hr
-    "Jelszó: "     ; hu
-    "パスワード"     ; ja
-    "Пароль"       ; kk
-    "ಗುಪ್ತಪದ"      ; kn
-    "암호"         ; ko
-    "ពាក្យសម្ងាត់" ; km
-    "slaptažodis"  ; lt
-    "അടയാളവാക്ക്"   ; ml
-    "गुप्तशब्द"       ; mr
-    "passord"      ; nb
-    "wachtwoord"   ; nl
-    "ପ୍ରବେଶ ସଙ୍କେତ" ; or
-    "ਪਾਸਵਰਡ"       ; pa
-    "hasło"        ; pl
-    "senha"        ; pt
-    "Пароль"       ; ru
-    "රහස්පදය"      ; si
-    "Heslo"        ; sk
-    "geslo"        ; sl
-    "lozinka"      ; sr
-    "Лозинка"      ; sr
-    "lösenord"     ; sv
-    "கடவுச்சொல்"    ; ta
-    "సంకేతపదము"     ; te
-    "parola"       ; tr
-    "Пароль"       ; uk
-    "Mật khẩu"     ; vi
-    "密码"          ; zh_CN
-    "密碼"          ; zh_TW
-    "iphasiwedi"   ; zu
+    ; These are sorted according to the GNU en_US locale.
+    "암호"		; ko
+    "パスワード"	; ja
+    "ପ୍ରବେଶ ସଙ୍କେତ"	; or
+    "ពាក្យសម្ងាត់"		; km
+    "adgangskode"	; da
+    "contraseña"	; es
+    "contrasenya"	; ca
+    "geslo"		; sl
+    "hasło"		; pl
+    "heslo"		; cs, sk
+    "iphasiwedi"	; zu
+    "jelszó"		; hu
+    "lösenord"		; sv
+    "lozinka"		; hr, sr
+    "mật khẩu"		; vi
+    "mot de passe"	; fr
+    "parola"		; tr
+    "pasahitza"		; eu
+    "passord"		; nb
+    "passwort"		; de
+    "pasvorto"		; eo
+    "salasana"		; fi
+    "senha"		; pt
+    "slaptažodis"	; lt
+    "wachtwoord"	; nl
+    "كلمة السر"		; ar
+    "ססמה"		; he
+    "лозинка"		; sr
+    "пароль"		; kk, ru, uk
+    "गुप्तशब्द"		; mr
+    "शब्दकूट"		; hi
+    "પાસવર્ડ"		; gu
+    "సంకేతపదము"		; te
+    "ਪਾਸਵਰਡ"		; pa
+    "ಗುಪ್ತಪದ"		; kn
+    "கடவுச்சொல்"		; ta
+    "അടയാളവാക്ക്"		; ml
+    "গুপ্তশব্দ"		; as
+    "পাসওয়ার্ড"		; bn_IN
+    "රහස්පදය"		; si
+    "密码"		; zh_CN
+    "密碼"		; zh_TW
     )
   "List of words equivalent to \"password\".
 This is used by Shell mode and other parts of Emacs to recognize
-- 
2.39.2