[Emacs-diffs] scratch/gnus-cloud 586ee65 22/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Teodor Zlatanov]

branch: scratch/gnus-cloud
commit 586ee659d1bee49c5b13749318a929658a801080
Merge: 30107d5 037f82a
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/international/characters.el |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 371f698..1757d2b 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -623,16 +623,19 @@ with L, LRE, or LRO Unicode bidi character type.")
   (set-case-syntax-pair ?Ʊ ?ʊ tbl)
   (set-case-syntax-pair ?Ʋ ?ʋ tbl)
   (set-case-syntax-pair ?Ʒ ?ʒ tbl)
+  ;; We use set-downcase-syntax below, since we want upcase of dž
+  ;; return DŽ, not Dž, and the same for the rest.
   (set-case-syntax-pair ?DŽ ?dž tbl)
-  (set-case-syntax-pair ?Dž ?dž tbl)
+  (set-downcase-syntax ?Dž ?dž tbl)
   (set-case-syntax-pair ?LJ ?lj tbl)
-  (set-case-syntax-pair ?Lj ?lj tbl)
+  (set-downcase-syntax ?Lj ?lj tbl)
   (set-case-syntax-pair ?NJ ?nj tbl)
-  (set-case-syntax-pair ?Nj ?nj tbl)
+  (set-downcase-syntax ?Nj ?nj tbl)
 
   ;; 01F0; F; 006A 030C; # LATIN SMALL LETTER J WITH CARON
+
   (set-case-syntax-pair ?DZ ?dz tbl)
-  (set-case-syntax-pair ?Dz ?dz tbl)
+  (set-downcase-syntax ?Dz ?dz tbl)
   (set-case-syntax-pair ?Ƕ ?ƕ tbl)
   (set-case-syntax-pair ?Ƿ ?ƿ tbl)
   (set-case-syntax-pair ?Ⱥ ?ⱥ tbl)