Move password-word-equivalents defn to mule-conf

* lisp/international/mule-conf.el (password-word-equivalents):
Move here ...
* lisp/simple.el (password-word-equivalents): ... from here.
This variable belongs in an i18n file somewhere, not in simple.el,
since it’s i18n-related.  Also, having it in simple.el tickles
Emacs performance bugs on some platforms when developers visit
simple.el.  Problem reported by Drew Adams in, for example:
https://lists.gnu.org/r/emacs-devel/2018-04/msg00124.html

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index ea687f0ae5e2f07bf123be9f4b2cad5b7e9ea786..dc095707a2cb0bab0649ec0df6f80968368505f2 100644 (file)
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1571,6 +1571,61 @@ for decoding and encoding files, process I/O, etc."
 (aset latin-extra-code-table ?\225 t)
 (aset latin-extra-code-table ?\226 t)
 
+(defcustom password-word-equivalents
+  '("password" "passcode" "passphrase" "pass phrase"
+    ; 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
+password prompts, including prompts in languages other than
+English.  Different case choices should not be assumed to be
+included; callers should bind `case-fold-search' to t."
+  :type '(repeat string)
+  :version "24.4"
+  :group 'processes)
+
 ;; The old code-pages library is obsoleted by coding systems based on
 ;; the charsets defined in this file but might be required by user
 ;; code.

diff --git a/lisp/simple.el b/lisp/simple.el
index 7d8010fa507349429bce2ac81244807d85ee58bf..aad8d3b06c0e07a606e8bed7528e7c8b9b7ad0d4 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3170,61 +3170,6 @@ which is defined in the `warnings' library.\n")
     (setq buffer-undo-list nil)
     t))
 \f
-(defcustom password-word-equivalents
-  '("password" "passcode" "passphrase" "pass phrase"
-    ; 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
-password prompts, including prompts in languages other than
-English.  Different case choices should not be assumed to be
-included; callers should bind `case-fold-search' to t."
-  :type '(repeat string)
-  :version "24.4"
-  :group 'processes)
-
 (defvar shell-command-history nil
   "History list for some commands that read shell commands.