diff options
| author | Kenichi Handa <handa@gnu.org> | 2014-07-02 00:34:58 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@gnu.org> | 2014-07-02 00:34:58 +0900 |
| commit | 763a11d0d0dcf543e89a22c98f55ea07c40ceefa (patch) | |
| tree | 9ecaec1b8a509a799903926ecd961ab905a1b1bd | |
| parent | 0782685d43f026b2366dbacbebc79021a9df50c6 (diff) | |
| parent | a519335cc3a00f3d4d8efac2c08d9b6b17c7fcf0 (diff) | |
| download | emacs-763a11d0d0dcf543e89a22c98f55ea07c40ceefa.tar.gz | |
merge trunk
47 files changed, 5234 insertions, 1083 deletions
diff --git a/ChangeLog b/ChangeLog index 3a5797a7caa..8226a138d06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-06-28 Glenn Morris <rgm@gnu.org> + + * configure.ac (lwlib_deps_frag, oldxmenu_deps_frag): New output files. + * make-dist (lwlib, oldXMenu): Distribute *.mk. + 2014-06-27 Glenn Morris <rgm@gnu.org> * Makefile.in (src): No more need to pass BOOTSTRAPEMACS. diff --git a/admin/ChangeLog b/admin/ChangeLog index d96368c4f9a..a20e93d38c2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,15 @@ +2014-06-30 Glenn Morris <rgm@gnu.org> + + * update_autogen: Find loaddefs targets rather than + parsing lisp/Makefile.in + +2014-06-29 Glenn Morris <rgm@gnu.org> + + * update_autogen: Remove need to cd into/out of lisp/. + + * grammars/Makefile.in (bootstrap-clean): Don't delete Makefile, + for sake of top-level maintainer-clean rule. + 2014-06-26 Eli Zaretskii <eliz@gnu.org> * notes/unicode: Some notes about what to do when a new Unicode diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index 1454225b80a..c3ee2ef951f 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in @@ -99,7 +99,10 @@ ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy distclean: rm -f Makefile -bootstrap-clean maintainer-clean: distclean +## Perhaps this should do what extraclean (qv) does. +bootstrap-clean: + +maintainer-clean: distclean ## We do not normally delete the generated files, even in bootstrap. ## Creating them does not take long, so we could easily change this. diff --git a/admin/update_autogen b/admin/update_autogen index d9d34fa3d6e..ef0edfef50c 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -322,15 +322,20 @@ EOF echo "Finding loaddef targets..." -sed -n -e '/^AUTOGEN_VCS/,/^$/p' lisp/Makefile.in | \ - sed -e '/AUTOGEN_VCS/d' -e '/^$/d' -e 's/\\//' \ - >| $tempfile || die "sed error" +find lisp -name '*.el' -exec grep '^;.*generated-autoload-file:' {} + | \ + sed -e '/loaddefs\|esh-groups/d' -e 's|/[^/]*: "|/|' -e 's/"//g' \ + >| $tempfile || die "Error finding targets" genfiles= while read genfile; do - [ -r lisp/$genfile ] || die "Unable to read $genfile" + ## Or we can just use sort -u when making tempfile... + case " $genfiles " in + *" $genfile "*) continue ;; + esac + + [ -r $genfile ] || die "Unable to read $genfile" genfiles="$genfiles $genfile" done < $tempfile @@ -369,18 +374,12 @@ make -C lisp "$@" autoloads EMACS=../src/bootstrap-emacs || die "make src error" cp $ldefs_in $ldefs_out || die "cp ldefs_boot error" -cd lisp - echo "Checking status of loaddef files..." ## It probably would be fine to just check+commit lisp/, since ## making autoloads should not effect any other files. But better ## safe than sorry. -modified=$(status $genfiles ${ldefs_out#lisp/}) || die - - -## bzr status output is always relative to top-level, not PWD. -[ "$vcs" = "bzr" ] && cd ../ +modified=$(status $genfiles $ldefs_out) || die commit "loaddefs" $modified || die "commit error" diff --git a/configure.ac b/configure.ac index b253d2465fa..04c75e30df8 100644 --- a/configure.ac +++ b/configure.ac @@ -1590,11 +1590,14 @@ if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then deps_frag=autodeps.mk fi fi +lwlib_deps_frag=$srcdir/lwlib/$deps_frag +oldxmenu_deps_frag=$srcdir/oldXMenu/$deps_frag deps_frag=$srcdir/src/$deps_frag AC_SUBST(MKDEPDIR) AC_SUBST(DEPFLAGS) AC_SUBST_FILE(deps_frag) - +AC_SUBST_FILE(lwlib_deps_frag) +AC_SUBST_FILE(oldxmenu_deps_frag) lisp_frag=$srcdir/src/lisp.mk AC_SUBST_FILE(lisp_frag) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 2d202715a0b..4302b53a63a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2014-06-28 Glenn Morris <rgm@gnu.org> + + * minibuf.texi (Intro to Minibuffers): Batch mode is basic. + (Reading a Password): Mention batch mode. (Bug#17839) + 2014-06-23 Glenn Morris <rgm@gnu.org> * Makefile.in (%.texi): Disable implicit rules. diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 19f941ba68d..e76b827cd2f 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -101,7 +101,9 @@ the minibuffer is in a separate frame. @xref{Minibuffers and Frames}. When Emacs is running in batch mode, any request to read from the minibuffer actually reads a line from the standard input descriptor that -was supplied when Emacs was started. +was supplied when Emacs was started. This supports only basic input: +none of the special minibuffer features (history, completion, +password hiding, etc.) are available in batch mode. @node Text from Minibuffer @section Reading Text Strings with the Minibuffer @@ -2146,7 +2148,8 @@ function @code{read-passwd}. @defun read-passwd prompt &optional confirm default This function reads a password, prompting with @var{prompt}. It does not echo the password as the user types it; instead, it echoes @samp{.} -for each character in the password. +for each character in the password. (Note that in batch mode, the +input is not hidden.) The optional argument @var{confirm}, if non-@code{nil}, says to read the password twice and insist it must be the same both times. If it isn't diff --git a/etc/ChangeLog b/etc/ChangeLog index fbeaed956a4..ae44fc45c3c 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2014-06-28 Glenn Morris <rgm@gnu.org> + + * publicsuffix.txt: Update from source. + 2014-06-24 Eli Barzilay <eli@barzilay.org> * NEWS: calculator.el user-visible changes. @@ -178,6 +178,13 @@ permissions set to temporary values (e.g., for creating private files). ** Functions `rmail-delete-forward' and `rmail-delete-backward' take an optional repeat-count argument. +--- +** New utilities in subr-x.el: +*** New macros `if-let' and `when-let' allow defining bindings and to + execute code depending whether all values are true. +*** New macros `thread-first' and `thread-last' allow threading a form + as the first or last argument of subsequent forms. + * Changes in Emacs 24.5 on Non-Free Operating Systems diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt index 45cd95aca30..fd84dc6f663 100644 --- a/etc/publicsuffix.txt +++ b/etc/publicsuffix.txt @@ -1,44 +1,8 @@ -// ***** BEGIN LICENSE BLOCK ***** -// Version: MPL 1.1/GPL 2.0/LGPL 2.1 -// -// The contents of this file are subject to the Mozilla Public License Version -// 1.1 (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ -// -// Software distributed under the License is distributed on an "AS IS" basis, -// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -// for the specific language governing rights and limitations under the -// License. -// -// The Original Code is the Public Suffix List. -// -// The Initial Developer of the Original Code is -// Jo Hermans <jo.hermans@gmail.com>. -// Portions created by the Initial Developer are Copyright (C) 2007 -// the Initial Developer. All Rights Reserved. -// -// Contributor(s): -// Ruben Arakelyan <ruben@rubenarakelyan.com> -// Gervase Markham <gerv@gerv.net> -// Pamela Greene <pamg.bugs@gmail.com> -// David Triendl <david@triendl.name> -// Jothan Frakes <jothan@gmail.com> -// The kind representatives of many TLD registries -// -// Alternatively, the contents of this file may be used under the terms of -// either the GNU General Public License Version 2 or later (the "GPL"), or -// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -// in which case the provisions of the GPL or the LGPL are applicable instead -// of those above. If you wish to allow use of your version of this file only -// under the terms of either the GPL or the LGPL, and not to allow others to -// use your version of this file under the terms of the MPL, indicate your -// decision by deleting the provisions above and replace them with the notice -// and other provisions required by the GPL or the LGPL. If you do not delete -// the provisions above, a recipient may use your version of this file under -// the terms of any one of the MPL, the GPL or the LGPL. -// -// ***** END LICENSE BLOCK ***** +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +// ===BEGIN ICANN DOMAINS=== // ac : http://en.wikipedia.org/wiki/.ac ac @@ -211,20 +175,21 @@ it.ao // aq : http://en.wikipedia.org/wiki/.aq aq -// ar : http://en.wikipedia.org/wiki/.ar -*.ar -!congresodelalengua3.ar -!educ.ar -!gobiernoelectronico.ar -!mecon.ar -!nacion.ar -!nic.ar -!promocion.ar -!retina.ar -!uba.ar +// ar : https://nic.ar/normativa-vigente.xhtml +ar +com.ar +edu.ar +gob.ar +gov.ar +int.ar +mil.ar +net.ar +org.ar +tur.ar // arpa : http://en.wikipedia.org/wiki/.arpa // Confirmed by registry <iana-questions@icann.org> 2008-06-18 +arpa e164.arpa in-addr.arpa ip6.arpa @@ -236,7 +201,7 @@ urn.arpa as gov.as -// asia: http://en.wikipedia.org/wiki/.asia +// asia : http://en.wikipedia.org/wiki/.asia asia // at : http://en.wikipedia.org/wiki/.at @@ -247,17 +212,31 @@ co.at gv.at or.at -// http://www.info.at/ -biz.at -info.at - -// priv.at : http://www.nic.priv.at/ -// Submitted by registry <lendl@nic.at> 2008-06-09 -priv.at - // au : http://en.wikipedia.org/wiki/.au -*.au -// au geographical names (vic.au etc... are covered above) +// http://www.auda.org.au/ +au +// 2LDs +com.au +net.au +org.au +edu.au +gov.au +asn.au +id.au +// Historic 2LDs (closed to new registration, but sites still exist) +info.au +conf.au +oz.au +// CGDNs - http://www.cgdn.org.au/ +act.au +nsw.au +nt.au +qld.au +sa.au +tas.au +vic.au +wa.au +// 3LDs act.edu.au nsw.edu.au nt.edu.au @@ -266,24 +245,14 @@ sa.edu.au tas.edu.au vic.edu.au wa.edu.au -act.gov.au -// Removed at request of Shae.Donelan@services.nsw.gov.au, 2010-03-04 -// nsw.gov.au -nt.gov.au +// act.gov.au Bug 984824 - Removed at request of Greg Tankard +// nsw.gov.au Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au> +// nt.gov.au Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au> qld.gov.au sa.gov.au tas.gov.au vic.gov.au wa.gov.au -// CGDNs - http://www.aucd.org.au/ -act.au -nsw.au -nt.au -qld.au -sa.au -tas.au -vic.au -wa.au // aw : http://en.wikipedia.org/wiki/.aw aw @@ -323,6 +292,7 @@ rs.ba // bb : http://en.wikipedia.org/wiki/.bb bb biz.bb +co.bb com.bb edu.bb gov.bb @@ -330,6 +300,7 @@ info.bb net.bb org.bb store.bb +tv.bb // bd : http://en.wikipedia.org/wiki/.bd *.bd @@ -381,7 +352,7 @@ z.bg 6.bg 7.bg 8.bg -9.bg +9.bg // bh : http://en.wikipedia.org/wiki/.bh bh @@ -432,8 +403,8 @@ net.bo mil.bo tv.bo -// br : http://registro.br/dominio/dpn.html -// Updated by registry <fneves@registro.br> 2011-03-01 +// br : http://registro.br/dominio/categoria.html +// Submitted by registry <fneves@registro.br> 2014-03-04 br adm.br adv.br @@ -446,13 +417,13 @@ b.br bio.br blog.br bmd.br -can.br cim.br cng.br cnt.br com.br coop.br ecn.br +eco.br edu.br emp.br eng.br @@ -473,10 +444,12 @@ ind.br inf.br jor.br jus.br +leg.br lel.br mat.br med.br mil.br +mp.br mus.br net.br nom.br @@ -522,6 +495,7 @@ org.bt // bv : No registrations at this time. // Submitted by registry <jarle@uninett.no> 2006-06-16 +bv // bw : http://en.wikipedia.org/wiki/.bw // http://www.gobin.info/domainname/bw.doc @@ -615,15 +589,21 @@ gouv.ci // ck : http://en.wikipedia.org/wiki/.ck *.ck +!www.ck // cl : http://en.wikipedia.org/wiki/.cl cl gov.cl gob.cl +co.cl +mil.cl -// cm : http://en.wikipedia.org/wiki/.cm +// cm : http://en.wikipedia.org/wiki/.cm plus bug 981927 cm +co.cm +com.cm gov.cm +net.cm // cn : http://en.wikipedia.org/wiki/.cn // Submitted by registry <tanyaling@cnnic.cn> 2008-06-11 @@ -694,33 +674,6 @@ web.co // com : http://en.wikipedia.org/wiki/.com com -// CentralNic names : http://www.centralnic.com/names/domains -// Confirmed by registry <gavin.brown@centralnic.com> 2008-06-09 -ar.com -br.com -cn.com -de.com -eu.com -gb.com -hu.com -jpn.com -kr.com -no.com -qc.com -ru.com -sa.com -se.com -uk.com -us.com -uy.com -za.com - -// Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26 -operaunite.com - -// Requested by Eduardo Vela <evn@google.com> 2010-09-06 -appspot.com - // coop : http://en.wikipedia.org/wiki/.coop coop @@ -746,6 +699,14 @@ inf.cu // cv : http://en.wikipedia.org/wiki/.cv cv +// cw : http://www.una.cw/cw_registry/ +// Confirmed by registry <registry@una.net> 2013-03-26 +cw +com.cw +edu.cw +net.cw +org.cw + // cx : http://en.wikipedia.org/wiki/.cx // list of other 2nd level tlds ? cx @@ -834,7 +795,7 @@ org.ee fie.ee // eg : http://en.wikipedia.org/wiki/.eg -eg +eg com.eg edu.eg eun.eg @@ -870,8 +831,6 @@ fi // completely removed. // TODO: Check for updates (expected to be phased out around Q1/2009) aland.fi -// iki.fi : Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05 -iki.fi // fj : http://en.wikipedia.org/wiki/.fj *.fj @@ -918,6 +877,7 @@ ga // gb : This registry is effectively dormant // Submitted by registry <Damien.Shaw@ja.net> 2008-06-12 +gb // gd : http://en.wikipedia.org/wiki/.gd gd @@ -935,13 +895,12 @@ pvt.ge // gf : http://en.wikipedia.org/wiki/.gf gf -// gg : http://www.channelisles.net/applic/avextn.shtml +// gg : http://www.channelisles.net/register-domains/ +// Confirmed by registry <nigel@channelisles.net> 2013-11-28 gg co.gg -org.gg net.gg -sch.gg -gov.gg +org.gg // gh : http://en.wikipedia.org/wiki/.gh // see also: http://www.nic.gh/reg_now.php @@ -972,6 +931,7 @@ gm // gn : http://psg.com/dns/gn/gn.txt // Submitted by registry <randy@psg.com> 2008-06-17 +gn ac.gn com.gn edu.gn @@ -1006,8 +966,15 @@ gov.gr // gs : http://en.wikipedia.org/wiki/.gs gs -// gt : http://www.gt/politicas.html -*.gt +// gt : http://www.gt/politicas_de_registro.html +gt +com.gt +edu.gt +gob.gt +ind.gt +mil.gt +net.gt +org.gt // gu : http://gadao.gov.gu/registration.txt *.gu @@ -1045,7 +1012,7 @@ org.hk 网絡.hk 组织.hk 組織.hk -組织.hk +組织.hk // hm : http://en.wikipedia.org/wiki/.hm hm @@ -1121,13 +1088,15 @@ tozsde.hu utazas.hu video.hu -// id : http://en.wikipedia.org/wiki/.id -// see also: https://register.pandi.or.id/ +// id : https://register.pandi.or.id/ id ac.id +biz.id co.id +desa.id go.id mil.id +my.id net.id or.id sch.id @@ -1140,16 +1109,18 @@ gov.ie // il : http://en.wikipedia.org/wiki/.il *.il -// im : https://www.nic.im/pdfs/imfaqs.pdf +// im : https://www.nic.im/ +// Submitted by registry <info@nic.im> 2013-11-15 im +ac.im co.im +com.im ltd.co.im -plc.co.im net.im -gov.im org.im -nic.im -ac.im +plc.co.im +tt.im +tv.im // in : http://en.wikipedia.org/wiki/.in // see also: http://www.inregistry.in/policies/ @@ -1221,294 +1192,385 @@ int.is it gov.it edu.it -// list of reserved geo-names : +// Reserved geo-names: // http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazione-versione-6.0.pdf -// (There is also a list of reserved geo-names corresponding to Italian -// municipalities : http://www.nic.it/documenti/appendice-c.pdf , but it is -// not included here.) -agrigento.it +// There is also a list of reserved geo-names corresponding to Italian municipalities +// http://www.nic.it/documenti/appendice-c.pdf, but it is not included here. +// Regions +abr.it +abruzzo.it +aosta-valley.it +aostavalley.it +bas.it +basilicata.it +cal.it +calabria.it +cam.it +campania.it +emilia-romagna.it +emiliaromagna.it +emr.it +friuli-v-giulia.it +friuli-ve-giulia.it +friuli-vegiulia.it +friuli-venezia-giulia.it +friuli-veneziagiulia.it +friuli-vgiulia.it +friuliv-giulia.it +friulive-giulia.it +friulivegiulia.it +friulivenezia-giulia.it +friuliveneziagiulia.it +friulivgiulia.it +fvg.it +laz.it +lazio.it +lig.it +liguria.it +lom.it +lombardia.it +lombardy.it +lucania.it +mar.it +marche.it +mol.it +molise.it +piedmont.it +piemonte.it +pmn.it +pug.it +puglia.it +sar.it +sardegna.it +sardinia.it +sic.it +sicilia.it +sicily.it +taa.it +tos.it +toscana.it +trentino-a-adige.it +trentino-aadige.it +trentino-alto-adige.it +trentino-altoadige.it +trentino-s-tirol.it +trentino-stirol.it +trentino-sud-tirol.it +trentino-sudtirol.it +trentino-sued-tirol.it +trentino-suedtirol.it +trentinoa-adige.it +trentinoaadige.it +trentinoalto-adige.it +trentinoaltoadige.it +trentinos-tirol.it +trentinostirol.it +trentinosud-tirol.it +trentinosudtirol.it +trentinosued-tirol.it +trentinosuedtirol.it +tuscany.it +umb.it +umbria.it +val-d-aosta.it +val-daosta.it +vald-aosta.it +valdaosta.it +valle-aosta.it +valle-d-aosta.it +valle-daosta.it +valleaosta.it +valled-aosta.it +valledaosta.it +vallee-aoste.it +valleeaoste.it +vao.it +vda.it +ven.it +veneto.it +// Provinces ag.it -alessandria.it +agrigento.it al.it -ancona.it +alessandria.it +alto-adige.it +altoadige.it an.it +ancona.it +andria-barletta-trani.it +andria-trani-barletta.it +andriabarlettatrani.it +andriatranibarletta.it +ao.it aosta.it aoste.it -ao.it -arezzo.it +ap.it +aq.it +aquila.it ar.it +arezzo.it ascoli-piceno.it ascolipiceno.it -ap.it asti.it at.it -avellino.it av.it -bari.it +avellino.it ba.it -andria-barletta-trani.it -andriabarlettatrani.it -trani-barletta-andria.it -tranibarlettaandria.it +balsan.it +bari.it barletta-trani-andria.it barlettatraniandria.it -andria-trani-barletta.it -andriatranibarletta.it -trani-andria-barletta.it -traniandriabarletta.it -bt.it belluno.it -bl.it benevento.it -bn.it bergamo.it bg.it -biella.it bi.it -bologna.it +biella.it +bl.it +bn.it bo.it +bologna.it bolzano.it bozen.it -balsan.it -alto-adige.it -altoadige.it -suedtirol.it -bz.it +br.it brescia.it -bs.it brindisi.it -br.it -cagliari.it +bs.it +bt.it +bz.it ca.it +cagliari.it caltanissetta.it -cl.it +campidano-medio.it +campidanomedio.it campobasso.it -cb.it -carboniaiglesias.it carbonia-iglesias.it -iglesias-carbonia.it -iglesiascarbonia.it -ci.it +carboniaiglesias.it +carrara-massa.it +carraramassa.it caserta.it -ce.it catania.it -ct.it catanzaro.it -cz.it -chieti.it +cb.it +ce.it +cesena-forli.it +cesenaforli.it ch.it -como.it +chieti.it +ci.it +cl.it +cn.it co.it +como.it cosenza.it -cs.it -cremona.it cr.it +cremona.it crotone.it -kr.it +cs.it +ct.it cuneo.it -cn.it +cz.it dell-ogliastra.it dellogliastra.it -ogliastra.it -og.it -enna.it en.it -ferrara.it +enna.it +fc.it fe.it fermo.it -fm.it +ferrara.it +fg.it +fi.it firenze.it florence.it -fi.it +fm.it foggia.it -fg.it forli-cesena.it forlicesena.it -cesena-forli.it -cesenaforli.it -fc.it -frosinone.it fr.it -genova.it -genoa.it +frosinone.it ge.it -gorizia.it +genoa.it +genova.it go.it -grosseto.it +gorizia.it gr.it -imperia.it +grosseto.it +iglesias-carbonia.it +iglesiascarbonia.it im.it -isernia.it +imperia.it is.it -laquila.it -aquila.it -aq.it +isernia.it +kr.it la-spezia.it +laquila.it laspezia.it -sp.it latina.it -lt.it -lecce.it +lc.it le.it +lecce.it lecco.it -lc.it -livorno.it li.it -lodi.it +livorno.it lo.it -lucca.it +lodi.it +lt.it lu.it +lucca.it macerata.it -mc.it mantova.it -mn.it massa-carrara.it massacarrara.it -carrara-massa.it -carraramassa.it -ms.it matera.it -mt.it +mb.it +mc.it +me.it medio-campidano.it mediocampidano.it -campidano-medio.it -campidanomedio.it -vs.it messina.it -me.it -milano.it -milan.it mi.it -modena.it +milan.it +milano.it +mn.it mo.it -monza.it +modena.it monza-brianza.it +monza-e-della-brianza.it +monza.it monzabrianza.it monzaebrianza.it monzaedellabrianza.it -monza-e-della-brianza.it -mb.it -napoli.it -naples.it +ms.it +mt.it na.it -novara.it +naples.it +napoli.it no.it -nuoro.it +novara.it nu.it -oristano.it +nuoro.it +og.it +ogliastra.it +olbia-tempio.it +olbiatempio.it or.it +oristano.it +ot.it +pa.it padova.it padua.it -pd.it palermo.it -pa.it parma.it -pr.it pavia.it -pv.it -perugia.it -pg.it -pescara.it +pc.it +pd.it pe.it +perugia.it pesaro-urbino.it pesarourbino.it -urbino-pesaro.it -urbinopesaro.it -pu.it +pescara.it +pg.it +pi.it piacenza.it -pc.it pisa.it -pi.it pistoia.it -pt.it -pordenone.it pn.it +po.it +pordenone.it potenza.it -pz.it +pr.it prato.it -po.it +pt.it +pu.it +pv.it +pz.it +ra.it ragusa.it -rg.it ravenna.it -ra.it -reggio-calabria.it -reggiocalabria.it rc.it +re.it +reggio-calabria.it reggio-emilia.it +reggiocalabria.it reggioemilia.it -re.it -rieti.it +rg.it ri.it +rieti.it rimini.it +rm.it rn.it +ro.it roma.it rome.it -rm.it rovigo.it -ro.it -salerno.it sa.it +salerno.it sassari.it -ss.it savona.it -sv.it -siena.it si.it +siena.it siracusa.it -sr.it -sondrio.it so.it -taranto.it +sondrio.it +sp.it +sr.it +ss.it +suedtirol.it +sv.it ta.it +taranto.it +te.it tempio-olbia.it tempioolbia.it -olbia-tempio.it -olbiatempio.it -ot.it teramo.it -te.it terni.it -tr.it -torino.it -turin.it +tn.it to.it -trapani.it +torino.it tp.it -trento.it +tr.it +trani-andria-barletta.it +trani-barletta-andria.it +traniandriabarletta.it +tranibarlettaandria.it +trapani.it trentino.it -tn.it +trento.it treviso.it -tv.it trieste.it ts.it -udine.it +turin.it +tv.it ud.it -varese.it +udine.it +urbino-pesaro.it +urbinopesaro.it va.it +varese.it +vb.it +vc.it +ve.it venezia.it venice.it -ve.it verbania.it -vb.it vercelli.it -vc.it verona.it -vr.it +vi.it vibo-valentia.it vibovalentia.it -vv.it vicenza.it -vi.it viterbo.it +vr.it +vs.it vt.it +vv.it -// je : http://www.channelisles.net/applic/avextn.shtml +// je : http://www.channelisles.net/register-domains/ +// Confirmed by registry <nigel@channelisles.net> 2013-11-28 je co.je -org.je net.je -sch.je -gov.je +org.je // jm : http://www.com.jm/register.html *.jm @@ -1529,10 +1591,9 @@ jobs // jp : http://en.wikipedia.org/wiki/.jp // http://jprs.co.jp/en/jpdomain.html -// Submitted by registry <yone@jprs.co.jp> 2008-06-11 -// Updated by registry <yone@jprs.co.jp> 2008-12-04 +// Submitted by registry <info@jprs.jp> 2014-02-28 jp -// jp organizational type names +// jp organizational type names ac.jp ad.jp co.jp @@ -1542,125 +1603,1748 @@ gr.jp lg.jp ne.jp or.jp +// jp preficture type names +aichi.jp +akita.jp +aomori.jp +chiba.jp +ehime.jp +fukui.jp +fukuoka.jp +fukushima.jp +gifu.jp +gunma.jp +hiroshima.jp +hokkaido.jp +hyogo.jp +ibaraki.jp +ishikawa.jp +iwate.jp +kagawa.jp +kagoshima.jp +kanagawa.jp +kochi.jp +kumamoto.jp +kyoto.jp +mie.jp +miyagi.jp +miyazaki.jp +nagano.jp +nagasaki.jp +nara.jp +niigata.jp +oita.jp +okayama.jp +okinawa.jp +osaka.jp +saga.jp +saitama.jp +shiga.jp +shimane.jp +shizuoka.jp +tochigi.jp +tokushima.jp +tokyo.jp +tottori.jp +toyama.jp +wakayama.jp +yamagata.jp +yamaguchi.jp +yamanashi.jp // jp geographic type names // http://jprs.jp/doc/rule/saisoku-1.html -*.aichi.jp -*.akita.jp -*.aomori.jp -*.chiba.jp -*.ehime.jp -*.fukui.jp -*.fukuoka.jp -*.fukushima.jp -*.gifu.jp -*.gunma.jp -*.hiroshima.jp -*.hokkaido.jp -*.hyogo.jp -*.ibaraki.jp -*.ishikawa.jp -*.iwate.jp -*.kagawa.jp -*.kagoshima.jp -*.kanagawa.jp *.kawasaki.jp *.kitakyushu.jp *.kobe.jp -*.kochi.jp -*.kumamoto.jp -*.kyoto.jp -*.mie.jp -*.miyagi.jp -*.miyazaki.jp -*.nagano.jp -*.nagasaki.jp *.nagoya.jp -*.nara.jp -*.niigata.jp -*.oita.jp -*.okayama.jp -*.okinawa.jp -*.osaka.jp -*.saga.jp -*.saitama.jp *.sapporo.jp *.sendai.jp -*.shiga.jp -*.shimane.jp -*.shizuoka.jp -*.tochigi.jp -*.tokushima.jp -*.tokyo.jp -*.tottori.jp -*.toyama.jp -*.wakayama.jp -*.yamagata.jp -*.yamaguchi.jp -*.yamanashi.jp *.yokohama.jp -!metro.tokyo.jp -!pref.aichi.jp -!pref.akita.jp -!pref.aomori.jp -!pref.chiba.jp -!pref.ehime.jp -!pref.fukui.jp -!pref.fukuoka.jp -!pref.fukushima.jp -!pref.gifu.jp -!pref.gunma.jp -!pref.hiroshima.jp -!pref.hokkaido.jp -!pref.hyogo.jp -!pref.ibaraki.jp -!pref.ishikawa.jp -!pref.iwate.jp -!pref.kagawa.jp -!pref.kagoshima.jp -!pref.kanagawa.jp -!pref.kochi.jp -!pref.kumamoto.jp -!pref.kyoto.jp -!pref.mie.jp -!pref.miyagi.jp -!pref.miyazaki.jp -!pref.nagano.jp -!pref.nagasaki.jp -!pref.nara.jp -!pref.niigata.jp -!pref.oita.jp -!pref.okayama.jp -!pref.okinawa.jp -!pref.osaka.jp -!pref.saga.jp -!pref.saitama.jp -!pref.shiga.jp -!pref.shimane.jp -!pref.shizuoka.jp -!pref.tochigi.jp -!pref.tokushima.jp -!pref.tottori.jp -!pref.toyama.jp -!pref.wakayama.jp -!pref.yamagata.jp -!pref.yamaguchi.jp -!pref.yamanashi.jp -!city.chiba.jp -!city.fukuoka.jp -!city.hiroshima.jp !city.kawasaki.jp !city.kitakyushu.jp !city.kobe.jp -!city.kyoto.jp !city.nagoya.jp -!city.niigata.jp -!city.okayama.jp -!city.osaka.jp -!city.saitama.jp !city.sapporo.jp !city.sendai.jp -!city.shizuoka.jp !city.yokohama.jp +// 4th level registration +aisai.aichi.jp +ama.aichi.jp +anjo.aichi.jp +asuke.aichi.jp +chiryu.aichi.jp +chita.aichi.jp +fuso.aichi.jp +gamagori.aichi.jp +handa.aichi.jp +hazu.aichi.jp +hekinan.aichi.jp +higashiura.aichi.jp +ichinomiya.aichi.jp +inazawa.aichi.jp +inuyama.aichi.jp +isshiki.aichi.jp +iwakura.aichi.jp +kanie.aichi.jp +kariya.aichi.jp +kasugai.aichi.jp +kira.aichi.jp +kiyosu.aichi.jp +komaki.aichi.jp +konan.aichi.jp +kota.aichi.jp +mihama.aichi.jp +miyoshi.aichi.jp +nishio.aichi.jp +nisshin.aichi.jp +obu.aichi.jp +oguchi.aichi.jp +oharu.aichi.jp +okazaki.aichi.jp +owariasahi.aichi.jp +seto.aichi.jp +shikatsu.aichi.jp +shinshiro.aichi.jp +shitara.aichi.jp +tahara.aichi.jp +takahama.aichi.jp +tobishima.aichi.jp +toei.aichi.jp +togo.aichi.jp +tokai.aichi.jp +tokoname.aichi.jp +toyoake.aichi.jp +toyohashi.aichi.jp +toyokawa.aichi.jp +toyone.aichi.jp +toyota.aichi.jp +tsushima.aichi.jp +yatomi.aichi.jp +akita.akita.jp +daisen.akita.jp +fujisato.akita.jp +gojome.akita.jp +hachirogata.akita.jp +happou.akita.jp +higashinaruse.akita.jp +honjo.akita.jp +honjyo.akita.jp +ikawa.akita.jp +kamikoani.akita.jp +kamioka.akita.jp +katagami.akita.jp +kazuno.akita.jp +kitaakita.akita.jp +kosaka.akita.jp +kyowa.akita.jp +misato.akita.jp +mitane.akita.jp +moriyoshi.akita.jp +nikaho.akita.jp +noshiro.akita.jp +odate.akita.jp +oga.akita.jp +ogata.akita.jp +semboku.akita.jp +yokote.akita.jp +yurihonjo.akita.jp +aomori.aomori.jp +gonohe.aomori.jp +hachinohe.aomori.jp +hashikami.aomori.jp +hiranai.aomori.jp +hirosaki.aomori.jp +itayanagi.aomori.jp +kuroishi.aomori.jp +misawa.aomori.jp +mutsu.aomori.jp +nakadomari.aomori.jp +noheji.aomori.jp +oirase.aomori.jp +owani.aomori.jp +rokunohe.aomori.jp +sannohe.aomori.jp +shichinohe.aomori.jp +shingo.aomori.jp +takko.aomori.jp +towada.aomori.jp +tsugaru.aomori.jp +tsuruta.aomori.jp +abiko.chiba.jp +asahi.chiba.jp +chonan.chiba.jp +chosei.chiba.jp +choshi.chiba.jp +chuo.chiba.jp +funabashi.chiba.jp +futtsu.chiba.jp +hanamigawa.chiba.jp +ichihara.chiba.jp +ichikawa.chiba.jp +ichinomiya.chiba.jp +inzai.chiba.jp +isumi.chiba.jp +kamagaya.chiba.jp +kamogawa.chiba.jp +kashiwa.chiba.jp +katori.chiba.jp +katsuura.chiba.jp +kimitsu.chiba.jp +kisarazu.chiba.jp +kozaki.chiba.jp +kujukuri.chiba.jp +kyonan.chiba.jp +matsudo.chiba.jp +midori.chiba.jp +mihama.chiba.jp +minamiboso.chiba.jp +mobara.chiba.jp +mutsuzawa.chiba.jp +nagara.chiba.jp +nagareyama.chiba.jp +narashino.chiba.jp +narita.chiba.jp +noda.chiba.jp +oamishirasato.chiba.jp +omigawa.chiba.jp +onjuku.chiba.jp +otaki.chiba.jp +sakae.chiba.jp +sakura.chiba.jp +shimofusa.chiba.jp +shirako.chiba.jp +shiroi.chiba.jp +shisui.chiba.jp +sodegaura.chiba.jp +sosa.chiba.jp +tako.chiba.jp +tateyama.chiba.jp +togane.chiba.jp +tohnosho.chiba.jp +tomisato.chiba.jp +urayasu.chiba.jp +yachimata.chiba.jp +yachiyo.chiba.jp +yokaichiba.chiba.jp +yokoshibahikari.chiba.jp +yotsukaido.chiba.jp +ainan.ehime.jp +honai.ehime.jp +ikata.ehime.jp +imabari.ehime.jp +iyo.ehime.jp +kamijima.ehime.jp +kihoku.ehime.jp +kumakogen.ehime.jp +masaki.ehime.jp +matsuno.ehime.jp +matsuyama.ehime.jp +namikata.ehime.jp +niihama.ehime.jp +ozu.ehime.jp +saijo.ehime.jp +seiyo.ehime.jp +shikokuchuo.ehime.jp +tobe.ehime.jp +toon.ehime.jp +uchiko.ehime.jp +uwajima.ehime.jp +yawatahama.ehime.jp +echizen.fukui.jp +eiheiji.fukui.jp +fukui.fukui.jp +ikeda.fukui.jp +katsuyama.fukui.jp +mihama.fukui.jp +minamiechizen.fukui.jp +obama.fukui.jp +ohi.fukui.jp +ono.fukui.jp +sabae.fukui.jp +sakai.fukui.jp +takahama.fukui.jp +tsuruga.fukui.jp +wakasa.fukui.jp +ashiya.fukuoka.jp +buzen.fukuoka.jp +chikugo.fukuoka.jp +chikuho.fukuoka.jp +chikujo.fukuoka.jp +chikushino.fukuoka.jp +chikuzen.fukuoka.jp +chuo.fukuoka.jp +dazaifu.fukuoka.jp +fukuchi.fukuoka.jp +hakata.fukuoka.jp +higashi.fukuoka.jp +hirokawa.fukuoka.jp +hisayama.fukuoka.jp +iizuka.fukuoka.jp +inatsuki.fukuoka.jp +kaho.fukuoka.jp +kasuga.fukuoka.jp +kasuya.fukuoka.jp +kawara.fukuoka.jp +keisen.fukuoka.jp +koga.fukuoka.jp +kurate.fukuoka.jp +kurogi.fukuoka.jp +kurume.fukuoka.jp +minami.fukuoka.jp +miyako.fukuoka.jp +miyama.fukuoka.jp +miyawaka.fukuoka.jp +mizumaki.fukuoka.jp +munakata.fukuoka.jp +nakagawa.fukuoka.jp +nakama.fukuoka.jp +nishi.fukuoka.jp +nogata.fukuoka.jp +ogori.fukuoka.jp +okagaki.fukuoka.jp +okawa.fukuoka.jp +oki.fukuoka.jp +omuta.fukuoka.jp +onga.fukuoka.jp +onojo.fukuoka.jp +oto.fukuoka.jp +saigawa.fukuoka.jp +sasaguri.fukuoka.jp +shingu.fukuoka.jp +shinyoshitomi.fukuoka.jp +shonai.fukuoka.jp +soeda.fukuoka.jp +sue.fukuoka.jp +tachiarai.fukuoka.jp +tagawa.fukuoka.jp +takata.fukuoka.jp +toho.fukuoka.jp +toyotsu.fukuoka.jp +tsuiki.fukuoka.jp +ukiha.fukuoka.jp +umi.fukuoka.jp +usui.fukuoka.jp +yamada.fukuoka.jp +yame.fukuoka.jp +yanagawa.fukuoka.jp +yukuhashi.fukuoka.jp +aizubange.fukushima.jp +aizumisato.fukushima.jp +aizuwakamatsu.fukushima.jp +asakawa.fukushima.jp +bandai.fukushima.jp +date.fukushima.jp +fukushima.fukushima.jp +furudono.fukushima.jp +futaba.fukushima.jp +hanawa.fukushima.jp +higashi.fukushima.jp +hirata.fukushima.jp +hirono.fukushima.jp +iitate.fukushima.jp +inawashiro.fukushima.jp +ishikawa.fukushima.jp +iwaki.fukushima.jp +izumizaki.fukushima.jp +kagamiishi.fukushima.jp +kaneyama.fukushima.jp +kawamata.fukushima.jp +kitakata.fukushima.jp +kitashiobara.fukushima.jp +koori.fukushima.jp +koriyama.fukushima.jp +kunimi.fukushima.jp +miharu.fukushima.jp +mishima.fukushima.jp +namie.fukushima.jp +nango.fukushima.jp +nishiaizu.fukushima.jp +nishigo.fukushima.jp +okuma.fukushima.jp +omotego.fukushima.jp +ono.fukushima.jp +otama.fukushima.jp +samegawa.fukushima.jp +shimogo.fukushima.jp +shirakawa.fukushima.jp +showa.fukushima.jp +soma.fukushima.jp +sukagawa.fukushima.jp +taishin.fukushima.jp +tamakawa.fukushima.jp +tanagura.fukushima.jp +tenei.fukushima.jp +yabuki.fukushima.jp +yamato.fukushima.jp +yamatsuri.fukushima.jp +yanaizu.fukushima.jp +yugawa.fukushima.jp +anpachi.gifu.jp +ena.gifu.jp +gifu.gifu.jp +ginan.gifu.jp +godo.gifu.jp +gujo.gifu.jp +hashima.gifu.jp +hichiso.gifu.jp +hida.gifu.jp +higashishirakawa.gifu.jp +ibigawa.gifu.jp +ikeda.gifu.jp +kakamigahara.gifu.jp +kani.gifu.jp +kasahara.gifu.jp +kasamatsu.gifu.jp +kawaue.gifu.jp +kitagata.gifu.jp +mino.gifu.jp +minokamo.gifu.jp +mitake.gifu.jp +mizunami.gifu.jp +motosu.gifu.jp +nakatsugawa.gifu.jp +ogaki.gifu.jp +sakahogi.gifu.jp +seki.gifu.jp +sekigahara.gifu.jp +shirakawa.gifu.jp +tajimi.gifu.jp +takayama.gifu.jp +tarui.gifu.jp +toki.gifu.jp +tomika.gifu.jp +wanouchi.gifu.jp +yamagata.gifu.jp +yaotsu.gifu.jp +yoro.gifu.jp +annaka.gunma.jp +chiyoda.gunma.jp +fujioka.gunma.jp +higashiagatsuma.gunma.jp +isesaki.gunma.jp +itakura.gunma.jp +kanna.gunma.jp +kanra.gunma.jp +katashina.gunma.jp +kawaba.gunma.jp +kiryu.gunma.jp +kusatsu.gunma.jp +maebashi.gunma.jp +meiwa.gunma.jp +midori.gunma.jp +minakami.gunma.jp +naganohara.gunma.jp +nakanojo.gunma.jp +nanmoku.gunma.jp +numata.gunma.jp +oizumi.gunma.jp +ora.gunma.jp +ota.gunma.jp +shibukawa.gunma.jp +shimonita.gunma.jp +shinto.gunma.jp +showa.gunma.jp +takasaki.gunma.jp +takayama.gunma.jp +tamamura.gunma.jp +tatebayashi.gunma.jp +tomioka.gunma.jp +tsukiyono.gunma.jp +tsumagoi.gunma.jp +ueno.gunma.jp +yoshioka.gunma.jp +asaminami.hiroshima.jp +daiwa.hiroshima.jp +etajima.hiroshima.jp +fuchu.hiroshima.jp +fukuyama.hiroshima.jp +hatsukaichi.hiroshima.jp +higashihiroshima.hiroshima.jp +hongo.hiroshima.jp +jinsekikogen.hiroshima.jp +kaita.hiroshima.jp +kui.hiroshima.jp +kumano.hiroshima.jp +kure.hiroshima.jp +mihara.hiroshima.jp +miyoshi.hiroshima.jp +naka.hiroshima.jp +onomichi.hiroshima.jp +osakikamijima.hiroshima.jp +otake.hiroshima.jp +saka.hiroshima.jp +sera.hiroshima.jp +seranishi.hiroshima.jp +shinichi.hiroshima.jp +shobara.hiroshima.jp +takehara.hiroshima.jp +abashiri.hokkaido.jp +abira.hokkaido.jp +aibetsu.hokkaido.jp +akabira.hokkaido.jp +akkeshi.hokkaido.jp +asahikawa.hokkaido.jp +ashibetsu.hokkaido.jp +ashoro.hokkaido.jp +assabu.hokkaido.jp +atsuma.hokkaido.jp +bibai.hokkaido.jp +biei.hokkaido.jp +bifuka.hokkaido.jp +bihoro.hokkaido.jp +biratori.hokkaido.jp +chippubetsu.hokkaido.jp +chitose.hokkaido.jp +date.hokkaido.jp +ebetsu.hokkaido.jp +embetsu.hokkaido.jp +eniwa.hokkaido.jp +erimo.hokkaido.jp +esan.hokkaido.jp +esashi.hokkaido.jp +fukagawa.hokkaido.jp +fukushima.hokkaido.jp +furano.hokkaido.jp +furubira.hokkaido.jp +haboro.hokkaido.jp +hakodate.hokkaido.jp +hamatonbetsu.hokkaido.jp +hidaka.hokkaido.jp +higashikagura.hokkaido.jp +higashikawa.hokkaido.jp +hiroo.hokkaido.jp +hokuryu.hokkaido.jp +hokuto.hokkaido.jp +honbetsu.hokkaido.jp +horokanai.hokkaido.jp +horonobe.hokkaido.jp +ikeda.hokkaido.jp +imakane.hokkaido.jp +ishikari.hokkaido.jp +iwamizawa.hokkaido.jp +iwanai.hokkaido.jp +kamifurano.hokkaido.jp +kamikawa.hokkaido.jp +kamishihoro.hokkaido.jp +kamisunagawa.hokkaido.jp +kamoenai.hokkaido.jp +kayabe.hokkaido.jp +kembuchi.hokkaido.jp +kikonai.hokkaido.jp +kimobetsu.hokkaido.jp +kitahiroshima.hokkaido.jp +kitami.hokkaido.jp +kiyosato.hokkaido.jp +koshimizu.hokkaido.jp +kunneppu.hokkaido.jp +kuriyama.hokkaido.jp +kuromatsunai.hokkaido.jp +kushiro.hokkaido.jp +kutchan.hokkaido.jp +kyowa.hokkaido.jp +mashike.hokkaido.jp +matsumae.hokkaido.jp +mikasa.hokkaido.jp +minamifurano.hokkaido.jp +mombetsu.hokkaido.jp +moseushi.hokkaido.jp +mukawa.hokkaido.jp +muroran.hokkaido.jp +naie.hokkaido.jp +nakagawa.hokkaido.jp +nakasatsunai.hokkaido.jp +nakatombetsu.hokkaido.jp +nanae.hokkaido.jp +nanporo.hokkaido.jp +nayoro.hokkaido.jp +nemuro.hokkaido.jp +niikappu.hokkaido.jp +niki.hokkaido.jp +nishiokoppe.hokkaido.jp +noboribetsu.hokkaido.jp +numata.hokkaido.jp +obihiro.hokkaido.jp +obira.hokkaido.jp +oketo.hokkaido.jp +okoppe.hokkaido.jp +otaru.hokkaido.jp +otobe.hokkaido.jp +otofuke.hokkaido.jp +otoineppu.hokkaido.jp +oumu.hokkaido.jp +ozora.hokkaido.jp +pippu.hokkaido.jp +rankoshi.hokkaido.jp +rebun.hokkaido.jp +rikubetsu.hokkaido.jp +rishiri.hokkaido.jp +rishirifuji.hokkaido.jp +saroma.hokkaido.jp +sarufutsu.hokkaido.jp +shakotan.hokkaido.jp +shari.hokkaido.jp +shibecha.hokkaido.jp +shibetsu.hokkaido.jp +shikabe.hokkaido.jp +shikaoi.hokkaido.jp +shimamaki.hokkaido.jp +shimizu.hokkaido.jp +shimokawa.hokkaido.jp +shinshinotsu.hokkaido.jp +shintoku.hokkaido.jp +shiranuka.hokkaido.jp +shiraoi.hokkaido.jp +shiriuchi.hokkaido.jp +sobetsu.hokkaido.jp +sunagawa.hokkaido.jp +taiki.hokkaido.jp +takasu.hokkaido.jp +takikawa.hokkaido.jp +takinoue.hokkaido.jp +teshikaga.hokkaido.jp +tobetsu.hokkaido.jp +tohma.hokkaido.jp +tomakomai.hokkaido.jp +tomari.hokkaido.jp +toya.hokkaido.jp +toyako.hokkaido.jp +toyotomi.hokkaido.jp +toyoura.hokkaido.jp +tsubetsu.hokkaido.jp +tsukigata.hokkaido.jp +urakawa.hokkaido.jp +urausu.hokkaido.jp +uryu.hokkaido.jp +utashinai.hokkaido.jp +wakkanai.hokkaido.jp +wassamu.hokkaido.jp +yakumo.hokkaido.jp +yoichi.hokkaido.jp +aioi.hyogo.jp +akashi.hyogo.jp +ako.hyogo.jp +amagasaki.hyogo.jp +aogaki.hyogo.jp +asago.hyogo.jp +ashiya.hyogo.jp +awaji.hyogo.jp +fukusaki.hyogo.jp +goshiki.hyogo.jp +harima.hyogo.jp +himeji.hyogo.jp +ichikawa.hyogo.jp +inagawa.hyogo.jp +itami.hyogo.jp +kakogawa.hyogo.jp +kamigori.hyogo.jp +kamikawa.hyogo.jp +kasai.hyogo.jp +kasuga.hyogo.jp +kawanishi.hyogo.jp +miki.hyogo.jp +minamiawaji.hyogo.jp +nishinomiya.hyogo.jp +nishiwaki.hyogo.jp +ono.hyogo.jp +sanda.hyogo.jp +sannan.hyogo.jp +sasayama.hyogo.jp +sayo.hyogo.jp +shingu.hyogo.jp +shinonsen.hyogo.jp +shiso.hyogo.jp +sumoto.hyogo.jp +taishi.hyogo.jp +taka.hyogo.jp +takarazuka.hyogo.jp +takasago.hyogo.jp +takino.hyogo.jp +tamba.hyogo.jp +tatsuno.hyogo.jp +toyooka.hyogo.jp +yabu.hyogo.jp +yashiro.hyogo.jp +yoka.hyogo.jp +yokawa.hyogo.jp +ami.ibaraki.jp +asahi.ibaraki.jp +bando.ibaraki.jp +chikusei.ibaraki.jp +daigo.ibaraki.jp +fujishiro.ibaraki.jp +hitachi.ibaraki.jp +hitachinaka.ibaraki.jp +hitachiomiya.ibaraki.jp +hitachiota.ibaraki.jp +ibaraki.ibaraki.jp +ina.ibaraki.jp +inashiki.ibaraki.jp +itako.ibaraki.jp +iwama.ibaraki.jp +joso.ibaraki.jp +kamisu.ibaraki.jp +kasama.ibaraki.jp +kashima.ibaraki.jp +kasumigaura.ibaraki.jp +koga.ibaraki.jp +miho.ibaraki.jp +mito.ibaraki.jp +moriya.ibaraki.jp +naka.ibaraki.jp +namegata.ibaraki.jp +oarai.ibaraki.jp +ogawa.ibaraki.jp +omitama.ibaraki.jp +ryugasaki.ibaraki.jp +sakai.ibaraki.jp +sakuragawa.ibaraki.jp +shimodate.ibaraki.jp +shimotsuma.ibaraki.jp +shirosato.ibaraki.jp +sowa.ibaraki.jp +suifu.ibaraki.jp +takahagi.ibaraki.jp +tamatsukuri.ibaraki.jp +tokai.ibaraki.jp +tomobe.ibaraki.jp +tone.ibaraki.jp +toride.ibaraki.jp +tsuchiura.ibaraki.jp +tsukuba.ibaraki.jp +uchihara.ibaraki.jp +ushiku.ibaraki.jp +yachiyo.ibaraki.jp +yamagata.ibaraki.jp +yawara.ibaraki.jp +yuki.ibaraki.jp +anamizu.ishikawa.jp +hakui.ishikawa.jp +hakusan.ishikawa.jp +kaga.ishikawa.jp +kahoku.ishikawa.jp +kanazawa.ishikawa.jp +kawakita.ishikawa.jp +komatsu.ishikawa.jp +nakanoto.ishikawa.jp +nanao.ishikawa.jp +nomi.ishikawa.jp +nonoichi.ishikawa.jp +noto.ishikawa.jp +shika.ishikawa.jp +suzu.ishikawa.jp +tsubata.ishikawa.jp +tsurugi.ishikawa.jp +uchinada.ishikawa.jp +wajima.ishikawa.jp +fudai.iwate.jp +fujisawa.iwate.jp +hanamaki.iwate.jp +hiraizumi.iwate.jp +hirono.iwate.jp +ichinohe.iwate.jp +ichinoseki.iwate.jp +iwaizumi.iwate.jp +iwate.iwate.jp +joboji.iwate.jp +kamaishi.iwate.jp +kanegasaki.iwate.jp +karumai.iwate.jp +kawai.iwate.jp +kitakami.iwate.jp +kuji.iwate.jp +kunohe.iwate.jp +kuzumaki.iwate.jp +miyako.iwate.jp +mizusawa.iwate.jp +morioka.iwate.jp +ninohe.iwate.jp +noda.iwate.jp +ofunato.iwate.jp +oshu.iwate.jp +otsuchi.iwate.jp +rikuzentakata.iwate.jp +shiwa.iwate.jp +shizukuishi.iwate.jp +sumita.iwate.jp +tanohata.iwate.jp +tono.iwate.jp +yahaba.iwate.jp +yamada.iwate.jp +ayagawa.kagawa.jp +higashikagawa.kagawa.jp +kanonji.kagawa.jp +kotohira.kagawa.jp +manno.kagawa.jp +marugame.kagawa.jp +mitoyo.kagawa.jp +naoshima.kagawa.jp +sanuki.kagawa.jp +tadotsu.kagawa.jp +takamatsu.kagawa.jp +tonosho.kagawa.jp +uchinomi.kagawa.jp +utazu.kagawa.jp +zentsuji.kagawa.jp +akune.kagoshima.jp +amami.kagoshima.jp +hioki.kagoshima.jp +isa.kagoshima.jp +isen.kagoshima.jp +izumi.kagoshima.jp +kagoshima.kagoshima.jp +kanoya.kagoshima.jp +kawanabe.kagoshima.jp +kinko.kagoshima.jp +kouyama.kagoshima.jp +makurazaki.kagoshima.jp +matsumoto.kagoshima.jp +minamitane.kagoshima.jp +nakatane.kagoshima.jp +nishinoomote.kagoshima.jp +satsumasendai.kagoshima.jp +soo.kagoshima.jp +tarumizu.kagoshima.jp +yusui.kagoshima.jp +aikawa.kanagawa.jp +atsugi.kanagawa.jp +ayase.kanagawa.jp +chigasaki.kanagawa.jp +ebina.kanagawa.jp +fujisawa.kanagawa.jp +hadano.kanagawa.jp +hakone.kanagawa.jp +hiratsuka.kanagawa.jp +isehara.kanagawa.jp +kaisei.kanagawa.jp +kamakura.kanagawa.jp +kiyokawa.kanagawa.jp +matsuda.kanagawa.jp +minamiashigara.kanagawa.jp +miura.kanagawa.jp +nakai.kanagawa.jp +ninomiya.kanagawa.jp +odawara.kanagawa.jp +oi.kanagawa.jp +oiso.kanagawa.jp +sagamihara.kanagawa.jp +samukawa.kanagawa.jp +tsukui.kanagawa.jp +yamakita.kanagawa.jp +yamato.kanagawa.jp +yokosuka.kanagawa.jp +yugawara.kanagawa.jp +zama.kanagawa.jp +zushi.kanagawa.jp +aki.kochi.jp +geisei.kochi.jp +hidaka.kochi.jp +higashitsuno.kochi.jp +ino.kochi.jp +kagami.kochi.jp +kami.kochi.jp +kitagawa.kochi.jp +kochi.kochi.jp +mihara.kochi.jp +motoyama.kochi.jp +muroto.kochi.jp +nahari.kochi.jp +nakamura.kochi.jp +nankoku.kochi.jp +nishitosa.kochi.jp +niyodogawa.kochi.jp +ochi.kochi.jp +okawa.kochi.jp +otoyo.kochi.jp +otsuki.kochi.jp +sakawa.kochi.jp +sukumo.kochi.jp +susaki.kochi.jp +tosa.kochi.jp +tosashimizu.kochi.jp +toyo.kochi.jp +tsuno.kochi.jp +umaji.kochi.jp +yasuda.kochi.jp +yusuhara.kochi.jp +amakusa.kumamoto.jp +arao.kumamoto.jp +aso.kumamoto.jp +choyo.kumamoto.jp +gyokuto.kumamoto.jp +hitoyoshi.kumamoto.jp +kamiamakusa.kumamoto.jp +kashima.kumamoto.jp +kikuchi.kumamoto.jp +kosa.kumamoto.jp +kumamoto.kumamoto.jp +mashiki.kumamoto.jp +mifune.kumamoto.jp +minamata.kumamoto.jp +minamioguni.kumamoto.jp +nagasu.kumamoto.jp +nishihara.kumamoto.jp +oguni.kumamoto.jp +ozu.kumamoto.jp +sumoto.kumamoto.jp +takamori.kumamoto.jp +uki.kumamoto.jp +uto.kumamoto.jp +yamaga.kumamoto.jp +yamato.kumamoto.jp +yatsushiro.kumamoto.jp +ayabe.kyoto.jp +fukuchiyama.kyoto.jp +higashiyama.kyoto.jp +ide.kyoto.jp +ine.kyoto.jp +joyo.kyoto.jp +kameoka.kyoto.jp +kamo.kyoto.jp +kita.kyoto.jp +kizu.kyoto.jp +kumiyama.kyoto.jp +kyotamba.kyoto.jp +kyotanabe.kyoto.jp +kyotango.kyoto.jp +maizuru.kyoto.jp +minami.kyoto.jp +minamiyamashiro.kyoto.jp +miyazu.kyoto.jp +muko.kyoto.jp +nagaokakyo.kyoto.jp +nakagyo.kyoto.jp +nantan.kyoto.jp +oyamazaki.kyoto.jp +sakyo.kyoto.jp +seika.kyoto.jp +tanabe.kyoto.jp +uji.kyoto.jp +ujitawara.kyoto.jp +wazuka.kyoto.jp +yamashina.kyoto.jp +yawata.kyoto.jp +asahi.mie.jp +inabe.mie.jp +ise.mie.jp +kameyama.mie.jp +kawagoe.mie.jp +kiho.mie.jp +kisosaki.mie.jp +kiwa.mie.jp +komono.mie.jp +kumano.mie.jp +kuwana.mie.jp +matsusaka.mie.jp +meiwa.mie.jp +mihama.mie.jp +minamiise.mie.jp +misugi.mie.jp +miyama.mie.jp +nabari.mie.jp +shima.mie.jp +suzuka.mie.jp +tado.mie.jp +taiki.mie.jp +taki.mie.jp +tamaki.mie.jp +toba.mie.jp +tsu.mie.jp +udono.mie.jp +ureshino.mie.jp +watarai.mie.jp +yokkaichi.mie.jp +furukawa.miyagi.jp +higashimatsushima.miyagi.jp +ishinomaki.miyagi.jp +iwanuma.miyagi.jp +kakuda.miyagi.jp +kami.miyagi.jp +kawasaki.miyagi.jp +kesennuma.miyagi.jp +marumori.miyagi.jp +matsushima.miyagi.jp +minamisanriku.miyagi.jp +misato.miyagi.jp +murata.miyagi.jp +natori.miyagi.jp +ogawara.miyagi.jp +ohira.miyagi.jp +onagawa.miyagi.jp +osaki.miyagi.jp +rifu.miyagi.jp +semine.miyagi.jp +shibata.miyagi.jp +shichikashuku.miyagi.jp +shikama.miyagi.jp +shiogama.miyagi.jp +shiroishi.miyagi.jp +tagajo.miyagi.jp +taiwa.miyagi.jp +tome.miyagi.jp +tomiya.miyagi.jp +wakuya.miyagi.jp +watari.miyagi.jp +yamamoto.miyagi.jp +zao.miyagi.jp +aya.miyazaki.jp +ebino.miyazaki.jp +gokase.miyazaki.jp +hyuga.miyazaki.jp +kadogawa.miyazaki.jp +kawaminami.miyazaki.jp +kijo.miyazaki.jp +kitagawa.miyazaki.jp +kitakata.miyazaki.jp +kitaura.miyazaki.jp +kobayashi.miyazaki.jp +kunitomi.miyazaki.jp +kushima.miyazaki.jp +mimata.miyazaki.jp +miyakonojo.miyazaki.jp +miyazaki.miyazaki.jp +morotsuka.miyazaki.jp +nichinan.miyazaki.jp +nishimera.miyazaki.jp +nobeoka.miyazaki.jp +saito.miyazaki.jp +shiiba.miyazaki.jp +shintomi.miyazaki.jp +takaharu.miyazaki.jp +takanabe.miyazaki.jp +takazaki.miyazaki.jp +tsuno.miyazaki.jp +achi.nagano.jp +agematsu.nagano.jp +anan.nagano.jp +aoki.nagano.jp +asahi.nagano.jp +azumino.nagano.jp +chikuhoku.nagano.jp +chikuma.nagano.jp +chino.nagano.jp +fujimi.nagano.jp +hakuba.nagano.jp +hara.nagano.jp +hiraya.nagano.jp +iida.nagano.jp +iijima.nagano.jp +iiyama.nagano.jp +iizuna.nagano.jp +ikeda.nagano.jp +ikusaka.nagano.jp +ina.nagano.jp +karuizawa.nagano.jp +kawakami.nagano.jp +kiso.nagano.jp +kisofukushima.nagano.jp +kitaaiki.nagano.jp +komagane.nagano.jp +komoro.nagano.jp +matsukawa.nagano.jp +matsumoto.nagano.jp +miasa.nagano.jp +minamiaiki.nagano.jp +minamimaki.nagano.jp +minamiminowa.nagano.jp +minowa.nagano.jp +miyada.nagano.jp +miyota.nagano.jp +mochizuki.nagano.jp +nagano.nagano.jp +nagawa.nagano.jp +nagiso.nagano.jp +nakagawa.nagano.jp +nakano.nagano.jp +nozawaonsen.nagano.jp +obuse.nagano.jp +ogawa.nagano.jp +okaya.nagano.jp +omachi.nagano.jp +omi.nagano.jp +ookuwa.nagano.jp +ooshika.nagano.jp +otaki.nagano.jp +otari.nagano.jp +sakae.nagano.jp +sakaki.nagano.jp +saku.nagano.jp +sakuho.nagano.jp +shimosuwa.nagano.jp +shinanomachi.nagano.jp +shiojiri.nagano.jp +suwa.nagano.jp +suzaka.nagano.jp +takagi.nagano.jp +takamori.nagano.jp +takayama.nagano.jp +tateshina.nagano.jp +tatsuno.nagano.jp +togakushi.nagano.jp +togura.nagano.jp +tomi.nagano.jp +ueda.nagano.jp +wada.nagano.jp +yamagata.nagano.jp +yamanouchi.nagano.jp +yasaka.nagano.jp +yasuoka.nagano.jp +chijiwa.nagasaki.jp +futsu.nagasaki.jp +goto.nagasaki.jp +hasami.nagasaki.jp +hirado.nagasaki.jp +iki.nagasaki.jp +isahaya.nagasaki.jp +kawatana.nagasaki.jp +kuchinotsu.nagasaki.jp +matsuura.nagasaki.jp +nagasaki.nagasaki.jp +obama.nagasaki.jp +omura.nagasaki.jp +oseto.nagasaki.jp +saikai.nagasaki.jp +sasebo.nagasaki.jp +seihi.nagasaki.jp +shimabara.nagasaki.jp +shinkamigoto.nagasaki.jp +togitsu.nagasaki.jp +tsushima.nagasaki.jp +unzen.nagasaki.jp +ando.nara.jp +gose.nara.jp +heguri.nara.jp +higashiyoshino.nara.jp +ikaruga.nara.jp +ikoma.nara.jp +kamikitayama.nara.jp +kanmaki.nara.jp +kashiba.nara.jp +kashihara.nara.jp +katsuragi.nara.jp +kawai.nara.jp +kawakami.nara.jp +kawanishi.nara.jp +koryo.nara.jp +kurotaki.nara.jp +mitsue.nara.jp +miyake.nara.jp +nara.nara.jp +nosegawa.nara.jp +oji.nara.jp +ouda.nara.jp +oyodo.nara.jp +sakurai.nara.jp +sango.nara.jp +shimoichi.nara.jp +shimokitayama.nara.jp +shinjo.nara.jp +soni.nara.jp +takatori.nara.jp +tawaramoto.nara.jp +tenkawa.nara.jp +tenri.nara.jp +uda.nara.jp +yamatokoriyama.nara.jp +yamatotakada.nara.jp +yamazoe.nara.jp +yoshino.nara.jp +aga.niigata.jp +agano.niigata.jp +gosen.niigata.jp +itoigawa.niigata.jp +izumozaki.niigata.jp +joetsu.niigata.jp +kamo.niigata.jp +kariwa.niigata.jp +kashiwazaki.niigata.jp +minamiuonuma.niigata.jp +mitsuke.niigata.jp +muika.niigata.jp +murakami.niigata.jp +myoko.niigata.jp +nagaoka.niigata.jp +niigata.niigata.jp +ojiya.niigata.jp +omi.niigata.jp +sado.niigata.jp +sanjo.niigata.jp +seiro.niigata.jp +seirou.niigata.jp +sekikawa.niigata.jp +shibata.niigata.jp +tagami.niigata.jp +tainai.niigata.jp +tochio.niigata.jp +tokamachi.niigata.jp +tsubame.niigata.jp +tsunan.niigata.jp +uonuma.niigata.jp +yahiko.niigata.jp +yoita.niigata.jp +yuzawa.niigata.jp +beppu.oita.jp +bungoono.oita.jp +bungotakada.oita.jp +hasama.oita.jp +hiji.oita.jp +himeshima.oita.jp +hita.oita.jp +kamitsue.oita.jp +kokonoe.oita.jp +kuju.oita.jp +kunisaki.oita.jp +kusu.oita.jp +oita.oita.jp +saiki.oita.jp +taketa.oita.jp +tsukumi.oita.jp +usa.oita.jp +usuki.oita.jp +yufu.oita.jp +akaiwa.okayama.jp +asakuchi.okayama.jp +bizen.okayama.jp +hayashima.okayama.jp +ibara.okayama.jp +kagamino.okayama.jp +kasaoka.okayama.jp +kibichuo.okayama.jp +kumenan.okayama.jp +kurashiki.okayama.jp +maniwa.okayama.jp +misaki.okayama.jp +nagi.okayama.jp +niimi.okayama.jp +nishiawakura.okayama.jp +okayama.okayama.jp +satosho.okayama.jp +setouchi.okayama.jp +shinjo.okayama.jp +shoo.okayama.jp +soja.okayama.jp +takahashi.okayama.jp +tamano.okayama.jp +tsuyama.okayama.jp +wake.okayama.jp +yakage.okayama.jp +aguni.okinawa.jp +ginowan.okinawa.jp +ginoza.okinawa.jp +gushikami.okinawa.jp +haebaru.okinawa.jp +higashi.okinawa.jp +hirara.okinawa.jp +iheya.okinawa.jp +ishigaki.okinawa.jp +ishikawa.okinawa.jp +itoman.okinawa.jp +izena.okinawa.jp +kadena.okinawa.jp +kin.okinawa.jp +kitadaito.okinawa.jp +kitanakagusuku.okinawa.jp +kumejima.okinawa.jp +kunigami.okinawa.jp +minamidaito.okinawa.jp +motobu.okinawa.jp +nago.okinawa.jp +naha.okinawa.jp +nakagusuku.okinawa.jp +nakijin.okinawa.jp +nanjo.okinawa.jp +nishihara.okinawa.jp +ogimi.okinawa.jp +okinawa.okinawa.jp +onna.okinawa.jp +shimoji.okinawa.jp +taketomi.okinawa.jp +tarama.okinawa.jp +tokashiki.okinawa.jp +tomigusuku.okinawa.jp +tonaki.okinawa.jp +urasoe.okinawa.jp +uruma.okinawa.jp +yaese.okinawa.jp +yomitan.okinawa.jp +yonabaru.okinawa.jp +yonaguni.okinawa.jp +zamami.okinawa.jp +abeno.osaka.jp +chihayaakasaka.osaka.jp +chuo.osaka.jp +daito.osaka.jp +fujiidera.osaka.jp +habikino.osaka.jp +hannan.osaka.jp +higashiosaka.osaka.jp +higashisumiyoshi.osaka.jp +higashiyodogawa.osaka.jp +hirakata.osaka.jp +ibaraki.osaka.jp +ikeda.osaka.jp +izumi.osaka.jp +izumiotsu.osaka.jp +izumisano.osaka.jp +kadoma.osaka.jp +kaizuka.osaka.jp +kanan.osaka.jp +kashiwara.osaka.jp +katano.osaka.jp +kawachinagano.osaka.jp +kishiwada.osaka.jp +kita.osaka.jp +kumatori.osaka.jp +matsubara.osaka.jp +minato.osaka.jp +minoh.osaka.jp +misaki.osaka.jp +moriguchi.osaka.jp +neyagawa.osaka.jp +nishi.osaka.jp +nose.osaka.jp +osakasayama.osaka.jp +sakai.osaka.jp +sayama.osaka.jp +sennan.osaka.jp +settsu.osaka.jp +shijonawate.osaka.jp +shimamoto.osaka.jp +suita.osaka.jp +tadaoka.osaka.jp +taishi.osaka.jp +tajiri.osaka.jp +takaishi.osaka.jp +takatsuki.osaka.jp +tondabayashi.osaka.jp +toyonaka.osaka.jp +toyono.osaka.jp +yao.osaka.jp +ariake.saga.jp +arita.saga.jp +fukudomi.saga.jp +genkai.saga.jp +hamatama.saga.jp +hizen.saga.jp +imari.saga.jp +kamimine.saga.jp +kanzaki.saga.jp +karatsu.saga.jp +kashima.saga.jp +kitagata.saga.jp +kitahata.saga.jp +kiyama.saga.jp +kouhoku.saga.jp +kyuragi.saga.jp +nishiarita.saga.jp +ogi.saga.jp +omachi.saga.jp +ouchi.saga.jp +saga.saga.jp +shiroishi.saga.jp +taku.saga.jp +tara.saga.jp +tosu.saga.jp +yoshinogari.saga.jp +arakawa.saitama.jp +asaka.saitama.jp +chichibu.saitama.jp +fujimi.saitama.jp +fujimino.saitama.jp +fukaya.saitama.jp +hanno.saitama.jp +hanyu.saitama.jp +hasuda.saitama.jp +hatogaya.saitama.jp +hatoyama.saitama.jp +hidaka.saitama.jp +higashichichibu.saitama.jp +higashimatsuyama.saitama.jp +honjo.saitama.jp +ina.saitama.jp +iruma.saitama.jp +iwatsuki.saitama.jp +kamiizumi.saitama.jp +kamikawa.saitama.jp +kamisato.saitama.jp +kasukabe.saitama.jp +kawagoe.saitama.jp +kawaguchi.saitama.jp +kawajima.saitama.jp +kazo.saitama.jp +kitamoto.saitama.jp +koshigaya.saitama.jp +kounosu.saitama.jp +kuki.saitama.jp +kumagaya.saitama.jp +matsubushi.saitama.jp +minano.saitama.jp +misato.saitama.jp +miyashiro.saitama.jp +miyoshi.saitama.jp +moroyama.saitama.jp +nagatoro.saitama.jp +namegawa.saitama.jp +niiza.saitama.jp +ogano.saitama.jp +ogawa.saitama.jp +ogose.saitama.jp +okegawa.saitama.jp +omiya.saitama.jp +otaki.saitama.jp +ranzan.saitama.jp +ryokami.saitama.jp +saitama.saitama.jp +sakado.saitama.jp +satte.saitama.jp +sayama.saitama.jp +shiki.saitama.jp +shiraoka.saitama.jp +soka.saitama.jp +sugito.saitama.jp +toda.saitama.jp +tokigawa.saitama.jp +tokorozawa.saitama.jp +tsurugashima.saitama.jp +urawa.saitama.jp +warabi.saitama.jp +yashio.saitama.jp +yokoze.saitama.jp +yono.saitama.jp +yorii.saitama.jp +yoshida.saitama.jp +yoshikawa.saitama.jp +yoshimi.saitama.jp +aisho.shiga.jp +gamo.shiga.jp +higashiomi.shiga.jp +hikone.shiga.jp +koka.shiga.jp +konan.shiga.jp +kosei.shiga.jp +koto.shiga.jp +kusatsu.shiga.jp +maibara.shiga.jp +moriyama.shiga.jp +nagahama.shiga.jp +nishiazai.shiga.jp +notogawa.shiga.jp +omihachiman.shiga.jp +otsu.shiga.jp +ritto.shiga.jp +ryuoh.shiga.jp +takashima.shiga.jp +takatsuki.shiga.jp +torahime.shiga.jp +toyosato.shiga.jp +yasu.shiga.jp +akagi.shimane.jp +ama.shimane.jp +gotsu.shimane.jp +hamada.shimane.jp +higashiizumo.shimane.jp +hikawa.shimane.jp +hikimi.shimane.jp +izumo.shimane.jp +kakinoki.shimane.jp +masuda.shimane.jp +matsue.shimane.jp +misato.shimane.jp +nishinoshima.shimane.jp +ohda.shimane.jp +okinoshima.shimane.jp +okuizumo.shimane.jp +shimane.shimane.jp +tamayu.shimane.jp +tsuwano.shimane.jp +unnan.shimane.jp +yakumo.shimane.jp +yasugi.shimane.jp +yatsuka.shimane.jp +arai.shizuoka.jp +atami.shizuoka.jp +fuji.shizuoka.jp +fujieda.shizuoka.jp +fujikawa.shizuoka.jp +fujinomiya.shizuoka.jp +fukuroi.shizuoka.jp +gotemba.shizuoka.jp +haibara.shizuoka.jp +hamamatsu.shizuoka.jp +higashiizu.shizuoka.jp +ito.shizuoka.jp +iwata.shizuoka.jp +izu.shizuoka.jp +izunokuni.shizuoka.jp +kakegawa.shizuoka.jp +kannami.shizuoka.jp +kawanehon.shizuoka.jp +kawazu.shizuoka.jp +kikugawa.shizuoka.jp +kosai.shizuoka.jp +makinohara.shizuoka.jp +matsuzaki.shizuoka.jp +minamiizu.shizuoka.jp +mishima.shizuoka.jp +morimachi.shizuoka.jp +nishiizu.shizuoka.jp +numazu.shizuoka.jp +omaezaki.shizuoka.jp +shimada.shizuoka.jp +shimizu.shizuoka.jp +shimoda.shizuoka.jp +shizuoka.shizuoka.jp +susono.shizuoka.jp +yaizu.shizuoka.jp +yoshida.shizuoka.jp +ashikaga.tochigi.jp +bato.tochigi.jp +haga.tochigi.jp +ichikai.tochigi.jp +iwafune.tochigi.jp +kaminokawa.tochigi.jp +kanuma.tochigi.jp +karasuyama.tochigi.jp +kuroiso.tochigi.jp +mashiko.tochigi.jp +mibu.tochigi.jp +moka.tochigi.jp +motegi.tochigi.jp +nasu.tochigi.jp +nasushiobara.tochigi.jp +nikko.tochigi.jp +nishikata.tochigi.jp +nogi.tochigi.jp +ohira.tochigi.jp +ohtawara.tochigi.jp +oyama.tochigi.jp +sakura.tochigi.jp +sano.tochigi.jp +shimotsuke.tochigi.jp +shioya.tochigi.jp +takanezawa.tochigi.jp +tochigi.tochigi.jp +tsuga.tochigi.jp +ujiie.tochigi.jp +utsunomiya.tochigi.jp +yaita.tochigi.jp +aizumi.tokushima.jp +anan.tokushima.jp +ichiba.tokushima.jp +itano.tokushima.jp +kainan.tokushima.jp +komatsushima.tokushima.jp +matsushige.tokushima.jp +mima.tokushima.jp +minami.tokushima.jp +miyoshi.tokushima.jp +mugi.tokushima.jp +nakagawa.tokushima.jp +naruto.tokushima.jp +sanagochi.tokushima.jp +shishikui.tokushima.jp +tokushima.tokushima.jp +wajiki.tokushima.jp +adachi.tokyo.jp +akiruno.tokyo.jp +akishima.tokyo.jp +aogashima.tokyo.jp +arakawa.tokyo.jp +bunkyo.tokyo.jp +chiyoda.tokyo.jp +chofu.tokyo.jp +chuo.tokyo.jp +edogawa.tokyo.jp +fuchu.tokyo.jp +fussa.tokyo.jp +hachijo.tokyo.jp +hachioji.tokyo.jp +hamura.tokyo.jp +higashikurume.tokyo.jp +higashimurayama.tokyo.jp +higashiyamato.tokyo.jp +hino.tokyo.jp +hinode.tokyo.jp +hinohara.tokyo.jp +inagi.tokyo.jp +itabashi.tokyo.jp +katsushika.tokyo.jp +kita.tokyo.jp +kiyose.tokyo.jp +kodaira.tokyo.jp +koganei.tokyo.jp +kokubunji.tokyo.jp +komae.tokyo.jp +koto.tokyo.jp +kouzushima.tokyo.jp +kunitachi.tokyo.jp +machida.tokyo.jp +meguro.tokyo.jp +minato.tokyo.jp +mitaka.tokyo.jp +mizuho.tokyo.jp +musashimurayama.tokyo.jp +musashino.tokyo.jp +nakano.tokyo.jp +nerima.tokyo.jp +ogasawara.tokyo.jp +okutama.tokyo.jp +ome.tokyo.jp +oshima.tokyo.jp +ota.tokyo.jp +setagaya.tokyo.jp +shibuya.tokyo.jp +shinagawa.tokyo.jp +shinjuku.tokyo.jp +suginami.tokyo.jp +sumida.tokyo.jp +tachikawa.tokyo.jp +taito.tokyo.jp +tama.tokyo.jp +toshima.tokyo.jp +chizu.tottori.jp +hino.tottori.jp +kawahara.tottori.jp +koge.tottori.jp +kotoura.tottori.jp +misasa.tottori.jp +nanbu.tottori.jp +nichinan.tottori.jp +sakaiminato.tottori.jp +tottori.tottori.jp +wakasa.tottori.jp +yazu.tottori.jp +yonago.tottori.jp +asahi.toyama.jp +fuchu.toyama.jp +fukumitsu.toyama.jp +funahashi.toyama.jp +himi.toyama.jp +imizu.toyama.jp +inami.toyama.jp +johana.toyama.jp +kamiichi.toyama.jp +kurobe.toyama.jp +nakaniikawa.toyama.jp +namerikawa.toyama.jp +nanto.toyama.jp +nyuzen.toyama.jp +oyabe.toyama.jp +taira.toyama.jp +takaoka.toyama.jp +tateyama.toyama.jp +toga.toyama.jp +tonami.toyama.jp +toyama.toyama.jp +unazuki.toyama.jp +uozu.toyama.jp +yamada.toyama.jp +arida.wakayama.jp +aridagawa.wakayama.jp +gobo.wakayama.jp +hashimoto.wakayama.jp +hidaka.wakayama.jp +hirogawa.wakayama.jp +inami.wakayama.jp +iwade.wakayama.jp +kainan.wakayama.jp +kamitonda.wakayama.jp +katsuragi.wakayama.jp +kimino.wakayama.jp +kinokawa.wakayama.jp +kitayama.wakayama.jp +koya.wakayama.jp +koza.wakayama.jp +kozagawa.wakayama.jp +kudoyama.wakayama.jp +kushimoto.wakayama.jp +mihama.wakayama.jp +misato.wakayama.jp +nachikatsuura.wakayama.jp +shingu.wakayama.jp +shirahama.wakayama.jp +taiji.wakayama.jp +tanabe.wakayama.jp +wakayama.wakayama.jp +yuasa.wakayama.jp +yura.wakayama.jp +asahi.yamagata.jp +funagata.yamagata.jp +higashine.yamagata.jp +iide.yamagata.jp +kahoku.yamagata.jp +kaminoyama.yamagata.jp +kaneyama.yamagata.jp +kawanishi.yamagata.jp +mamurogawa.yamagata.jp +mikawa.yamagata.jp +murayama.yamagata.jp +nagai.yamagata.jp +nakayama.yamagata.jp +nanyo.yamagata.jp +nishikawa.yamagata.jp +obanazawa.yamagata.jp +oe.yamagata.jp +oguni.yamagata.jp +ohkura.yamagata.jp +oishida.yamagata.jp +sagae.yamagata.jp +sakata.yamagata.jp +sakegawa.yamagata.jp +shinjo.yamagata.jp +shirataka.yamagata.jp +shonai.yamagata.jp +takahata.yamagata.jp +tendo.yamagata.jp +tozawa.yamagata.jp +tsuruoka.yamagata.jp +yamagata.yamagata.jp +yamanobe.yamagata.jp +yonezawa.yamagata.jp +yuza.yamagata.jp +abu.yamaguchi.jp +hagi.yamaguchi.jp +hikari.yamaguchi.jp +hofu.yamaguchi.jp +iwakuni.yamaguchi.jp +kudamatsu.yamaguchi.jp +mitou.yamaguchi.jp +nagato.yamaguchi.jp +oshima.yamaguchi.jp +shimonoseki.yamaguchi.jp +shunan.yamaguchi.jp +tabuse.yamaguchi.jp +tokuyama.yamaguchi.jp +toyota.yamaguchi.jp +ube.yamaguchi.jp +yuu.yamaguchi.jp +chuo.yamanashi.jp +doshi.yamanashi.jp +fuefuki.yamanashi.jp +fujikawa.yamanashi.jp +fujikawaguchiko.yamanashi.jp +fujiyoshida.yamanashi.jp +hayakawa.yamanashi.jp +hokuto.yamanashi.jp +ichikawamisato.yamanashi.jp +kai.yamanashi.jp +kofu.yamanashi.jp +koshu.yamanashi.jp +kosuge.yamanashi.jp +minami-alps.yamanashi.jp +minobu.yamanashi.jp +nakamichi.yamanashi.jp +nanbu.yamanashi.jp +narusawa.yamanashi.jp +nirasaki.yamanashi.jp +nishikatsura.yamanashi.jp +oshino.yamanashi.jp +otsuki.yamanashi.jp +showa.yamanashi.jp +tabayama.yamanashi.jp +tsuru.yamanashi.jp +uenohara.yamanashi.jp +yamanakako.yamanashi.jp +yamanashi.yamanashi.jp // ke : http://www.kenic.or.ke/index.php?option=com_content&task=view&id=117&Itemid=145 *.ke @@ -1719,6 +3403,7 @@ edu.kn gov.kn // kp : http://www.kcce.kp/en_index.php +kp com.kp edu.kp gov.kp @@ -1793,11 +3478,10 @@ gov.la per.la com.la org.la -// see http://www.c.la/ -c.la // lb : http://en.wikipedia.org/wiki/.lb // Submitted by registry <randy@psg.com> 2008-06-17 +lb com.lb edu.lb gov.lb @@ -1834,11 +3518,9 @@ assn.lk grp.lk hotel.lk -// local : http://en.wikipedia.org/wiki/.local -local - // lr : http://psg.com/dns/lr/lr.txt // Submitted by registry <randy@psg.com> 2008-06-17 +lr com.lr edu.lr gov.lr @@ -1981,11 +3663,21 @@ mq mr gov.mr -// ms : http://en.wikipedia.org/wiki/.ms +// ms : http://www.nic.ms/pdf/MS_Domain_Name_Rules.pdf ms - -// mt : https://www.nic.org.mt/dotmt/ -*.mt +com.ms +edu.ms +gov.ms +net.ms +org.ms + +// mt : https://www.nic.org.mt/go/policy +// Submitted by registry <help@nic.org.mt> 2013-11-19 +mt +com.mt +edu.mt +net.mt +org.mt // mu : http://en.wikipedia.org/wiki/.mu mu @@ -2602,6 +4294,7 @@ name.my // mz : http://www.gobin.info/domainname/mz-template.doc *.mz +!teledata.mz // na : http://www.na-nic.com.na/ // http://www.info.na/domain/ @@ -2637,16 +4330,6 @@ ne // net : http://en.wikipedia.org/wiki/.net net -// CentralNic names : http://www.centralnic.com/names/domains -// Submitted by registry <gavin.brown@centralnic.com> 2008-06-17 -gb.net -se.net -uk.net - -// ZaNiC names : http://www.za.net/ -// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03 -za.net - // nf : http://en.wikipedia.org/wiki/.nf nf com.nf @@ -2661,13 +4344,16 @@ other.nf store.nf // ng : http://psg.com/dns/ng/ -// Submitted by registry <randy@psg.com> 2008-06-17 -ac.ng +ng com.ng edu.ng -gov.ng +name.ng net.ng org.ng +sch.ng +gov.ng +mil.ng +mobi.ng // ni : http://www.nic.ni/dominios.htm *.ni @@ -2680,13 +4366,10 @@ nl // BV.nl will be a registry for dutch BV's (besloten vennootschap) bv.nl -// the co.nl domain is managed by CoDNS B.V. Added 2010-05-23. -co.nl - // no : http://www.norid.no/regelverk/index.en.html // The Norwegian registry has declined to notify us of updates. The web pages // referenced below are the official source of the data. There is also an -// announce mailing list: +// announce mailing list: // https://postlister.uninett.no/sympa/info/norid-diskusjon no // Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html @@ -3450,9 +5133,6 @@ våler.østfold.no valer.hedmark.no våler.hedmark.no -// the co.no domain is managed by CoDNS B.V. Added 2010-05-23. -co.no - // np : http://www.mos.com.np/register.html *.np @@ -3471,32 +5151,40 @@ com.nr nu // nz : http://en.wikipedia.org/wiki/.nz -*.nz +// Confirmed by registry <jay@nzrs.net.nz> 2014-05-19 +nz +ac.nz +co.nz +cri.nz +geek.nz +gen.nz +govt.nz +health.nz +iwi.nz +kiwi.nz +maori.nz +mil.nz +māori.nz +net.nz +org.nz +parliament.nz +school.nz // om : http://en.wikipedia.org/wiki/.om -*.om -!mediaphone.om -!nawrastelecom.om -!nawras.om -!omanmobile.om -!omanpost.om -!omantel.om -!rakpetroleum.om -!siemens.om -!songfest.om -!statecouncil.om +om +co.om +com.om +edu.om +gov.om +med.om +museum.om +net.om +org.om +pro.om // org : http://en.wikipedia.org/wiki/.org org -// CentralNic names : http://www.centralnic.com/names/domains -// Submitted by registry <gavin.brown@centralnic.com> 2008-06-17 -ae.org - -// ZaNiC names : http://www.za.net/ -// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03 -za.org - // pa : http://www.nic.pa/ // Some additional second level "domains" resolve directly as hostnames, such as // pannet.pa, so we add a rule for "pa". @@ -3601,7 +5289,7 @@ turystyka.pl 6bone.pl art.pl mbone.pl -// Government domains (administered by ippt.gov.pl) +// Government domains (administred by ippt.gov.pl) gov.pl uw.gov.pl um.gov.pl @@ -3750,8 +5438,8 @@ poznan.pl wroc.pl zakopane.pl -// co.pl : Mainseek Sp. z o.o. http://www.co.pl -co.pl +// pm : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf +pm // pn : http://www.government.pn/PnRegistry/policies.htm pn @@ -3761,6 +5449,9 @@ org.pn edu.pn net.pn +// post : http://en.wikipedia.org/wiki/.post +post + // pr : http://www.nic.pr/index.asp?f=1 pr com.pr @@ -3819,11 +5510,27 @@ ed.pw go.pw belau.pw -// py : http://www.nic.py/faq_a.html#faq_b -*.py - -// qa : http://www.qatar.net.qa/services/virtual.htm -*.qa +// py : http://www.nic.py/pautas.html#seccion_9 +// Confirmed by registry 2012-10-03 +py +com.py +coop.py +edu.py +gov.py +mil.py +net.py +org.py + +// qa : http://domains.qa/en/ +qa +com.qa +edu.qa +gov.qa +mil.qa +name.qa +net.qa +org.qa +sch.qa // re : http://www.afnic.re/obtenir/chartes/nommage-re/annexe-descriptifs re @@ -3928,7 +5635,6 @@ oryol.ru palana.ru penza.ru perm.ru -pskov.ru ptz.ru rnd.ru ryazan.ru @@ -4043,11 +5749,12 @@ net.sd org.sd edu.sd med.sd +tv.sd gov.sd info.sd // se : http://en.wikipedia.org/wiki/.se -// Submitted by registry <Patrik.Wallstrom@iis.se> 2008-06-24 +// Submitted by registry <patrik.wallstrom@iis.se> 2014-03-18 se a.se ac.se @@ -4081,7 +5788,6 @@ pp.se press.se r.se s.se -sshn.se t.se tm.se u.se @@ -4090,7 +5796,7 @@ x.se y.se z.se -// sg : http://www.nic.net.sg/sub_policies_agreement/2ld.html +// sg : http://www.nic.net.sg/page/registration-policies-procedures-and-guidelines sg com.sg net.sg @@ -4099,15 +5805,20 @@ gov.sg edu.sg per.sg -// sh : http://www.nic.sh/rules.html -// list of 2nd level domains ? +// sh : http://www.nic.sh/registrar.html sh +com.sh +net.sh +gov.sh +org.sh +mil.sh // si : http://en.wikipedia.org/wiki/.si si // sj : No registrations at this time. // Submitted by registry <jarle@uninett.no> 2008-06-16 +sj // sk : http://en.wikipedia.org/wiki/.sk // list of 2nd level domains ? @@ -4162,8 +5873,18 @@ store.st // su : http://en.wikipedia.org/wiki/.su su -// sv : http://www.svnet.org.sv/svpolicy.html -*.sv +// sv : http://www.svnet.org.sv/niveldos.pdf +sv +com.sv +edu.sv +gob.sv +org.sv +red.sv + +// sx : http://en.wikipedia.org/wiki/.sx +// Confirmed by registry <jcvignes@openregistry.com> 2012-05-31 +sx +gov.sx // sy : http://en.wikipedia.org/wiki/.sy // see also: http://www.gobin.info/domainname/sy.doc @@ -4196,8 +5917,7 @@ tel tf // tg : http://en.wikipedia.org/wiki/.tg -// http://www.nic.tg/nictg/index.php implies no reserved 2nd-level domains, -// although this contradicts wikipedia. +// http://www.nic.tg/ tg // th : http://en.wikipedia.org/wiki/.th @@ -4211,7 +5931,7 @@ mi.th net.th or.th -// tj : http://www.nic.tj/policy.htm +// tj : http://www.nic.tj/policy.html tj ac.tj biz.tj @@ -4236,9 +5956,16 @@ tk tl gov.tl -// tm : http://www.nic.tm/rules.html -// list of 2nd level tlds ? +// tm : http://www.nic.tm/local.html tm +com.tm +co.tm +org.tm +net.tm +nom.tm +gov.tm +mil.tm +edu.tm // tn : http://en.wikipedia.org/wiki/.tn // http://whois.ati.tn/ @@ -4274,6 +6001,10 @@ org.to edu.to mil.to +// tp : No registrations at this time. +// Submitted by Ryan Sleevi <ryan.sleevi@gmail.com> 2014-01-03 +tp + // tr : http://en.wikipedia.org/wiki/.tr *.tr !nic.tr @@ -4325,97 +6056,134 @@ club.tw 組織.tw 商業.tw -// tz : http://en.wikipedia.org/wiki/.tz -// Submitted by registry <randy@psg.com> 2008-06-17 -// Updated from http://www.tznic.or.tz/index.php/domains.html 2010-10-25 +// tz : http://www.tznic.or.tz/index.php/domains +// Confirmed by registry <manager@tznic.or.tz> 2013-01-22 +tz ac.tz co.tz go.tz +hotel.tz +info.tz +me.tz mil.tz +mobi.tz ne.tz or.tz sc.tz +tv.tz -// ua : http://www.nic.net.ua/ +// ua : https://hostmaster.ua/policy/?ua +// Submitted by registry <dk@cctld.ua> 2012-04-27 ua +// ua 2LD com.ua edu.ua gov.ua in.ua net.ua org.ua -// ua geo-names +// ua geographic names +// https://hostmaster.ua/2ld/ cherkassy.ua +cherkasy.ua chernigov.ua +chernihiv.ua +chernivtsi.ua chernovtsy.ua ck.ua cn.ua +cr.ua crimea.ua cv.ua dn.ua dnepropetrovsk.ua +dnipropetrovsk.ua +dominic.ua donetsk.ua dp.ua if.ua ivano-frankivsk.ua kh.ua +kharkiv.ua kharkov.ua kherson.ua khmelnitskiy.ua +khmelnytskyi.ua kiev.ua kirovograd.ua km.ua kr.ua +krym.ua ks.ua kv.ua +kyiv.ua lg.ua +lt.ua lugansk.ua lutsk.ua +lv.ua lviv.ua mk.ua +mykolaiv.ua nikolaev.ua od.ua +odesa.ua odessa.ua pl.ua poltava.ua +rivne.ua rovno.ua rv.ua +sb.ua sebastopol.ua +sevastopol.ua +sm.ua sumy.ua te.ua ternopil.ua +uz.ua uzhgorod.ua vinnica.ua +vinnytsia.ua vn.ua +volyn.ua +yalta.ua zaporizhzhe.ua -zp.ua +zaporizhzhia.ua zhitomir.ua +zhytomyr.ua +zp.ua zt.ua -// ug : http://www.registry.co.ug/ +// Private registries in .ua +co.ua +pp.ua + +// ug : https://www.registry.co.ug/ ug co.ug +or.ug ac.ug sc.ug go.ug ne.ug -or.ug +com.ug +org.ug // uk : http://en.wikipedia.org/wiki/.uk -*.uk +// Submitted by registry <Michael.Daly@nominet.org.uk> +uk +ac.uk +co.uk +gov.uk +ltd.uk +me.uk +net.uk +nhs.uk +org.uk +plc.uk +police.uk *.sch.uk -!bl.uk -!british-library.uk -!icnet.uk -!jet.uk -!mod.uk -!nel.uk -!nhs.uk -!nic.uk -!nls.uk -!national-library-scotland.uk -!parliament.uk -!police.uk // us : http://en.wikipedia.org/wiki/.us us @@ -4499,7 +6267,7 @@ k12.de.us k12.fl.us k12.ga.us k12.gu.us -// k12.hi.us Hawaii has a state-wide DOE login: bug 614565 +// k12.hi.us Bug 614565 - Hawaii has a state-wide DOE login k12.ia.us k12.id.us k12.il.us @@ -4530,7 +6298,7 @@ k12.pa.us k12.pr.us k12.ri.us k12.sc.us -k12.sd.us +// k12.sd.us Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us> k12.tn.us k12.tx.us k12.ut.us @@ -4539,7 +6307,7 @@ k12.vt.us k12.va.us k12.wa.us k12.wi.us -k12.wv.us +// k12.wv.us Bug 947705 - Removed at request of Verne Britton <verne@wvnet.edu> k12.wy.us cc.ak.us @@ -4651,25 +6419,32 @@ lib.vt.us lib.va.us lib.wa.us lib.wi.us -lib.wv.us +// lib.wv.us Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us> lib.wy.us -// k12.ma.us contains school districts in Massachusetts. The 4LDs are +// k12.ma.us contains school districts in Massachusetts. The 4LDs are // managed indepedently except for private (PVT), charter (CHTR) and -// parochial (PAROCH) schools. Those are delegated dorectly to the +// parochial (PAROCH) schools. Those are delegated dorectly to the // 5LD operators. <k12-ma-hostmaster _ at _ rsuc.gweep.net> pvt.k12.ma.us chtr.k12.ma.us paroch.k12.ma.us -// uy : http://www.antel.com.uy/ -*.uy +// uy : http://www.nic.org.uy/ +uy +com.uy +edu.uy +gub.uy +mil.uy +net.uy +org.uy -// uz : http://www.reg.uz/registerr.html -// are there other 2nd level tlds ? +// uz : http://www.reg.uz/ uz -com.uz co.uz +com.uz +net.uz +org.uz // va : http://en.wikipedia.org/wiki/.va va @@ -4684,8 +6459,27 @@ gov.vc mil.vc edu.vc -// ve : http://registro.nic.ve/nicve/registro/index.html -*.ve +// ve : https://registro.nic.ve/ +// Confirmed by registry 2012-10-04 +// Updated 2014-05-20 - Bug 940478 +ve +arts.ve +co.ve +com.ve +e12.ve +edu.ve +firm.ve +gob.ve +gov.ve +info.ve +int.ve +mil.ve +net.ve +org.ve +rec.ve +store.ve +tec.ve +web.ve // vg : http://en.wikipedia.org/wiki/.vg vg @@ -4717,8 +6511,15 @@ pro.vn health.vn // vu : http://en.wikipedia.org/wiki/.vu -// list of 2nd level tlds ? +// http://www.vunic.vu/ vu +com.vu +edu.vu +net.vu +org.vu + +// wf : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf +wf // ws : http://en.wikipedia.org/wiki/.ws // http://samoanic.ws/index.dhtml @@ -4729,6 +6530,9 @@ org.ws gov.ws edu.ws +// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf +yt + // IDN ccTLDs // Please sort by ISO 3166 ccTLD, then punicode string // when submitting patches and follow this format: @@ -4737,78 +6541,81 @@ edu.ws // <URL> // xn--mgbaam7a8h ("Emerat" Arabic) : AE -//http://nic.ae/english/arabicdomain/rules.jsp +// http://nic.ae/english/arabicdomain/rules.jsp امارات -// xn--54b7fta0cc ("Bangla" Bangla) : BD +// xn--54b7fta0cc ("Bangla" Bangla) : BD বাংলা -// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN +// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhongguo>) : CN // CNNIC // http://cnnic.cn/html/Dir/2005/10/11/3218.htm 中国 -// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhonggou>) : CN +// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhongguo>) : CN // CNNIC // http://cnnic.cn/html/Dir/2005/10/11/3218.htm 中國 -// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ +// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ الجزائر // xn--wgbh1c ("Egypt" Arabic .masr) : EG // http://www.dotmasr.eg/ مصر -// xn--node ("ge" Georgian (Mkhedruli)) : GE +// xn--node ("ge" Georgian (Mkhedruli)) : GE გე // xn--j6w193g ("Hong Kong" Chinese-Han) : HK // https://www2.hkirc.hk/register/rules.jsp 香港 -// xn--h2brj9c ("Bharat" Devanagari) : IN +// xn--h2brj9c ("Bharat" Devanagari) : IN // India भारत -// xn--mgbbh1a71e ("Bharat" Arabic) : IN +// xn--mgbbh1a71e ("Bharat" Arabic) : IN // India بھارت -// xn--fpcrj9c3d ("Bharat" Telugu) : IN +// xn--fpcrj9c3d ("Bharat" Telugu) : IN // India భారత్ -// xn--gecrj9c ("Bharat" Gujarati) : IN +// xn--gecrj9c ("Bharat" Gujarati) : IN // India ભારત -// xn--s9brj9c ("Bharat" Gurmukhi) : IN +// xn--s9brj9c ("Bharat" Gurmukhi) : IN // India ਭਾਰਤ -// xn--45brj9c ("Bharat" Bengali) : IN +// xn--45brj9c ("Bharat" Bengali) : IN // India ভারত -// xn--xkc2dl3a5ee0h ("India" Tamil) : IN +// xn--xkc2dl3a5ee0h ("India" Tamil) : IN // India இந்தியா -// xn--mgba3a4f16a ("Iran" Persian) : IR +// xn--mgba3a4f16a ("Iran" Persian) : IR ایران -// xn--mgba3a4fra ("Iran" Arabic) : IR +// xn--mgba3a4fra ("Iran" Arabic) : IR ايران -//xn--mgbayh7gpa ("al-Ordon" Arabic) JO -//National Information Technology Center (NITC) -//Royal Scientific Society, Al-Jubeiha +// xn--mgbayh7gpa ("al-Ordon" Arabic) : JO +// National Information Technology Center (NITC) +// Royal Scientific Society, Al-Jubeiha الاردن -// xn--3e0b707e ("Republic of Korea" Hangul) : KR +// xn--3e0b707e ("Republic of Korea" Hangul) : KR 한국 +// xn--80ao21a ("Kaz" Kazakh) : KZ +қаз + // xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK // http://nic.lk ලංකා @@ -4817,10 +6624,16 @@ edu.ws // http://nic.lk இலங்கை -// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA +// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA المغرب -// xn--mgb9awbf ("Oman" Arabic) : OM +// xn--l1acc ("mon" Mongolian) : MN +мон + +// xn--mgbx4cd0ab ("Malaysia" Malay) : MY +مليسيا + +// xn--mgb9awbf ("Oman" Arabic) : OM عمان // xn--ygbi2ammx ("Falasteen" Arabic) : PS @@ -4828,8 +6641,15 @@ edu.ws // http://www.pnina.ps فلسطين -// xn--90a3ac ("srb" Cyrillic) : RS +// xn--90a3ac ("srb" Cyrillic) : RS +// http://www.rnids.rs/en/the-.срб-domain срб +пр.срб +орг.срб +обр.срб +од.срб +упр.срб +ак.срб // xn--p1ai ("rf" Russian-Cyrillic) : RU // http://www.cctld.ru/en/docs/rulesrf.php @@ -4843,19 +6663,19 @@ edu.ws // http://www.nic.net.sa/ السعودية -// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA +// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA السعودیة -// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA +// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA السعودیۃ -// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA +// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA السعوديه -// xn--ogbpf8fl ("Syria" Arabic) : SY +// xn--ogbpf8fl ("Syria" Arabic) : SY سورية -// xn--mgbtf8fl ("Syria" Arabic) variant : SY +// xn--mgbtf8fl ("Syria" Arabic) variant : SY سوريا // xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG @@ -4880,13 +6700,13 @@ edu.ws // http://www.twnic.net/english/dn/dn_07a.htm 台湾 -// xn--nnx388a ("Taiwan") variant : TW +// xn--nnx388a ("Taiwan") variant : TW 臺灣 -// xn--j1amh ("ukr" Cyrillic) : UA +// xn--j1amh ("ukr" Cyrillic) : UA укр -// xn--mgb2ddes ("AlYemen" Arabic) : YE +// xn--mgb2ddes ("AlYemen" Arabic) : YE اليمن // xxx : http://icmregistry.com @@ -4895,9 +6715,6 @@ xxx // ye : http://www.y.net.ye/services/domain_name.htm *.ye -// yu : http://www.nic.yu/pravilnik-e.html -*.yu - // za : http://www.zadna.org.za/slds.html *.za @@ -4907,7 +6724,1404 @@ xxx // zw : http://en.wikipedia.org/wiki/.zw *.zw -// DynDNS.com Dynamic DNS zones : http://www.dyndns.com/services/dns/dyndns/ + +// xn--80asehdb : 2013-07-14 CORE Association +онлайн + +// xn--80aswg : 2013-07-14 CORE Association +сайт + +// xn--ngbc5azd : 2013-07-14 International Domain Registry Pty. Ltd. +شبكة + +// xn--unup4y : 2013-07-14 Spring Fields, LLC +游戏 + +// xn--vhquv : 2013-08-28 Dash McCook, LLC +企业 + +// camera : 2013-08-28 Atomic Maple, LLC +camera + +// clothing : 2013-08-28 Steel Lake, LLC +clothing + +// lighting : 2013-08-28 John McCook, LLC +lighting + +// singles : 2013-08-28 Fern Madison, LLC +singles + +// ventures : 2013-08-28 Binky Lake, LLC +ventures + +// voyage : 2013-08-28 Ruby House, LLC +voyage + +// guru : 2013-08-28 Pioneer Cypress, LLC +guru + +// holdings : 2013-08-28 John Madison, LLC +holdings + +// equipment : 2013-08-28 Corn Station, LLC +equipment + +// bike : 2013-08-28 Grand Hollow, LLC +bike + +// estate : 2013-08-28 Trixy Park, LLC +estate + +// tattoo : 2013-08-30 Uniregistry,Corp. +tattoo + +// xn--3ds443g : 2013-09-09 TLD Registry Limited +在线 + +// xn--fiq228c5hs : 2013-09-09 TLD Registry Limited +中文网 + +// land : 2013-09-10 Pine Moon, LLC +land + +// plumbing : 2013-09-10 Spring Tigers, LLC +plumbing + +// contractors : 2013-09-10 Magic Woods, LLC +contractors + +// sexy : 2013-09-11 Uniregistry,Corp. +sexy + +// menu : 2013-09-11 Wedding TLD2, LLC +menu + +// xn--rhqv96g : 2013-09-11 Stable Tone Limited +世界 + +// uno : 2013-09-11 Dot Latin, LLC +uno + +// gallery : 2013-09-13 Sugar House, LLC +gallery + +// technology : 2013-09-13 Auburn Falls +technology + +// xn--3bst00m : 2013-09-13 Eagle Horizon Limited +集团 + +// reviews : 2013-09-13 Extra Cover, LLC +reviews + +// guide : 2013-09-13 Snow Moon, LLC +guide + +// xn--6qq986b3x1 : 2013-09-13 Tycoon Treasure Limited +我爱你 + +// graphics : 2013-09-13 Over Madison, LLC +graphics + +// construction : 2013-09-13 Fox Dynamite, LLC +construction + +// onl : 2013-09-16 I-Registry Ltd. +onl + +// xn--q9jyb4c : 2013-09-17 Charleston Road Registry +みんな + +// diamonds : 2013-09-23 John Edge, LLC +diamonds + +// kiwi : 2013-09-23 Dot Kiwi Limited +kiwi + +// enterprises : 2013-09-23 Snow Oaks LLC +enterprises + +// today : 2013-09-23 Pearl Woods, LLC +today + +// futbol : 2013-09-23 Atomic Falls, LLC +futbol + +// photography : 2013-09-23 Sugar Glen, LLC +photography + +// tips : 2013-09-23 Corn Willow, LLC +tips + +// directory : 2013-09-23 Extra Madison, LLC +directory + +// kitchen : 2013-09-23 Just Goodbye, LLC +kitchen + +// xn--6frz82g : 2013-09-24 Afilias Limited +移动 + +// kim : 2013-09-24 Afilias Limited +kim + +// xn--cg4bki : 2013-09-27 Samsung SDS Co., LTD +삼성 + +// monash : 2013-10-01 Monash University +monash + +// wed : 2013-10-02 Atgron, Inc. +wed + +// pink : 2013-10-02 Afilias Limited +pink + +// ruhr : 2013-10-02 regiodot GmbH & Co. KG +ruhr + +// buzz : 2013-10-03 DOTSTRATEGY CO. +buzz + +// careers : 2013-10-03 Wild Corner, LLC +careers + +// shoes : 2013-10-03 Binky Galley, LLC +shoes + +// xn--4gbrim : 2013-10-07 Suhub Electronic Establishment +موقع + +// career : 2013-10-09 dotCareer, LLC +career + +// otsuka : 2013-10-11 Otsuka Holdings Co. Ltd. +otsuka + +// xn--fiQ64b : 2013-10-14 CITIC Group Corporation +中信 + +// gift : 2013-10-18 Uniregistry Corp. +gift + +// recipes : 2013-10-18 Grand Island, LLC +recipes + +// coffee : 2013-10-18 Trixy Cover, LLC +coffee + +// luxury : 2013-10-18 Luxury Partners, LLC +luxury + +// domains : 2013-10-18 Sugar Cross, LLC +domains + +// photos : 2013-10-18 Sea Corner, LLC +photos + +// limo : 2013-10-18 Hidden Frostbite, LLC +limo + +// viajes : 2013-10-18 Black Madison, LLC +viajes + +// wang : 2013-10-24 Zodiac Leo Limited +wang + +// democrat : 2013-10-24 United TLD Holdco Ltd. +democrat + +// mango : 2013-10-25 PUNTO FA S.L. +mango + +// cab : 2013-10-25 Half Sunset, LLC +cab + +// support : 2013-10-25 Grand Orchard, LLC +support + +// dance : 2013-10-25 United TLD Holdco Ltd. +dance + +// nagoya : 2013-10-25 GMO Registry, Inc. +nagoya + +// computer : 2013-10-25 Pine Mill, LLC +computer + +// wien : 2013-10-28 punkt.wien GmbH +wien + +// berlin : 2013-10-31 dotBERLIN GmbH & Co. KG +berlin + +// codes : 2013-10-31 Puff Willow, LLC +codes + +// email : 2013-10-31 Spring Madison, LLC +email + +// xn--mgbab2bd : 2013-10-31 CORE Association +بازار + +// repair : 2013-11-07 Lone Sunset, LLC +repair + +// holiday : 2013-11-07 Goose Woods, LLC +holiday + +// center : 2013-11-07 Tin Mill, LLC +center + +// systems : 2013-11-07 Dash Cypress, LLC +systems + +// wiki : 2013-11-07 Top Level Design, LLC +wiki + +// ceo : 2013-11-07 CEOTLD Pty Ltd +ceo + +// international : 2013-11-07 Wild Way, LLC +international + +// solar : 2013-11-07 Ruby Town, LLC +solar + +// company : 2013-11-07 Silver Avenue, LLC +company + +// education : 2013-11-07 Brice Way, LLC +education + +// training : 2013-11-07 Wild Willow, LLC +training + +// academy : 2013-11-07 Half Oaks, LLC +academy + +// marketing : 2013-11-07 Fern Pass, LLC +marketing + +// florist : 2013-11-08 Half Cypress, LLC +florist + +// solutions : 2013-11-07 Silver Cover, LLC +solutions + +// build : 2013-11-07 Plan Bee LLC +build + +// institute : 2013-11-07 Outer Maple, LLC +institute + +// builders : 2013-11-07 Atomic Madison, LLC +builders + +// red : 2013-11-07 Afilias Limited +red + +// blue : 2013-11-07 Afilias Limited +blue + +// ninja : 2013-11-07 United TLD Holdco Ltd. +ninja + +// business : 2013-11-07 Spring Cross, LLC +business + +// gal : 2013-11-07 Asociación puntoGAL +gal + +// social : 2013-11-07 United TLD Holdco Ltd. +social + +// house : 2013-11-07 Sugar Park, LLC +house + +// camp : 2013-11-07 Delta Dynamite, LLC +camp + +// immobilien : 2013-11-07 United TLD Holdco Ltd. +immobilien + +// moda : 2013-11-07 United TLD Holdco Ltd. +moda + +// glass : 2013-11-07 Black Cover, LLC +glass + +// management : 2013-11-07 John Goodbye, LLC +management + +// kaufen : 2013-11-07 United TLD Holdco Ltd. +kaufen + +// farm : 2013-11-07 Just Maple, LLC +farm + +// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center +公益 + +// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center +政务 + +// club : 2013-11-08 .CLUB DOMAINS, LLC +club + +// voting : 2013-11-13 Valuetainment Corp. +voting + +// TOKYO : 2013-11-13 GMO Registry, Inc. +tokyo + +// moe : 2013-11-13 Interlink Co., Ltd. +moe + +// guitars : 2013-11-14 Uniregistry, Corp. +guitars + +// bargains : 2013-11-14 Half Hallow, LLC +bargains + +// xn--nqv7fs00ema : 2013-11-14 Public Interest Registry +组织机构 + +// desi : 2013-11-14 Desi Networks LLC +desi + +// cool : 2013-11-14 Koko Lake, LLC +cool + +// boutique : 2013-11-14 Over Galley, LLC +boutique + +// pics : 2013-11-14 Uniregistry, Corp. +pics + +// xn--c1avg : 2013-11-14 Public Interest Registry +орг + +// xn--55qx5d : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） +公司 + +// xn--io0a7i : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） +网络 + +// cheap : 2013-11-14 Sand Cover, LLC +cheap + +// xn--xhq521b : 2013-11-14 Guangzhou YU Wei Information Technology Co., Ltd. +广东 + +// photo : 2013-11-14 Uniregistry, Corp. +photo + +// network : 2013-11-14 Trixy Manor, LLC +network + +// zone : 2013-11-14 Outer Falls, LLC +zone + +// xn--nqv7f : 2013-11-14 Public Interest Registry +机构 + +// link : 2013-11-14 Uniregistry, Corp. +link + +// QPON : 2013-11-14 dotCOOL, Inc. +qpon + +// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry +संगठन + +// agency : 2013-11-14 Steel Falls, LLC +agency + +// tienda : 2013-11-14 Victor Manor, LLC +tienda + +// works : 2013-11-14 Little Dynamite, LLC +works + +// london : 2013-11-14 Dot London Domains Limited +london + +// watch : 2013-11-14 Sand Shadow, LLC +watch + +// rocks : 2013-11-14 Ruby Moon, LLC +rocks + +// SHIKSHA : 2013-11-14 Afilias Limited +shiksha + +// xn--d1acj3b : 2013-11-21 The Foundation for Network Initiatives “The Smart Internet” +дети + +// budapest : 2013-11-21 Top Level Domain Holdings Limited +budapest + +// nrw : 2013-11-21 Minds + Machines GmbH +nrw + +// VOTE : 2013-11-21 Monolith Registry LLC +vote + +// fishing : 2013-11-21 Top Level Domain Holdings Limited +fishing + +// expert : 2013-11-21 Magic Pass, LLC +expert + +// horse : 2013-11-21 Top Level Domain Holdings Limited +horse + +// christmas : 2013-11-21 Uniregistry, Corp. +christmas + +// cooking : 2013-11-21 Top Level Domain Holdings Limited +cooking + +// xn--czru2d : 2013-11-21 Zodiac Capricorn Limited +商城 + +// casa : 2013-11-21 Top Level Domain Holdings Limited +casa + +// rich : 2013-11-21 I-REGISTRY Ltd., Niederlassung Deutschland +rich + +// VOTO : 2013-11-21 Monolith Registry LLC +voto + +// tools : 2013-11-21 Pioneer North, LLC +tools + +// xn--45q11c : 2013-11-21 Zodiac Scorpio Limited +八卦 + +// praxi : 2013-12-05 Praxi S.p.A. +praxi + +// events : 2013-12-05 Pioneer Maple, LLC +events + +// flights : 2013-12-05 Fox Station, LLC +flights + +// report : 2013-12-05 Binky Glen, LLC +report + +// partners : 2013-12-05 Magic Glen, LLC +partners + +// neustar : 2013-12-05 NeuStar, Inc. +neustar + +// rentals : 2013-12-05 Big Hollow,LLC +rentals + +// catering : 2013-12-05 New Falls. LLC +catering + +// community : 2013-12-05 Fox Orchard, LLC +community + +// maison : 2013-12-05 Victor Frostbite, LLC +maison + +// parts : 2013-12-05 Sea Goodbye, LLC +parts + +// cleaning : 2013-12-05 Fox Shadow, LLC +cleaning + +// okinawa : 2013-12-05 BusinessRalliart inc. +okinawa + +// foundation : 2013-12-05 John Dale, LLC +foundation + +// properties : 2013-12-05 Big Pass, LLC +properties + +// vacations : 2013-12-05 Atomic Tigers, LLC +vacations + +// productions : 2013-12-05 Magic Birch, LLC +productions + +// industries : 2013-12-05 Outer House, LLC +industries + +// haus : 2013-12-05 Pixie Edge, LLC +haus + +// vision : 2013-12-05 Koko Station, LLC +vision + +// mormon : 2013-12-05 IRI Domain Management, LLC (""Applicant"") +mormon + +// cards : 2013-12-05 Foggy Hollow, LLC +cards + +// ink : 2013-12-05 Top Level Design, LLC +ink + +// villas : 2013-12-05 New Sky, LLC +villas + +// consulting : 2013-12-05 Pixie Station, LLC +consulting + +// cruises : 2013-12-05 Spring Way, LLC +cruises + +// krd : 2013-12-05 KRG Department of Information Technology +krd + +// xyz : 2013-12-05 XYZ.COM LLC +xyz + +// dating : 2013-12-05 Pine Fest, LLC +dating + +// exposed : 2013-12-05 Victor Beach, LLC +exposed + +// condos : 2013-12-05 Pine House, LLC +condos + +// eus : 2013-12-12 Puntueus Fundazioa +eus + +// Caravan : 2013-12-12 Caravan International, Inc. +caravan + +// actor : 2013-12-12 United TLD Holdco Ltd. +actor + +// saarland : 2013-12-12 dotSaarland GmbH +saarland + +// yokohama : 2013-12-12 GMO Registry, Inc. +yokohama + +// pub : 2013-12-12 United TLD Holdco Ltd. +pub + +// xn--p1acf : 2013-12-12 Rusnames Limited +рус + +// ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd. +ren + +// fish : 2013-12-12 Fox Woods, LLC +fish + +// BAR : 2013-12-12 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable +bar + +// DNP : 2013-12-13 Dai Nippon Printing Co., Ltd. +dnp + +// bid : 2013-12-19 dot Bid Limited +bid + +// supply : 2013-12-19 Half Falls, LLC +supply + +// Miami : 2013-12-19 Top Level Domain Holdings Limited +miami + +// supplies : 2013-12-19 Atomic Fields, LLC +supplies + +// quebec : 2013-12-19 PointQuébec Inc +quebec + +// MOSCOW : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) +moscow + +// globo : 2013-12-19 Globo Comunicação e Participações S.A +globo + +// AXA : 2013-12-19 AXA SA +axa + +// xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) +москва + +// xn--czrs0t : 2013-12-19 Wild Island, LLC +商店 + +// vodka : 2013-12-19 Top Level Domain Holdings Limited +vodka + +// REST : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable +rest + +// frogans : 2013-12-19 OP3FT +frogans + +// WTC : 2013-12-19 World Trade Centers Association, Inc. +wtc + +// rodeo : 2013-12-19 Top Level Domain Holdings Limited +rodeo + +// sohu : 2013-12-19 Sohu.com Limited +sohu + +// BEST : 2013-12-19 BestTLD Pty Ltd +best + +// country : 2013-12-19 Top Level Domain Holdings Limited +country + +// KRED : 2013-12-19 KredTLD Pty Ltd +kred + +// feedback : 2013-12-19 Top Level Spectrum, Inc. +feedback + +// work : 2013-12-19 Top Level Domain Holdings Limited +work + +// luxe : 2014-01-09 Top Level Domain Holdings Limited +luxe + +// ryukyu : 2014-01-09 BusinessRalliart inc. +ryukyu + +// autos : 2014-01-09 DERAutos, LLC +autos + +// homes : 2014-01-09 DERHomes, LLC +homes + +// jetzt : 2014-01-09 New TLD Company AB +jetzt + +// yachts : 2014-01-09 DERYachts, LLC +yachts + +// motorcycles : 2014-01-09 DERMotorcycles, LLC +motorcycles + +// mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft +mini + +// ggee : 2014-01-09 GMO Internet, Inc. +ggee + +// beer : 2014-01-09 Top Level Domain Holdings Limited +beer + +// xn--1qqw23a : 2014-01-13 Guangzhou YU Wei Information Technology Co., Ltd. +佛山 + +// college : 2014-01-16 XYZ.COM LLC +college + +// ovh : 2014-01-16 OVH SAS +ovh + +// meet : 2014-01-16 Afilias Limited +meet + +// xn--ses554g : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED +网址 + +// gop : 2014-01-16 Republican State Leadership Committee, Inc. +gop + +// blackfriday : 2014-01-16 Uniregistry, Corp. +blackfriday + +// lacaixa : 2014-01-16 CAIXA D'ESTALVIS I PENSIONS DE BARCELONA +lacaixa + +// xn--czr694b : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES(HOLDING) COMPANY.HONGKONG LIMITED +商标 + +// vegas : 2014-01-16 Dot Vegas, Inc. +vegas + +// black : 2014-01-16 Afilias Limited +black + +// soy : 2014-01-23 Charleston Road Registry Inc. +soy + +// trade : 2014-01-23 Elite Registry Limited +trade + +// gent : 2014-01-23 COMBELL GROUP NV/SA +gent + +// ing : 2014-01-23 Charleston Road Registry Inc. +ing + +// dad : 2014-01-23 Charleston Road Registry Inc. +dad + +// shriram : 2014-01-23 Shriram Capital Ltd. +shriram + +// bayern : 2014-01-23 Bayern Connect GmbH +bayern + +// scot : 2014-01-23 Dot Scot Registry Limited +scot + +// webcam : 2014-01-23 dot Webcam Limited +webcam + +// foo : 2014-01-23 Charleston Road Registry Inc. +foo + +// eat : 2014-01-23 Charleston Road Registry Inc. +eat + +// nyc : 2014-01-23 The City of New York +nyc + +// prod : 2014-01-23 Charleston Road Registry Inc. +prod + +// how : 2014-01-23 Charleston Road Registry Inc. +how + +// day : 2014-01-30 Charleston Road Registry Inc. +day + +// meme : 2014-01-30 Charleston Road Registry Inc. +meme + +// mov : 2014-01-30 Charleston Road Registry Inc. +mov + +// paris : 2014-01-30 City of Paris +paris + +// boo : 2014-01-30 Charleston Road Registry Inc. +boo + +// new : 2014-01-30 Charleston Road Registry Inc. +new + +// ifm : 2014-01-30 ifm electronic gmbh +ifm + +// life : 2014-02-06 Trixy Oaks, LLC +life + +// archi : 2014-02-06 STARTING DOT LIMITED +archi + +// spiegel : 2014-02-06 SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG +spiegel + +// brussels : 2014-02-06 DNS.be vzw +brussels + +// church : 2014-02-06 Holly Fileds, LLC +church + +// here : 2014-02-06 Charleston Road Registry Inc. +here + +// dabur : 2014-02-06 Dabur India Limited +dabur + +// vlaanderen : 2014-02-06 DNS.be vzw +vlaanderen + +// cologne : 2014-02-06 NetCologne Gesellschaft für Telekommunikation mbH +cologne + +// xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd +手机 + +// wme : 2014-02-13 William Morris Endeavor Entertainment, LLC +wme + +// nhk : 2014-02-13 Japan Broadcasting Corporation (NHK) +nhk + +// suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION +suzuki + +// whoswho : 2014-02-20 Who's Who Registry +whoswho + +// scb : 2014-02-20 The Siam Commercial Bank Public Company Limited ("SCB""\) +scb + +// hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH +hamburg + +// services : 2014-02-27 Fox Castle, LLC +services + +// bzh : 2014-02-27 Association www.bzh +bzh + +// rio : 2014-02-27 Empresa Municipal de Informática SA - IPLANRIO +rio + +// cash : 2014-03-07 Delta Lake, LLC +cash + +// gives : 2014-03-07 United TLD Holdco Ltd. +gives + +// hiphop : 2014-03-07 Uniregistry, Corp. +hiphop + +// degree : 2014-03-07 Puff House, LLC +degree + +// digital : 2014-03-07 Dash Park, LLC +digital + +// rehab : 2014-03-07 United TLD Holdco Ltd. +rehab + +// wtf : 2014-03-07 Hidden Way, LLC +wtf + +// financial : 2014-03-07 Just Cover, LLC +financial + +// limited : 2014-03-07 Big Fest, LLC +limited + +// discount : 2014-03-07 Holly Hill, LLC +discount + +// fail : 2014-03-07 Atomic Pipe, LLC +fail + +// vet : 2014-03-07 Wild Dale, LLC +vet + +// ngo : 2014-03-07 Public Interest Registry +ngo + +// fitness : 2014-03-07 Brice Orchard, LLC +fitness + +// schule : 2014-03-07 Outer Moon, LLC +schule + +// navy : 2014-03-07 United TLD Holdco Ltd. +navy + +// bio : 2014-03-07 STARTING DOT LIMITED +bio + +// ong : 2014-03-07 Public Interest Registry +ong + +// town : 2014-03-07 Koko Moon, LLC +town + +// toys : 2014-03-07 Pioneer Orchard, LLC +toys + +// army : 2014-03-07 United TLD Holdco Ltd. +army + +// engineering : 2014-03-07 Romeo Canyon +engineering + +// capital : 2014-03-07 Delta Mill, LLC +capital + +// exchange : 2014-03-07 Spring Falls, LLC +exchange + +// fan : 2014-03-07 Goose Glen, LLC +fan + +// market : 2014-03-07 Victor Way, LLC +market + +// media : 2014-03-07 Grand Glen, LLC +media + +// lease : 2014-03-07 Victor Trail, LLC +lease + +// university : 2014-03-07 Little Station, LLC +university + +// reisen : 2014-03-07 New Cypress, LLC +reisen + +// airforce : 2014-03-07 United TLD Holdco Ltd. +airforce + +// pictures : 2014-03-07 Foggy Sky, LLC +pictures + +// gripe : 2014-03-07 Corn Sunset, LLC +gripe + +// engineering : 2014-03-07 United TLD Holdco Ltd. +engineering + +// associates : 2014-03-07 Baxter Hill, LLC +associates + +// xn--mxtq1m : 2014-03-07 Net-Chinese Co., Ltd. +政府 + +// williamhill : 2014-03-13 William Hill Organization Limited +williamhill + +// hiv : 2014-03-13 dotHIV gemeinnuetziger e.V. +hiv + +// sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ) +sca + +// reise : 2014-03-13 dotreise GmbH +reise + +// accountants : 2014-03-20 Knob Town, LLC +accountants + +// clinic : 2014-03-20 Goose Park, LLC +clinic + +// versicherung : 2014-03-20 dotversicherung-registry GmbH +versicherung + +// top : 2014-03-20 Jiangsu Bangning Science & Technology Co.,Ltd. +top + +// furniture : 2014-03-20 Lone Fields, LLC +furniture + +// dental : 2014-03-20 Tin Birch, LLC +dental + +// fund : 2014-03-20 John Castle, LLC +fund + +// creditcard : 2014-03-20 Binky Frostbite, LLC +creditcard + +// insure : 2014-03-20 Pioneer Willow, LLC +insure + +// audio : 2014-03-20 Uniregistry, Corp. +audio + +// claims : 2014-03-20 Black Corner, LLC +claims + +// loans : 2014-03-20 June Woods, LLC +loans + +// auction : 2014-03-20 Sand Galley, LLC +auction + +// attorney : 2014-03-20 Victor North, LLC +attorney + +// finance : 2014-03-20 Cotton Cypress, LLC +finance + +// investments : 2014-03-20 Holly Glen, LLC +investments + +// juegos : 2014-03-20 Uniregistry, Corp. +juegos + +// dentist : 2014-03-20 Outer Lake, LLC +dentist + +// lds : 2014-03-20 IRI Domain Management, LLC +lds + +// lawyer : 2014-03-20 Atomic Station, LLC +lawyer + +// surgery : 2014-03-20 Tin Avenue, LLC +surgery + +// gratis : 2014-03-20 Pioneer Tigers, LLC +gratis + +// software : 2014-03-20 Over Birch, LLC +software + +// mortgage : 2014-03-20 Outer Gardens, LLC +mortgage + +// republican : 2014-03-20 United TLD Holdco Ltd. +republican + +// credit : 2014-03-20 Snow Shadow, LLC +credit + +// tax : 2014-03-20 Storm Orchard, LLC +tax + +// africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa +africa + +// joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry +joburg + +// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry +durban + +// capetown : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry +capetown + +// sap : 2014-03-27 SAP AG +sap + +// datsun : 2014-03-27 NISSAN MOTOR CO., LTD. +datsun + +// infiniti : 2014-03-27 NISSAN MOTOR CO., LTD. +infiniti + +// firmdale : 2014-03-27 Firmdale Holdings Limited +firmdale + +// organic : 2014-03-27 Afilias Limited +organic + +// nissan : 2014-03-27 NISSAN MOTOR CO., LTD. +nissan + +// website : 2014-04-03 DotWebsite Inc. +website + +// space : 2014-04-03 DotSpace Inc. +space + +// schmidt : 2014-04-03 SALM S.A.S. +schmidt + +// cuisinella : 2014-04-03 SALM S.A.S. +cuisinella + +// samsung : 2014-04-03 SAMSUNG SDS CO., LTD +samsung + +// crs : 2014-04-03 Federated Co operatives Limited +crs + +// doosan : 2014-04-03 Doosan Corporation +doosan + +// press : 2014-04-03 DotPress Inc. +press + +// emerck : 2014-04-03 Merck KGaA +emerck + +// erni : 2014-04-03 ERNI Group Holding AG +erni + +// direct : 2014-04-10 Half Trail, LLC +direct + +// yandex : 2014-04-10 YANDEX, LLC +yandex + +// lotto : 2014-04-10 Afilias Limited +lotto + +// toshiba : 2014-04-10 TOSHIBA Corporation +toshiba + +// bauhaus : 2014-04-17 Werkhaus GmbH +bauhaus + +// host : 2014-04-17 DotHost Inc. +host + +// ltda : 2014-04-17 DOMAIN ROBOT SERVICOS DE HOSPEDAGEM NA INTERNET LTDA +ltda + +// global : 2014-04-17 Dot GLOBAL AS +global + +// abogado : 2014-04-24 Top Level Domain Holdings Limited +abogado + +// place : 2014-04-24 Snow Galley, LLC +place + +// tirol : 2014-04-24 punkt Tirol GmbH +tirol + +// gmx : 2014-04-24 1&1 Mail & Media GmbH +gmx + +// tatar : 2014-04-24 Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic" +tatar + +// scholarships : 2014-04-24 Scholarships.com, LLC +scholarships + +// eurovision : 2014-04-24 European Broadcasting Union (EBU) +eurovision + +// wedding : 2014-04-24 Top Level Domain Holdings Limited +wedding + +// active : 2014-05-01 The Active Network, Inc +active + +// madrid : 2014-05-01 Comunidad de Madrid +madrid + +// youtube : 2014-05-01 Charleston Road Registry Inc. +youtube + +// sharp : 2014-05-01 Sharp Corporation +sharp + +// uol : 2014-05-01 UBN INTERNET LTDA. +uol + +// physio : 2014-05-01 PhysBiz Pty Ltd +physio + +// gmail : 2014-05-01 Charleston Road Registry Inc. +gmail + +// channel : 2014-05-08 Charleston Road Registry Inc. +channel + +// fly : 2014-05-08 Charleston Road Registry Inc. +fly + +// zip : 2014-05-08 Charleston Road Registry Inc. +zip + +// esq : 2014-05-08 Charleston Road Registry Inc. +esq + +// rsvp : 2014-05-08 Charleston Road Registry Inc. +rsvp + +// wales : 2014-05-08 Nominet UK +wales + +// cymru : 2014-05-08 Nominet UK +cymru + +// green : 2014-05-08 Afilias Limited +green + +// lgbt : 2014-05-08 Afilias Limited +lgbt + +// xn--hxt814e : 2014-05-15 Zodiac Libra Limited +网店 + +// cancerresearch : 2014-05-15 Australian Cancer Research Foundation +cancerresearch + +// everbank : 2014-05-15 EverBank +everbank + +// frl : 2014-05-15 FRLregistry B.V. +frl + +// property : 2014-05-22 Uniregistry, Corp. +property + +// forsale : 2014-05-22 Sea Oaks, LLC +forsale + +// seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal) +seat + +// deals : 2014-05-22 Sand Sunset, LLC +deals + +// nra : 2014-05-22 NRA Holdings Company, INC. +nra + +// xn--fjq720a : 2014-05-22 Will Bloom, LLC +娱乐 + +// realtor : 2014-05-29 Real Estate Domains LLC +realtor + +// bnpparibas : 2014-05-29 BNP Paribas +bnpparibas + +// melbourne : 2014-05-29 The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation +melbourne + +// hosting : 2014-05-29 Uniregistry, Corp. +hosting + +// yoga : 2014-05-29 Top Level Domain Holdings Limited +yoga + +// city : 2014-05-29 Snow Sky, LLC +city + +// bond : 2014-06-05 Bond University Limited +bond + +// click : 2014-06-05 Uniregistry, Corp. +click + +// cern : 2014-06-05 European Organization for Nuclear Research ("CERN") +cern + +// ===END ICANN DOMAINS=== +// ===BEGIN PRIVATE DOMAINS=== + +// Amazon CloudFront : https://aws.amazon.com/cloudfront/ +// Submitted by Donavan Miller <donavanm@amazon.com> 2013-03-22 +cloudfront.net + +// Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/ +// Submitted by Osman Surkatty <osmans@amazon.com> 2014-05-20 +ap-northeast-1.compute.amazonaws.com +ap-southeast-1.compute.amazonaws.com +ap-southeast-2.compute.amazonaws.com +cn-north-1.compute.amazonaws.cn +compute.amazonaws.cn +compute.amazonaws.com +compute-1.amazonaws.com +eu-west-1.compute.amazonaws.com +sa-east-1.compute.amazonaws.com +us-east-1.amazonaws.com +us-gov-west-1.compute.amazonaws.com +us-west-1.compute.amazonaws.com +us-west-2.compute.amazonaws.com +z-1.compute-1.amazonaws.com +z-2.compute-1.amazonaws.com + +// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ +// Submitted by Adam Stein <astein@amazon.com> 2013-04-02 +elasticbeanstalk.com + +// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/ +// Submitted by Scott Vidmar <svidmar@amazon.com> 2013-03-27 +elb.amazonaws.com + +// Amazon S3 : https://aws.amazon.com/s3/ +// Submitted by Courtney Eckhardt <coec@amazon.com> 2013-03-22 +s3.amazonaws.com +s3-us-west-2.amazonaws.com +s3-us-west-1.amazonaws.com +s3-eu-west-1.amazonaws.com +s3-ap-southeast-1.amazonaws.com +s3-ap-southeast-2.amazonaws.com +s3-ap-northeast-1.amazonaws.com +s3-sa-east-1.amazonaws.com +s3-us-gov-west-1.amazonaws.com +s3-fips-us-gov-west-1.amazonaws.com +s3-website-us-east-1.amazonaws.com +s3-website-us-west-2.amazonaws.com +s3-website-us-west-1.amazonaws.com +s3-website-eu-west-1.amazonaws.com +s3-website-ap-southeast-1.amazonaws.com +s3-website-ap-southeast-2.amazonaws.com +s3-website-ap-northeast-1.amazonaws.com +s3-website-sa-east-1.amazonaws.com +s3-website-us-gov-west-1.amazonaws.com + +// BetaInABox +// Submitted by adrian@betainabox.com 2012-09-13 +betainabox.com + +// CentralNic : http://www.centralnic.com/names/domains +// Submitted by registry <gavin.brown@centralnic.com> 2012-09-27 +ae.org +ar.com +br.com +cn.com +com.de +com.se +de.com +eu.com +gb.com +gb.net +hu.com +hu.net +jp.net +jpn.com +kr.com +mex.com +no.com +qc.com +ru.com +sa.com +se.com +se.net +uk.com +uk.net +us.com +uy.com +za.bz +za.com + +// Africa.com Web Solutions Ltd : https://registry.africa.com +// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 +africa.com + +// iDOT Services Limited : http://www.domain.gr.com +// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 +gr.com + +// Radix FZC : http://domains.in.net +// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 +in.net + +// US REGISTRY LLC : http://us.org +// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 +us.org + +// co.com Registry, LLC : https://registry.co.com +// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04 +co.com + +// c.la : http://www.c.la/ +c.la + +// cloudControl : https://www.cloudcontrol.com/ +// Submitted by Tobias Wilken <tw@cloudcontrol.com> 2013-07-23 +cloudcontrolled.com +cloudcontrolapp.com + +// co.ca : http://registry.co.ca/ +co.ca + +// CoDNS B.V. +co.nl +co.no + +// Cupcake : https://cupcake.io/ +// Submitted by Jonathan Rudenberg <jonathan@cupcake.io> 2013-10-08 +cupcake.is + +// DreamHost : http://www.dreamhost.com/ +// Submitted by Andrew Farmer <andrew.farmer@dreamhost.com> 2012-10-02 +dreamhosters.com + +// DynDNS.com : http://www.dyndns.com/services/dns/dyndns/ dyndns-at-home.com dyndns-at-work.com dyndns-blog.com @@ -5187,3 +8401,129 @@ webhop.net webhop.org worse-than.tv writesthisblog.com + +// Fastly Inc. http://www.fastly.com/ +// Submitted by Vladimir Vuksan <vladimir@fastly.com> 2013-05-31 +a.ssl.fastly.net +b.ssl.fastly.net +global.ssl.fastly.net +a.prod.fastly.net +global.prod.fastly.net + +// Firebase, Inc. +// Submitted by Chris Raynor <chris@firebase.com> 2014-01-21 +firebaseapp.com + +// GitHub, Inc. +// Submitted by Ben Toews <btoews@github.com> 2014-02-06 +github.io +githubusercontent.com + +// GlobeHosting, Inc. +// Submitted by Zoltan Egresi <egresi@globehosting.com> 2013-07-12 +ro.com + +// Google, Inc. +// Submitted by Eduardo Vela <evn@google.com> 2012-10-24 +appspot.com +blogspot.be +blogspot.bj +blogspot.ca +blogspot.cf +blogspot.ch +blogspot.co.at +blogspot.co.il +blogspot.co.nz +blogspot.co.uk +blogspot.com +blogspot.com.ar +blogspot.com.au +blogspot.com.br +blogspot.com.es +blogspot.cv +blogspot.cz +blogspot.de +blogspot.dk +blogspot.fi +blogspot.fr +blogspot.gr +blogspot.hk +blogspot.hu +blogspot.ie +blogspot.in +blogspot.it +blogspot.jp +blogspot.kr +blogspot.mr +blogspot.mx +blogspot.nl +blogspot.no +blogspot.pt +blogspot.re +blogspot.ro +blogspot.se +blogspot.sg +blogspot.sk +blogspot.td +blogspot.tw +codespot.com +googleapis.com +googlecode.com +withgoogle.com + +// Heroku : https://www.heroku.com/ +// Submitted by Tom Maher <tmaher@heroku.com> 2013-05-02 +herokuapp.com +herokussl.com + +// iki.fi +// Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05 +iki.fi + +// info.at : http://www.info.at/ +biz.at +info.at + +// Michau Enterprises Limited : http://www.co.pl/ +co.pl + +// Microsoft : http://microsoft.com +// Submitted by Barry Dorrans <bdorrans@microsoft.com> 2014-01-24 +azurewebsites.net +azure-mobile.net +cloudapp.net + +// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/ +// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net> 2014-02-02 +nfshost.com + +// NYC.mn : http://www.information.nyc.mn +// Submitted by Matthew Brown <mattbrown@nyc.mn> 2013-03-11 +nyc.mn + +// One Fold Media : http://www.onefoldmedia.com/ +// Submitted by Eddie Jones <eddie@onefoldmedia.com> 2014-06-10 +nid.io + +// Opera Software, A.S.A. +// Submitted by Yngve Pettersen <yngve@opera.com> 2009-11-26 +operaunite.com + +// OutSystems +// Submitted by Duarte Santos <domain-admin@outsystemscloud.com> 2014-03-11 +outsystemscloud.com + +// Red Hat, Inc. OpenShift : https://openshift.redhat.com/ +// Submitted by Tim Kramer <tkramer@rhcloud.com> 2012-10-24 +rhcloud.com + +// priv.at : http://www.nic.priv.at/ +// Submitted by registry <lendl@nic.at> 2008-06-09 +priv.at + +// ZaNiC : http://www.za.net/ +// Submitted by registry <hostmaster@nic.za.net> 2009-10-03 +za.net +za.org + +// ===END PRIVATE DOMAINS=== diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87d834af763..0b90c3c98ad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,63 @@ +2014-06-30 Fabián Ezequiel Gallina <fgallina@gnu.org> + + * emacs-lisp/subr-x.el (string-reverse): Define as obsolete alias + for `reverse'. + +2014-06-30 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/autoload.el (autoload-ensure-writable): New variable. + (autoload-ensure-default-file): Maybe make existing output writable. + * Makefile.in (AUTOGEN_VCS): Remove. + (autoloads): Use autoload-ensure-writable rather than AUTOGEN_VCS. + +2014-06-30 Fabián Ezequiel Gallina <fgallina@gnu.org> + + * emacs-lisp/subr-x.el (string-reverse): Use `reverse'. + +2014-06-30 Fabián Ezequiel Gallina <fgallina@gnu.org> + + New if-let, when-let, thread-first and thread-last macros. + + * emacs-lisp/subr-x.el + (internal--listify, internal--check-binding) + (internal--build-binding-value-form, internal--build-binding) + (internal--build-bindings): New functions. + (internal--thread-argument, thread-first, thread-last) + (if-let, when-let): New macros. + +2014-06-30 Grégoire Jadi <daimrod@gmail.com> + + * net/rcirc.el (rcirc-buffer-process): Restore previous + behaviour. (Bug#17772) + +2014-06-29 Alan Mackenzie <acm@muc.de> + + Don't call c-parse-state when c++-template-syntax-table is active. + * progmodes/cc-engine.el (c-guess-continued-construct CASE G) + (c-guess-basic-syntax CASE 5D.3): Rearrange so that + c-syntactic-skip-backwards isn't called with the pertinent syntax + table. + +2014-06-28 Stephen Berman <stephen.berman@gmx.net> + + * calendar/todo-mode.el (todo-set-top-priorities): Fix logic to + account for file-wide setting of todo-top-priorities-overrides. + Make code a bit cleaner. + +2014-06-28 Glenn Morris <rgm@gnu.org> + + * net/eww.el (eww-mode) <eww-current-title>: Make local. (Bug#17860) + +2014-06-28 Stephen Berman <stephen.berman@gmx.net> + + * calendar/todo-mode.el (todo-prefix-overlays): If there is no + category-wide setting of todo-top-priorities-overrides, check for + a file-wide setting and fontify accordingly. + +2014-06-28 Glenn Morris <rgm@gnu.org> + + * subr.el (read-passwd): Warn about batch mode. (Bug#17839) + 2014-06-28 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/hideif.el: Use lexical-binding. Fix up cl-lib usage. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index fefbd5cda56..eba63666ddb 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -70,18 +70,6 @@ AUTOGENEL = loaddefs.el \ cedet/srecode/loaddefs.el \ org/org-loaddefs.el -# Versioned files that are the value of someone's `generated-autoload-file'. -# Note that update_loaddefs parses this. -AUTOGEN_VCS = \ - ps-print.el \ - obsolete/tpu-edt.el \ - mail/rmail.el \ - dired.el \ - ibuffer.el \ - htmlfontify.el \ - emacs-lisp/eieio.el \ - textmodes/reftex.el - # Value of max-lisp-eval-depth when compiling initially. # During bootstrapping the byte-compiler is run interpreted when compiling # itself, and uses more stack than usual. @@ -183,7 +171,6 @@ finder-data: --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(srcdir)/finder-inf.el"))' \ -f finder-compile-keywords-make-dist $$wins -# The chmod +w is to handle env var CVSREAD=1. # Use expand-file-name rather than $abs_scrdir so that Emacs does not # get confused when it compares file-names for equality. # @@ -191,10 +178,10 @@ finder-data: # If you want to allow autoloads in such files, remove that, # and make this depend on leim. autoloads: $(LOADDEFS) - cd $(lisp) && chmod +w $(AUTOGEN_VCS) $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l autoload \ + --eval '(setq autoload-ensure-writable t)' \ --eval '(setq autoload-builtin-package-versions t)' \ --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \ -f batch-update-autoloads $$wins diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 1a54cc2c67b..b4945c542c5 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -4292,30 +4292,30 @@ set the user customizable option `todo-top-priorities-overrides'." (file todo-current-todo-file) (rules todo-top-priorities-overrides) (frule (assoc-string file rules)) - (crule (assoc-string cat (nth 2 frule))) (crules (nth 2 frule)) - (cur (or (if arg (cdr crule) (nth 1 frule)) + (crule (assoc-string cat crules)) + (cur (or (and arg (cdr crule)) + (nth 1 frule) todo-top-priorities)) (prompt (if arg (concat "Number of top priorities in this category" " (currently %d): ") (concat "Default number of top priorities per category" " in this file (currently %d): "))) - (new -1) - nrule) + (new -1)) (while (< new 0) (let ((cur0 cur)) (setq new (read-number (format prompt cur0)) prompt "Enter a non-negative number: " cur0 nil))) - (setq nrule (if arg - (append (delete crule crules) (list (cons cat new))) - (append (list file new) (list crules)))) - (setq rules (cons (if arg - (list file cur nrule) - nrule) - (delete frule rules))) - (customize-save-variable 'todo-top-priorities-overrides rules) - (todo-prefix-overlays))) + (let ((nrule (if arg + (append (delete crule crules) (list (cons cat new))) + (append (list file new) (list crules))))) + (setq rules (cons (if arg + (list file cur nrule) + nrule) + (delete frule rules))) + (customize-save-variable 'todo-top-priorities-overrides rules) + (todo-prefix-overlays)))) (defun todo-find-item (str) "Search for filtered item STR in its saved todo file. @@ -5303,6 +5303,8 @@ of each other." (todo-current-category) (nth 2 (assoc-string todo-current-todo-file todo-top-priorities-overrides)))) + (nth 1 (assoc-string todo-current-todo-file + todo-top-priorities-overrides)) todo-top-priorities)) done prefix) (save-excursion diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 361e8fa7c68..38956df66de 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -351,9 +351,26 @@ not be relied upon." ";;; " basename " ends here\n"))) +(defvar autoload-ensure-writable nil + "Non-nil means `autoload-ensure-default-file' makes existing file writable.") +;; Just in case someone tries to get you to overwrite a file that you +;; don't want to. +;;;###autoload +(put 'autoload-ensure-writable 'risky-local-variable t) + (defun autoload-ensure-default-file (file) - "Make sure that the autoload file FILE exists and if not create it." - (unless (file-exists-p file) + "Make sure that the autoload file FILE exists, creating it if needed. +If the file already exists and `autoload-ensure-writable' is non-nil, +make it writable." + (if (file-exists-p file) + ;; Probably pointless, but replaces the old AUTOGEN_VCS in lisp/Makefile, + ;; which was designed to handle CVSREAD=1 and equivalent. + (and autoload-ensure-writable + (let ((modes (file-modes file))) + (if (zerop (logand modes #o0200)) + ;; Ignore any errors here, and let subsequent attempts + ;; to write the file raise any real error. + (ignore-errors (set-file-modes file (logior modes #o0200)))))) (write-region (autoload-rubric file) nil file)) file) diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el index 505a556b65f..76473b39a77 100644 --- a/lisp/emacs-lisp/subr-x.el +++ b/lisp/emacs-lisp/subr-x.el @@ -32,6 +32,113 @@ ;;; Code: +(require 'pcase) + + +(defmacro internal--thread-argument (first? &rest forms) + "Internal implementation for `thread-first' and `thread-last'. +When Argument FIRST? is non-nil argument is threaded first, else +last. FORMS are the expressions to be threaded." + (pcase forms + (`(,x (,f . ,args) . ,rest) + `(internal--thread-argument + ,first? ,(if first? `(,f ,x ,@args) `(,f ,@args ,x)) ,@rest)) + (`(,x ,f . ,rest) `(internal--thread-argument ,first? (,f ,x) ,@rest)) + (_ (car forms)))) + +(defmacro thread-first (&rest forms) + "Thread FORMS elements as the first argument of their succesor. +Example: + (thread-first + 5 + (+ 20) + (/ 25) + - + (+ 40)) +Is equivalent to: + (+ (- (/ (+ 5 20) 25)) 40) +Note how the single `-' got converted into a list before +threading." + (declare (indent 1) + (debug (form &rest [&or symbolp (sexp &rest form)]))) + `(internal--thread-argument t ,@forms)) + +(defmacro thread-last (&rest forms) + "Thread FORMS elements as the last argument of their succesor. +Example: + (thread-last + 5 + (+ 20) + (/ 25) + - + (+ 40)) +Is equivalent to: + (+ 40 (- (/ 25 (+ 20 5)))) +Note how the single `-' got converted into a list before +threading." + (declare (indent 1) (debug thread-first)) + `(internal--thread-argument nil ,@forms)) + +(defsubst internal--listify (elt) + "Wrap ELT in a list if it is not one." + (if (not (listp elt)) + (list elt) + elt)) + +(defsubst internal--check-binding (binding) + "Check BINDING is properly formed." + (when (> (length binding) 2) + (signal + 'error + (cons "`let' bindings can have only one value-form" binding))) + binding) + +(defsubst internal--build-binding-value-form (binding prev-var) + "Build the conditional value form for BINDING using PREV-VAR." + `(,(car binding) (and ,prev-var ,(cadr binding)))) + +(defun internal--build-binding (binding prev-var) + "Check and build a single BINDING with PREV-VAR." + (thread-first + binding + internal--listify + internal--check-binding + (internal--build-binding-value-form prev-var))) + +(defun internal--build-bindings (bindings) + "Check and build conditional value forms for BINDINGS." + (let ((prev-var t)) + (mapcar (lambda (binding) + (let ((binding (internal--build-binding binding prev-var))) + (setq prev-var (car binding)) + binding)) + bindings))) + +(defmacro if-let (bindings then &rest else) + "Process BINDINGS and if all values are non-nil eval THEN, else ELSE. +Argument BINDINGS is a list of tuples whose car is a symbol to be +bound and (optionally) used in THEN, and its cadr is a sexp to be +evaled to set symbol's value. In the special case you only want +to bind a single value, BINDINGS can just be a plain tuple." + (declare (indent 2) (debug ((&rest (symbolp form)) form body))) + (when (and (<= (length bindings) 2) + (not (listp (car bindings)))) + ;; Adjust the single binding case + (setq bindings (list bindings))) + `(let* ,(internal--build-bindings bindings) + (if ,(car (internal--listify (car (last bindings)))) + ,then + ,@else))) + +(defmacro when-let (bindings &rest body) + "Process BINDINGS and if all values are non-nil eval BODY. +Argument BINDINGS is a list of tuples whose car is a symbol to be +bound and (optionally) used in BODY, and its cadr is a sexp to be +evaled to set symbol's value. In the special case you only want +to bind a single value, BINDINGS can just be a plain tuple." + (declare (indent 1) (debug if-let)) + (list 'if-let bindings (macroexp-progn body))) + (defsubst hash-table-keys (hash-table) "Return a list of keys in HASH-TABLE." (let ((keys '())) @@ -52,9 +159,7 @@ "Join all STRINGS using SEPARATOR." (mapconcat 'identity strings separator)) -(defsubst string-reverse (str) - "Reverse the string STR." - (apply 'string (nreverse (string-to-list str)))) +(define-obsolete-function-alias 'string-reverse 'reverse "24.5") (defsubst string-trim-left (string) "Remove leading whitespace from STRING." diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index ffaaa1b7afc..eca209012d6 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -374,7 +374,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...) ;;;*** -;;;### (autoloads nil "align" "align.el" (21299 64170 881226 0)) +;;;### (autoloads nil "align" "align.el" (21417 20521 870414 0)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -1452,8 +1452,8 @@ Keymap summary ;;;*** -;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21419 62246 +;;;;;; 751914 0)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1604,14 +1604,16 @@ insert a template for the file depending on the mode of the buffer. ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21425 +;;;;;; 43779 760127 645000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) (put 'generated-autoload-load-name 'safe-local-variable 'stringp) +(put 'autoload-ensure-writable 'risky-local-variable t) + (autoload 'update-file-autoloads "autoload" "\ Update the autoloads for FILE. If prefix arg SAVE-AFTER is non-nil, save the buffer too. @@ -1872,8 +1874,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21264 28773 -;;;;;; 629489 0)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21414 44327 +;;;;;; 790846 0)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -2120,7 +2122,7 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (21294 46247 414129 +;;;### (autoloads nil "bookmark" "bookmark.el" (21397 35239 170099 ;;;;;; 0)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) @@ -2287,8 +2289,7 @@ explicitly. If you load a file containing bookmarks with the same names as bookmarks already present in your Emacs, the new bookmarks will get -unique numeric suffixes \"<2>\", \"<3>\", ... following the same -method buffers use to resolve name collisions. +unique numeric suffixes \"<2>\", \"<3>\", etc. \(fn FILE &optional OVERWRITE NO-MSG)" t nil) @@ -2672,7 +2673,7 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (21202 31159 541460 +;;;### (autoloads nil "bubbles" "play/bubbles.el" (21410 47268 609529 ;;;;;; 0)) ;;; Generated autoloads from play/bubbles.el @@ -2968,7 +2969,7 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21231 31415 579137 +;;;### (autoloads nil "calculator" "calculator.el" (21417 20521 870414 ;;;;;; 0)) ;;; Generated autoloads from calculator.el @@ -2980,8 +2981,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21383 2343 -;;;;;; 498187 0)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21403 21198 +;;;;;; 190145 203000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3049,8 +3050,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21385 -;;;;;; 6339 454454 0)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21425 +;;;;;; 14635 268306 0)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3060,8 +3061,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21308 46599 -;;;;;; 181916 0)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21419 62246 +;;;;;; 751914 0)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -4959,32 +4960,6 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crisp" "emulation/crisp.el" (21187 63826 213216 -;;;;;; 0)) -;;; Generated autoloads from emulation/crisp.el - -(defvar crisp-mode nil "\ -Track status of CRiSP emulation mode. -A value of nil means CRiSP mode is not enabled. A value of t -indicates CRiSP mode is enabled. - -Setting this variable directly does not take effect; -use either M-x customize or the function `crisp-mode'.") - -(custom-autoload 'crisp-mode "crisp" nil) - -(autoload 'crisp-mode "crisp" "\ -Toggle CRiSP/Brief emulation (CRiSP mode). -With a prefix argument ARG, enable CRiSP mode if ARG is positive, -and disable it otherwise. If called from Lisp, enable the mode -if ARG is omitted or nil. - -\(fn &optional ARG)" t nil) - -(defalias 'brief-mode 'crisp-mode) - -;;;*** - ;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21263 7861 493097 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/crm.el @@ -5571,7 +5546,7 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (21379 5287 607434 0)) +;;;### (autoloads nil "dbus" "net/dbus.el" (21414 44327 790846 0)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5810,7 +5785,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21251 41787 268999 0)) +;;;### (autoloads nil "delsel" "delsel.el" (21414 44327 790846 0)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5940,7 +5915,8 @@ relevant to POS. ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21346 7974 405729 0)) +;;;### (autoloads nil "desktop" "desktop.el" (21419 62246 751914 +;;;;;; 0)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6268,8 +6244,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21409 26408 +;;;;;; 607647 0)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6312,7 +6288,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21348 49701 793915 0)) +;;;### (autoloads nil "dired" "dired.el" (21414 44327 790846 0)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6735,7 +6711,7 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (21187 63826 213216 +;;;### (autoloads nil "dunnet" "play/dunnet.el" (21406 50214 284651 ;;;;;; 0)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 1)) package--builtin-versions) @@ -7954,7 +7930,7 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21260 31670 94248 +;;;### (autoloads nil "edt" "emulation/edt.el" (21417 20521 870414 ;;;;;; 0)) ;;; Generated autoloads from emulation/edt.el @@ -8681,7 +8657,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21311 55332 986627 0)) +;;;### (autoloads nil "erc" "erc/erc.el" (21412 2598 318409 0)) ;;; Generated autoloads from erc/erc.el (push (purecopy '(erc 5 3)) package--builtin-versions) @@ -9188,7 +9164,7 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21261 52533 628241 +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21419 62246 751914 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/ert.el @@ -9278,8 +9254,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads nil "eshell" "eshell/eshell.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "eshell" "eshell/eshell.el" (21403 21396 190131 +;;;;;; 14000)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) @@ -9937,7 +9913,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21271 29460 497806 0)) +;;;### (autoloads nil "eww" "net/eww.el" (21423 59302 489365 0)) ;;; Generated autoloads from net/eww.el (autoload 'eww "eww" "\ @@ -10334,7 +10310,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21293 25385 120083 0)) +;;;### (autoloads nil "ffap" "ffap.el" (21401 32300 989919 0)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10699,8 +10675,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21230 -;;;;;; 10550 983182 0)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21419 +;;;;;; 62246 751914 0)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -11863,8 +11839,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21365 58789 -;;;;;; 638999 0)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21393 38187 +;;;;;; 675040 0)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -12473,8 +12449,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21296 1575 438327 -;;;;;; 0)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21414 44327 +;;;;;; 790846 0)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12882,7 +12858,7 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21255 45558 780901 +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21388 20265 495157 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/gv.el @@ -13202,7 +13178,7 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21355 22953 61816 +;;;### (autoloads nil "help-fns" "help-fns.el" (21419 62246 751914 ;;;;;; 0)) ;;; Generated autoloads from help-fns.el @@ -13674,8 +13650,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21292 4516 -;;;;;; 491683 0)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21422 8265 +;;;;;; 959286 0)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13913,7 +13889,7 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode. ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21379 5287 607434 +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21402 53158 293492 ;;;;;; 0)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -14145,8 +14121,8 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads nil "html2text" "gnus/html2text.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "html2text" "gnus/html2text.el" (21417 20521 +;;;;;; 870414 0)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -14450,8 +14426,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21195 -;;;;;; 23530 495420 0)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21419 +;;;;;; 62246 751914 0)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -15525,7 +15501,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (21359 20005 772941 0)) +;;;### (autoloads nil "info" "info.el" (21419 7843 195974 0)) ;;; Generated autoloads from info.el (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\ @@ -16426,7 +16402,7 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21350 58112 380040 +;;;### (autoloads nil "js" "progmodes/js.el" (21388 20265 495157 ;;;;;; 0)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16673,9 +16649,10 @@ The kind of Korean keyboard for Korean input method. ;;;*** -;;;### (autoloads nil "landmark" "play/landmark.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "landmark" "play/landmark.el" (21419 7843 195974 +;;;;;; 0)) ;;; Generated autoloads from play/landmark.el +(push (purecopy '(landmark 1 0)) package--builtin-versions) (defalias 'landmark-repeat 'landmark-test-run) @@ -18773,8 +18750,8 @@ The default is 20. If LIMIT is negative, do not limit the listing. ;;;*** -;;;### (autoloads nil "mule-util" "international/mule-util.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "mule-util" "international/mule-util.el" (21412 +;;;;;; 2598 318409 0)) ;;; Generated autoloads from international/mule-util.el (defsubst string-to-list (string) "\ @@ -18810,7 +18787,7 @@ If ELLIPSIS is non-nil, it should be a string which will replace the end of STR (including any padding) if it extends beyond END-COLUMN, unless the display width of STR is equal to or less than the display width of ELLIPSIS. If it is non-nil and not a string, then ELLIPSIS -defaults to \"...\". +defaults to `truncate-string-ellipsis'. \(fn STR END-COLUMN &optional START-COLUMN PADDING ELLIPSIS)" nil nil) @@ -20054,8 +20031,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (21383 2343 -;;;;;; 498187 0)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (21417 20521 +;;;;;; 870414 0)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -20156,8 +20133,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21381 47015 -;;;;;; 637535 0)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21419 62246 +;;;;;; 751914 0)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20759,8 +20736,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (21419 62246 +;;;;;; 751914 0)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -21879,8 +21856,8 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21364 37926 -;;;;;; 837230 0)) +;;;### (autoloads nil "python" "progmodes/python.el" (21414 44327 +;;;;;; 790846 0)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 2)) package--builtin-versions) @@ -22264,7 +22241,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (21361 61732 646433 +;;;### (autoloads nil "rcirc" "net/rcirc.el" (21425 14635 268306 ;;;;;; 0)) ;;; Generated autoloads from net/rcirc.el @@ -22349,7 +22326,7 @@ were operated on recently. ;;;*** -;;;### (autoloads nil "rect" "rect.el" (21203 52022 581300 0)) +;;;### (autoloads nil "rect" "rect.el" (21409 26408 607647 0)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22510,8 +22487,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21379 5529 -;;;;;; 990138 255000)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21418 41409 +;;;;;; 280143 158000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'reftex-citation "reftex-cite" nil t) (autoload 'reftex-all-document-files "reftex-parse") @@ -23261,7 +23238,7 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (21346 7974 405729 +;;;### (autoloads nil "rst" "textmodes/rst.el" (21415 65191 692645 ;;;;;; 0)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23292,8 +23269,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21355 -;;;;;; 22953 61816 0)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21414 +;;;;;; 44327 790846 0)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23310,7 +23287,7 @@ Major mode for editing Ruby code. ;;;*** -;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21187 63826 213216 +;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21419 62246 751914 ;;;;;; 0)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) @@ -23735,7 +23712,7 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads nil "scroll-all" "scroll-all.el" (21187 63826 213216 +;;;### (autoloads nil "scroll-all" "scroll-all.el" (21388 20265 495157 ;;;;;; 0)) ;;; Generated autoloads from scroll-all.el @@ -24215,7 +24192,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (21220 61111 156047 0)) +;;;### (autoloads nil "ses" "ses.el" (21405 29360 677747 0)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24325,8 +24302,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21383 -;;;;;; 2343 498187 0)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21419 +;;;;;; 62246 751914 0)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24635,7 +24612,7 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21293 25385 120083 +;;;### (autoloads nil "skeleton" "skeleton.el" (21420 38312 308000 ;;;;;; 0)) ;;; Generated autoloads from skeleton.el @@ -24687,7 +24664,9 @@ not needed, a prompt-string or an expression for complex read functions. If ELEMENT is a string or a character it gets inserted (see also `skeleton-transformation-function'). Other possibilities are: - \\n go to next line and indent according to mode + \\n go to next line and indent according to mode, unless + this is the first/last element of a skeleton and point + is at bol/eol _ interesting point, interregion here - interesting point, no interregion interaction, overrides interesting point set by _ @@ -24702,6 +24681,11 @@ If ELEMENT is a string or a character it gets inserted (see also After termination, point will be positioned at the last occurrence of - or at the first occurrence of _ or at the end of the inserted text. +Note that \\n as the last element of the skeleton only inserts a +newline if not at eol. If you want to unconditionally insert a newline +at the end of the skeleton, use \"\\n\" instead. Likewise with \\n +as the first element when at bol. + Further elements can be defined via `skeleton-further-elements'. ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted repeatedly for different inputs. The SKELETON is processed as often as @@ -24747,8 +24731,8 @@ symmetrical ones, and the same character twice for the others. ;;;*** -;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21409 26408 +;;;;;; 607647 0)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -26759,7 +26743,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (21339 34726 39547 0)) +;;;### (autoloads nil "term" "term.el" (21414 44327 790846 0)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -27180,8 +27164,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21414 44327 +;;;;;; 790846 0)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27466,10 +27450,10 @@ See also docstring of the function tibetan-compose-region. ;;;*** -;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21381 47015 -;;;;;; 637535 0)) +;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21393 38187 +;;;;;; 675040 0)) ;;; Generated autoloads from textmodes/tildify.el -(push (purecopy '(tildify 4 5 1)) package--builtin-versions) +(push (purecopy '(tildify 4 5 3)) package--builtin-versions) (autoload 'tildify-region "tildify" "\ Add hard spaces in the region between BEG and END. @@ -27890,8 +27874,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21379 -;;;;;; 5287 607434 0)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21423 +;;;;;; 59302 489365 0)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -28029,72 +28013,6 @@ holds a keymap. ;;;*** -;;;### (autoloads nil "tpu-edt" "emulation/tpu-edt.el" (21187 63826 -;;;;;; 213216 0)) -;;; Generated autoloads from emulation/tpu-edt.el -(push (purecopy '(tpu-edt 4 5)) package--builtin-versions) - -(defvar tpu-edt-mode nil "\ -Non-nil if Tpu-Edt mode is enabled. -See the command `tpu-edt-mode' for a description of this minor mode. -Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `tpu-edt-mode'.") - -(custom-autoload 'tpu-edt-mode "tpu-edt" nil) - -(autoload 'tpu-edt-mode "tpu-edt" "\ -Toggle TPU/edt emulation on or off. -With a prefix argument ARG, enable the mode if ARG is positive, -and disable it otherwise. If called from Lisp, enable the mode -if ARG is omitted or nil. - -\(fn &optional ARG)" t nil) - -(defalias 'tpu-edt 'tpu-edt-on) - -(autoload 'tpu-edt-on "tpu-edt" "\ -Turn on TPU/edt emulation. - -\(fn)" t nil) - -;;;*** - -;;;### (autoloads nil "tpu-mapper" "emulation/tpu-mapper.el" (21187 -;;;;;; 63826 213216 0)) -;;; Generated autoloads from emulation/tpu-mapper.el - -(autoload 'tpu-mapper "tpu-mapper" "\ -Create an Emacs lisp file defining the TPU-edt keypad for X-windows. - -This command displays an instruction screen showing the TPU-edt keypad -and asks you to press the TPU-edt editing keys. It uses the keys you -press to create an Emacs Lisp file that will define a TPU-edt keypad -for your X server. You can even re-arrange the standard EDT keypad to -suit your tastes (or to cope with those silly Sun and PC keypads). - -Finally, you will be prompted for the name of the file to store the key -definitions. If you chose the default, TPU-edt will find it and load it -automatically. If you specify a different file name, you will need to -set the variable ``tpu-xkeys-file'' before starting TPU-edt. Here's how -you might go about doing that in your init file. - - (setq tpu-xkeys-file (expand-file-name \"~/.my-emacs-x-keys\")) - (tpu-edt) - -Known Problems: - -Sometimes, tpu-mapper will ignore a key you press, and just continue to -prompt for the same key. This can happen when your window manager sucks -up the key and doesn't pass it on to Emacs, or it could be an Emacs bug. -Either way, there's nothing that tpu-mapper can do about it. You must -press RETURN, to skip the current key and continue. Later, you and/or -your local X guru can try to figure out why the key is being ignored. - -\(fn)" t nil) - -;;;*** - ;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/tq.el @@ -28155,7 +28073,7 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21330 19750 309501 +;;;### (autoloads nil "tramp" "net/tramp.el" (21406 50214 284651 ;;;;;; 0)) ;;; Generated autoloads from net/tramp.el @@ -28271,8 +28189,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21406 50214 +;;;;;; 284651 0)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28820,8 +28738,8 @@ Might do a non-blocking connection; use `process-status' to check. ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21360 -;;;;;; 40869 887231 0)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21419 +;;;;;; 62246 751914 0)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -28875,8 +28793,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (21302 6606 390237 -;;;;;; 377000)) +;;;### (autoloads nil "url-http" "url/url-http.el" (21419 62246 751914 +;;;;;; 0)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -29800,7 +29718,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21360 40869 887231 0)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21396 14374 24888 0)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -29935,7 +29853,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (21383 2343 498187 0)) +;;;;;; (21388 20265 495157 0)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30629,59 +30547,6 @@ Key bindings: ;;;*** -;;;### (autoloads nil "vi" "emulation/vi.el" (20929 34089 117790 -;;;;;; 0)) -;;; Generated autoloads from emulation/vi.el - -(autoload 'vi-mode "vi" "\ -Major mode that acts like the `vi' editor. -The purpose of this mode is to provide you the combined power of vi (namely, -the \"cross product\" effect of commands and repeat last changes) and Emacs. - -This command redefines nearly all keys to look like vi commands. -It records the previous major mode, and any vi command for input -\(`i', `a', `s', etc.) switches back to that mode. -Thus, ordinary Emacs (in whatever major mode you had been using) -is \"input\" mode as far as vi is concerned. - -To get back into vi from \"input\" mode, you must issue this command again. -Therefore, it is recommended that you assign it to a key. - -Major differences between this mode and real vi : - -* Limitations and unsupported features - - Search patterns with line offset (e.g. /pat/+3 or /pat/z.) are - not supported. - - Ex commands are not implemented; try ':' to get some hints. - - No line undo (i.e. the 'U' command), but multi-undo is a standard feature. - -* Modifications - - The stopping positions for some point motion commands (word boundary, - pattern search) are slightly different from standard 'vi'. - Also, no automatic wrap around at end of buffer for pattern searching. - - Since changes are done in two steps (deletion then insertion), you need - to undo twice to completely undo a change command. But this is not needed - for undoing a repeated change command. - - No need to set/unset 'magic', to search for a string with regular expr - in it just put a prefix arg for the search commands. Replace cmds too. - - ^R is bound to incremental backward search, so use ^L to redraw screen. - -* Extensions - - Some standard (or modified) Emacs commands were integrated, such as - incremental search, query replace, transpose objects, and keyboard macros. - - In command state, ^X links to the 'ctl-x-map', and ESC can be linked to - esc-map or set undefined. These can give you the full power of Emacs. - - See vi-com-map for those keys that are extensions to standard vi, e.g. - `vi-name-last-change-or-macro', `vi-verify-spelling', `vi-locate-def', - `vi-mark-region', and 'vi-quote-words'. Some of them are quite handy. - - Use \\[vi-switch-mode] to switch among different modes quickly. - -Syntax table and abbrevs while in vi mode remain as they were in Emacs. - -\(fn)" t nil) - -;;;*** - ;;;### (autoloads nil "viet-util" "language/viet-util.el" (21187 ;;;;;; 63826 213216 0)) ;;; Generated autoloads from language/viet-util.el @@ -30983,22 +30848,6 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads nil "vip" "emulation/vip.el" (21187 63826 213216 -;;;;;; 0)) -;;; Generated autoloads from emulation/vip.el - -(autoload 'vip-setup "vip" "\ -Set up bindings for C-x 7 and C-z that are useful for VIP users. - -\(fn)" nil nil) - -(autoload 'vip-mode "vip" "\ -Turn on VIP emulation of VI. - -\(fn)" t nil) - -;;;*** - ;;;### (autoloads nil "viper" "emulation/viper.el" (21222 16439 978802 ;;;;;; 0)) ;;; Generated autoloads from emulation/viper.el @@ -31568,7 +31417,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21240 46395 727291 +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21414 44327 790846 ;;;;;; 0)) ;;; Generated autoloads from wid-edit.el @@ -31687,7 +31536,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21240 46395 727291 0)) +;;;### (autoloads nil "woman" "woman.el" (21393 38187 675040 0)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -31736,28 +31585,6 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "ws-mode" "emulation/ws-mode.el" (21187 63826 -;;;;;; 213216 0)) -;;; Generated autoloads from emulation/ws-mode.el -(push (purecopy '(ws-mode 0 7)) package--builtin-versions) - -(autoload 'wordstar-mode "ws-mode" "\ -Major mode with WordStar-like key bindings. - -BUGS: - - Help menus with WordStar commands (C-j just calls help-for-help) - are not implemented - - Options for search and replace - - Show markers (C-k h) is somewhat strange - - Search and replace (C-q a) is only available in forward direction - -No key bindings beginning with ESC are installed, they will work -Emacs-like. - -\(fn)" t nil) - -;;;*** - ;;;### (autoloads nil "xml" "xml.el" (21187 63826 213216 0)) ;;; Generated autoloads from xml.el @@ -31833,7 +31660,7 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21359 20005 772941 +;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21414 44327 790846 ;;;;;; 0)) ;;; Generated autoloads from xt-mouse.el @@ -31894,33 +31721,34 @@ Zone out, completely. ;;;;;; "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el" ;;;;;; "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el" ;;;;;; "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el" -;;;;;; "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el" -;;;;;; "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el" -;;;;;; "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el" -;;;;;; "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el" -;;;;;; "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el" -;;;;;; "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-units.el" -;;;;;; "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el" -;;;;;; "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el" -;;;;;; "calendar/cal-bahai.el" "calendar/cal-coptic.el" "calendar/cal-french.el" -;;;;;; "calendar/cal-html.el" "calendar/cal-islam.el" "calendar/cal-iso.el" -;;;;;; "calendar/cal-julian.el" "calendar/cal-loaddefs.el" "calendar/cal-mayan.el" -;;;;;; "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el" -;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/diary-loaddefs.el" -;;;;;; "calendar/hol-loaddefs.el" "cdl.el" "cedet/cedet-cscope.el" -;;;;;; "cedet/cedet-files.el" "cedet/cedet-global.el" "cedet/cedet-idutils.el" -;;;;;; "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" "cedet/ede/base.el" -;;;;;; "cedet/ede/cpp-root.el" "cedet/ede/custom.el" "cedet/ede/dired.el" -;;;;;; "cedet/ede/emacs.el" "cedet/ede/files.el" "cedet/ede/generic.el" -;;;;;; "cedet/ede/linux.el" "cedet/ede/locate.el" "cedet/ede/make.el" -;;;;;; "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el" "cedet/ede/pmake.el" -;;;;;; "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" -;;;;;; "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" -;;;;;; "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" -;;;;;; "cedet/ede/proj-shared.el" "cedet/ede/proj.el" "cedet/ede/project-am.el" -;;;;;; "cedet/ede/shell.el" "cedet/ede/simple.el" "cedet/ede/source.el" -;;;;;; "cedet/ede/speedbar.el" "cedet/ede/srecode.el" "cedet/ede/system.el" -;;;;;; "cedet/ede/util.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" +;;;;;; "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el" +;;;;;; "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el" +;;;;;; "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el" +;;;;;; "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el" +;;;;;; "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el" +;;;;;; "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el" +;;;;;; "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el" +;;;;;; "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el" +;;;;;; "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el" +;;;;;; "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el" +;;;;;; "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el" +;;;;;; "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el" +;;;;;; "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el" +;;;;;; "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el" +;;;;;; "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el" +;;;;;; "cedet/cedet-idutils.el" "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" +;;;;;; "cedet/ede/base.el" "cedet/ede/cpp-root.el" "cedet/ede/custom.el" +;;;;;; "cedet/ede/dired.el" "cedet/ede/emacs.el" "cedet/ede/files.el" +;;;;;; "cedet/ede/generic.el" "cedet/ede/linux.el" "cedet/ede/loaddefs.el" +;;;;;; "cedet/ede/locate.el" "cedet/ede/make.el" "cedet/ede/makefile-edit.el" +;;;;;; "cedet/ede/pconf.el" "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" +;;;;;; "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" +;;;;;; "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" +;;;;;; "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" +;;;;;; "cedet/ede/proj.el" "cedet/ede/project-am.el" "cedet/ede/shell.el" +;;;;;; "cedet/ede/simple.el" "cedet/ede/source.el" "cedet/ede/speedbar.el" +;;;;;; "cedet/ede/srecode.el" "cedet/ede/system.el" "cedet/ede/util.el" +;;;;;; "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" ;;;;;; "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el" ;;;;;; "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el" ;;;;;; "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el" @@ -31938,13 +31766,13 @@ Zone out, completely. ;;;;;; "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el" ;;;;;; "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el" ;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el" -;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" -;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el" -;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el" -;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el" -;;;;;; "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el" -;;;;;; "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el" -;;;;;; "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" +;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el" +;;;;;; "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el" +;;;;;; "cedet/semantic/senator.el" "cedet/semantic/sort.el" "cedet/semantic/symref.el" +;;;;;; "cedet/semantic/symref/cscope.el" "cedet/semantic/symref/filter.el" +;;;;;; "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el" +;;;;;; "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el" +;;;;;; "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" @@ -31954,19 +31782,19 @@ Zone out, completely. ;;;;;; "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el" ;;;;;; "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el" ;;;;;; "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el" -;;;;;; "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el" -;;;;;; "cedet/srecode/srt.el" "cedet/srecode/table.el" "cedet/srecode/template.el" -;;;;;; "cedet/srecode/texi.el" "cus-dep.el" "dframe.el" "dired-aux.el" -;;;;;; "dired-x.el" "dos-fns.el" "dos-vars.el" "dos-w32.el" "dynamic-setting.el" -;;;;;; "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" -;;;;;; "emacs-lisp/byte-opt.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" -;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" -;;;;;; "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el" -;;;;;; "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el" -;;;;;; "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" "emacs-lisp/smie.el" -;;;;;; "emacs-lisp/subr-x.el" "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el" -;;;;;; "emulation/cua-gmrk.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el" -;;;;;; "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/tpu-extras.el" +;;;;;; "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el" +;;;;;; "cedet/srecode/semantic.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" +;;;;;; "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el" +;;;;;; "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el" +;;;;;; "dos-w32.el" "dynamic-setting.el" "emacs-lisp/avl-tree.el" +;;;;;; "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" "emacs-lisp/cl-extra.el" +;;;;;; "emacs-lisp/cl-loaddefs.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" +;;;;;; "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-custom.el" +;;;;;; "emacs-lisp/eieio-datadebug.el" "emacs-lisp/eieio-opt.el" +;;;;;; "emacs-lisp/eieio-speedbar.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" +;;;;;; "emacs-lisp/smie.el" "emacs-lisp/subr-x.el" "emacs-lisp/tcover-ses.el" +;;;;;; "emacs-lisp/tcover-unsafep.el" "emulation/cua-gmrk.el" "emulation/edt-lk201.el" +;;;;;; "emulation/edt-mapper.el" "emulation/edt-pc.el" "emulation/edt-vt100.el" ;;;;;; "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el" ;;;;;; "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el" ;;;;;; "emulation/viper-util.el" "erc/erc-backend.el" "erc/erc-goodies.el" @@ -31977,32 +31805,32 @@ Zone out, completely. ;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el" ;;;;;; "eshell/em-term.el" "eshell/em-tramp.el" "eshell/em-unix.el" ;;;;;; "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el" -;;;;;; "eshell/esh-ext.el" "eshell/esh-io.el" "eshell/esh-module.el" -;;;;;; "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el" -;;;;;; "eshell/esh-var.el" "ezimage.el" "format-spec.el" "fringe.el" -;;;;;; "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" -;;;;;; "gnus/gnus-cite.el" "gnus/gnus-cloud.el" "gnus/gnus-cus.el" -;;;;;; "gnus/gnus-demon.el" "gnus/gnus-dup.el" "gnus/gnus-eform.el" -;;;;;; "gnus/gnus-ems.el" "gnus/gnus-icalendar.el" "gnus/gnus-int.el" -;;;;;; "gnus/gnus-logic.el" "gnus/gnus-mh.el" "gnus/gnus-salt.el" -;;;;;; "gnus/gnus-score.el" "gnus/gnus-srvr.el" "gnus/gnus-topic.el" -;;;;;; "gnus/gnus-undo.el" "gnus/gnus-util.el" "gnus/gnus-uu.el" -;;;;;; "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" "gnus/legacy-gnus-agent.el" -;;;;;; "gnus/mail-parse.el" "gnus/mail-prsvr.el" "gnus/mail-source.el" -;;;;;; "gnus/mailcap.el" "gnus/messcompat.el" "gnus/mm-archive.el" -;;;;;; "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-util.el" -;;;;;; "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" "gnus/nnagent.el" -;;;;;; "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" "gnus/nneething.el" -;;;;;; "gnus/nngateway.el" "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnir.el" -;;;;;; "gnus/nnmail.el" "gnus/nnmaildir.el" "gnus/nnmairix.el" "gnus/nnmbox.el" -;;;;;; "gnus/nnmh.el" "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnregistry.el" -;;;;;; "gnus/nnrss.el" "gnus/nnspool.el" "gnus/nntp.el" "gnus/nnvirtual.el" -;;;;;; "gnus/nnweb.el" "gnus/registry.el" "gnus/rfc1843.el" "gnus/rfc2045.el" -;;;;;; "gnus/rfc2047.el" "gnus/rfc2104.el" "gnus/rfc2231.el" "gnus/rtree.el" -;;;;;; "gnus/sieve-manage.el" "gnus/smime.el" "gnus/spam-stat.el" -;;;;;; "gnus/spam-wash.el" "hex-util.el" "hfy-cmap.el" "ibuf-ext.el" -;;;;;; "international/cp51932.el" "international/eucjp-ms.el" "international/fontset.el" -;;;;;; "international/iso-ascii.el" "international/ja-dic-cnv.el" +;;;;;; "eshell/esh-ext.el" "eshell/esh-groups.el" "eshell/esh-io.el" +;;;;;; "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el" +;;;;;; "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "format-spec.el" +;;;;;; "fringe.el" "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" +;;;;;; "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cloud.el" +;;;;;; "gnus/gnus-cus.el" "gnus/gnus-demon.el" "gnus/gnus-dup.el" +;;;;;; "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-icalendar.el" +;;;;;; "gnus/gnus-int.el" "gnus/gnus-logic.el" "gnus/gnus-mh.el" +;;;;;; "gnus/gnus-salt.el" "gnus/gnus-score.el" "gnus/gnus-srvr.el" +;;;;;; "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el" +;;;;;; "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" +;;;;;; "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el" "gnus/mail-prsvr.el" +;;;;;; "gnus/mail-source.el" "gnus/mailcap.el" "gnus/messcompat.el" +;;;;;; "gnus/mm-archive.el" "gnus/mm-bodies.el" "gnus/mm-decode.el" +;;;;;; "gnus/mm-util.el" "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" +;;;;;; "gnus/nnagent.el" "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" +;;;;;; "gnus/nneething.el" "gnus/nngateway.el" "gnus/nnheader.el" +;;;;;; "gnus/nnimap.el" "gnus/nnir.el" "gnus/nnmail.el" "gnus/nnmaildir.el" +;;;;;; "gnus/nnmairix.el" "gnus/nnmbox.el" "gnus/nnmh.el" "gnus/nnnil.el" +;;;;;; "gnus/nnoo.el" "gnus/nnregistry.el" "gnus/nnrss.el" "gnus/nnspool.el" +;;;;;; "gnus/nntp.el" "gnus/nnvirtual.el" "gnus/nnweb.el" "gnus/registry.el" +;;;;;; "gnus/rfc1843.el" "gnus/rfc2045.el" "gnus/rfc2047.el" "gnus/rfc2104.el" +;;;;;; "gnus/rfc2231.el" "gnus/rtree.el" "gnus/sieve-manage.el" +;;;;;; "gnus/smime.el" "gnus/spam-stat.el" "gnus/spam-wash.el" "hex-util.el" +;;;;;; "hfy-cmap.el" "ibuf-ext.el" "international/cp51932.el" "international/eucjp-ms.el" +;;;;;; "international/fontset.el" "international/iso-ascii.el" "international/ja-dic-cnv.el" ;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "kermit.el" ;;;;;; "language/hanja-util.el" "language/thai-word.el" "ldefs-boot.el" ;;;;;; "leim/quail/arabic.el" "leim/quail/croatian.el" "leim/quail/cyril-jis.el" @@ -32044,13 +31872,13 @@ Zone out, completely. ;;;;;; "nxml/rng-pttrn.el" "nxml/rng-uri.el" "nxml/rng-util.el" ;;;;;; "nxml/xsd-regexp.el" "obsolete/abbrevlist.el" "obsolete/assoc.el" ;;;;;; "obsolete/awk-mode.el" "obsolete/bruce.el" "obsolete/cl-compat.el" -;;;;;; "obsolete/complete.el" "obsolete/cust-print.el" "obsolete/erc-hecomplete.el" -;;;;;; "obsolete/fast-lock.el" "obsolete/gulp.el" "obsolete/iso-acc.el" -;;;;;; "obsolete/iso-insert.el" "obsolete/iso-swed.el" "obsolete/keyswap.el" -;;;;;; "obsolete/lazy-lock.el" "obsolete/ledit.el" "obsolete/levents.el" -;;;;;; "obsolete/lmenu.el" "obsolete/longlines.el" "obsolete/lucid.el" -;;;;;; "obsolete/mailpost.el" "obsolete/meese.el" "obsolete/mouse-sel.el" -;;;;;; "obsolete/old-emacs-lock.el" "obsolete/old-whitespace.el" +;;;;;; "obsolete/complete.el" "obsolete/crisp.el" "obsolete/cust-print.el" +;;;;;; "obsolete/erc-hecomplete.el" "obsolete/fast-lock.el" "obsolete/gulp.el" +;;;;;; "obsolete/iso-acc.el" "obsolete/iso-insert.el" "obsolete/iso-swed.el" +;;;;;; "obsolete/keyswap.el" "obsolete/lazy-lock.el" "obsolete/ledit.el" +;;;;;; "obsolete/levents.el" "obsolete/lmenu.el" "obsolete/longlines.el" +;;;;;; "obsolete/lucid.el" "obsolete/mailpost.el" "obsolete/meese.el" +;;;;;; "obsolete/mouse-sel.el" "obsolete/old-emacs-lock.el" "obsolete/old-whitespace.el" ;;;;;; "obsolete/options.el" "obsolete/otodo-mode.el" "obsolete/patcomp.el" ;;;;;; "obsolete/pc-mode.el" "obsolete/pc-select.el" "obsolete/pgg-def.el" ;;;;;; "obsolete/pgg-gpg.el" "obsolete/pgg-parse.el" "obsolete/pgg-pgp.el" @@ -32058,7 +31886,9 @@ Zone out, completely. ;;;;;; "obsolete/resume.el" "obsolete/s-region.el" "obsolete/scribe.el" ;;;;;; "obsolete/spell.el" "obsolete/sregex.el" "obsolete/sup-mouse.el" ;;;;;; "obsolete/swedish.el" "obsolete/sym-comp.el" "obsolete/terminal.el" -;;;;;; "obsolete/vc-mcvs.el" "obsolete/xesam.el" "obsolete/yow.el" +;;;;;; "obsolete/tpu-edt.el" "obsolete/tpu-extras.el" "obsolete/tpu-mapper.el" +;;;;;; "obsolete/vc-mcvs.el" "obsolete/vi.el" "obsolete/vip.el" +;;;;;; "obsolete/ws-mode.el" "obsolete/xesam.el" "obsolete/yow.el" ;;;;;; "org/ob-C.el" "org/ob-R.el" "org/ob-asymptote.el" "org/ob-awk.el" ;;;;;; "org/ob-calc.el" "org/ob-clojure.el" "org/ob-comint.el" "org/ob-core.el" ;;;;;; "org/ob-css.el" "org/ob-ditaa.el" "org/ob-dot.el" "org/ob-emacs-lisp.el" @@ -32078,14 +31908,14 @@ Zone out, completely. ;;;;;; "org/org-eshell.el" "org/org-faces.el" "org/org-feed.el" ;;;;;; "org/org-footnote.el" "org/org-gnus.el" "org/org-habit.el" ;;;;;; "org/org-id.el" "org/org-indent.el" "org/org-info.el" "org/org-inlinetask.el" -;;;;;; "org/org-install.el" "org/org-irc.el" "org/org-list.el" "org/org-macro.el" -;;;;;; "org/org-mhe.el" "org/org-mobile.el" "org/org-mouse.el" "org/org-pcomplete.el" -;;;;;; "org/org-plot.el" "org/org-protocol.el" "org/org-rmail.el" -;;;;;; "org/org-src.el" "org/org-table.el" "org/org-timer.el" "org/org-w3m.el" -;;;;;; "org/ox-ascii.el" "org/ox-beamer.el" "org/ox-html.el" "org/ox-icalendar.el" -;;;;;; "org/ox-latex.el" "org/ox-man.el" "org/ox-md.el" "org/ox-odt.el" -;;;;;; "org/ox-org.el" "org/ox-publish.el" "org/ox-texinfo.el" "org/ox.el" -;;;;;; "play/gametree.el" "progmodes/ada-prj.el" "progmodes/cc-align.el" +;;;;;; "org/org-install.el" "org/org-irc.el" "org/org-list.el" "org/org-loaddefs.el" +;;;;;; "org/org-macro.el" "org/org-mhe.el" "org/org-mobile.el" "org/org-mouse.el" +;;;;;; "org/org-pcomplete.el" "org/org-plot.el" "org/org-protocol.el" +;;;;;; "org/org-rmail.el" "org/org-src.el" "org/org-table.el" "org/org-timer.el" +;;;;;; "org/org-w3m.el" "org/ox-ascii.el" "org/ox-beamer.el" "org/ox-html.el" +;;;;;; "org/ox-icalendar.el" "org/ox-latex.el" "org/ox-man.el" "org/ox-md.el" +;;;;;; "org/ox-odt.el" "org/ox-org.el" "org/ox-publish.el" "org/ox-texinfo.el" +;;;;;; "org/ox.el" "play/gametree.el" "progmodes/ada-prj.el" "progmodes/cc-align.el" ;;;;;; "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el" ;;;;;; "progmodes/cc-defs.el" "progmodes/cc-fonts.el" "progmodes/cc-langs.el" ;;;;;; "progmodes/cc-menus.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el" @@ -32108,8 +31938,8 @@ Zone out, completely. ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el" -;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21386 65266 511227 -;;;;;; 583000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21426 35556 729434 +;;;;;; 927000)) ;;;*** diff --git a/lisp/net/eww.el b/lisp/net/eww.el index e8eb09c9a8e..02fc575c261 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -478,6 +478,7 @@ word(s) will be searched for via `eww-search-prefix'." (setq-local eww-current-url 'author) (setq-local eww-current-dom nil) (setq-local eww-current-source nil) + (setq-local eww-current-title "") (setq-local browse-url-browser-function 'eww-browse-url) (setq-local after-change-functions 'eww-process-text-input) (setq-local eww-history nil) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index a0e72d1a6f5..9f2b4bb85db 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -802,11 +802,11 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.") (defun rcirc-buffer-process (&optional buffer) "Return the process associated with channel BUFFER. With no argument or nil as argument, use the current buffer." - (let ((buffer (or buffer (if (buffer-live-p rcirc-server-buffer) - rcirc-server-buffer - (error "Server buffer deleted"))))) - (or (with-current-buffer buffer rcirc-process) - rcirc-process))) + (let ((buffer (or buffer (and (buffer-live-p rcirc-server-buffer) + rcirc-server-buffer)))) + (if buffer + (with-current-buffer buffer rcirc-process) + rcirc-process))) (defun rcirc-server-name (process) "Return PROCESS server name, given by the 001 response." diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 1606cfb3357..594ff053d44 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -823,6 +823,8 @@ be after it." (defmacro c-with-syntax-table (table &rest code) ;; Temporarily switches to the specified syntax table in a failsafe ;; way to execute code. + ;; Maintainers' note: If TABLE is `c++-template-syntax-table', DON'T call + ;; any forms inside this that call `c-parse-state'. !!!! `(let ((c-with-syntax-table-orig-table (syntax-table))) (unwind-protect (progn diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 6b406b0d89c..7404241af9b 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -9355,16 +9355,16 @@ comment at the start of cc-engine.el for more info." (not (looking-at c-<-op-cont-regexp)))))) (c-with-syntax-table c++-template-syntax-table (goto-char placeholder) - (c-beginning-of-statement-1 containing-sexp t) - (if (save-excursion - (c-backward-syntactic-ws containing-sexp) - (eq (char-before) ?<)) - ;; In a nested template arglist. - (progn - (goto-char placeholder) - (c-syntactic-skip-backward "^,;" containing-sexp t) - (c-forward-syntactic-ws)) - (back-to-indentation))) + (c-beginning-of-statement-1 containing-sexp t)) + (if (save-excursion + (c-backward-syntactic-ws containing-sexp) + (eq (char-before) ?<)) + ;; In a nested template arglist. + (progn + (goto-char placeholder) + (c-syntactic-skip-backward "^,;" containing-sexp t) + (c-forward-syntactic-ws)) + (back-to-indentation)) ;; FIXME: Should use c-add-stmt-syntax, but it's not yet ;; template aware. (c-add-syntax 'template-args-cont (point) placeholder)) @@ -10022,16 +10022,16 @@ comment at the start of cc-engine.el for more info." (eq (char-after placeholder) ?<)))))) (c-with-syntax-table c++-template-syntax-table (goto-char placeholder) - (c-beginning-of-statement-1 lim t) - (if (save-excursion - (c-backward-syntactic-ws lim) - (eq (char-before) ?<)) - ;; In a nested template arglist. - (progn - (goto-char placeholder) - (c-syntactic-skip-backward "^,;" lim t) - (c-forward-syntactic-ws)) - (back-to-indentation))) + (c-beginning-of-statement-1 lim t)) + (if (save-excursion + (c-backward-syntactic-ws lim) + (eq (char-before) ?<)) + ;; In a nested template arglist. + (progn + (goto-char placeholder) + (c-syntactic-skip-backward "^,;" lim t) + (c-forward-syntactic-ws)) + (back-to-indentation)) ;; FIXME: Should use c-add-stmt-syntax, but it's not yet ;; template aware. (c-add-syntax 'template-args-cont (point) placeholder)) diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index d2d2de8801a..ee002b7bc7b 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -394,7 +394,9 @@ The syntax tables aren't stored directly since they're quite large." ;; lists are parsed. Note that this encourages incorrect parsing of ;; templates since they might contain normal operators that uses the ;; '<' and '>' characters. Therefore this syntax table might go - ;; away when CC Mode handles templates correctly everywhere. + ;; away when CC Mode handles templates correctly everywhere. WHILE + ;; THIS SYNTAX TABLE IS CURRENT, `c-parse-state' MUST _NOT_ BE + ;; CALLED!!! t nil (java c++) `(lambda () (let ((table (funcall ,(c-lang-const c-make-mode-syntax-table)))) diff --git a/lisp/subr.el b/lisp/subr.el index 09a085288a5..a0c56bf9752 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2016,6 +2016,7 @@ If optional CONFIRM is non-nil, read the password twice to make sure. Optional DEFAULT is a default password to use instead of empty input. This function echoes `.' for each character that the user types. +Note that in batch mode, the input is not hidden! Once the caller uses the password, it can erase the password by doing (clear-string STRING)." @@ -2055,7 +2056,11 @@ by doing (clear-string STRING)." (add-hook 'after-change-functions hide-chars-fun nil 'local)) (unwind-protect (let ((enable-recursive-minibuffers t)) - (read-string prompt nil t default)) ; t = "no history" + (read-string + (if noninteractive + (format "%s[INPUT WILL NOT BE HIDDEN!] " prompt) ; bug#17839 + prompt) + nil t default)) ; t = "no history" (when (buffer-live-p minibuf) (with-current-buffer minibuf ;; Not sure why but it seems that there might be cases where the diff --git a/lisp/url/url-domsuf.el b/lisp/url/url-domsuf.el index 6cedd3c3ca7..365cf561ae2 100644 --- a/lisp/url/url-domsuf.el +++ b/lisp/url/url-domsuf.el @@ -72,11 +72,11 @@ ((and (null modifier) (string= domain entry)) (setq allowedp nil)) - ;; "!pref.hokkaido.jp" + ;; "!city.yokohama.jp" ((and (eq modifier t) (string= domain entry)) (setq allowedp t)) - ;; "*.ar" + ;; "*.bd" ((and (numberp modifier) (= length modifier) (string= entry upper-domain)) @@ -85,13 +85,14 @@ ;; Tests: +;; TODO convert to a proper test/automated test. ;; (url-domsuf-cookie-allowed-p "com") => nil -;; (url-domsuf-cookie-allowed-p "foo.bar.ar") => t -;; (url-domsuf-cookie-allowed-p "bar.ar") => nil +;; (url-domsuf-cookie-allowed-p "foo.bar.bd") => t +;; (url-domsuf-cookie-allowed-p "bar.bd") => nil ;; (url-domsuf-cookie-allowed-p "co.uk") => nil ;; (url-domsuf-cookie-allowed-p "foo.bar.hokkaido.jo") => t -;; (url-domsuf-cookie-allowed-p "bar.hokkaido.jp") => nil -;; (url-domsuf-cookie-allowed-p "pref.hokkaido.jp") => t +;; (url-domsuf-cookie-allowed-p "bar.yokohama.jp") => nil +;; (url-domsuf-cookie-allowed-p "city.yokohama.jp") => t (provide 'url-domsuf) diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 430add5a8b6..20ace660739 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,15 @@ +2014-06-28 Glenn Morris <rgm@gnu.org> + + * Makefile.in: Use gcc auto-dependency information. + Move old dependency information to new file deps.mk. + (MKDIR_P, DEPFLAGS, MKDEPDIR, lwlib_deps_frag): + New, set by configure. + (DEPDIR): New variable. + (ALL_CFLAGS): Add DEPFLAGS. + (.c.o): Add MKDEPDIR. + (clean, mostlyclean): Delete DEPDIR. + * deps.mk, autodeps.mk: New files. + 2014-06-17 Paul Eggert <eggert@cs.ucla.edu> Omit redundant extern decls. diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index 7185aa60727..516b3286951 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -41,6 +41,7 @@ RANLIB=@RANLIB@ AR = @AR@ ARFLAGS = @ARFLAGS@ +MKDIR_P = @MKDIR_P@ LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o MOTIF_OBJS = lwlib-Xm.o @@ -50,13 +51,19 @@ TOOLKIT_OBJS = $(@X_TOOLKIT_TYPE@_OBJS) OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o +DEPDIR = deps +## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. +DEPFLAGS = @DEPFLAGS@ +## ${MKDIR_P} ${DEPDIR} (if AUTO_DEPEND); else ':'. +MKDEPDIR = @MKDEPDIR@ + ## ../src is where the generated file (config.h, globals.h) are. ## $(srcdir)/../src is where the non-generated files (lisp.h) are. ## (In an out-of-tree build, these two are not the same.) ## $(srcdir) is where the lwlib sources are. ## There are no generated lwlib files, hence no need for -I. ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ - $(C_SWITCH_MACHINE) \ + $(C_SWITCH_MACHINE) $(DEPFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \ -Demacs -I../src \ -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib @@ -65,6 +72,7 @@ all: liblw.a .PHONY: all .c.o: + @$(MKDEPDIR) $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< liblw.a: $(OBJS) @@ -72,30 +80,18 @@ liblw.a: $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ -## Generated files in ../src, non-generated in $(srcdir)/../src. -config_h = ../src/config.h $(srcdir)/../src/conf_post.h -lisp_h = $(srcdir)/../src/lisp.h -## lisp.h includes this. globals_h = ../src/globals.h -src_h = $(config_h) $(lisp_h) $(globals_h) - $(globals_h): $(MAKE) -C ../src globals.h -lwlib-utils.o: $(src_h) lwlib-utils.c lwlib-utils.h lwlib.h -lwlib.o: $(src_h) lwlib.c lwlib.h lwlib-int.h lwlib-utils.h \ - lwlib-Xlw.h lwlib-Xm.h lwlib-Xaw.h -lwlib-Xlw.o: $(src_h) lwlib-Xlw.c lwlib.h lwlib-int.h lwlib-Xlw.h xlwmenu.h -lwlib-Xaw.o: $(src_h) lwlib-Xaw.c lwlib-Xaw.h lwlib.h lwlib-int.h -lwlib-Xm.o: $(src_h) lwlib-Xm.c lwlib-Xm.h lwlib.h lwlib-int.h lwlib-utils.h -xlwmenu.o: $(src_h) xlwmenu.c xlwmenu.h lwlib.h xlwmenuP.h \ - $(srcdir)/../src/xterm.h - +## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. +@lwlib_deps_frag@ .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean clean mostlyclean: rm -f *.o liblw.a \#* + -rm -rf ${DEPDIR} distclean: clean rm -f Makefile diff --git a/lwlib/autodeps.mk b/lwlib/autodeps.mk new file mode 100644 index 00000000000..f7109295ce2 --- /dev/null +++ b/lwlib/autodeps.mk @@ -0,0 +1,5 @@ +### autodeps.mk --- lwlib/Makefile fragment for GNU Emacs + +## This is inserted in lwlib/Makefile if AUTO_DEPEND=yes. + +-include $(ALLOBJS:%.o=${DEPDIR}/%.d) diff --git a/lwlib/deps.mk b/lwlib/deps.mk new file mode 100644 index 00000000000..6355ec62e62 --- /dev/null +++ b/lwlib/deps.mk @@ -0,0 +1,43 @@ +### deps.mk --- lwlib/Makefile fragment for GNU Emacs + +# Copyright (C) 1992, 1993 Lucid, Inc. +# Copyright (C) 1994, 2001-2014 Free Software Foundation, Inc. +# +# This file is part of the Lucid Widget Library. +# +# The Lucid Widget Library 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 1, or (at your option) +# any later version. +# +# The Lucid Widget Library 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: + +## This file is inserted in lwlib/Makefile if AUTO_DEPEND=no. +## It defines static dependencies between the various source files. + +### Code: + +## Generated files in ../src, non-generated in $(srcdir)/../src. +config_h = ../src/config.h $(srcdir)/../src/conf_post.h +lisp_h = $(srcdir)/../src/lisp.h +## lisp.h includes this. +src_h = $(config_h) $(lisp_h) $(globals_h) + +lwlib-utils.o: $(src_h) lwlib-utils.c lwlib-utils.h lwlib.h +lwlib.o: $(src_h) lwlib.c lwlib.h lwlib-int.h lwlib-utils.h \ + lwlib-Xlw.h lwlib-Xm.h lwlib-Xaw.h +lwlib-Xlw.o: $(src_h) lwlib-Xlw.c lwlib.h lwlib-int.h lwlib-Xlw.h xlwmenu.h +lwlib-Xaw.o: $(src_h) lwlib-Xaw.c lwlib-Xaw.h lwlib.h lwlib-int.h +lwlib-Xm.o: $(src_h) lwlib-Xm.c lwlib-Xm.h lwlib.h lwlib-int.h lwlib-utils.h +xlwmenu.o: $(src_h) xlwmenu.c xlwmenu.h lwlib.h xlwmenuP.h \ + $(srcdir)/../src/xterm.h + +### deps.mk ends here diff --git a/make-dist b/make-dist index ed6a7cf8798..fba490547ee 100755 --- a/make-dist +++ b/make-dist @@ -438,12 +438,12 @@ echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources'" echo "Making links to \`oldXMenu'" (cd oldXMenu - ln *.[ch] *.in ../${tempdir}/oldXMenu + ln *.[ch] *.in *.mk ../${tempdir}/oldXMenu ln README ChangeLog ../${tempdir}/oldXMenu) echo "Making links to \`lwlib'" (cd lwlib - ln *.[ch] *.in ../${tempdir}/lwlib + ln *.[ch] *.in *.mk ../${tempdir}/lwlib ln README ChangeLog ../${tempdir}/lwlib) ## It is important to distribute admin/ because it contains sources diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 74686f64972..2bccaf2f6ef 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,17 @@ +2014-06-28 Glenn Morris <rgm@gnu.org> + + * deps.mk (${OBJS}): Depend on ../src/config.h. + + * Makefile.in: Use gcc auto-dependency information. + Move old dependency information to new file deps.mk. + (MKDIR_P, DEPFLAGS, MKDEPDIR, oldxmenu_deps_frag): + New, set by configure. + (DEPDIR): New variable. + (ALL_CFLAGS): Add DEPFLAGS. + (.c.o): Add MKDEPDIR. + (clean, mostlyclean): Delete DEPDIR. + * deps.mk, autodeps.mk: New files. + 2014-06-15 Glenn Morris <rgm@gnu.org> * Makefile.in (CPPFLAGS): Explicitly set via configure. diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 91b313ac627..bfa7d97912a 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -63,6 +63,7 @@ RM = rm -f RANLIB = @RANLIB@ AR = @AR@ ARFLAGS = @ARFLAGS@ +MKDIR_P = @MKDIR_P@ OBJS = Activate.o \ AddPane.o \ @@ -92,13 +93,20 @@ OBJS = Activate.o \ all: libXMenu11.a .PHONY: all +DEPDIR = deps +## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. +DEPFLAGS = @DEPFLAGS@ +## ${MKDIR_P} ${DEPDIR} (if AUTO_DEPEND); else ':'. +MKDEPDIR = @MKDEPDIR@ + ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ - $(C_SWITCH_X_SITE) \ + $(C_SWITCH_X_SITE) $(DEPFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) ${PROFILING_CFLAGS} \ $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \ -I../src -I../lib -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib .c.o: + @$(MKDEPDIR) $(CC) -c ${ALL_CFLAGS} $< libXMenu11.a: $(OBJS) $(EXTRA) @@ -106,42 +114,14 @@ libXMenu11.a: $(OBJS) $(EXTRA) $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA) $(RANLIB) $@ -Activate.o: Activate.c XMenuInt.h XMenu.h X10.h -AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h -AddSel.o: AddSel.c XMenuInt.h XMenu.h X10.h -ChgPane.o: ChgPane.c XMenuInt.h XMenu.h X10.h -ChgSel.o: ChgSel.c XMenuInt.h XMenu.h X10.h -Create.o: Create.c XMenuInt.h XMenu.h X10.h -DelPane.o: DelPane.c XMenuInt.h XMenu.h X10.h -DelSel.o: DelSel.c XMenuInt.h XMenu.h X10.h -Destroy.o: Destroy.c XMenuInt.h XMenu.h X10.h -Error.o: Error.c XMenuInt.h XMenu.h X10.h -EvHand.o: EvHand.c XMenuInt.h XMenu.h X10.h -FindPane.o: FindPane.c XMenuInt.h XMenu.h X10.h -FindSel.o: FindSel.c XMenuInt.h XMenu.h X10.h -InsPane.o: InsPane.c XMenuInt.h XMenu.h X10.h -InsSel.o: InsSel.c XMenuInt.h XMenu.h X10.h -Internal.o: Internal.c XMenuInt.h XMenu.h X10.h -Locate.o: Locate.c XMenuInt.h XMenu.h X10.h -Post.o: Post.c XMenuInt.h XMenu.h X10.h -Recomp.o: Recomp.c XMenuInt.h XMenu.h X10.h -SetAEQ.o: SetAEQ.c XMenuInt.h XMenu.h X10.h -SetFrz.o: SetFrz.c XMenuInt.h XMenu.h X10.h -SetPane.o: SetPane.c XMenuInt.h XMenu.h X10.h -SetSel.o: SetSel.c XMenuInt.h XMenu.h X10.h -XDelAssoc.o: XDelAssoc.c X10.h -XLookAssoc.o: XLookAssoc.c X10.h -XCrAssoc.o: XCrAssoc.c X10.h -XDestAssoc.o: XDestAssoc.c X10.h -XMakeAssoc.o: XMakeAssoc.c X10.h -insque.o: insque.c +## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. +@oldxmenu_deps_frag@ .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean -mostlyclean: +clean mostlyclean: rm -f libXMenu11.a ${OBJS} ${EXTRA} - -clean: mostlyclean + -rm -rf ${DEPDIR} bootstrap-clean maintainer-clean distclean: clean rm -f Makefile @@ -150,3 +130,4 @@ bootstrap-clean maintainer-clean distclean: clean tags: $(TAGS) -t *.[ch] +### Makefile.in ends here diff --git a/oldXMenu/autodeps.mk b/oldXMenu/autodeps.mk new file mode 100644 index 00000000000..f7109295ce2 --- /dev/null +++ b/oldXMenu/autodeps.mk @@ -0,0 +1,5 @@ +### autodeps.mk --- lwlib/Makefile fragment for GNU Emacs + +## This is inserted in lwlib/Makefile if AUTO_DEPEND=yes. + +-include $(ALLOBJS:%.o=${DEPDIR}/%.d) diff --git a/oldXMenu/deps.mk b/oldXMenu/deps.mk new file mode 100644 index 00000000000..81088c51b1e --- /dev/null +++ b/oldXMenu/deps.mk @@ -0,0 +1,72 @@ +### deps.mk --- oldXMenu/Makefile fragment for GNU Emacs + +## Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology + +## Permission to use, copy, modify, and distribute this +## software and its documentation for any purpose and without +## fee is hereby granted, provided that the above copyright +## notice appear in all copies and that both that copyright +## notice and this permission notice appear in supporting +## documentation, and that the name of M.I.T. not be used in +## advertising or publicity pertaining to distribution of the +## software without specific, written prior permission. +## M.I.T. makes no representations about the suitability of +## this software for any purpose. It is provided "as is" +## without express or implied warranty. + + +## Copyright (C) 2001-2014 Free Software Foundation, Inc. + +## This program 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. + +## This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + +### Commentary: + +## This file is inserted in oldXMenu/Makefile if AUTO_DEPEND=no. +## It defines static dependencies between the various source files. + +### Code: + +Activate.o: Activate.c XMenuInt.h XMenu.h X10.h +AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h +AddSel.o: AddSel.c XMenuInt.h XMenu.h X10.h +ChgPane.o: ChgPane.c XMenuInt.h XMenu.h X10.h +ChgSel.o: ChgSel.c XMenuInt.h XMenu.h X10.h +Create.o: Create.c XMenuInt.h XMenu.h X10.h +DelPane.o: DelPane.c XMenuInt.h XMenu.h X10.h +DelSel.o: DelSel.c XMenuInt.h XMenu.h X10.h +Destroy.o: Destroy.c XMenuInt.h XMenu.h X10.h +Error.o: Error.c XMenuInt.h XMenu.h X10.h +EvHand.o: EvHand.c XMenuInt.h XMenu.h X10.h +FindPane.o: FindPane.c XMenuInt.h XMenu.h X10.h +FindSel.o: FindSel.c XMenuInt.h XMenu.h X10.h +InsPane.o: InsPane.c XMenuInt.h XMenu.h X10.h +InsSel.o: InsSel.c XMenuInt.h XMenu.h X10.h +Internal.o: Internal.c XMenuInt.h XMenu.h X10.h +Locate.o: Locate.c XMenuInt.h XMenu.h X10.h +Post.o: Post.c XMenuInt.h XMenu.h X10.h +Recomp.o: Recomp.c XMenuInt.h XMenu.h X10.h +SetAEQ.o: SetAEQ.c XMenuInt.h XMenu.h X10.h +SetFrz.o: SetFrz.c XMenuInt.h XMenu.h X10.h +SetPane.o: SetPane.c XMenuInt.h XMenu.h X10.h +SetSel.o: SetSel.c XMenuInt.h XMenu.h X10.h +XDelAssoc.o: XDelAssoc.c X10.h +XLookAssoc.o: XLookAssoc.c X10.h +XCrAssoc.o: XCrAssoc.c X10.h +XDestAssoc.o: XDestAssoc.c X10.h +XMakeAssoc.o: XMakeAssoc.c X10.h +insque.o: insque.c + +${OBJS}: ../src/config.h + +### deps.mk ends here diff --git a/src/ChangeLog b/src/ChangeLog index ec9c0ce42fd..1db9e8768e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4,6 +4,51 @@ (MAX_CHARBUF_EXTRA_SIZE): New macro. (ALLOC_CONVERSION_WORK_AREA): Use MAX_CHARBUF_EXTRA_SIZE. +2014-06-30 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (judge): EmacsScroller: Move dealloc code here. + (dealloc): Remove for EmacsScroller. + + * nsterm.h (EmacsScroller): Remove dealloc. + +2014-06-30 Eli Zaretskii <eliz@gnu.org> + + * coding.c (MIN_CHARBUF_SIZE): Enlarge to 32. (Bug#17881) + +2014-06-30 Jan Djärv <jan.h.d@swipnet.se> + + * nsmenu.m (update_frame_tool_bar): Set wait_for_tool_bar to NO + when setNeedsDisplay is called so we don't trigger redisplay for every + tool bar update. + + * nsterm.m (any_help_event_p): New variable. + (mouseMoved:): Set any_help_event_p to YES if help event is + generated. Remove else with empty help event that triggered redisplay + for every mouse move. + (windowDidResignKey:): If any_help_event_p, generate empty help + event. + +2014-06-29 Dmitry Antipov <dmantipov@yandex.ru> + + * xfns.c (Qsuppress_icon): Remove; no real users. + (syms_of_xfns): Don't DEFSYM it. Remove ancient comments. + * w32fns.c (Qsuppress_icon): Remove, for the same reason. + (syms_of_w32fns): Don't DEFSYM it. + +2014-06-29 Glenn Morris <rgm@gnu.org> + + * Makefile.in (ns-app): Mark as PHONY. + +2014-06-28 Glenn Morris <rgm@gnu.org> + + * Makefile.in (mostlyclean): There are no libXMenu11.a, + liblw.a in this directory. + +2014-06-28 Andreas Schwab <schwab@linux-m68k.org> + + * coding.c (encode_coding_utf_8): Correctly count produced_chars + also in unibyte case. (Bug#17865) + 2014-06-28 K. Handa <handa@gnu.org> * coding.c (MAX_CHARBUF_SIZE): Renamed from CHARBUF_SIZE. diff --git a/src/Makefile.in b/src/Makefile.in index 748f38e55bd..a13f7b8b8be 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -518,6 +518,7 @@ emacs.res: $(ntsource)/emacs.rc \ $(WINDRES) -O COFF --include-dir=$(srcdir)/../nt \ -o $@ $(ntsource)/emacs.rc +.PHONY: ns-app ns-app: emacs$(EXEEXT) $(MAKE) -C ../nextstep all @@ -525,7 +526,7 @@ ns-app: emacs$(EXEEXT) .PHONY: versionclean extraclean mostlyclean: - rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a + rm -f temacs$(EXEEXT) core *.core \#* *.o rm -f ../etc/DOC rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) rm -f buildobj.h diff --git a/src/coding.c b/src/coding.c index e68700c099d..d4c468cfbbf 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1549,8 +1549,8 @@ encode_coding_utf_8 (struct coding_system *coding) *dst++ = CHAR_TO_BYTE8 (c); else CHAR_STRING_ADVANCE_NO_UNIFY (c, dst); - produced_chars++; } + produced_chars = dst - (coding->destination + coding->produced); } record_conversion_result (coding, CODING_RESULT_SUCCESS); coding->produced_char += produced_chars; diff --git a/src/deps.mk b/src/deps.mk index 1d67d750983..3fdbbe6605f 100644 --- a/src/deps.mk +++ b/src/deps.mk @@ -1,7 +1,7 @@ ### deps.mk --- src/Makefile fragment for GNU Emacs -## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2014 Free Software -## Foundation, Inc. +## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2014 +## Free Software Foundation, Inc. ## This file is part of GNU Emacs. @@ -27,8 +27,6 @@ ## Eg callproc.c only depends on w32.h for WINDOWSNT builds. ## One way to fix this would be to replace w32.h (etc) by $(W32_H), ## a variable set by configure. Does not seem worth the trouble. -## Since the w32 build does not even use this file, you might ask -## why these dependencies are here at all... ## nsgui.h: In fact, every .o file depends directly or indirectly on ## dispextern.h and hence nsgui.h under NS. But the ones that actually diff --git a/src/nsmenu.m b/src/nsmenu.m index 24c1189584b..778b068ef8b 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1152,7 +1152,10 @@ update_frame_tool_bar (struct frame *f) FRAME_TOOLBAR_HEIGHT (f) = 0; if (view->wait_for_tool_bar && FRAME_TOOLBAR_HEIGHT (f) > 0) + { + view->wait_for_tool_bar = NO; [view setNeedsDisplay: YES]; + } unblock_input (); } diff --git a/src/nsterm.h b/src/nsterm.h index e77aca3d50d..2619b710073 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -412,7 +412,6 @@ typedef float EmacsCGFloat; - initFrame: (NSRect )r window: (Lisp_Object)win; - (void)setFrame: (NSRect)r; -- (void)dealloc; - setPosition: (int) position portion: (int) portion whole: (int) whole; - (int) checkSamePosition: (int)position portion: (int)portion diff --git a/src/nsterm.m b/src/nsterm.m index c6450804f57..f2eeeda93bf 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -283,6 +283,11 @@ static NSMutableArray *ns_pending_files, *ns_pending_service_names, static BOOL ns_do_open_file = NO; static BOOL ns_last_use_native_fullscreen; +/* Non-zero means that a HELP_EVENT has been generated since Emacs + start. */ + +static BOOL any_help_event_p = NO; + static struct { struct input_event *q; int nr, cap; @@ -5688,14 +5693,10 @@ not_in_argv (NSString *arg) /* NOTE: help_echo_{window,pos,object} are set in xdisp.c (note_mouse_highlight), which is called through the note_mouse_movement () call above */ + any_help_event_p = YES; gen_help_event (help_echo_string, frame, help_echo_window, help_echo_object, help_echo_pos); } - else - { - help_echo_string = Qnil; - gen_help_event (Qnil, frame, Qnil, Qnil, 0); - } if (emacsframe->mouse_moved && send_appdefined) ns_send_appdefined (-1); @@ -5973,6 +5974,14 @@ if (cols > 0 && rows > 0) x_set_frame_alpha (emacsframe); } + if (any_help_event_p) + { + Lisp_Object frame; + XSETFRAME (frame, emacsframe); + help_echo_string = Qnil; + gen_help_event (Qnil, frame, Qnil, Qnil, 0); + } + if (emacs_event && is_focus_frame) { [self deleteWorkingText]; @@ -7135,15 +7144,6 @@ if (cols > 0 && rows > 0) } -- (void)dealloc -{ - NSTRACE (EmacsScroller_dealloc); - if (!NILP (win)) - wset_vertical_scroll_bar (XWINDOW (win), Qnil); - [super dealloc]; -} - - - condemn { NSTRACE (condemn); @@ -7171,6 +7171,9 @@ if (cols > 0 && rows > 0) view = (EmacsView *)FRAME_NS_VIEW (frame); if (view != nil) view->scrollbarsNeedingUpdate++; + if (!NILP (win)) + wset_vertical_scroll_bar (XWINDOW (win), Qnil); + win = Qnil; [self removeFromSuperview]; [self release]; unblock_input (); diff --git a/src/w32fns.c b/src/w32fns.c index 057bc95ee94..e24148af4ff 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -96,7 +96,6 @@ static HWND hourglass_hwnd = NULL; #define IDC_HAND MAKEINTRESOURCE(32649) #endif -Lisp_Object Qsuppress_icon; Lisp_Object Qundefined_color; Lisp_Object Qcancel_timer; Lisp_Object Qfont_param; @@ -8091,7 +8090,6 @@ syms_of_w32fns (void) w32_visible_system_caret_hwnd = NULL; - DEFSYM (Qsuppress_icon, "suppress-icon"); DEFSYM (Qundefined_color, "undefined-color"); DEFSYM (Qcancel_timer, "cancel-timer"); DEFSYM (Qhyper, "hyper"); @@ -8106,8 +8104,6 @@ syms_of_w32fns (void) DEFSYM (Qworkarea, "workarea"); DEFSYM (Qmm_size, "mm-size"); DEFSYM (Qframes, "frames"); - /* This is the end of symbol initialization. */ - Fput (Qundefined_color, Qerror_conditions, listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror)); diff --git a/src/xfns.c b/src/xfns.c index c3d9900207f..651d21294e3 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -125,7 +125,6 @@ extern LWLIB_ID widget_id_tick; #define MAXREQUEST(dpy) (XMaxRequestSize (dpy)) -static Lisp_Object Qsuppress_icon; static Lisp_Object Qundefined_color; static Lisp_Object Qcompound_text, Qcancel_timer; Lisp_Object Qfont_param; @@ -6137,15 +6136,10 @@ frame_parm_handler x_frame_parm_handlers[] = void syms_of_xfns (void) { - /* The section below is built by the lisp expression at the top of the file, - just above where these variables are declared. */ - /*&&& init symbols here &&&*/ - DEFSYM (Qsuppress_icon, "suppress-icon"); DEFSYM (Qundefined_color, "undefined-color"); DEFSYM (Qcompound_text, "compound-text"); DEFSYM (Qcancel_timer, "cancel-timer"); DEFSYM (Qfont_param, "font-parameter"); - /* This is the end of symbol initialization. */ Fput (Qundefined_color, Qerror_conditions, listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror)); diff --git a/test/ChangeLog b/test/ChangeLog index f67fad959fa..8c28eaf30dc 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,5 +1,32 @@ +2014-06-30 Fabián Ezequiel Gallina <fgallina@gnu.org> + + * automated/subr-x-tests.el: New file. + +2014-06-29 Michael Albinus <michael.albinus@gmx.de> + + * automated/tramp-tests.el (tramp--instrument-test-case): + Print debug buffer in any case. + +2014-06-28 Leo Liu <sdl.web@gmail.com> + + * automated/calc-tests.el: New file and add tests for math-bignum. + (Bug#17556) + +2014-06-28 Michael Albinus <michael.albinus@gmx.de> + + * automated/dbus-tests.el (dbus--test-register-service) + (dbus-test02-register-service-session): Replace `dbus-ping' calls + by `dbus-list-known-names'. (Bug#17858) + 2014-06-28 Glenn Morris <rgm@gnu.org> + * automated/Makefile.in (GDB): New variable. + (emacs): Use $GDB. (Bug#15991) + + * automated/Makefile.in (WRITE_LOG): New variable. + (%.log): Use WRITE_LOG. + (test_template): Disable logging. + * automated/Makefile.in (TESTS): New list of short PHONY aliases. (test_template): New definition. Apply to TESTS. diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in index da14fda88d6..e0eaffa4c2c 100644 --- a/test/automated/Makefile.in +++ b/test/automated/Makefile.in @@ -20,10 +20,10 @@ ### Commentary: ## Some targets: -## check: re-run all tests +## check: re-run all tests, writing to .log files. ## check-maybe: run all tests whose .log file needs updating ## filename.log: run tests from filename.el(c) if .log file needs updating -## filename: re-run tests from filename.el(c) +## filename: re-run tests from filename.el(c), with no logging ### Code: @@ -47,9 +47,12 @@ EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)" # Prevent any settings in the user environment causing problems. unexport EMACSDATA EMACSDOC EMACSPATH GREP_OPTIONS +## To run tests under a debugger, set this to eg: "gdb --args". +GDB = + # The actual Emacs command run in the targets below. # Prevent any setting of EMACSLOADPATH in user environment causing problems. -emacs = EMACSLOADPATH= LC_ALL=C EMACS_TEST_DIRECTORY=$(srcdir) "$(EMACS)" $(EMACSOPT) +emacs = EMACSLOADPATH= LC_ALL=C EMACS_TEST_DIRECTORY=$(srcdir) $(GDB) "$(EMACS)" $(EMACSOPT) .PHONY: all check @@ -60,10 +63,9 @@ all: check @$(emacs) -f batch-byte-compile $< ## Ignore any test errors so we can continue to test other files. -## (It would be nice if we could get an error when running an -## individual test, but not when running check.) ## But compilation errors are always fatal. -## +WRITE_LOG = >& $@ || { stat=ERROR; cat $@; }; echo $$stat: $@ + ## I'd prefer to use -emacs -f ert-run-tests-batch-and-exit rather ## than || true, since the former makes problems more obvious. ## I'd also prefer to @-hide the grep part and not the @@ -74,7 +76,7 @@ all: check ## basename duplicates a file in lisp/ (eg eshell.el). ## ii) Although -l basename will automatically load .el or .elc, ## -l ./basename treats basename as a literal file (it would be nice -## to change this). +## to change this; bug#17848 - if that gets done, this can be simplified). ## ## Beware: it approximates `no-byte-compile', so watch out for false-positives! %.log: ${srcdir}/%.el @@ -87,10 +89,7 @@ all: check echo Testing $$loadfile; \ stat=OK ; \ $(emacs) -l ert -l $$loadfile \ - -f ert-run-tests-batch-and-exit >& $@ || { \ - stat=ERROR; \ - cat $@; }; \ - echo $$stat: $@ + -f ert-run-tests-batch-and-exit ${WRITE_LOG} ELFILES = $(wildcard ${srcdir}/*.el) LOGFILES = $(patsubst %.el,%.log,$(notdir ${ELFILES})) @@ -102,11 +101,11 @@ TESTS = ${LOGFILES:.log=} .PHONY: ${TESTS} -## The short aliases that always re-run the tests. +## The short aliases that always re-run the tests, with no logging. define test_template $(1): @test ! -f $(1).log || mv $(1).log $(1).log~ - @${MAKE} $(1).log + @${MAKE} $(1).log WRITE_LOG= endef $(foreach test,${TESTS},$(eval $(call test_template,${test}))) diff --git a/test/automated/calc-tests.el b/test/automated/calc-tests.el new file mode 100644 index 00000000000..b96a9e83e75 --- /dev/null +++ b/test/automated/calc-tests.el @@ -0,0 +1,42 @@ +;;; calc-tests.el --- tests for calc -*- lexical-binding: t; -*- + +;; Copyright (C) 2014 Free Software Foundation, Inc. + +;; Author: Leo Liu <sdl.web@gmail.com> +;; Keywords: maint + +;; 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: + +;;; Code: + +(require 'cl-lib) +(require 'ert) +(require 'calc) + +(ert-deftest test-math-bignum () + ;; bug#17556 + (let ((n (math-bignum most-negative-fixnum))) + (should (math-negp n)) + (should (cl-notany #'cl-minusp (cdr n))))) + +(provide 'calc-tests) +;;; calc-tests.el ends here + +;; Local Variables: +;; bug-reference-url-format: "http://debbugs.gnu.org/%s" +;; End: diff --git a/test/automated/dbus-tests.el b/test/automated/dbus-tests.el index c9d9c72ec1d..1af5c77de53 100644 --- a/test/automated/dbus-tests.el +++ b/test/automated/dbus-tests.el @@ -88,15 +88,15 @@ ;; Register an own service. (should (eq (dbus-register-service bus dbus-service-emacs) :primary-owner)) - (should (dbus-ping bus dbus-service-emacs 100)) + (should (member dbus-service-emacs (dbus-list-known-names bus))) (should (eq (dbus-register-service bus dbus-service-emacs) :already-owner)) - (should (dbus-ping bus dbus-service-emacs 100)) + (should (member dbus-service-emacs (dbus-list-known-names bus))) ;; Unregister the service. (should (eq (dbus-unregister-service bus dbus-service-emacs) :released)) - (should-not (dbus-ping bus dbus-service-emacs 100)) + (should-not (member dbus-service-emacs (dbus-list-known-names bus))) (should (eq (dbus-unregister-service bus dbus-service-emacs) :non-existent)) - (should-not (dbus-ping bus dbus-service-emacs 100)) + (should-not (member dbus-service-emacs (dbus-list-known-names bus))) ;; `dbus-service-dbus' is reserved for the BUS itself. (should-error (dbus-register-service bus dbus-service-dbus)) @@ -109,7 +109,7 @@ (dbus--test-register-service :session) (let ((service "org.freedesktop.Notifications")) - (when (dbus-ping :session service 100) + (when (member service (dbus-list-known-names :session)) ;; Cleanup. (dbus-ignore-errors (dbus-unregister-service :session service)) diff --git a/test/automated/subr-x-tests.el b/test/automated/subr-x-tests.el new file mode 100644 index 00000000000..df8412699a4 --- /dev/null +++ b/test/automated/subr-x-tests.el @@ -0,0 +1,526 @@ +;;; subr-x-tests.el --- Testing the extended lisp routines + +;; Copyright (C) 2014 Free Software Foundation, Inc. + +;; Author: Fabián E. Gallina <fgallina@gnu.org> +;; Keywords: + +;; This program 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. + +;; This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + +;;; Commentary: + +;; + +;;; Code: + +(require 'ert) +(require 'subr-x) + + +;; if-let tests + +(ert-deftest subr-x-test-if-let-single-binding-expansion () + "Test single bindings are expanded properly." + (should (equal + (macroexpand + '(if-let (a 1) + (- a) + "no")) + '(let* ((a (and t 1))) + (if a + (- a) + "no")))) + (should (equal + (macroexpand + '(if-let (a) + (- a) + "no")) + '(let* ((a (and t nil))) + (if a + (- a) + "no"))))) + +(ert-deftest subr-x-test-if-let-single-symbol-expansion () + "Test single symbol bindings are expanded properly." + (should (equal + (macroexpand + '(if-let (a) + (- a) + "no")) + '(let* ((a (and t nil))) + (if a + (- a) + "no")))) + (should (equal + (macroexpand + '(if-let (a b c) + (- a) + "no")) + '(let* ((a (and t nil)) + (b (and a nil)) + (c (and b nil))) + (if c + (- a) + "no")))) + (should (equal + (macroexpand + '(if-let (a (b 2) c) + (- a) + "no")) + '(let* ((a (and t nil)) + (b (and a 2)) + (c (and b nil))) + (if c + (- a) + "no"))))) + +(ert-deftest subr-x-test-if-let-nil-related-expansion () + "Test nil is processed properly." + (should (equal + (macroexpand + '(if-let (nil) + (- a) + "no")) + '(let* ((nil (and t nil))) + (if nil + (- a) + "no")))) + (should (equal + (macroexpand + '(if-let ((nil)) + (- a) + "no")) + '(let* ((nil (and t nil))) + (if nil + (- a) + "no")))) + (should (equal + (macroexpand + '(if-let ((a 1) (nil) (b 2)) + (- a) + "no")) + '(let* ((a (and t 1)) + (nil (and a nil)) + (b (and nil 2))) + (if b + (- a) + "no")))) + (should (equal + (macroexpand + '(if-let ((a 1) nil (b 2)) + (- a) + "no")) + '(let* ((a (and t 1)) + (nil (and a nil)) + (b (and nil 2))) + (if b + (- a) + "no"))))) + +(ert-deftest subr-x-test-if-let-malformed-binding () + "Test malformed bindings trigger errors." + (should-error (macroexpand + '(if-let (_ (a 1 1) (b 2) (c 3) d) + (- a) + "no")) + :type 'error) + (should-error (macroexpand + '(if-let (_ (a 1) (b 2 2) (c 3) d) + (- a) + "no")) + :type 'error) + (should-error (macroexpand + '(if-let (_ (a 1) (b 2) (c 3 3) d) + (- a) + "no")) + :type 'error) + (should-error (macroexpand + '(if-let ((a 1 1)) + (- a) + "no")) + :type 'error)) + +(ert-deftest subr-x-test-if-let-true () + "Test `if-let' with truthy bindings." + (should (equal + (if-let (a 1) + a + "no") + 1)) + (should (equal + (if-let ((a 1) (b 2) (c 3)) + (list a b c) + "no") + (list 1 2 3)))) + +(ert-deftest subr-x-test-if-let-false () + "Test `if-let' with falsey bindings." + (should (equal + (if-let (a nil) + (list a b c) + "no") + "no")) + (should (equal + (if-let ((a nil) (b 2) (c 3)) + (list a b c) + "no") + "no")) + (should (equal + (if-let ((a 1) (b nil) (c 3)) + (list a b c) + "no") + "no")) + (should (equal + (if-let ((a 1) (b 2) (c nil)) + (list a b c) + "no") + "no")) + (should (equal + (if-let (z (a 1) (b 2) (c 3)) + (list a b c) + "no") + "no")) + (should (equal + (if-let ((a 1) (b 2) (c 3) d) + (list a b c) + "no") + "no"))) + +(ert-deftest subr-x-test-if-let-bound-references () + "Test `if-let' bindings can refer to already bound symbols." + (should (equal + (if-let ((a (1+ 0)) (b (1+ a)) (c (1+ b))) + (list a b c) + "no") + (list 1 2 3)))) + +(ert-deftest subr-x-test-if-let-and-lazyness-is-preserved () + "Test `if-let' respects `and' lazyness." + (let (a-called b-called c-called) + (should (equal + (if-let ((a nil) + (b (setq b-called t)) + (c (setq c-called t))) + "yes" + (list a-called b-called c-called)) + (list nil nil nil)))) + (let (a-called b-called c-called) + (should (equal + (if-let ((a (setq a-called t)) + (b nil) + (c (setq c-called t))) + "yes" + (list a-called b-called c-called)) + (list t nil nil)))) + (let (a-called b-called c-called) + (should (equal + (if-let ((a (setq a-called t)) + (b (setq b-called t)) + (c nil) + (d (setq c-called t))) + "yes" + (list a-called b-called c-called)) + (list t t nil))))) + + +;; when-let tests + +(ert-deftest subr-x-test-when-let-body-expansion () + "Test body allows for multiple sexps wrapping with progn." + (should (equal + (macroexpand + '(when-let (a 1) + (message "opposite") + (- a))) + '(let* ((a (and t 1))) + (if a + (progn + (message "opposite") + (- a))))))) + +(ert-deftest subr-x-test-when-let-single-binding-expansion () + "Test single bindings are expanded properly." + (should (equal + (macroexpand + '(when-let (a 1) + (- a))) + '(let* ((a (and t 1))) + (if a + (- a))))) + (should (equal + (macroexpand + '(when-let (a) + (- a))) + '(let* ((a (and t nil))) + (if a + (- a)))))) + +(ert-deftest subr-x-test-when-let-single-symbol-expansion () + "Test single symbol bindings are expanded properly." + (should (equal + (macroexpand + '(when-let (a) + (- a))) + '(let* ((a (and t nil))) + (if a + (- a))))) + (should (equal + (macroexpand + '(when-let (a b c) + (- a))) + '(let* ((a (and t nil)) + (b (and a nil)) + (c (and b nil))) + (if c + (- a))))) + (should (equal + (macroexpand + '(when-let (a (b 2) c) + (- a))) + '(let* ((a (and t nil)) + (b (and a 2)) + (c (and b nil))) + (if c + (- a)))))) + +(ert-deftest subr-x-test-when-let-nil-related-expansion () + "Test nil is processed properly." + (should (equal + (macroexpand + '(when-let (nil) + (- a))) + '(let* ((nil (and t nil))) + (if nil + (- a))))) + (should (equal + (macroexpand + '(when-let ((nil)) + (- a))) + '(let* ((nil (and t nil))) + (if nil + (- a))))) + (should (equal + (macroexpand + '(when-let ((a 1) (nil) (b 2)) + (- a))) + '(let* ((a (and t 1)) + (nil (and a nil)) + (b (and nil 2))) + (if b + (- a))))) + (should (equal + (macroexpand + '(when-let ((a 1) nil (b 2)) + (- a))) + '(let* ((a (and t 1)) + (nil (and a nil)) + (b (and nil 2))) + (if b + (- a)))))) + +(ert-deftest subr-x-test-when-let-malformed-binding () + "Test malformed bindings trigger errors." + (should-error (macroexpand + '(when-let (_ (a 1 1) (b 2) (c 3) d) + (- a))) + :type 'error) + (should-error (macroexpand + '(when-let (_ (a 1) (b 2 2) (c 3) d) + (- a))) + :type 'error) + (should-error (macroexpand + '(when-let (_ (a 1) (b 2) (c 3 3) d) + (- a))) + :type 'error) + (should-error (macroexpand + '(when-let ((a 1 1)) + (- a))) + :type 'error)) + +(ert-deftest subr-x-test-when-let-true () + "Test `when-let' with truthy bindings." + (should (equal + (when-let (a 1) + a) + 1)) + (should (equal + (when-let ((a 1) (b 2) (c 3)) + (list a b c)) + (list 1 2 3)))) + +(ert-deftest subr-x-test-when-let-false () + "Test `when-let' with falsey bindings." + (should (equal + (when-let (a nil) + (list a b c) + "no") + nil)) + (should (equal + (when-let ((a nil) (b 2) (c 3)) + (list a b c) + "no") + nil)) + (should (equal + (when-let ((a 1) (b nil) (c 3)) + (list a b c) + "no") + nil)) + (should (equal + (when-let ((a 1) (b 2) (c nil)) + (list a b c) + "no") + nil)) + (should (equal + (when-let (z (a 1) (b 2) (c 3)) + (list a b c) + "no") + nil)) + (should (equal + (when-let ((a 1) (b 2) (c 3) d) + (list a b c) + "no") + nil))) + +(ert-deftest subr-x-test-when-let-bound-references () + "Test `when-let' bindings can refer to already bound symbols." + (should (equal + (when-let ((a (1+ 0)) (b (1+ a)) (c (1+ b))) + (list a b c)) + (list 1 2 3)))) + +(ert-deftest subr-x-test-when-let-and-lazyness-is-preserved () + "Test `when-let' respects `and' lazyness." + (let (a-called b-called c-called) + (should (equal + (progn + (when-let ((a nil) + (b (setq b-called t)) + (c (setq c-called t))) + "yes") + (list a-called b-called c-called)) + (list nil nil nil)))) + (let (a-called b-called c-called) + (should (equal + (progn + (when-let ((a (setq a-called t)) + (b nil) + (c (setq c-called t))) + "yes") + (list a-called b-called c-called)) + (list t nil nil)))) + (let (a-called b-called c-called) + (should (equal + (progn + (when-let ((a (setq a-called t)) + (b (setq b-called t)) + (c nil) + (d (setq c-called t))) + "yes") + (list a-called b-called c-called)) + (list t t nil))))) + + +;; Thread first tests + +(ert-deftest subr-x-test-thread-first-no-forms () + "Test `thread-first' with no forms expands to the first form." + (should (equal (macroexpand '(thread-first 5)) 5)) + (should (equal (macroexpand '(thread-first (+ 1 2))) '(+ 1 2)))) + +(ert-deftest subr-x-test-thread-first-function-names-are-threaded () + "Test `thread-first' wraps single function names." + (should (equal (macroexpand + '(thread-first 5 + -)) + '(- 5))) + (should (equal (macroexpand + '(thread-first (+ 1 2) + -)) + '(- (+ 1 2))))) + +(ert-deftest subr-x-test-thread-first-expansion () + "Test `thread-first' expands correctly." + (should (equal + (macroexpand '(thread-first + 5 + (+ 20) + (/ 25) + - + (+ 40))) + '(+ (- (/ (+ 5 20) 25)) 40)))) + +(ert-deftest subr-x-test-thread-first-examples () + "Test several `thread-first' examples." + (should (equal (thread-first (+ 40 2)) 42)) + (should (equal (thread-first + 5 + (+ 20) + (/ 25) + - + (+ 40)) 39)) + (should (equal (thread-first + "this-is-a-string" + (split-string "-") + (nbutlast 2) + (append (list "good"))) + (list "this" "is" "good")))) + +;; Thread last tests + +(ert-deftest subr-x-test-thread-last-no-forms () + "Test `thread-last' with no forms expands to the first form." + (should (equal (macroexpand '(thread-last 5)) 5)) + (should (equal (macroexpand '(thread-last (+ 1 2))) '(+ 1 2)))) + +(ert-deftest subr-x-test-thread-last-function-names-are-threaded () + "Test `thread-last' wraps single function names." + (should (equal (macroexpand + '(thread-last 5 + -)) + '(- 5))) + (should (equal (macroexpand + '(thread-last (+ 1 2) + -)) + '(- (+ 1 2))))) + +(ert-deftest subr-x-test-thread-last-expansion () + "Test `thread-last' expands correctly." + (should (equal + (macroexpand '(thread-last + 5 + (+ 20) + (/ 25) + - + (+ 40))) + '(+ 40 (- (/ 25 (+ 20 5))))))) + +(ert-deftest subr-x-test-thread-last-examples () + "Test several `thread-last' examples." + (should (equal (thread-last (+ 40 2)) 42)) + (should (equal (thread-last + 5 + (+ 20) + (/ 25) + - + (+ 40)) 39)) + (should (equal (thread-last + (list 1 -2 3 -4 5) + (mapcar #'abs) + (cl-reduce #'+) + (format "abs sum is: %s")) + "abs sum is: 15"))) + + +(provide 'subr-x-tests) +;;; subr-x-tests.el ends here diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index b010ab467f6..864a43d638f 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -116,18 +116,15 @@ shall not contain a timeout." `(let ((tramp-verbose ,verbose) (tramp-message-show-message t) (tramp-debug-on-error t)) - (condition-case err + (unwind-protect (progn ,@body) - (ert-test-skipped - (signal (car err) (cdr err))) - ((error quit) - (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil - (with-current-buffer (tramp-get-connection-buffer v) - (message "%s" (buffer-string))) - (with-current-buffer (tramp-get-debug-buffer v) - (message "%s" (buffer-string)))) - (message "%s" err) - (signal (car err) (cdr err)))))) + (when (> tramp-verbose 3) + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (with-current-buffer (tramp-get-connection-buffer v) + (message "%s" (buffer-string))) + (with-current-buffer + (tramp-get-debug-buffer v) + (message "%s" (buffer-string)))))))) (ert-deftest tramp-test00-availability () "Test availability of Tramp functions." |