Merge from trunk.

4 files changed, 40 insertions, 6 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ee6b7606c55..be79a9d864d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,8 +1,12 @@
-2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
+2012-04-09  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add
+	emacs-gnutls.
+	($(infodir)/emacs-gnutls, emacs-gnutls.dvi): New targets.
 
-	* Makefile.in: Add gnutls.texi to build.
+2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
 
-	* gnutls.texi: New file to explain the GnuTLS integration.
+	* Makefile.in: Add emacs-gnutls.texi to build.
 
 	* emacs-gnutls.texi: Add documentation for the GnuTLS integration.
 
diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 6e4a65c292c..0f81786cdb5 100644
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -51,7 +51,7 @@ INFO_TARGETS = $(infodir)/ccmode \
 		$(infodir)/remember $(infodir)/nxml-mode \
 		$(infodir)/epa $(infodir)/mairix-el $(infodir)/sasl \
 		$(infodir)/auth $(infodir)/eieio $(infodir)/ede \
-		$(infodir)/semantic $(infodir)/edt
+		$(infodir)/semantic $(infodir)/edt $(infodir)/emacs-gnutls
 DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dbus.dvi dired-x.dvi \
 		ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \
 		sieve.dvi pgg.dvi mh-e.dvi \
@@ -62,7 +62,7 @@ DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dbus.dvi dired-x.dvi \
 		newsticker.dvi rcirc.dvi erc.dvi ert.dvi \
 		remember.dvi nxml-mode.dvi \
 		epa.dvi mairix-el.dvi sasl.dvi auth.dvi eieio.dvi ede.dvi \
-		semantic.dvi edt.dvi
+		semantic.dvi edt.dvi emacs-gnutls.dvi
 INFOSOURCES = info.texi
 
 # The following rule does not work with all versions of `make'.
@@ -350,6 +350,11 @@ $(infodir)/edt: edt.texi doclicense.texi
 edt.dvi: edt.texi doclicense.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/edt.texi
 
+$(infodir)/emacs-gnutls: emacs-gnutls.texi doclicense.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) emacs-gnutls.texi
+emacs-gnutls.dvi: emacs-gnutls.texi doclicense.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-gnutls.texi
+
 mostlyclean:
 	- $(DEL) *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
 
@@ -377,7 +382,7 @@ clean: mostlyclean
 		 $(infodir)/epa* $(infodir)/sasl* \
 		 $(infodir)/mairix-el* $(infodir)/auth* \
 		 $(infodir)/eieio* $(infodir)/ede* \
-		 $(infodir)/semantic* $(infodir)edt*
+		 $(infodir)/semantic* $(infodir)edt* $(infodir)/emacs-gnutls*
 
 distclean: clean
 	- $(DEL) makefile
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c3093aa2c2..954daf68510 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* international/characters.el: Recover lost case pairs.
+	(Bug#11209)
+
 2012-04-09  Chong Yidong  <cyd@gnu.org>
 
 	* custom.el (custom-variable-p): Return nil for non-symbol
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index ba8b8955fba..99985fa72c7 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -560,6 +560,7 @@ with L, LRE, or LRO Unicode bidi character type.")
 		       (#x01AC . #x01AD)
 		       (#x01AF . #x01B0)
 		       (#x01B3 . #x01B6)
+		       (#x01B8 . #x01B9)
 		       (#x01BC . #x01BD)
 		       (#x01CD . #x01DC)
 		       (#x01DE . #x01EF)
@@ -575,6 +576,7 @@ with L, LRE, or LRO Unicode bidi character type.")
 	  (set-case-syntax-pair from (1+ from) tbl)
 	  (setq from (+ from 2))))))
 
+  (set-case-syntax-pair ?Ÿ ?ÿ tbl)
   (set-case-syntax-pair #x189 #x256 tbl)
   (set-case-syntax-pair #x18A #x257 tbl)
 
@@ -590,6 +592,24 @@ with L, LRE, or LRO Unicode bidi character type.")
   ;; (set-downcase-syntax  ?İ ?i tbl)
   ;; (set-upcase-syntax    ?I ?ı tbl)
 
+  (set-case-syntax-pair ?Ɓ ?ɓ tbl)
+  (set-case-syntax-pair ?Ɔ ?ɔ tbl)
+  (set-case-syntax-pair ?Ǝ ?ǝ tbl)
+  (set-case-syntax-pair ?Ə ?ə tbl)
+  (set-case-syntax-pair ?Ɛ ?ɛ tbl)
+  (set-case-syntax-pair ?Ɠ ?ɠ tbl)
+  (set-case-syntax-pair ?Ɣ ?ɣ tbl)
+  (set-case-syntax-pair ?Ɩ ?ɩ tbl)
+  (set-case-syntax-pair ?Ɨ ?ɨ tbl)
+  (set-case-syntax-pair ?Ɯ ?ɯ tbl)
+  (set-case-syntax-pair ?Ɲ ?ɲ tbl)
+  (set-case-syntax-pair ?Ɵ ?ɵ tbl)
+  (set-case-syntax-pair ?Ʀ ?ʀ tbl)
+  (set-case-syntax-pair ?Ʃ ?ʃ tbl)
+  (set-case-syntax-pair ?Ʈ ?ʈ tbl)
+  (set-case-syntax-pair ?Ʊ ?ʊ tbl)
+  (set-case-syntax-pair ?Ʋ ?ʋ tbl)
+  (set-case-syntax-pair ?Ʒ ?ʒ tbl)
   (set-case-syntax-pair ?DŽ ?dž tbl)
   (set-case-syntax-pair ?Dž ?dž tbl)
   (set-case-syntax-pair ?LJ ?lj tbl)