Merge from trunk.

doc/misc/ChangeLog

+2011-06-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi (Customizing Completion): Mention authinfo-style
+	files.
+	(Password handling): `auth-source-debug' is good for debug messages.
+
 2011-05-31  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* gnus.texi (Store custom flags and keywords): Refer to

etc/NEWS

@@ -511,6 +511,11 @@ See the variable `diary-comment-start'.
 *** Appointments can specify their individual warning times.
 See the variable `appt-warning-time-regexp'.
 
+---
+*** The function specified by `appt-disp-window-function' may be passed
+lists of arguments if multiple appointments are due at similar times.
+If you are using a custom function for this, you should update it.
+
 +++
 *** New function `diary-hebrew-birthday'.
 

leim/CXTERM-DIC/4Corner.tit

+# -*- coding: cn-big5 -*-
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2

leim/CXTERM-DIC/ARRAY30.tit

+# -*- coding: cn-big5 -*-
 ##############################################################
 # 行列３０鍵輸入法, CXTERM 專用輸入法資料表格.
 # 給 CXTERM 使用前, 請您先用 tit2cit 將此檔轉換成 .cit 格式。

leim/CXTERM-DIC/CCDOSPY.tit

+# -*- coding: euc-china -*-
 # Header added for Emacs
 #
 # This file is included in the directory contrib/clients/cxterm of the

leim/CXTERM-DIC/ECDICT.tit

+# -*- coding: cn-big5 -*-
 AUTORELOAD:	YES
 AUTOSTUDY:	NO
 FULLCODE:	YES

leim/CXTERM-DIC/ETZY.tit

+# -*- coding: cn-big5 -*-
 # HANZI input table for cxterm
 # Generated from ETZY.cit by cit2tit
 # To be used by cxterm, convert me to .cit format first

leim/CXTERM-DIC/PY-b5.tit

+# -*- coding: cn-big5 -*-
 # Header added for Emacs
 #
 # This file is included in the directory contrib/clients/cxterm of the

leim/CXTERM-DIC/Punct-b5.tit

+# -*- coding: cn-big5 -*-
 # HANZI input table for cxterm
 # Generated from Punct-b5.cit by cit2tit
 # To be used by cxterm, convert me to .cit format first

leim/CXTERM-DIC/Punct.tit

+# -*- coding: euc-china -*-
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 1

leim/CXTERM-DIC/QJ-b5.tit

+# -*- coding: cn-big5 -*-
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2

leim/CXTERM-DIC/QJ.tit

+# -*- coding: euc-china -*-
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2

leim/CXTERM-DIC/SW.tit

+# -*- coding: euc-china -*-
 # Header added for Emacs
 #
 # This file is included in the directory contrib/clients/cxterm of the

leim/CXTERM-DIC/TONEPY.tit

+# -*- coding: euc-china -*-
 # Header added for Emacs
 #
 # This file is included in the directory contrib/clients/cxterm of the

leim/CXTERM-DIC/ZOZY.tit

+# -*- coding: cn-big5 -*-
 # HANZI input table for cxterm
 # Generated from ZOZY.cit by cit2tit
 # To be used by cxterm, convert me to .cit format first

leim/ChangeLog

+2011-06-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* SKK-DIC/SKK-JISYO.L: Add proper coding tag.
+	* CXTERM-DIC/4Corner.tit, CXTERM-DIC/ARRAY30.tit,
+	* CXTERM-DIC/CCDOSPY.tit, CXTERM-DIC/ECDICT.tit,
+	* CXTERM-DIC/ETZY.tit, CXTERM-DIC/PY-b5.tit,
+	* CXTERM-DIC/Punct-b5.tit, CXTERM-DIC/Punct.tit,
+	* CXTERM-DIC/QJ-b5.tit, CXTERM-DIC/QJ.tit, CXTERM-DIC/SW.tit,
+	* CXTERM-DIC/TONEPY.tit, CXTERM-DIC/ZOZY.tit: Likewise.
+	* MISC-DIC/cangjie-table.b5, MISC-DIC/cangjie-table.cns,
+	* MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Likewise.
+
+	* Makefile.in (TIT_BIG5): Renamed from TIT-BIG5.
+
 2011-05-30  Oliver Scholz  <epameinondas@gmx.de>
 
 	* quail/ipa-praat.el: New input method.

leim/MISC-DIC/cangjie-table.b5

+# -*- coding: big5 -*-
 # Copyright 2001 Christian Wittern <wittern@iis.sinica.edu.tw>
 #
 # Permission to copy and distribute both modified and

leim/MISC-DIC/cangjie-table.cns

+# -*- coding: iso-2022-cn-ext -*-
 # This file is automatically generated from the file cangjie-table.b5
 # by Big5->CNS converter.
 #

leim/MISC-DIC/pinyin.map

+% -*- coding: cn-gb-2312 -*-
 % Header added for Emacs
 %
 % This file is included in the free package called CCE.  It is