emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] xwidget_mvp b465657 3/4: Merge remote-tracking branch 'ori


From: Joakim Verona
Subject: [Emacs-diffs] xwidget_mvp b465657 3/4: Merge remote-tracking branch 'origin/master' into xwidget_mvp
Date: Mon, 25 May 2015 15:31:40 +0000

branch: xwidget_mvp
commit b4656572a1779c0516e9048f1a88434ce5b72536
Merge: 3929aec c2ef2ad
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>

    Merge remote-tracking branch 'origin/master' into xwidget_mvp
---
 .gitignore                         |    1 -
 admin/charsets/Makefile            |  324 ----------------------------------
 admin/charsets/Makefile.in         |  336 ++++++++++++++++++++++++++++++++++++
 admin/charsets/mapconv             |   28 ++--
 admin/charsets/mapfiles/PTCP154    |    2 +-
 configure.ac                       |    3 +-
 doc/misc/erc.texi                  |   20 ++
 etc/NEWS                           |    7 +
 lib-src/emacsclient.c              |    8 +-
 lisp/ChangeLog.16                  |    3 +-
 lisp/autorevert.el                 |   37 ++--
 lisp/emacs-lisp/cl-generic.el      |   43 +++--
 lisp/emacs-lisp/package.el         |    9 +-
 lisp/erc/erc.el                    |   53 +++++-
 test/automated/cl-generic-tests.el |   40 ++++-
 15 files changed, 514 insertions(+), 400 deletions(-)

diff --git a/.gitignore b/.gitignore
index 618249c..df9dc8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,6 @@ Info.plist
 InfoPlist.strings
 Makefile
 makefile
-!admin/charsets/Makefile
 !etc/refcards/Makefile
 !test/automated/data/flymake/Makefile
 !test/indent/Makefile
diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile
deleted file mode 100644
index e5cf250..0000000
--- a/admin/charsets/Makefile
+++ /dev/null
@@ -1,324 +0,0 @@
-# Makefile -- Makefile to generate charset maps in etc/charsets.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-#   National Institute of Advanced Industrial Science and Technology (AIST)
-#   Registration Number H13PRO009
-#
-# This file is part of GNU Emacs.
-
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-# Commentary:
-
-#  If your system doesn't have the directory /usr/share/i18n/charmaps,
-#  get the source of the latest glibc, gzip all the charmap files in
-#  the directory "localedate/charmaps", and set the variable
-#  GLIBC_CHARMAPS to that directory.
-
-GLIBC_CHARMAPS=/usr/share/i18n/charmaps
-
-CHARSETS = ${ISO8859} ${IBM} ${CODEPAGE} ${CJK} ${MISC} ${MULE}
-
-# Note: We can not prepend "ISO-" to these map files because of file
-# name limits on DOS.
-ISO8859 = \
-       8859-2.map 8859-3.map 8859-4.map 8859-5.map 8859-6.map 8859-7.map \
-       8859-8.map 8859-9.map 8859-10.map 8859-11.map 8859-13.map 8859-14.map \
-       8859-15.map 8859-16.map
-
-IBM = \
-       IBM037.map IBM038.map \
-       IBM256.map IBM273.map IBM274.map IBM275.map IBM277.map IBM278.map \
-       IBM280.map IBM281.map IBM284.map IBM285.map IBM290.map IBM297.map \
-       IBM420.map IBM423.map IBM424.map IBM437.map IBM500.map IBM850.map \
-       IBM851.map IBM852.map IBM855.map IBM856.map IBM857.map IBM860.map \
-       IBM861.map IBM862.map IBM863.map IBM864.map IBM865.map IBM866.map \
-       IBM868.map IBM869.map IBM870.map IBM871.map IBM874.map IBM875.map \
-       IBM880.map IBM891.map IBM903.map IBM904.map IBM905.map IBM918.map \
-       IBM1004.map IBM1026.map IBM1047.map
-
-CODEPAGE = \
-       CP737.map CP775.map CP1125.map\
-       CP1250.map CP1251.map CP1252.map CP1253.map CP1254.map \
-       CP1255.map CP1256.map CP1257.map CP1258.map \
-       CP10007.map \
-       CP720.map CP858.map
-
-CJK =   GB2312.map GBK.map GB180302.map GB180304.map \
-       BIG5.map BIG5-HKSCS.map\
-       CNS-1.map CNS-2.map CNS-3.map CNS-4.map CNS-5.map CNS-6.map CNS-7.map \
-       CNS-F.map \
-       JISX0201.map JISX0208.map JISX0212.map JISX2131.map JISX2132.map \
-       JISC6226.map CP932-2BYTE.map JISX213A.map\
-       KSC5601.map KSC5636.map JOHAB.map
-
-MISC =  KOI-8.map KOI8-R.map KOI8-U.map KOI8-T.map ALTERNATIVNYJ.map \
-       MIK.map PTCP154.map \
-       TIS-620.map VISCII.map VSCII.map VSCII-2.map\
-       KA-PS.map KA-ACADEMY.map \
-       HP-ROMAN8.map NEXTSTEP.map MACINTOSH.map EBCDICUK.map EBCDICUS.map \
-       stdenc.map symbol.map \
-       CP949-2BYTE.map \
-       BIG5-1.map BIG5-2.map
-
-# Emacs-mule charsets.
-MULE = MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
-       MULE-sisheng.map MULE-tibetan.map \
-       MULE-lviscii.map MULE-uviscii.map
-
-TRANS_TABLE = cp51932.el eucjp-ms.el
-SED_SCRIPT = jisx2131-filter
-
-all: ${CHARSETS} ${TRANS_TABLE}
-
-AWK = gawk
-
-# Rules for each charset
-
-VSCII.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[0-9a-f].[  ]/' GLIBC-1 compact.awk > $@
-
-VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[2-7a-f].[  ]/' GLIBC-1 compact.awk \
-         | sed 's/0x20-0x7F.*/0x00-0x7F 0x0000/' > $@
-
-ALTERNATIVNYJ.map: IBM866.map
-       # Generating address@hidden
-       @echo "# Modified from IBM866.map according to the chart at" > $@
-       @echo "# http://www.cyrillic.com/ref/cyrillic/koi-8alt.html,"; >> $@
-       @echo "# with guesses for the Unicodes of the glyphs." >> $@
-       @sed -e '1 d' \
-            -e '/0xF2/ s/ .*/ 0x2019/' \
-            -e '/0xF3/ s/ .*/ 0x2018/' \
-            -e '/0xF4/ s/ .*/ 0x0301/' \
-            -e '/0xF5/ s/ .*/ 0x0300/' \
-            -e '/0xF6/ s/ .*/ 0x203A/' \
-            -e '/0xF7/ s/ .*/ 0x2039/' \
-            -e '/0xF8/ s/ .*/ 0x2191/' \
-            -e '/0xF9/ s/ .*/ 0x2193/' \
-            -e '/0xFA/ s/ .*/ 0x00B1/' \
-            -e '/0xFB/ s/ .*/ 0x00F7/' < $< >> $@
-
-MIK.map: mapfiles/bulgarian-mik.txt mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '1,$$' CZYBORRA compact.awk > $@
-
-PTCP154.map: mapfiles/PTCP154 mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^0x/' IANA compact.awk > $@
-
-stdenc.map: mapfiles/stdenc.txt mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
-
-symbol.map: mapfiles/symbol.txt mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
-
-CP720.map: mapfiles/CP720.map
-       # Generating address@hidden
-       @cp $< $@
-
-CP858.map: mapfiles/CP858.map
-       # Generating address@hidden
-       @cp $< $@
-
-CP949-2BYTE.map: ${GLIBC_CHARMAPS}/CP949.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
-
-GB2312.map: ${GLIBC_CHARMAPS}/GB2312.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
-
-GBK.map: ${GLIBC_CHARMAPS}/GBK.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
-
-GB180302.map: ${GLIBC_CHARMAPS}/GB18030.gz mapconv gb180302.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x..\/x..[    ]/' GLIBC-2 gb180302.awk > $@
-
-GB180304.map: GB180302.map gb180304.awk
-       # Generating address@hidden
-       @$(AWK) -f gb180304.awk < $< > $@
-
-JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[0-9]/' GLIBC-1 compact.awk > $@
-       @echo "# Generated by hand" >> $@
-       @echo "0xA1-0xDF 0xFF61" >> $@
-
-JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 \
-         | sed 's/0x2015/0x2014/' > $@
-
-JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@
-
-jisx2131-filter: mapfiles/JISX213A.map
-       @sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
-
-JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv jisx2131-filter
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 \
-         | sed -f jisx2131-filter \
-         | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
-
-JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@
-
-JISX213A.map: mapfiles/JISX213A.map
-       # Generating $@
-       @cp $<  $@
-
-CP932-2BYTE.map: mapfiles/CP932.TXT mapconv cp932.awk
-       # Generating address@hidden
-       @./mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@
-
-cp51932.el: CP932-2BYTE.map cp51932.awk
-       @$(AWK) -f cp51932.awk < CP932-2BYTE.map > $@
-
-eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz eucjp-ms.awk
-       @zcat $< | $(AWK) -f eucjp-ms.awk > $@
-
-JISC6226.map: mapfiles/Uni2JIS mapconv kuten.awk
-       # Generating address@hidden
-# As Uni2JIS doesn't contain mappings of characters added to Unicode
-# recently, we add them manually here (including one correction for
-# U+005C vs U+FF3C).  These changes are based on bogytech's blog at
-# http://bogytech.blogspot.jp/search/label/emacs.
-       @./mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk \
-         | sed -e '/0x2140/s/005C/FF3C/' \
-               -e '$$ a 0x3442 0x3D4E' \
-               -e '$$ a 0x374E 0x25874' \
-               -e '$$ a 0x3764 0x28EF6' \
-               -e '$$ a 0x513D 0x2F80F' \
-               -e '$$ a 0x7045 0x9724' > $@
-
-KSC5601.map: ${GLIBC_CHARMAPS}/EUC-KR.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
-
-BIG5.map: ${GLIBC_CHARMAPS}/BIG5.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2 > $@
-
-BIG5-1.map: BIG5.map mapconv big5.awk
-       # Generating address@hidden
-       @echo "# Generated from $<" > $@
-       @sed -n -e '/0xa140/,/0xc8fe/p' < $< | gawk -f big5.awk >> $@
-
-BIG5-2.map: BIG5.map mapconv big5.awk
-       # Generating address@hidden
-       @echo "# Generated from $<" > $@
-       @sed -n -e '/0xc940/,$$ p' < $< | gawk -f big5.awk >> $@
-
-BIG5-HKSCS.map: ${GLIBC_CHARMAPS}/BIG5-HKSCS.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[89a-f].\//' GLIBC-2 compact.awk > $@
-
-JOHAB.map: ${GLIBC_CHARMAPS}/JOHAB.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
-
-CNS-1.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
-
-# CNS-1.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-#      # Generating address@hidden
-#      @./mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@
-
-CNS-2.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@
-
-CNS-3.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@
-
-CNS-4.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@
-
-CNS-5.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@
-
-CNS-6.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@
-
-CNS-7.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@
-
-CNS-F.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@
-
-# General target to produce map files for mule charsets.
-MULE-%.map: mapfiles/MULE-%.map
-       # Generating address@hidden
-       @cp $< $@
-
-# General target to produce map files for ISO-8859, GEORGIAN, and
-# EBCDIC charsets.  We can not use the original file name because of
-# file name limit on DOS.  "KA" is ISO 639 language code for Georgian.
-
-8859-%.map: ${GLIBC_CHARMAPS}/ISO-8859-%.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x/' GLIBC-1 compact.awk > $@
-
-KA-%.map: ${GLIBC_CHARMAPS}/GEORGIAN-%.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x/' GLIBC-1 compact.awk > $@
-
-EBCDIC%.map: ${GLIBC_CHARMAPS}/EBCDIC-%.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x/' GLIBC-1 compact.awk > $@
-
-# General target to produce map files for single-byte charsets.
-
-%.map: ${GLIBC_CHARMAPS}/%.gz mapconv compact.awk
-       # Generating address@hidden
-       @./mapconv $< '/^<.*[   ]\/x/' GLIBC-1 compact.awk > $@
-
-install:
-       @for f in ${CHARSETS}; do \
-         if test -r $$f; then \
-           if ! cmp -s $$f ../../etc/charsets/$$f; then \
-             echo updating $$f; \
-             cp $$f ../../etc/charsets; \
-           fi; \
-         fi; \
-       done
-       @for f in ${TRANS_TABLE}; do \
-         if test -r $$f; then \
-           if ! cmp -s $$f ../../lisp/international/$$f; then \
-             echo updating $$f; \
-             cp $$f ../../lisp/international; \
-           fi; \
-         fi; \
-       done
-
-# Clear files that are automatically generated.
-clean:
-       rm -f ${CHARSETS} ${TRANS_TABLE} ${SED_SCRIPT}
-
diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in
new file mode 100644
index 0000000..13de84d
--- /dev/null
+++ b/admin/charsets/Makefile.in
@@ -0,0 +1,336 @@
+### @configure_input@
+
+# Copyright (C) 2015 Free Software Foundation, Inc.
+
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+#   National Institute of Advanced Industrial Science and Technology (AIST)
+#   Registration Number H13PRO009
+#
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+### Commentary:
+
+# Generate charset maps in etc/charsets.
+
+#  If your system doesn't have the directory /usr/share/i18n/charmaps,
+#  get the source of the latest glibc, gzip all the charmap files in
+#  the directory "localedate/charmaps", and set the variable
+#  GLIBC_CHARMAPS to that directory.
+
+SHELL = @SHELL@
+
+AWK = @AWK@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+charsetdir = ${top_srcdir}/etc/charsets
+lispintdir = ${top_srcdir}/lisp/international
+mapfiledir = ${srcdir}/mapfiles
+
+GLIBC_CHARMAPS=/usr/share/i18n/charmaps
+
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_V_GEN = $(address@hidden@)
+am__v_GEN_ = $(address@hidden@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(address@hidden@)
+am__v_at_ = $(address@hidden@)
+am__v_at_0 = @
+am__v_at_1 =
+
+# Note: We can not prepend "ISO-" to these map files because of file
+# name limits on DOS.
+ISO8859 = \
+       8859-2.map 8859-3.map 8859-4.map 8859-5.map 8859-6.map 8859-7.map \
+       8859-8.map 8859-9.map 8859-10.map 8859-11.map 8859-13.map 8859-14.map \
+       8859-15.map 8859-16.map
+
+IBM = \
+       IBM037.map IBM038.map \
+       IBM256.map IBM273.map IBM274.map IBM275.map IBM277.map IBM278.map \
+       IBM280.map IBM281.map IBM284.map IBM285.map IBM290.map IBM297.map \
+       IBM420.map IBM423.map IBM424.map IBM437.map IBM500.map IBM850.map \
+       IBM851.map IBM852.map IBM855.map IBM856.map IBM857.map IBM860.map \
+       IBM861.map IBM862.map IBM863.map IBM864.map IBM865.map IBM866.map \
+       IBM868.map IBM869.map IBM870.map IBM871.map IBM874.map IBM875.map \
+       IBM880.map IBM891.map IBM903.map IBM904.map IBM905.map IBM918.map \
+       IBM1004.map IBM1026.map IBM1047.map
+
+CODEPAGE = \
+       CP737.map CP775.map CP1125.map\
+       CP1250.map CP1251.map CP1252.map CP1253.map CP1254.map \
+       CP1255.map CP1256.map CP1257.map CP1258.map \
+       CP10007.map \
+       CP720.map CP858.map
+
+CJK =   GB2312.map GBK.map GB180302.map GB180304.map \
+       BIG5.map BIG5-HKSCS.map\
+       CNS-1.map CNS-2.map CNS-3.map CNS-4.map CNS-5.map CNS-6.map CNS-7.map \
+       CNS-F.map \
+       JISX0201.map JISX0208.map JISX0212.map JISX2131.map JISX2132.map \
+       JISC6226.map CP932-2BYTE.map JISX213A.map\
+       KSC5601.map KSC5636.map JOHAB.map
+
+MISC =  KOI-8.map KOI8-R.map KOI8-U.map KOI8-T.map ALTERNATIVNYJ.map \
+       MIK.map PTCP154.map \
+       TIS-620.map VISCII.map VSCII.map VSCII-2.map\
+       KA-PS.map KA-ACADEMY.map \
+       HP-ROMAN8.map NEXTSTEP.map MACINTOSH.map EBCDICUK.map EBCDICUS.map \
+       stdenc.map symbol.map \
+       CP949-2BYTE.map \
+       BIG5-1.map BIG5-2.map
+
+# Emacs-mule charsets.
+MULE = MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
+       MULE-sisheng.map MULE-tibetan.map \
+       MULE-lviscii.map MULE-uviscii.map
+
+SED_SCRIPT = jisx2131-filter
+
+TRANS_TABLE = cp51932.el eucjp-ms.el
+TRANS_TABLE := $(addprefix ${lispintdir}/,${TRANS_TABLE})
+
+CHARSETS = ${ISO8859} ${IBM} ${CODEPAGE} ${CJK} ${MISC} ${MULE}
+CHARSETS := $(addprefix ${charsetdir}/,${CHARSETS})
+
+## Those charsets whose source is not in GLIBC_CHARMAPS.
+LOCAL = MIK.map PTCP154.map stdenc.map symbol.map CP720.map CP858.map \
+  JISX213A.map CP932-2BYTE.map JISC6226.map \
+  CNS-2.map CNS-3.map CNS-4.map CNS-5.map CNS-6.map CNS-7.map \
+  ALTERNATIVNYJ.map GB180304.map \
+  ${MULE}
+LOCAL := $(addprefix ${charsetdir}/,${LOCAL})
+
+
+.PHONY: all local
+
+all: ${CHARSETS} ${TRANS_TABLE}
+local: ${LOCAL} ${TRANS_TABLE}
+
+## Rules for each charset.
+
+mapconv = ${srcdir}/mapconv
+run_mapconv = AWK=${AWK} ${srcdir}/mapconv
+big5 = ${srcdir}/big5.awk
+compact = ${srcdir}/compact.awk
+cp51932 = ${srcdir}/cp51932.awk
+cp932 = ${srcdir}/cp932.awk
+eucjp_ms = ${srcdir}/eucjp-ms.awk
+gb180302 = ${srcdir}/gb180302.awk
+gb180304 = ${srcdir}/gb180304.awk
+kuten = ${srcdir}/kuten.awk
+
+## Short aliases, eg VSCII.map = ${charsetdir}/VSCII.map
+define map_template
+ .PHONY: $(notdir ${1})
+ $(notdir ${1}): ${1}
+endef
+
+$(foreach mfile,${CHARSETS},$(eval $(call map_template,$(mfile))))
+
+${charsetdir}/VSCII.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[0-9a-f].[  ]/' GLIBC-1 
${compact} > $@
+
+${charsetdir}/VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz ${mapconv} 
${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[2-7a-f].[  ]/' GLIBC-1 
${compact} \
+         | sed 's/0x20-0x7F.*/0x00-0x7F 0x0000/' > $@
+
+${charsetdir}/ALTERNATIVNYJ.map: ${charsetdir}/IBM866.map
+       ${AM_V_GEN}(echo "# Modified from $(notdir $<) according to the chart 
at" && \
+         echo "# http://www.cyrillic.com/ref/cyrillic/koi-8alt.html,"; && \
+         echo "# with guesses for the Unicodes of the glyphs." && \
+         sed -e '1 d' \
+            -e '/0xF2/ s/ .*/ 0x2019/' \
+            -e '/0xF3/ s/ .*/ 0x2018/' \
+            -e '/0xF4/ s/ .*/ 0x0301/' \
+            -e '/0xF5/ s/ .*/ 0x0300/' \
+            -e '/0xF6/ s/ .*/ 0x203A/' \
+            -e '/0xF7/ s/ .*/ 0x2039/' \
+            -e '/0xF8/ s/ .*/ 0x2191/' \
+            -e '/0xF9/ s/ .*/ 0x2193/' \
+            -e '/0xFA/ s/ .*/ 0x00B1/' \
+            -e '/0xFB/ s/ .*/ 0x00F7/' < $< ) > $@
+
+${charsetdir}/MIK.map: ${mapfiledir}/bulgarian-mik.txt ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '1,$$' CZYBORRA ${compact} > $@
+
+${charsetdir}/PTCP154.map: ${mapfiledir}/PTCP154 ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^0x/' IANA ${compact} > $@
+
+${charsetdir}/stdenc.map: ${mapfiledir}/stdenc.txt ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^[0-9A-Fa-f]/' UNICODE ${compact} > $@
+
+${charsetdir}/symbol.map: ${mapfiledir}/symbol.txt ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^[0-9A-Fa-f]/' UNICODE ${compact} > $@
+
+${charsetdir}/CP720.map: ${mapfiledir}/CP720.map
+       ${AM_V_GEN}cp $< $@
+
+${charsetdir}/CP858.map: ${mapfiledir}/CP858.map
+       ${AM_V_GEN}cp $< $@
+
+${charsetdir}/CP949-2BYTE.map: ${GLIBC_CHARMAPS}/CP949.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[89a-f]/' GLIBC-2 
${compact} > $@
+
+${charsetdir}/GB2312.map: ${GLIBC_CHARMAPS}/GB2312.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 
${compact} > $@
+
+${charsetdir}/GBK.map: ${GLIBC_CHARMAPS}/GBK.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[89a-f]/' GLIBC-2 
${compact} > $@
+
+${charsetdir}/GB180302.map: ${GLIBC_CHARMAPS}/GB18030.gz ${mapconv} ${gb180302}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x..\/x..[    ]/' GLIBC-2 
${gb180302} > $@
+
+${charsetdir}/GB180304.map: ${charsetdir}/GB180302.map ${gb180304}
+       ${AM_V_GEN}$(AWK) -f ${gb180304} < $< > $@
+
+${charsetdir}/JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz ${mapconv} 
${compact}
+       ${AM_V_GEN}(${mapconv} $< '/^<.*[       ]\/x[0-9]/' GLIBC-1 ${compact} 
&& \
+         echo "# Generated by hand" && \
+         echo "0xA1-0xDF 0xFF61" ) > $@
+
+${charsetdir}/JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 \
+         | sed 's/0x2015/0x2014/' > $@
+
+${charsetdir}/JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x8f/ s,/x8f,,' GLIBC-2-7 
${compact} > $@
+
+jisx2131-filter: ${mapfiledir}/JISX213A.map
+       ${AM_V_at}sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < 
$< > $@
+
+${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} 
jisx2131-filter
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 \
+         | sed -f jisx2131-filter \
+         | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
+
+${charsetdir}/JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@
+
+${charsetdir}/JISX213A.map: ${mapfiledir}/JISX213A.map
+       ${AM_V_GEN}cp $< $@
+
+${charsetdir}/CP932-2BYTE.map: ${mapfiledir}/CP932.TXT ${mapconv} ${cp932}
+       ${AM_V_GEN}${run_mapconv} $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 
${cp932} > $@
+
+${lispintdir}/cp51932.el: ${charsetdir}/CP932-2BYTE.map ${cp51932}
+       ${AM_V_GEN}$(AWK) -f ${cp51932} < $< > $@
+
+${lispintdir}/eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz ${eucjp_ms}
+       ${AM_V_GEN}gunzip -c $< | $(AWK) -f ${eucjp_ms} > $@
+
+# As Uni2JIS doesn't contain mappings of characters added to Unicode
+# recently, we add them manually here (including one correction for
+# U+005C vs U+FF3C).  These changes are based on bogytech's blog at
+# http://bogytech.blogspot.jp/search/label/emacs.
+${charsetdir}/JISC6226.map: ${mapfiledir}/Uni2JIS ${mapconv} ${kuten}
+       ${AM_V_GEN}(${run_mapconv} $< '/^[^#].*0-/' YASUOKA ${kuten} \
+         | sed -e '/0x2140/s/005C/FF3C/' && \
+         echo '0x3442 0x3D4E' && echo '0x374E 0x25874' && \
+         echo '0x3764 0x28EF6' && echo '0x513D 0x2F80F' && \
+         echo '0x7045 0x9724' ) > $@
+
+${charsetdir}/KSC5601.map: ${GLIBC_CHARMAPS}/EUC-KR.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 
${compact} > $@
+
+${charsetdir}/BIG5.map: ${GLIBC_CHARMAPS}/BIG5.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2 > $@
+
+${charsetdir}/BIG5-1.map: ${charsetdir}/BIG5.map ${mapconv} ${big5}
+       ${AM_V_GEN}(echo "# Generated from $(notdir $<)" && \
+         sed -n -e '/0xa140/,/0xc8fe/p' < $< | $(AWK) -f ${big5} ) > $@
+
+${charsetdir}/BIG5-2.map: ${charsetdir}/BIG5.map ${mapconv} ${big5}
+       ${AM_V_GEN}(echo "# Generated from $(notdir $<)" && \
+         sed -n -e '/0xc940/,$$ p' < $< | $(AWK) -f ${big5} ) > $@
+
+${charsetdir}/BIG5-HKSCS.map: ${GLIBC_CHARMAPS}/BIG5-HKSCS.gz ${mapconv} 
${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[89a-f].\//' GLIBC-2 
${compact} > $@
+
+${charsetdir}/JOHAB.map: ${GLIBC_CHARMAPS}/JOHAB.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[89a-f]/' GLIBC-2 
${compact} > $@
+
+${charsetdir}/CNS-1.map: ${GLIBC_CHARMAPS}/EUC-TW.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 
${compact} > $@
+
+# ${charsetdir}/CNS-1.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+#      ${AM_V_GEN}${run_mapconv} $< '/^C1/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-2.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^C2/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-3.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^C3/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-4.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^C4/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-5.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^C5/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-6.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^C6/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-7.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^C7/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-F.map: ${GLIBC_CHARMAPS}/EUC-TW.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 
${compact} > $@
+
+# General target to produce map files for mule charsets.
+${charsetdir}/MULE-%.map: ${mapfiledir}/MULE-%.map
+       ${AM_V_GEN}cp $< $@
+
+# General target to produce map files for ISO-8859, GEORGIAN, and
+# EBCDIC charsets.  We can not use the original file name because of
+# file name limit on DOS.  "KA" is ISO 639 language code for Georgian.
+
+${charsetdir}/8859-%.map: ${GLIBC_CHARMAPS}/ISO-8859-%.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x/' GLIBC-1 ${compact} > $@
+
+${charsetdir}/KA-%.map: ${GLIBC_CHARMAPS}/GEORGIAN-%.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x/' GLIBC-1 ${compact} > $@
+
+${charsetdir}/EBCDIC%.map: ${GLIBC_CHARMAPS}/EBCDIC-%.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x/' GLIBC-1 ${compact} > $@
+
+# General target to produce map files for single-byte charsets.
+
+${charsetdir}/%.map: ${GLIBC_CHARMAPS}/%.gz ${mapconv} ${compact}
+       ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x/' GLIBC-1 ${compact} > $@
+
+
+.PHONY: clean bootstrap-clean distclean maintainer-clean extraclean totalclean
+
+clean:
+       rm -f ${SED_SCRIPT}
+
+bootstrap-clean: clean
+
+distclean: clean
+       rm -f Makefile
+
+maintainer-clean: distclean
+
+## Do not remove these files, even in a bootstrap.  They rarely change.
+extraclean:
+       rm -f ${LOCAL} ${TRANS_TABLE}
+
+totalclean: extraclean
+       rm -f ${CHARSETS}
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 8433d22..6fd13c6 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Copyright (C) 2015 Free Software Foundation, Inc.
+
 # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
@@ -33,8 +35,10 @@
 #      GLIBC-1 GLIBC-2 GLIBC-2-7 CZYBORRA IANA UNICODE UNICODE2 YASUOKA
 #   $4: awk script
 
-FILE="admin/charsets/$1"
-BASE=`basename $1 .gz`
+BASE=`expr "$1" : '.*/\(.*\)' '|' "$1"` # basename
+FILE="admin/charsets/mapfiles/$BASE"
+BASE=`expr "$BASE" : '\(.*\)\.gz$' '|' "$BASE"` # remove any .gz suffix
+AWK=${AWK:-awk}
 
 case "$3" in
     GLIBC*)
@@ -69,7 +73,7 @@ fi
 
 if [ -n "$4" ] ; then
     if [ -f "$4" ] ; then
-       AWKPROG="gawk -f $4"
+       AWKPROG="$AWK -f $4"
     else
        echo "Awk program does not exist: $4"
        exit 1
@@ -81,20 +85,20 @@ fi
 if [ "$3" = "GLIBC-1" ] ; then
     # Source format is:
     #   <UYYYY>        /xXX
-    zcat $1 | sed -n -e "$2 p" \
+    gunzip -c $1 | sed -n -e "${2}p" \
        | sed -e 's,<U\([^>]*\)>[       ]*/x\(..\).*,0x\2 0x\1,' \
        | sort | ${AWKPROG}
 elif [ "$3" = "GLIBC-2" ] ; then
     # Source format is:
     #   <UYYYY>        /xXX/xZZ
-    zcat $1 | sed -n -e "$2 p" \
+    gunzip -c $1 | sed -n -e "${2}p" \
        | sed -e 's,<U\([^>]*\)>[       ]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \
        | sort | ${AWKPROG}
 elif [ "$3" = "GLIBC-2-7" ] ; then
     # Source format is:
     #   <UYYYY>        /xXX/xZZ
     # We must drop MSBs of XX and ZZ
-    zcat $1 | sed -n -e "$2 p" \
+    gunzip -c $1 | sed -n -e "${2}p" \
        | sed -e 's/xa/x2/g' -e 's/xb/x3/g' -e 's/xc/x4/g' \
              -e 's/xd/x5/g' -e 's/xe/x6/g' -e 's/xf/x7/g' \
              -e 's,<U\([^>]*\)>[       ]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \
@@ -102,13 +106,13 @@ elif [ "$3" = "GLIBC-2-7" ] ; then
 elif [ "$3" = "CZYBORRA" ] ; then
     # Source format is:
     #   =XX    U+YYYY
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
        | sed -e 's/=\(..\)[^U]*U+\([0-9A-F]*\).*/0x\1 0x\2/' \
        | sort | ${AWKPROG}
 elif [ "$3" = "IANA" ] ; then
     # Source format is:
     #   0xXX   0xYYYY
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
        | sed -e 's/\(0x[0-9A-Fa-f]*\)[^0]*\(0x[0-9A-Fa-f]*\).*/\1 \2/' \
        | sort | ${AWKPROG}
 elif [ "$3" = "UNICODE" ] ; then
@@ -116,25 +120,25 @@ elif [ "$3" = "UNICODE" ] ; then
     #   YYYY   XX
     # We perform reverse sort to prefer the first one in the
     # duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
        | sed -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \
        | sort -r
 elif [ "$3" = "UNICODE2" ] ; then
     # Source format is:
     #   0xXXXX 0xYYYY  # ...
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
        | sed -e 's/\([0-9A-Fx]*\)[^0]*\([0-9A-Fx]*\).*/\1 \2/' \
        | ${AWKPROG} | sort -n -k 4,4
 elif [ "$3" = "YASUOKA" ] ; then
     # Source format is:
     # YYYY     0-XXXX (XXXX is a Kuten code)
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
        | sed -e 's/\([0-9A-F]*\)[^0]*0-\([0-9]*\).*/0x\2 0x\1/' \
        | sort | ${AWKPROG}
 elif [ "$3" = "KANJI-DATABASE" ] ; then
     # Source format is:
     # C?-XXXX U+YYYYY .....
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
        | sed -e 's/...\(....\) U+\([0-9A-F]*\).*/0x\1 0x\2/' \
        | sort | ${AWKPROG}
 else
diff --git a/admin/charsets/mapfiles/PTCP154 b/admin/charsets/mapfiles/PTCP154
index 1d76058..ab493e5 100644
--- a/admin/charsets/mapfiles/PTCP154
+++ b/admin/charsets/mapfiles/PTCP154
@@ -288,4 +288,4 @@ e-mail: auskov&idc.kz
 Intended usage:
 COMMON
 
-(record created 2002-09-27)
\ No newline at end of file
+(record created 2002-09-27)
diff --git a/configure.ac b/configure.ac
index 458a688..c1cccd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5293,7 +5293,8 @@ fi
 
 dnl The admin/ directory used to be excluded from tarfiles.
 if test -d $srcdir/admin; then
-  SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES admin/unidata/Makefile 
admin/grammars/Makefile"
+  SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES admin/charsets/Makefile 
admin/unidata/Makefile admin/grammars/Makefile"
+  AC_CONFIG_FILES([admin/charsets/Makefile])
   AC_CONFIG_FILES([admin/unidata/Makefile])
   AC_CONFIG_FILES([admin/grammars/Makefile])
 fi                              dnl -d admin
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 9e570da..56aea0c 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -753,6 +753,26 @@ If non, @code{nil}, this is a list of IRC message types to 
hide, e.g.:
 @end example
 @end defopt
 
address@hidden erc-network-hide-list
+If non, @code{nil}, this is a list of IRC networks and message types
+to hide, e.g.:
+
address@hidden
+(setq erc-network-hide-list (("freenode" "JOIN" "PART" "QUIT")
+("OFTC" "JOIN" "PART""))
address@hidden example
address@hidden defopt
+
address@hidden erc-channel-hide-list
+If non, @code{nil}, this is a list of IRC channels and message types
+to hide, e.g.:
+
address@hidden
+(setq erc-channel-hide-list (("#erc" "JOIN" "PART" "QUIT")
+("#emacs" "NICK"))
address@hidden example
address@hidden defopt
+
 @defopt erc-lurker-hide-list
 Like @code{erc-hide-list}, but only applies to messages sent by
 lurkers.  The function @code{erc-lurker-p} determines whether a given
diff --git a/etc/NEWS b/etc/NEWS
index 2540756..7ad85ba 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -249,6 +249,13 @@ Unicode standards.
 
 ** The `save-place' variable is replaced by a `save-place-mode'.
 
+** ERC
+
+*** Hide message types by network or channel. `erc-hide-list' will
+hide all messages of the specified type, where `erc-network-hide-list'
+and `erc-channel-hide-list' will only hide the specified message types
+for the respective specified targets.
+
 ** Midnight-mode
 *** `midnight-mode' is a proper minor mode.
 *** clean-buffer-*-regexps can now specify buffers via predicate functions.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 806275f..357ebc7 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -107,13 +107,13 @@ char *w32_getenv (char *);
 /* Name used to invoke this program.  */
 const char *progname;
 
-/* The second argument to main. */
+/* The second argument to main.  */
 char **main_argv;
 
 /* Nonzero means don't wait for a response from Emacs.  --no-wait.  */
 int nowait = 0;
 
-/* Nonzero means don't print messages for successful operations.  --quiet. */
+/* Nonzero means don't print messages for successful operations.  --quiet.  */
 int quiet = 0;
 
 /* Nonzero means args are expressions to be evaluated.  --eval.  */
@@ -131,7 +131,7 @@ const char *alt_display = NULL;
 /* The parent window ID, if we are opening a frame via XEmbed.  */
 char *parent_id = NULL;
 
-/* Nonzero means open a new Emacs frame on the current terminal. */
+/* Nonzero means open a new Emacs frame on the current terminal.  */
 int tty = 0;
 
 /* If non-NULL, the name of an editor to fallback to if the server
@@ -148,7 +148,7 @@ const char *server_file = NULL;
 int emacs_pid = 0;
 
 /* If non-NULL, a string that should form a frame parameter alist to
-   be used for the new frame */
+   be used for the new frame.  */
 const char *frame_parameters = NULL;
 
 static _Noreturn void print_help_and_exit (void);
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 457c151..bc5267a 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -5030,8 +5030,7 @@
        * mouse.el (mouse-yank-primarY): Look for frame-type w32, not
        system-type windows-nt.
 
-       * server.el (server-create-window-system-frame): Look for window
-       type.
+       * server.el (server-create-window-system-frame): Look for window type.
        (server-proces-filter): Only force a window system when windows-nt
        _and_ w32.  Explain why.
 
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 357916c..2ff7c01 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -1,4 +1,4 @@
-;;; autorevert.el --- revert buffers when files on disk change
+;;; autorevert.el --- revert buffers when files on disk change  -*- 
lexical-binding:t -*-
 
 ;; Copyright (C) 1997-1999, 2001-2015 Free Software Foundation, Inc.
 
@@ -95,7 +95,7 @@
 ;; mode.  For example, the following line will activate Auto-Revert
 ;; Mode in all C mode buffers:
 ;;
-;; (add-hook 'c-mode-hook 'turn-on-auto-revert-mode)
+;; (add-hook 'c-mode-hook #'turn-on-auto-revert-mode)
 
 ;;; Code:
 
@@ -260,10 +260,9 @@ buffers.  CPU usage depends on the version control system."
   :type 'boolean
   :version "22.1")
 
-(defvar global-auto-revert-ignore-buffer nil
+(defvar-local global-auto-revert-ignore-buffer nil
   "When non-nil, Global Auto-Revert Mode will not revert this buffer.
 This variable becomes buffer local when set in any fashion.")
-(make-variable-buffer-local 'global-auto-revert-ignore-buffer)
 
 (defcustom auto-revert-remote-files nil
   "If non-nil remote files are also reverted."
@@ -315,9 +314,9 @@ the list of old buffers.")
   "Position of last known end of file.")
 
 (add-hook 'find-file-hook
-         (lambda ()
-           (set (make-local-variable 'auto-revert-tail-pos)
-                (nth 7 (file-attributes buffer-file-name)))))
+         (lambda ()
+           (setq-local auto-revert-tail-pos
+                        (nth 7 (file-attributes buffer-file-name)))))
 
 (defvar auto-revert-notify-watch-descriptor-hash-list
   (make-hash-table :test 'equal)
@@ -326,15 +325,13 @@ Hash key is a watch descriptor, hash value is a list of 
buffers
 which are related to files being watched and carrying the same
 default directory.")
 
-(defvar auto-revert-notify-watch-descriptor nil
+(defvar-local auto-revert-notify-watch-descriptor nil
   "The file watch descriptor active for the current buffer.")
-(make-variable-buffer-local 'auto-revert-notify-watch-descriptor)
 (put 'auto-revert-notify-watch-descriptor 'permanent-local t)
 
-(defvar auto-revert-notify-modified-p nil
+(defvar-local auto-revert-notify-modified-p nil
   "Non-nil when file has been modified on the file system.
 This has been reported by a file notification event.")
-(make-variable-buffer-local 'auto-revert-notify-modified-p)
 
 ;; Functions:
 
@@ -370,7 +367,7 @@ without being changed in the part that is already in the 
buffer."
   "Turn on Auto-Revert Mode.
 
 This function is designed to be added to hooks, for example:
-  (add-hook 'c-mode-hook 'turn-on-auto-revert-mode)"
+  (add-hook 'c-mode-hook #'turn-on-auto-revert-mode)"
   (auto-revert-mode 1))
 
 
@@ -420,8 +417,8 @@ Perform a full revert? ")
       ;; else we might reappend our own end when we save
       (add-hook 'before-save-hook (lambda () (auto-revert-tail-mode 0)) nil t)
       (or (local-variable-p 'auto-revert-tail-pos) ; don't lose prior position
-         (set (make-local-variable 'auto-revert-tail-pos)
-              (nth 7 (file-attributes buffer-file-name))))
+         (setq-local auto-revert-tail-pos
+                      (nth 7 (file-attributes buffer-file-name))))
       ;; let auto-revert-mode set up the mechanism for us if it isn't already
       (or auto-revert-mode
          (let ((auto-revert-tail-mode t))
@@ -434,7 +431,7 @@ Perform a full revert? ")
   "Turn on Auto-Revert Tail mode.
 
 This function is designed to be added to hooks, for example:
-  (add-hook 'my-logfile-mode-hook 'turn-on-auto-revert-tail-mode)"
+  (add-hook 'my-logfile-mode-hook #'turn-on-auto-revert-tail-mode)"
   (auto-revert-tail-mode 1))
 
 
@@ -495,7 +492,7 @@ will use an up-to-date value of `auto-revert-interval'"
           (ignore-errors
             (file-notify-rm-watch auto-revert-notify-watch-descriptor)))))
      auto-revert-notify-watch-descriptor-hash-list)
-    (remove-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch))
+    (remove-hook 'kill-buffer-hook #'auto-revert-notify-rm-watch))
   (setq auto-revert-notify-watch-descriptor nil
        auto-revert-notify-modified-p nil))
 
@@ -508,7 +505,7 @@ will use an up-to-date value of `auto-revert-interval'"
          (file-symlink-p (or buffer-file-name default-directory)))
 
       ;; Fallback to file checks.
-      (set (make-local-variable 'auto-revert-use-notify) nil)
+      (setq-local auto-revert-use-notify nil)
 
     (when (not auto-revert-notify-watch-descriptor)
       (setq auto-revert-notify-watch-descriptor
@@ -530,10 +527,10 @@ will use an up-to-date value of `auto-revert-interval'"
                   (gethash auto-revert-notify-watch-descriptor
                            auto-revert-notify-watch-descriptor-hash-list))
             auto-revert-notify-watch-descriptor-hash-list)
-           (add-hook (make-local-variable 'kill-buffer-hook)
-                     'auto-revert-notify-rm-watch))
+           (add-hook 'kill-buffer-hook
+                     #'auto-revert-notify-rm-watch nil t))
        ;; Fallback to file checks.
-       (set (make-local-variable 'auto-revert-use-notify) nil)))))
+       (setq-local auto-revert-use-notify nil)))))
 
 ;; If we have file notifications, we want to update the auto-revert buffers
 ;; immediately when a notification occurs. Since file updates can happen very
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 13585bc..b3c127f 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -237,14 +237,19 @@ BODY, if present, is used as the body of a default method.
                (`(,spec-args . ,_) (cl--generic-split-args args))
                (mandatory (mapcar #'car spec-args))
                (apo (assq :argument-precedence-order options)))
-    (setf (cl--generic-dispatches generic) nil)
+    (unless (fboundp name)
+      ;; If the generic function was fmakunbound, throw away previous methods.
+      (setf (cl--generic-dispatches generic) nil)
+      (setf (cl--generic-method-table generic) nil))
     (when apo
       (dolist (arg (cdr apo))
         (let ((pos (memq arg mandatory)))
           (unless pos (error "%S is not a mandatory argument" arg))
-          (push (list (- (length mandatory) (length pos)))
-                (cl--generic-dispatches generic)))))
-    (setf (cl--generic-method-table generic) nil)
+          (let* ((argno (- (length mandatory) (length pos)))
+                 (dispatches (cl--generic-dispatches generic))
+                 (dispatch (or (assq argno dispatches) (list argno))))
+            (setf (cl--generic-dispatches generic)
+                  (cons dispatch (delq dispatch dispatches)))))))
     (setf (cl--generic-options generic) options)
     (cl--generic-make-function generic)))
 
@@ -438,16 +443,14 @@ which case this method will be invoked when the argument 
is `eql' to VAL.
           ;; the generic function.
           current-load-list)
       ;; For aliases, cl--generic-name gives us the actual name.
-      (funcall
-       (if purify-flag
-           ;; BEWARE!  Don't purify this function definition, since that leads
-           ;; to memory corruption if the hash-tables it holds are modified
-           ;; (the GC doesn't trace those pointers).
-           #'fset
-         ;; But do use `defalias' in the normal case, so that it interacts
-         ;; properly with nadvice, e.g. for tracing/debug-on-entry.
-         #'defalias)
-       (cl--generic-name generic) gfun))))
+      (let ((purify-flag
+             ;; BEWARE!  Don't purify this function definition, since that 
leads
+             ;; to memory corruption if the hash-tables it holds are modified
+             ;; (the GC doesn't trace those pointers).
+             nil))
+        ;; But do use `defalias', so that it interacts properly with nadvice,
+        ;; e.g. for tracing/debug-on-entry.
+        (defalias (cl--generic-name generic) gfun)))))
 
 (defmacro cl--generic-with-memoization (place &rest code)
   (declare (indent 1) (debug t))
@@ -705,6 +708,11 @@ methods.")
   (if (eq specializer t) (list cl--generic-t-generalizer)
     (error "Unknown specializer %S" specializer)))
 
+(eval-when-compile
+  ;; This macro is brittle and only really important in order to be
+  ;; able to preload cl-generic without also preloading the byte-compiler,
+  ;; So we use `eval-when-compile' so as not keep it available longer than
+  ;; strictly needed.
 (defmacro cl--generic-prefill-dispatchers (arg-or-context specializer)
   (unless (integerp arg-or-context)
     (setq arg-or-context `(&context . ,arg-or-context)))
@@ -722,7 +730,7 @@ methods.")
                        ,@(cl-generic-generalizers ',specializer)
                        ,cl--generic-t-generalizer)))
        ;; (message "Prefilling for %S with \n%S" dispatch ',fun)
-       (puthash dispatch ',fun cl--generic-dispatchers))))
+       (puthash dispatch ',fun cl--generic-dispatchers)))))
 
 (cl-defmethod cl-generic-combine-methods (generic methods)
   "Standard support for :after, :before, :around, and `:extra NAME' 
qualifiers."
@@ -796,8 +804,6 @@ Can only be used from within the lexical body of a primary 
or around method."
         specializers qualifiers
         (cl--generic-method-table (cl--generic generic)))))
 
-(defalias 'cl-method-qualifiers 'cl--generic-method-qualifiers)
-
 ;;; Add support for describe-function
 
 (defun cl--generic-search-method (met-name)
@@ -850,6 +856,9 @@ Can only be used from within the lexical body of a primary 
or around method."
 
 (add-hook 'help-fns-describe-function-functions #'cl--generic-describe)
 (defun cl--generic-describe (function)
+  ;; Supposedly this is called from help-fns, so help-fns should be loaded at
+  ;; this point.
+  (declare-function help-fns-short-filename "help-fns" (filename))
   (let ((generic (if (symbolp function) (cl--generic function))))
     (when generic
       (require 'help-mode)              ;Needed for `help-function-def' button!
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 79f37e7..7e09b1f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -341,7 +341,7 @@ This variable is fed automatically by Emacs when installing 
a new package.
 This variable is used by `package-autoremove' to decide
 which packages are no longer needed.
 You can use it to (re)install packages on other machines
-by running `package-user-selected-packages-install'.
+by running `package-install-selected-packages'.
 
 To check if a package is contained in this list here, use
 `package--user-selected-p', as it may populate the variable with
@@ -2993,9 +2993,10 @@ Optional argument NOQUERY non-nil means do not ask the 
user to confirm."
                        "]")))
           (message (replace-regexp-in-string "__" "ing" message-template) 
"started")
           ;; Packages being upgraded are not marked as selected.
-          (package--save-selected-packages
-           (remove-dups (append (mapcar #'package-desc-name .install)
-                                package-selected-packages)))
+          (when .install
+            (dolist (p .install)
+              (cl-pushnew (package-desc-name p) package-selected-packages))
+            (package--save-selected-packages package-selected-packages))
           (package-menu--perform-transaction install-list delete-list)
           (when package-selected-packages
             (if-let ((removable (package--removable-packages)))
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index cf422f1..ad5e1a2 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1,3 +1,4 @@
+
 ;; erc.el --- An Emacs Internet Relay Chat client  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1997-2015 Free Software Foundation, Inc.
@@ -12,6 +13,7 @@
 ;;               Kelvin White (address@hidden)
 ;; Maintainer: address@hidden
 ;; Keywords: IRC, chat, client, Internet
+
 ;; Version: 5.3
 
 ;; This file is part of GNU Emacs.
@@ -37,15 +39,13 @@
 ;; * http://sv.gnu.org/projects/erc/
 ;; * http://www.emacswiki.org/cgi-bin/wiki/ERC
 
+
+
 ;; As of 2006-06-13, ERC development is now hosted on Savannah
 ;; (http://sv.gnu.org/projects/erc).  I invite everyone who wants to
 ;; hack on it to contact me <address@hidden> in order to get write
 ;; access to the shared Arch archive.
 
-;; Installation:
-
-;; Put erc.el in your load-path, and put (require 'erc) in your .emacs.
-
 ;; Configuration:
 
 ;; Use M-x customize-group RET erc RET to get an overview
@@ -258,11 +258,25 @@ If nil, only \"> \" will be shown."
           (repeat :inline t :tag "Others" (string :tag "IRC Message Type"))))
 
 (defcustom erc-hide-list nil
-  "List of IRC type messages to hide.
+  "A global list of IRC message types to hide.
 A typical value would be '(\"JOIN\" \"PART\" \"QUIT\")."
   :group 'erc-ignore
   :type 'erc-message-type)
 
+(defcustom erc-network-hide-list nil
+  "A list of IRC networks to hide message types from.
+A typical value would be '((\"freenode\" \"MODE\")
+(\"OFTC\" \"JOIN\" \"QUIT\"))."
+  :group 'erc-ignore
+  :type 'erc-message-type)
+
+(defcustom erc-channel-hide-list nil
+  "A list of IRC channels to hide message types from.
+A typical value would be '((\"#emacs\" \"QUIT\" \JOIN\")
+(\"#erc\" \"NICK\")."
+  :group 'erc-ignore
+  :type 'erc-message-type)
+
 (defvar erc-session-password nil
   "The password used for the current session.")
 (make-variable-buffer-local 'erc-session-password)
@@ -2616,15 +2630,36 @@ otherwise `erc-server-announced-name'.  SERVER is 
matched against
                erc-common-server-suffixes))
         erc-server-announced-name)))
 
+(defun erc-add-targets (scope target-list)
+  (let ((targets
+        (mapcar (lambda (targets) (member scope targets)) target-list)))
+    (cdr (apply 'append (delete nil targets)))))
+
 (defun erc-hide-current-message-p (parsed)
   "Predicate indicating whether the parsed ERC response PARSED should be 
hidden.
 
 Messages are always hidden if the message type of PARSED appears in
-`erc-hide-list'.  In addition, messages whose type is a member of
-`erc-lurker-hide-list' are hidden if `erc-lurker-p' returns true."
+`erc-hide-list'. Message types that appear in `erc-network-hide-list'
+or `erc-channel-hide-list' are are only hidden if the target matches
+the network or channel in the list. In addition, messages whose type
+is a member of `erc-lurker-hide-list' are hidden if `erc-lurker-p'
+returns non-nil."
   (let* ((command (erc-response.command parsed))
-         (sender (car (erc-parse-user (erc-response.sender parsed)))))
+         (sender (car (erc-parse-user (erc-response.sender parsed))))
+         (channel (nth 1 (erc-response.command-args parsed)))
+         (network (or (and (fboundp 'erc-network-name) (erc-network-name))
+                     (erc-shorten-server-name
+                      (or erc-server-announced-name
+                          erc-session-server))))
+        (current-hide-list
+         (when erc-network-hide-list
+           (erc-add-targets network erc-network-hide-list)))
+        (current-hide-list
+         (apply 'append current-hide-list
+                (when erc-channel-hide-list
+                  (erc-add-targets channel erc-channel-hide-list)))))
     (or (member command erc-hide-list)
+        (member command current-hide-list)
         (and (member command erc-lurker-hide-list) (erc-lurker-p sender)))))
 
 (defun erc-display-message (parsed type buffer msg &rest args)
@@ -4150,7 +4185,7 @@ See also `erc-display-error-notice'."
                                    ;; server's setting if we haven't
                                    ;; established a connection yet
                                    (- 9 (length erc-nick-uniquifier))))
-                                erc-nick-uniquifier)))
+                               erc-nick-uniqifier)))
       (erc-cmd-NICK newnick)
       (erc-display-error-notice
        nil
diff --git a/test/automated/cl-generic-tests.el 
b/test/automated/cl-generic-tests.el
index a6035d1..2703b44 100644
--- a/test/automated/cl-generic-tests.el
+++ b/test/automated/cl-generic-tests.el
@@ -26,15 +26,18 @@
 (eval-when-compile (require 'ert)) ;Don't indirectly require cl-lib at 
run-time.
 (require 'cl-generic)
 
+(fmakunbound 'cl--generic-1)
 (cl-defgeneric cl--generic-1 (x y))
 (cl-defgeneric (setf cl--generic-1) (v y z) "My generic doc.")
 
 (ert-deftest cl-generic-test-00 ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x y))
   (cl-defmethod cl--generic-1 ((x t) y) (cons x y))
   (should (equal (cl--generic-1 'a 'b) '(a . b))))
 
 (ert-deftest cl-generic-test-01-eql ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x y))
   (cl-defmethod cl--generic-1 ((x t) y) (cons x y))
   (cl-defmethod cl--generic-1 ((_x (eql 4)) _y)
@@ -54,6 +57,7 @@
 (cl-defstruct (cl-generic-struct-child2 (:include cl-generic-struct-parent)) e)
 
 (ert-deftest cl-generic-test-02-struct ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x y) "My doc.")
   (cl-defmethod cl--generic-1 ((x t) y) "Doc 1." (cons x y))
   (cl-defmethod cl--generic-1 ((_x cl-generic-struct-parent) y)
@@ -91,6 +95,7 @@
     (should (equal x '(3 2 1)))))
 
 (ert-deftest cl-generic-test-04-overlapping-tagcodes ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x y) "My doc.")
   (cl-defmethod cl--generic-1 ((y t) z) (list y z))
   (cl-defmethod cl--generic-1 ((_y (eql 4)) _z)
@@ -104,6 +109,7 @@
   (should (equal (cl--generic-1 4 'b) '("four" "integer" "number" 4 b))))
 
 (ert-deftest cl-generic-test-05-alias ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x y) "My doc.")
   (defalias 'cl--generic-2 #'cl--generic-1)
   (cl-defmethod cl--generic-1 ((y t) z) (list y z))
@@ -112,6 +118,7 @@
   (should (equal (cl--generic-1 4 'b) '("four" 4 b))))
 
 (ert-deftest cl-generic-test-06-multiple-dispatch ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x y) "My doc.")
   (cl-defmethod cl--generic-1 (x y) (list x y))
   (cl-defmethod cl--generic-1 (_x (_y integer))
@@ -123,6 +130,7 @@
   (should (equal (cl--generic-1 1 2) '("x&y-int" "x-int" "y-int" 1 2))))
 
 (ert-deftest cl-generic-test-07-apo ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x y)
     (:documentation "My doc.") (:argument-precedence-order y x))
   (cl-defmethod cl--generic-1 (x y) (list x y))
@@ -136,6 +144,7 @@
 
 (ert-deftest cl-generic-test-08-after/before ()
   (let ((log ()))
+    (fmakunbound 'cl--generic-1)
     (cl-defgeneric cl--generic-1 (x y))
     (cl-defmethod cl--generic-1 ((_x t) y) (cons y log))
     (cl-defmethod cl--generic-1 ((_x (eql 4)) _y)
@@ -150,6 +159,7 @@
 (defun cl--generic-test-advice (&rest args) (cons "advice" (apply args)))
 
 (ert-deftest cl-generic-test-09-advice ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x y) "My doc.")
   (cl-defmethod cl--generic-1 (x y) (list x y))
   (advice-add 'cl--generic-1 :around #'cl--generic-test-advice)
@@ -161,6 +171,7 @@
   (should (equal (cl--generic-1 4 5) '("integer" 4 5))))
 
 (ert-deftest cl-generic-test-10-weird ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x &rest r) "My doc.")
   (cl-defmethod cl--generic-1 (x &rest r) (cons x r))
   ;; This kind of definition is not valid according to CLHS, but it does show
@@ -172,6 +183,7 @@
   (should (equal (cl--generic-1 1 2) '("integer" 2 1))))
 
 (ert-deftest cl-generic-test-11-next-method-p ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 (x y))
   (cl-defmethod cl--generic-1 ((x t) y)
     (list x y (cl-next-method-p)))
@@ -179,15 +191,33 @@
     (cl-list* "quatre" (cl-next-method-p) (cl-call-next-method)))
   (should (equal (cl--generic-1 4 5) '("quatre" t 4 5 nil))))
 
-(ert-deftest sm-generic-test-12-context ()
+(ert-deftest cl-generic-test-12-context ()
+  (fmakunbound 'cl--generic-1)
   (cl-defgeneric cl--generic-1 ())
-  (cl-defmethod cl--generic-1 (&context (overwrite-mode (eql t)))   'is-t)
-  (cl-defmethod cl--generic-1 (&context (overwrite-mode (eql nil))) 'is-nil)
-  (cl-defmethod cl--generic-1 () 'other)
+  (cl-defmethod cl--generic-1 (&context (overwrite-mode (eql t)))
+    (list 'is-t (cl-call-next-method)))
+  (cl-defmethod cl--generic-1 (&context (overwrite-mode (eql nil)))
+    (list 'is-nil (cl-call-next-method)))
+  (cl-defmethod cl--generic-1 () 'any)
   (should (equal (list (let ((overwrite-mode t))   (cl--generic-1))
                        (let ((overwrite-mode nil)) (cl--generic-1))
                        (let ((overwrite-mode 1))   (cl--generic-1)))
-                 '(is-t is-nil other))))
+                 '((is-t any) (is-nil any) any))))
+
+(ert-deftest cl-generic-test-13-head ()
+  (fmakunbound 'cl--generic-1)
+  (cl-defgeneric cl--generic-1 (x y))
+  (cl-defmethod cl--generic-1 ((x t) y) (cons x y))
+  (cl-defmethod cl--generic-1 ((_x (head 4)) _y)
+    (cons "quatre" (cl-call-next-method)))
+  (cl-defmethod cl--generic-1 ((_x (head 5)) _y)
+    (cons "cinq" (cl-call-next-method)))
+  (cl-defmethod cl--generic-1 ((_x (head 6)) y)
+    (cons "six" (cl-call-next-method 'a y)))
+  (should (equal (cl--generic-1 'a nil) '(a)))
+  (should (equal (cl--generic-1 '(4) nil) '("quatre" (4))))
+  (should (equal (cl--generic-1 '(5) nil) '("cinq" (5))))
+  (should (equal (cl--generic-1 '(6) nil) '("six" a))))
 
 (provide 'cl-generic-tests)
 ;;; cl-generic-tests.el ends here



reply via email to

[Prev in Thread] Current Thread [Next in Thread]