From 79bda3bc4731c7ac67b499a154c636d8eeb2edee Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Fri, 5 Oct 2018 00:22:20 +0000 Subject: [PATCH 1/5] Make nneething allow CRLF-encoded files (bug#32940) * lisp/gnus/nneething.el (nneething-request-article): Bind coding system to raw-text instead of binary when reading a file, that may be CRLF-encoded (bug#32940). --- lisp/gnus/nneething.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el index 9b6a92f10e7..886cbf81461 100644 --- a/lisp/gnus/nneething.el +++ b/lisp/gnus/nneething.el @@ -123,7 +123,7 @@ included.") (file-exists-p file) ; The file exists. (not (file-directory-p file)) ; It's not a dir. (save-excursion - (let ((nnmail-file-coding-system 'binary)) + (let ((nnmail-file-coding-system 'raw-text)) (nnmail-find-file file)) ; Insert the file in the nntp buf. (unless (nnheader-article-p) ; Either it's a real article... (let ((type From 8c53d9fede22b1929de4b9aaaca6a5611d5c5475 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 5 Oct 2018 16:51:17 +0300 Subject: [PATCH 2/5] Fix a typo in a doc string. * lisp/window.el (display-buffer-alist): Fix a typo in a doc string. Reported by Michael Heerdegen . --- lisp/window.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/window.el b/lisp/window.el index 818bd3dd2bd..f96c887be48 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -6831,7 +6831,7 @@ See `display-buffer' for details.") (put 'display-buffer-overriding-action 'risky-local-variable t) (defcustom display-buffer-alist nil - "Alist of uder-defined conditional actions for `display-buffer'. + "Alist of user-defined conditional actions for `display-buffer'. Its value takes effect before `display-buffer-base-action' and `display-buffer-fallback-action', but after `display-buffer-overriding-action', which see. From 7e4229411be6064a7dcd95480af6f02faa86751f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Oct 2018 12:38:36 +0300 Subject: [PATCH 3/5] Update the locale and language database * lisp/international/mule-cmds.el (locale-language-names): Update the list of supported locales. Use existing language names where available. --- lisp/international/mule-cmds.el | 52 ++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 333fe2aa917..88dfa6f34ba 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2229,7 +2229,7 @@ See `set-language-info-alist' for use in programs." ("bg" "Bulgarian" cp1251) ; Bulgarian ; bh Bihari ; bi Bislama - ("bn" . "UTF-8") ; Bengali, Bangla + ("bn" "Bengali" utf-8) ; Bengali, Bangla ("bo" . "Tibetan") ("br" . "Latin-1") ; Breton ("bs" . "Latin-2") ; Bosnian @@ -2242,6 +2242,7 @@ See `set-language-info-alist' for use in programs." ("de" "German" iso-8859-1) ; dv Divehi ; dz Bhutani + ("ee" . "Latin-4") ; Ewe ("el" "Greek" iso-8859-7) ;; Users who specify "en" explicitly typically want Latin-1, not ASCII. ;; That's actually what the GNU locales define, modulo things like @@ -2250,10 +2251,10 @@ See `set-language-info-alist' for use in programs." ("en" "English" iso-8859-1) ; English ("eo" . "Esperanto") ; Esperanto ("es" "Spanish" iso-8859-1) - ("et" . "Latin-1") ; Estonian + ("et" . "Latin-9") ; Estonian ("eu" . "Latin-1") ; Basque - ("fa" . "UTF-8") ; Persian - ("fi" . "Latin-1") ; Finnish + ("fa" "Persian" utf-8) ; Persian + ("fi" . "Latin-9") ; Finnish ("fj" . "Latin-1") ; Fiji ("fo" . "Latin-1") ; Faroese ("fr" "French" iso-8859-1) ; French @@ -2263,11 +2264,12 @@ See `set-language-info-alist' for use in programs." ("gez" "Ethiopic" utf-8) ; Geez ("gl" . "Latin-1") ; Gallegan; Galician ; gn Guarani - ("gu" . "UTF-8") ; Gujarati + ("gu" "Gujarati" utf-8) ; Gujarati ("gv" . "Latin-1") ; Manx Gaelic ; ha Hausa ("he" "Hebrew" iso-8859-8) ("hi" "Devanagari" utf-8) ; Hindi + ("hni_IN" . "UTF-8") ; Chhattisgarhi ("hr" "Croatian" iso-8859-2) ; Croatian ("hu" . "Latin-2") ; Hungarian ; hy Armenian @@ -2284,20 +2286,20 @@ See `set-language-info-alist' for use in programs." ("ka" "Georgian" georgian-ps) ; Georgian ; kk Kazakh ("kl" . "Latin-1") ; Greenlandic - ; km Cambodian + ("km" "Khmer" utf-8) ; Cambodian, Khmer ("kn" "Kannada" utf-8) ("ko" "Korean" euc-kr) - ; ks Kashmiri + ("ks" . "UTF-8") ; Kashmiri ; ku Kurdish ("kw" . "Latin-1") ; Cornish - ; ky Kirghiz + ("ky" . "UTF-8") ; Kirghiz ("la" . "Latin-1") ; Latin ("lb" . "Latin-1") ; Luxemburgish - ("lg" . "Laint-6") ; Ganda + ("lg" . "Latin-6") ; Ganda, a.k.a. Luganda ; ln Lingala ("lo" "Lao" utf-8) ; Laothian ("lt" "Lithuanian" iso-8859-13) - ("lv" . "Latvian") ; Latvian, Lettish + ("lv" "Latvian" iso-8859-13) ; Latvian, Lettish ; mg Malagasy ("mi" . "Latin-7") ; Maori ("mk" "Cyrillic-ISO" iso-8859-5) ; Macedonian @@ -2307,24 +2309,29 @@ See `set-language-info-alist' for use in programs." ("mr" "Devanagari" utf-8) ; Marathi ("ms" . "Latin-1") ; Malay ("mt" . "Latin-3") ; Maltese - ; my Burmese + ("my" "Burmese" utf-8) ; Burmese ; na Nauru ("nb" . "Latin-1") ; Norwegian ("ne" "Devanagari" utf-8) ; Nepali ("nl" "Dutch" iso-8859-1) + ("nn" . "Latin-1") ; Norwegian Nynorsk ("no" . "Latin-1") ; Norwegian + ("nr_ZA" . "UTF-8") ; South Ndebele + ("nso_ZA" . "UTF-8") ; Pedi ("oc" . "Latin-1") ; Occitan ("om_ET" . "UTF-8") ; (Afan) Oromo ("om" . "Latin-1") ; (Afan) Oromo - ; or Oriya - ("pa" . "UTF-8") ; Punjabi - ("pl" . "Latin-2") ; Polish + ("or" "Oriya" utf-8) + ("pa" "Punjabi" utf-8) ; Punjabi + ("pl" "Polish" iso-8859-2) ; Polish ; ps Pashto, Pushto + ("pt_BR" "Brazilian Portuguese" iso-8859-1) ; Brazilian Portuguese ("pt" . "Latin-1") ; Portuguese ; qu Quechua ("rm" . "Latin-1") ; Rhaeto-Romanic ; rn Kirundi ("ro" "Romanian" iso-8859-2) + ("ru_RU.koi8r" "Cyrillic-KOI8" koi8-r) ("ru_RU" "Russian" iso-8859-5) ("ru_UA" "Russian" koi8-u) ; rw Kinyarwanda @@ -2333,7 +2340,7 @@ See `set-language-info-alist' for use in programs." ("se" . "UTF-8") ; Northern Sami ; sg Sangho ("sh" . "Latin-2") ; Serbo-Croatian - ; si Sinhalese + ("si" "Sinhala" utf-8) ; Sinhalese ("sid" . "UTF-8") ; Sidamo ("sk" "Slovak" iso-8859-2) ("sl" "Slovenian" iso-8859-2) @@ -2341,7 +2348,7 @@ See `set-language-info-alist' for use in programs." ; sn Shona ("so_ET" "UTF-8") ; Somali ("so" "Latin-1") ; Somali - ("sq" . "Latin-1") ; Albanian + ("sq" . "Latin-2") ; Albanian ("sr" . "Latin-2") ; Serbian (Latin alphabet) ; ss Siswati ("st" . "Latin-1") ; Sesotho @@ -2349,17 +2356,20 @@ See `set-language-info-alist' for use in programs." ("sv" "Swedish" iso-8859-1) ; Swedish ("sw" . "Latin-1") ; Swahili ("ta" "Tamil" utf-8) - ("te" . "UTF-8") ; Telugu + ("te" "Telugu" utf-8) ; Telugu ("tg" "Tajik" koi8-t) - ("th" "Thai" tis-620) + ("th_TH.tis620" "Thai" tis-620) + ("th_TH.TIS-620" "Thai" tis-620) + ("th_TH" "Thai" iso-8859-11) + ("th" "Thai" iso-8859-11) ("ti" "Ethiopic" utf-8) ; Tigrinya ("tig_ER" . "UTF-8") ; Tigre ; tk Turkmen ("tl" . "Latin-1") ; Tagalog - ; tn Setswana + ("tn" . "Latin-9") ; Setswana, Tswana ; to Tonga ("tr" "Turkish" iso-8859-9) - ; ts Tsonga + ("ts" . "Latin-1") ; Tsonga ("tt" . "UTF-8") ; Tatar ; tw Twi ; ug Uighur @@ -2367,6 +2377,7 @@ See `set-language-info-alist' for use in programs." ("ur" . "UTF-8") ; Urdu ("uz_UZ@cyrillic" . "UTF-8"); Uzbek ("uz" . "Latin-1") ; Uzbek + ("ve" . "UTF-8") ; Venda ("vi" "Vietnamese" utf-8) ; vo Volapuk ("wa" . "Latin-1") ; Walloon @@ -2396,7 +2407,6 @@ See `set-language-info-alist' for use in programs." ;; Nonstandard or obsolete language codes ("cz" . "Czech") ; e.g. Solaris 2.6 - ("ee" . "Latin-4") ; Estonian, e.g. X11R6.4 ("iw" . "Hebrew") ; e.g. X11R6.4 ("sp" . "Cyrillic-ISO") ; Serbian (Cyrillic alphabet), e.g. X11R6.4 ("su" . "Latin-1") ; Finnish, e.g. Solaris 2.6 From b99192fe24fc5dd75340083403e95a65cb4a6d79 Mon Sep 17 00:00:00 2001 From: "Charles A. Roelli" Date: Sat, 6 Oct 2018 21:24:32 +0200 Subject: [PATCH 4/5] * lisp/simple.el (transient-mark-mode): Correct documentation. (Bug#32956) --- lisp/simple.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index d5674aae9b4..8bbafe49d32 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5793,10 +5793,10 @@ Transient Mark mode if ARG is omitted or nil. Transient Mark mode is a global minor mode. When enabled, the region is highlighted with the `region' face whenever the mark -is active. The mark is \"deactivated\" by changing the buffer, -and after certain other operations that set the mark but whose -main purpose is something else--for example, incremental search, -\\[beginning-of-buffer], and \\[end-of-buffer]. +is active. The mark is \"deactivated\" after certain non-motion +commands, including those that change the text in the buffer, and +during shift or mouse selection by any unshifted cursor motion +command (see Info node `Shift Selection' for more details). You can also deactivate the mark by typing \\[keyboard-quit] or \\[keyboard-escape-quit]. From 14c032d5f8d4ccb608cc906db34ddf17ce465449 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 7 Oct 2018 17:45:12 +0300 Subject: [PATCH 5/5] Avoid assertion violations in nonsensical calls to 'signal' * src/eval.c (Fsignal): If both arguments are nil, replace the first one with 'error', to avoid assertion violations further down the line. (Bug#32961) --- src/eval.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/eval.c b/src/eval.c index f9563a3f80c..e90a9861a1a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1503,7 +1503,7 @@ DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0, This function does not return. An error symbol is a symbol with an `error-conditions' property -that is a list of condition names. +that is a list of condition names. The symbol should be non-nil. A handler for any of those names will get to handle this signal. The symbol `error' should normally be one of them. @@ -1515,6 +1515,9 @@ See also the function `condition-case'. */ attributes: noreturn) (Lisp_Object error_symbol, Lisp_Object data) { + /* If they call us with nonsensical arguments, produce "peculiar error". */ + if (NILP (error_symbol) && NILP (data)) + error_symbol = Qerror; signal_or_quit (error_symbol, data, false); eassume (false); }