Merge from trunk.

This commit is contained in:
Paul Eggert 2012-04-09 12:51:35 -07:00
commit c6046b94e5
4 changed files with 40 additions and 6 deletions

View file

@ -1,8 +1,12 @@
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.
2012-04-09 Teodor Zlatanov <tzz@lifelogs.com>
* Makefile.in: Add gnutls.texi to build.
* 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.

View file

@ -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

View file

@ -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

View file

@ -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 tbl)
(set-case-syntax-pair tbl)
(set-case-syntax-pair tbl)