aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-04-10 14:59:42 -0700
committerPaul Eggert2012-04-10 14:59:42 -0700
commit1530927cb9a3dca7c0f41975f2e9e62ef8be92a2 (patch)
tree698ded24fc8f63cbbde51a4a5953ea6220e8acb3
parent271e61eb60721546bf373531852a88f14b840d12 (diff)
parent2a718f6fbc7c06bed37d0c8441014b90f9c06b0e (diff)
downloademacs-1530927cb9a3dca7c0f41975f2e9e62ef8be92a2.tar.gz
emacs-1530927cb9a3dca7c0f41975f2e9e62ef8be92a2.zip
Merge from trunk.
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--admin/ChangeLog7
-rw-r--r--admin/bzrmerge.el6
-rw-r--r--admin/unidata/Makefile.in42
-rwxr-xr-xautogen/configure11
-rw-r--r--configure.in10
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/NEWS4
-rw-r--r--etc/publicsuffix.txt5189
-rw-r--r--lisp/ChangeLog73
-rw-r--r--lisp/cus-start.el15
-rw-r--r--lisp/emacs-lisp/autoload.el3
-rw-r--r--lisp/erc/ChangeLog15
-rw-r--r--lisp/erc/erc-join.el27
-rw-r--r--lisp/erc/erc.el1
-rw-r--r--lisp/image.el3
-rw-r--r--lisp/international/characters.el2
-rw-r--r--lisp/international/quail.el58
-rw-r--r--lisp/language/european.el8
-rw-r--r--lisp/misc.el15
-rw-r--r--lisp/obsolete/mouse-sel.el (renamed from lisp/mouse-sel.el)3
-rw-r--r--lisp/progmodes/python.el2
-rw-r--r--lisp/recentf.el2
-rw-r--r--lisp/simple.el4
-rw-r--r--lisp/textmodes/fill.el5
-rw-r--r--lisp/tmm.el64
-rw-r--r--lisp/url/ChangeLog18
-rw-r--r--lisp/url/url-cookie.el45
-rw-r--r--lisp/url/url-domsuf.el98
-rw-r--r--lisp/url/url-util.el3
-rw-r--r--lisp/url/url.el11
-rw-r--r--lisp/vc/vc-annotate.el28
-rw-r--r--lisp/version.el36
-rw-r--r--nt/ChangeLog6
-rw-r--r--nt/makefile.w32-in10
-rw-r--r--src/ChangeLog21
-rw-r--r--src/keyboard.c21
-rw-r--r--src/w32.c10
38 files changed, 5710 insertions, 180 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d89e361c59..86a352c4cf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
12012-04-09 Paul Eggert <eggert@cs.ucla.edu> 12012-04-10 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 configure: new option --enable-gcc-warnings (Bug#11207) 3 configure: new option --enable-gcc-warnings (Bug#11207)
4 I have been using this change for many months in my private copy 4 I have been using this change for many months in my private copy
@@ -15,11 +15,13 @@
15 * lib/Makefile.am (AM_CFLAGS): New macro. 15 * lib/Makefile.am (AM_CFLAGS): New macro.
16 * m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib. 16 * m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
17 17
182012-04-10 Glenn Morris <rgm@gnu.org>
19
20 * configure.in: Conditionally generate admin/unidata/Makefile.
21
182012-04-09 Teodor Zlatanov <tzz@lifelogs.com> 222012-04-09 Teodor Zlatanov <tzz@lifelogs.com>
19 23
20 * info/dir (File): 24 * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls manual.
21 * Makefile.in: Add emacs-gnutls to the info directory and the
22 INFO_FILES target.
23 25
242012-04-09 Glenn Morris <rgm@gnu.org> 262012-04-09 Glenn Morris <rgm@gnu.org>
25 27
diff --git a/admin/ChangeLog b/admin/ChangeLog
index ac2323c77d0..a3a756bde64 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
12012-04-10 Glenn Morris <rgm@gnu.org>
2
3 * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
4
5 * unidata/Makefile.in: Add FSF copyright.
6 Make it use autoconf features, and work for out-of-tree builds.
7
12012-04-07 Eli Zaretskii <eliz@gnu.org> 82012-04-07 Eli Zaretskii <eliz@gnu.org>
2 9
3 * unidata/README: 10 * unidata/README:
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index cb63d5b16ba..0c72c8b5c93 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -1,9 +1,9 @@
1;;; bzrmerge.el --- help merge one Emacs bzr branch to another 1;;; bzrmerge.el --- help merge one Emacs bzr branch to another
2 2
3;; Copyright (C) 2010-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
4 4
5;; Author: Stefan Monnier <monnier@iro.umontreal.ca> 5;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6;; Keywords: 6;; Keywords: maint
7 7
8;; GNU Emacs is free software: you can redistribute it and/or modify 8;; GNU Emacs is free software: you can redistribute it and/or modify
9;; it under the terms of the GNU General Public License as published by 9;; it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
28 (require 'cl)) ; assert 28 (require 'cl)) ; assert
29 29
30(defvar bzrmerge-skip-regexp 30(defvar bzrmerge-skip-regexp
31 "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" 31 "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk"
32 "Regexp matching logs of revisions that might be skipped. 32 "Regexp matching logs of revisions that might be skipped.
33`bzrmerge-missing' will ask you if it should skip any matches.") 33`bzrmerge-missing' will ask you if it should skip any matches.")
34 34
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index c890dad8903..ecbd0490246 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -1,4 +1,7 @@
1# Makefile -- Makefile to generate character property tables. 1# Makefile -- Makefile to generate character property tables.
2
3# Copyright (C) 2012 Free Software Foundation, Inc.
4
2# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 5# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
3# National Institute of Advanced Industrial Science and Technology (AIST) 6# National Institute of Advanced Industrial Science and Technology (AIST)
4# Registration Number H13PRO009 7# Registration Number H13PRO009
@@ -18,25 +21,33 @@
18# You should have received a copy of the GNU General Public License 21# You should have received a copy of the GNU General Public License
19# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 22# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
20 23
24SHELL = /bin/sh
25
26srcdir = @srcdir@
27abs_builddir = @abs_builddir@
28top_srcdir = @top_srcdir@
29abs_top_builddir = @abs_top_builddir@
21 30
22EMACS = ../../src/emacs 31EMACS = ${abs_top_builddir}/src/emacs
23DSTDIR = ../../lisp/international 32DSTDIR = ${top_srcdir}/lisp/international
24RUNEMACS = ${EMACS} -Q -batch 33emacs = ${EMACS} -batch --no-site-file --no-site-lisp
25 34
26all: ${DSTDIR}/charprop.el 35all: ${DSTDIR}/charprop.el
27 36
28.el.elc: 37.el.elc:
29 ${RUNEMACS} -batch -f batch-byte-compile $< 38 ${emacs} -f batch-byte-compile $<
30 39
31unidata.txt: UnicodeData.txt 40unidata.txt: ${srcdir}/UnicodeData.txt
32 sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < UnicodeData.txt > $@ 41 sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < ${srcdir}/UnicodeData.txt > $@
33 42
34${DSTDIR}/charprop.el: unidata-gen.elc unidata.txt 43${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
35 ELC=`/bin/pwd`/unidata-gen.elc; \ 44 cd ${DSTDIR} && ${emacs} -l ${srcdir}/unidata-gen \
36 DATADIR=`/bin/pwd`; \ 45 -f unidata-gen-files ${srcdir} ${abs_builddir}/unidata.txt
37 DATA=unidata.txt; \ 46
38 cd ${DSTDIR}; \ 47## Like the above, but generate in PWD rather than lisp/international.
39 ${RUNEMACS} -batch --load $${ELC} -f unidata-gen-files $${DATADIR} $${DATA} 48charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
49 ${emacs} -l ${srcdir}/unidata-gen \
50 -f unidata-gen-files ${srcdir} unidata.txt
40 51
41install: charprop.el 52install: charprop.el
42 cp charprop.el ${DSTDIR} 53 cp charprop.el ${DSTDIR}
@@ -46,4 +57,9 @@ clean:
46 if test -f charprop.el; then \ 57 if test -f charprop.el; then \
47 rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \ 58 rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \
48 fi 59 fi
49 rm -f charprop.el unidata-gen.elc unidata.txt 60 rm -f charprop.el ${srcdir}/unidata-gen.elc unidata.txt
61
62distclean: clean
63 -rm -f ./Makefile
64
65maintainer-clean: distclean
diff --git a/autogen/configure b/autogen/configure
index 26b13d971f7..63e9348bb0c 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -22430,6 +22430,16 @@ if test -f $srcdir/${opt_makefile}.in; then
22430 22430
22431fi 22431fi
22432 22432
22433
22434opt_makefile=admin/unidata/Makefile
22435
22436if test -f $srcdir/${opt_makefile}.in; then
22437 SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
22438 ac_config_files="$ac_config_files admin/unidata/Makefile"
22439
22440fi
22441
22442
22433SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'` 22443SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'`
22434 22444
22435 22445
@@ -23259,6 +23269,7 @@ do
23259 "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; 23269 "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;;
23260 "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; 23270 "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
23261 "test/automated/Makefile") CONFIG_FILES="$CONFIG_FILES test/automated/Makefile" ;; 23271 "test/automated/Makefile") CONFIG_FILES="$CONFIG_FILES test/automated/Makefile" ;;
23272 "admin/unidata/Makefile") CONFIG_FILES="$CONFIG_FILES admin/unidata/Makefile" ;;
23262 "mkdirs") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdirs" ;; 23273 "mkdirs") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdirs" ;;
23263 "epaths") CONFIG_COMMANDS="$CONFIG_COMMANDS epaths" ;; 23274 "epaths") CONFIG_COMMANDS="$CONFIG_COMMANDS epaths" ;;
23264 "gdbinit") CONFIG_COMMANDS="$CONFIG_COMMANDS gdbinit" ;; 23275 "gdbinit") CONFIG_COMMANDS="$CONFIG_COMMANDS gdbinit" ;;
diff --git a/configure.in b/configure.in
index 4b67078bf39..41bdcf17b08 100644
--- a/configure.in
+++ b/configure.in
@@ -3913,6 +3913,16 @@ if test -f $srcdir/${opt_makefile}.in; then
3913 AC_CONFIG_FILES([test/automated/Makefile]) 3913 AC_CONFIG_FILES([test/automated/Makefile])
3914fi 3914fi
3915 3915
3916
3917dnl admin/ may or may not be present.
3918opt_makefile=admin/unidata/Makefile
3919
3920if test -f $srcdir/${opt_makefile}.in; then
3921 SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
3922 AC_CONFIG_FILES([admin/unidata/Makefile])
3923fi
3924
3925
3916SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'` 3926SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'`
3917 3927
3918AC_SUBST(SUBDIR_MAKEFILES_IN) 3928AC_SUBST(SUBDIR_MAKEFILES_IN)
diff --git a/etc/ChangeLog b/etc/ChangeLog
index adc4c941212..9353b617cb2 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * publicsuffix.txt: New file (bug#1401).
4
12012-04-02 Alan Mackenzie <acm@muc.de> 52012-04-02 Alan Mackenzie <acm@muc.de>
2 6
3 * NEWS: Add CC Mode entries. 7 * NEWS: Add CC Mode entries.
diff --git a/etc/NEWS b/etc/NEWS
index 2e11af4c1c3..6937ea98163 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -46,6 +46,10 @@ been adding them there, put them somewhere else, eg site-lisp.
46* Editing Changes in Emacs 24.2 46* Editing Changes in Emacs 24.2
47 47
48* Changes in Specialized Modes and Packages in Emacs 24.2 48* Changes in Specialized Modes and Packages in Emacs 24.2
49
50** erc will look up server/channel names via auth-source and use the
51 channel keys found, if any.
52
49 53
50* New Modes and Packages in Emacs 24.2 54* New Modes and Packages in Emacs 24.2
51 55
diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt
new file mode 100644
index 00000000000..3eeddef13f0
--- /dev/null
+++ b/etc/publicsuffix.txt
@@ -0,0 +1,5189 @@
1// ***** BEGIN LICENSE BLOCK *****
2// Version: MPL 1.1/GPL 2.0/LGPL 2.1
3//
4// The contents of this file are subject to the Mozilla Public License Version
5// 1.1 (the "License"); you may not use this file except in compliance with
6// the License. You may obtain a copy of the License at
7// http://www.mozilla.org/MPL/
8//
9// Software distributed under the License is distributed on an "AS IS" basis,
10// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
11// for the specific language governing rights and limitations under the
12// License.
13//
14// The Original Code is the Public Suffix List.
15//
16// The Initial Developer of the Original Code is
17// Jo Hermans <jo.hermans@gmail.com>.
18// Portions created by the Initial Developer are Copyright (C) 2007
19// the Initial Developer. All Rights Reserved.
20//
21// Contributor(s):
22// Ruben Arakelyan <ruben@rubenarakelyan.com>
23// Gervase Markham <gerv@gerv.net>
24// Pamela Greene <pamg.bugs@gmail.com>
25// David Triendl <david@triendl.name>
26// Jothan Frakes <jothan@gmail.com>
27// The kind representatives of many TLD registries
28//
29// Alternatively, the contents of this file may be used under the terms of
30// either the GNU General Public License Version 2 or later (the "GPL"), or
31// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
32// in which case the provisions of the GPL or the LGPL are applicable instead
33// of those above. If you wish to allow use of your version of this file only
34// under the terms of either the GPL or the LGPL, and not to allow others to
35// use your version of this file under the terms of the MPL, indicate your
36// decision by deleting the provisions above and replace them with the notice
37// and other provisions required by the GPL or the LGPL. If you do not delete
38// the provisions above, a recipient may use your version of this file under
39// the terms of any one of the MPL, the GPL or the LGPL.
40//
41// ***** END LICENSE BLOCK *****
42
43// ac : http://en.wikipedia.org/wiki/.ac
44ac
45com.ac
46edu.ac
47gov.ac
48net.ac
49mil.ac
50org.ac
51
52// ad : http://en.wikipedia.org/wiki/.ad
53ad
54nom.ad
55
56// ae : http://en.wikipedia.org/wiki/.ae
57// see also: "Domain Name Eligibility Policy" at http://www.aeda.ae/eng/aepolicy.php
58ae
59co.ae
60net.ae
61org.ae
62sch.ae
63ac.ae
64gov.ae
65mil.ae
66
67// aero : see http://www.information.aero/index.php?id=66
68aero
69accident-investigation.aero
70accident-prevention.aero
71aerobatic.aero
72aeroclub.aero
73aerodrome.aero
74agents.aero
75aircraft.aero
76airline.aero
77airport.aero
78air-surveillance.aero
79airtraffic.aero
80air-traffic-control.aero
81ambulance.aero
82amusement.aero
83association.aero
84author.aero
85ballooning.aero
86broker.aero
87caa.aero
88cargo.aero
89catering.aero
90certification.aero
91championship.aero
92charter.aero
93civilaviation.aero
94club.aero
95conference.aero
96consultant.aero
97consulting.aero
98control.aero
99council.aero
100crew.aero
101design.aero
102dgca.aero
103educator.aero
104emergency.aero
105engine.aero
106engineer.aero
107entertainment.aero
108equipment.aero
109exchange.aero
110express.aero
111federation.aero
112flight.aero
113freight.aero
114fuel.aero
115gliding.aero
116government.aero
117groundhandling.aero
118group.aero
119hanggliding.aero
120homebuilt.aero
121insurance.aero
122journal.aero
123journalist.aero
124leasing.aero
125logistics.aero
126magazine.aero
127maintenance.aero
128marketplace.aero
129media.aero
130microlight.aero
131modelling.aero
132navigation.aero
133parachuting.aero
134paragliding.aero
135passenger-association.aero
136pilot.aero
137press.aero
138production.aero
139recreation.aero
140repbody.aero
141res.aero
142research.aero
143rotorcraft.aero
144safety.aero
145scientist.aero
146services.aero
147show.aero
148skydiving.aero
149software.aero
150student.aero
151taxi.aero
152trader.aero
153trading.aero
154trainer.aero
155union.aero
156workinggroup.aero
157works.aero
158
159// af : http://www.nic.af/help.jsp
160af
161gov.af
162com.af
163org.af
164net.af
165edu.af
166
167// ag : http://www.nic.ag/prices.htm
168ag
169com.ag
170org.ag
171net.ag
172co.ag
173nom.ag
174
175// ai : http://nic.com.ai/
176ai
177off.ai
178com.ai
179net.ai
180org.ai
181
182// al : http://www.ert.gov.al/ert_alb/faq_det.html?Id=31
183al
184com.al
185edu.al
186gov.al
187mil.al
188net.al
189org.al
190
191// am : http://en.wikipedia.org/wiki/.am
192am
193
194// an : http://www.una.an/an_domreg/default.asp
195an
196com.an
197net.an
198org.an
199edu.an
200
201// ao : http://en.wikipedia.org/wiki/.ao
202// http://www.dns.ao/REGISTR.DOC
203ao
204ed.ao
205gv.ao
206og.ao
207co.ao
208pb.ao
209it.ao
210
211// aq : http://en.wikipedia.org/wiki/.aq
212aq
213
214// ar : http://en.wikipedia.org/wiki/.ar
215*.ar
216!congresodelalengua3.ar
217!educ.ar
218!gobiernoelectronico.ar
219!mecon.ar
220!nacion.ar
221!nic.ar
222!promocion.ar
223!retina.ar
224!uba.ar
225
226// arpa : http://en.wikipedia.org/wiki/.arpa
227// Confirmed by registry <iana-questions@icann.org> 2008-06-18
228e164.arpa
229in-addr.arpa
230ip6.arpa
231iris.arpa
232uri.arpa
233urn.arpa
234
235// as : http://en.wikipedia.org/wiki/.as
236as
237gov.as
238
239// asia: http://en.wikipedia.org/wiki/.asia
240asia
241
242// at : http://en.wikipedia.org/wiki/.at
243// Confirmed by registry <it@nic.at> 2008-06-17
244at
245ac.at
246co.at
247gv.at
248or.at
249
250// http://www.info.at/
251biz.at
252info.at
253
254// priv.at : http://www.nic.priv.at/
255// Submitted by registry <lendl@nic.at> 2008-06-09
256priv.at
257
258// au : http://en.wikipedia.org/wiki/.au
259*.au
260// au geographical names (vic.au etc... are covered above)
261act.edu.au
262nsw.edu.au
263nt.edu.au
264qld.edu.au
265sa.edu.au
266tas.edu.au
267vic.edu.au
268wa.edu.au
269act.gov.au
270// Removed at request of Shae.Donelan@services.nsw.gov.au, 2010-03-04
271// nsw.gov.au
272nt.gov.au
273qld.gov.au
274sa.gov.au
275tas.gov.au
276vic.gov.au
277wa.gov.au
278// CGDNs - http://www.aucd.org.au/
279act.au
280nsw.au
281nt.au
282qld.au
283sa.au
284tas.au
285vic.au
286wa.au
287
288// aw : http://en.wikipedia.org/wiki/.aw
289aw
290com.aw
291
292// ax : http://en.wikipedia.org/wiki/.ax
293ax
294
295// az : http://en.wikipedia.org/wiki/.az
296az
297com.az
298net.az
299int.az
300gov.az
301org.az
302edu.az
303info.az
304pp.az
305mil.az
306name.az
307pro.az
308biz.az
309
310// ba : http://en.wikipedia.org/wiki/.ba
311ba
312org.ba
313net.ba
314edu.ba
315gov.ba
316mil.ba
317unsa.ba
318unbi.ba
319co.ba
320com.ba
321rs.ba
322
323// bb : http://en.wikipedia.org/wiki/.bb
324bb
325biz.bb
326com.bb
327edu.bb
328gov.bb
329info.bb
330net.bb
331org.bb
332store.bb
333
334// bd : http://en.wikipedia.org/wiki/.bd
335*.bd
336
337// be : http://en.wikipedia.org/wiki/.be
338// Confirmed by registry <tech@dns.be> 2008-06-08
339be
340ac.be
341
342// bf : http://en.wikipedia.org/wiki/.bf
343bf
344gov.bf
345
346// bg : http://en.wikipedia.org/wiki/.bg
347// https://www.register.bg/user/static/rules/en/index.html
348bg
349a.bg
350b.bg
351c.bg
352d.bg
353e.bg
354f.bg
355g.bg
356h.bg
357i.bg
358j.bg
359k.bg
360l.bg
361m.bg
362n.bg
363o.bg
364p.bg
365q.bg
366r.bg
367s.bg
368t.bg
369u.bg
370v.bg
371w.bg
372x.bg
373y.bg
374z.bg
3750.bg
3761.bg
3772.bg
3783.bg
3794.bg
3805.bg
3816.bg
3827.bg
3838.bg
3849.bg
385
386// bh : http://en.wikipedia.org/wiki/.bh
387bh
388com.bh
389edu.bh
390net.bh
391org.bh
392gov.bh
393
394// bi : http://en.wikipedia.org/wiki/.bi
395// http://whois.nic.bi/
396bi
397co.bi
398com.bi
399edu.bi
400or.bi
401org.bi
402
403// biz : http://en.wikipedia.org/wiki/.biz
404biz
405
406// bj : http://en.wikipedia.org/wiki/.bj
407bj
408asso.bj
409barreau.bj
410gouv.bj
411
412// bm : http://www.bermudanic.bm/dnr-text.txt
413bm
414com.bm
415edu.bm
416gov.bm
417net.bm
418org.bm
419
420// bn : http://en.wikipedia.org/wiki/.bn
421*.bn
422
423// bo : http://www.nic.bo/
424bo
425com.bo
426edu.bo
427gov.bo
428gob.bo
429int.bo
430org.bo
431net.bo
432mil.bo
433tv.bo
434
435// br : http://registro.br/dominio/dpn.html
436// Updated by registry <fneves@registro.br> 2011-03-01
437br
438adm.br
439adv.br
440agr.br
441am.br
442arq.br
443art.br
444ato.br
445b.br
446bio.br
447blog.br
448bmd.br
449can.br
450cim.br
451cng.br
452cnt.br
453com.br
454coop.br
455ecn.br
456edu.br
457emp.br
458eng.br
459esp.br
460etc.br
461eti.br
462far.br
463flog.br
464fm.br
465fnd.br
466fot.br
467fst.br
468g12.br
469ggf.br
470gov.br
471imb.br
472ind.br
473inf.br
474jor.br
475jus.br
476lel.br
477mat.br
478med.br
479mil.br
480mus.br
481net.br
482nom.br
483not.br
484ntr.br
485odo.br
486org.br
487ppg.br
488pro.br
489psc.br
490psi.br
491qsl.br
492radio.br
493rec.br
494slg.br
495srv.br
496taxi.br
497teo.br
498tmp.br
499trd.br
500tur.br
501tv.br
502vet.br
503vlog.br
504wiki.br
505zlg.br
506
507// bs : http://www.nic.bs/rules.html
508bs
509com.bs
510net.bs
511org.bs
512edu.bs
513gov.bs
514
515// bt : http://en.wikipedia.org/wiki/.bt
516bt
517com.bt
518edu.bt
519gov.bt
520net.bt
521org.bt
522
523// bv : No registrations at this time.
524// Submitted by registry <jarle@uninett.no> 2006-06-16
525
526// bw : http://en.wikipedia.org/wiki/.bw
527// http://www.gobin.info/domainname/bw.doc
528// list of other 2nd level tlds ?
529bw
530co.bw
531org.bw
532
533// by : http://en.wikipedia.org/wiki/.by
534// http://tld.by/rules_2006_en.html
535// list of other 2nd level tlds ?
536by
537gov.by
538mil.by
539// Official information does not indicate that com.by is a reserved
540// second-level domain, but it's being used as one (see www.google.com.by and
541// www.yahoo.com.by, for example), so we list it here for safety's sake.
542com.by
543
544// http://hoster.by/
545of.by
546
547// bz : http://en.wikipedia.org/wiki/.bz
548// http://www.belizenic.bz/
549bz
550com.bz
551net.bz
552org.bz
553edu.bz
554gov.bz
555
556// ca : http://en.wikipedia.org/wiki/.ca
557ca
558// ca geographical names
559ab.ca
560bc.ca
561mb.ca
562nb.ca
563nf.ca
564nl.ca
565ns.ca
566nt.ca
567nu.ca
568on.ca
569pe.ca
570qc.ca
571sk.ca
572yk.ca
573// gc.ca: http://en.wikipedia.org/wiki/.gc.ca
574// see also: http://registry.gc.ca/en/SubdomainFAQ
575gc.ca
576
577// cat : http://en.wikipedia.org/wiki/.cat
578cat
579
580// cc : http://en.wikipedia.org/wiki/.cc
581cc
582
583// cd : http://en.wikipedia.org/wiki/.cd
584// see also: https://www.nic.cd/domain/insertDomain_2.jsp?act=1
585cd
586gov.cd
587
588// cf : http://en.wikipedia.org/wiki/.cf
589cf
590
591// cg : http://en.wikipedia.org/wiki/.cg
592cg
593
594// ch : http://en.wikipedia.org/wiki/.ch
595ch
596
597// ci : http://en.wikipedia.org/wiki/.ci
598// http://www.nic.ci/index.php?page=charte
599ci
600org.ci
601or.ci
602com.ci
603co.ci
604edu.ci
605ed.ci
606ac.ci
607net.ci
608go.ci
609asso.ci
610aéroport.ci
611int.ci
612presse.ci
613md.ci
614gouv.ci
615
616// ck : http://en.wikipedia.org/wiki/.ck
617*.ck
618
619// cl : http://en.wikipedia.org/wiki/.cl
620cl
621gov.cl
622gob.cl
623
624// cm : http://en.wikipedia.org/wiki/.cm
625cm
626gov.cm
627
628// cn : http://en.wikipedia.org/wiki/.cn
629// Submitted by registry <tanyaling@cnnic.cn> 2008-06-11
630cn
631ac.cn
632com.cn
633edu.cn
634gov.cn
635net.cn
636org.cn
637mil.cn
638公司.cn
639网络.cn
640網絡.cn
641// cn geographic names
642ah.cn
643bj.cn
644cq.cn
645fj.cn
646gd.cn
647gs.cn
648gz.cn
649gx.cn
650ha.cn
651hb.cn
652he.cn
653hi.cn
654hl.cn
655hn.cn
656jl.cn
657js.cn
658jx.cn
659ln.cn
660nm.cn
661nx.cn
662qh.cn
663sc.cn
664sd.cn
665sh.cn
666sn.cn
667sx.cn
668tj.cn
669xj.cn
670xz.cn
671yn.cn
672zj.cn
673hk.cn
674mo.cn
675tw.cn
676
677// co : http://en.wikipedia.org/wiki/.co
678// Submitted by registry <tecnico@uniandes.edu.co> 2008-06-11
679co
680arts.co
681com.co
682edu.co
683firm.co
684gov.co
685info.co
686int.co
687mil.co
688net.co
689nom.co
690org.co
691rec.co
692web.co
693
694// com : http://en.wikipedia.org/wiki/.com
695com
696
697// CentralNic names : http://www.centralnic.com/names/domains
698// Confirmed by registry <gavin.brown@centralnic.com> 2008-06-09
699ar.com
700br.com
701cn.com
702de.com
703eu.com
704gb.com
705hu.com
706jpn.com
707kr.com
708no.com
709qc.com
710ru.com
711sa.com
712se.com
713uk.com
714us.com
715uy.com
716za.com
717
718// Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26
719operaunite.com
720
721// Requested by Eduardo Vela <evn@google.com> 2010-09-06
722appspot.com
723
724// coop : http://en.wikipedia.org/wiki/.coop
725coop
726
727// cr : http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
728cr
729ac.cr
730co.cr
731ed.cr
732fi.cr
733go.cr
734or.cr
735sa.cr
736
737// cu : http://en.wikipedia.org/wiki/.cu
738cu
739com.cu
740edu.cu
741org.cu
742net.cu
743gov.cu
744inf.cu
745
746// cv : http://en.wikipedia.org/wiki/.cv
747cv
748
749// cx : http://en.wikipedia.org/wiki/.cx
750// list of other 2nd level tlds ?
751cx
752gov.cx
753
754// cy : http://en.wikipedia.org/wiki/.cy
755*.cy
756
757// cz : http://en.wikipedia.org/wiki/.cz
758cz
759
760// de : http://en.wikipedia.org/wiki/.de
761// Confirmed by registry <ops@denic.de> (with technical
762// reservations) 2008-07-01
763de
764
765// dj : http://en.wikipedia.org/wiki/.dj
766dj
767
768// dk : http://en.wikipedia.org/wiki/.dk
769// Confirmed by registry <robert@dk-hostmaster.dk> 2008-06-17
770dk
771
772// dm : http://en.wikipedia.org/wiki/.dm
773dm
774com.dm
775net.dm
776org.dm
777edu.dm
778gov.dm
779
780// do : http://en.wikipedia.org/wiki/.do
781do
782art.do
783com.do
784edu.do
785gob.do
786gov.do
787mil.do
788net.do
789org.do
790sld.do
791web.do
792
793// dz : http://en.wikipedia.org/wiki/.dz
794dz
795com.dz
796org.dz
797net.dz
798gov.dz
799edu.dz
800asso.dz
801pol.dz
802art.dz
803
804// ec : http://www.nic.ec/reg/paso1.asp
805// Submitted by registry <vabboud@nic.ec> 2008-07-04
806ec
807com.ec
808info.ec
809net.ec
810fin.ec
811k12.ec
812med.ec
813pro.ec
814org.ec
815edu.ec
816gov.ec
817gob.ec
818mil.ec
819
820// edu : http://en.wikipedia.org/wiki/.edu
821edu
822
823// ee : http://www.eenet.ee/EENet/dom_reeglid.html#lisa_B
824ee
825edu.ee
826gov.ee
827riik.ee
828lib.ee
829med.ee
830com.ee
831pri.ee
832aip.ee
833org.ee
834fie.ee
835
836// eg : http://en.wikipedia.org/wiki/.eg
837eg
838com.eg
839edu.eg
840eun.eg
841gov.eg
842mil.eg
843name.eg
844net.eg
845org.eg
846sci.eg
847
848// er : http://en.wikipedia.org/wiki/.er
849*.er
850
851// es : https://www.nic.es/site_ingles/ingles/dominios/index.html
852es
853com.es
854nom.es
855org.es
856gob.es
857edu.es
858
859// et : http://en.wikipedia.org/wiki/.et
860*.et
861
862// eu : http://en.wikipedia.org/wiki/.eu
863eu
864
865// fi : http://en.wikipedia.org/wiki/.fi
866fi
867// aland.fi : http://en.wikipedia.org/wiki/.ax
868// This domain is being phased out in favor of .ax. As there are still many
869// domains under aland.fi, we still keep it on the list until aland.fi is
870// completely removed.
871// TODO: Check for updates (expected to be phased out around Q1/2009)
872aland.fi
873// iki.fi : Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
874iki.fi
875
876// fj : http://en.wikipedia.org/wiki/.fj
877*.fj
878
879// fk : http://en.wikipedia.org/wiki/.fk
880*.fk
881
882// fm : http://en.wikipedia.org/wiki/.fm
883fm
884
885// fo : http://en.wikipedia.org/wiki/.fo
886fo
887
888// fr : http://www.afnic.fr/
889// domaines descriptifs : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-descriptifs
890fr
891com.fr
892asso.fr
893nom.fr
894prd.fr
895presse.fr
896tm.fr
897// domaines sectoriels : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-sectoriels
898aeroport.fr
899assedic.fr
900avocat.fr
901avoues.fr
902cci.fr
903chambagri.fr
904chirurgiens-dentistes.fr
905experts-comptables.fr
906geometre-expert.fr
907gouv.fr
908greta.fr
909huissier-justice.fr
910medecin.fr
911notaires.fr
912pharmacien.fr
913port.fr
914veterinaire.fr
915
916// ga : http://en.wikipedia.org/wiki/.ga
917ga
918
919// gb : This registry is effectively dormant
920// Submitted by registry <Damien.Shaw@ja.net> 2008-06-12
921
922// gd : http://en.wikipedia.org/wiki/.gd
923gd
924
925// ge : http://www.nic.net.ge/policy_en.pdf
926ge
927com.ge
928edu.ge
929gov.ge
930org.ge
931mil.ge
932net.ge
933pvt.ge
934
935// gf : http://en.wikipedia.org/wiki/.gf
936gf
937
938// gg : http://www.channelisles.net/applic/avextn.shtml
939gg
940co.gg
941org.gg
942net.gg
943sch.gg
944gov.gg
945
946// gh : http://en.wikipedia.org/wiki/.gh
947// see also: http://www.nic.gh/reg_now.php
948// Although domains directly at second level are not possible at the moment,
949// they have been possible for some time and may come back.
950gh
951com.gh
952edu.gh
953gov.gh
954org.gh
955mil.gh
956
957// gi : http://www.nic.gi/rules.html
958gi
959com.gi
960ltd.gi
961gov.gi
962mod.gi
963edu.gi
964org.gi
965
966// gl : http://en.wikipedia.org/wiki/.gl
967// http://nic.gl
968gl
969
970// gm : http://www.nic.gm/htmlpages%5Cgm-policy.htm
971gm
972
973// gn : http://psg.com/dns/gn/gn.txt
974// Submitted by registry <randy@psg.com> 2008-06-17
975ac.gn
976com.gn
977edu.gn
978gov.gn
979org.gn
980net.gn
981
982// gov : http://en.wikipedia.org/wiki/.gov
983gov
984
985// gp : http://www.nic.gp/index.php?lang=en
986gp
987com.gp
988net.gp
989mobi.gp
990edu.gp
991org.gp
992asso.gp
993
994// gq : http://en.wikipedia.org/wiki/.gq
995gq
996
997// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
998// Submitted by registry <segred@ics.forth.gr> 2008-06-09
999gr
1000com.gr
1001edu.gr
1002net.gr
1003org.gr
1004gov.gr
1005
1006// gs : http://en.wikipedia.org/wiki/.gs
1007gs
1008
1009// gt : http://www.gt/politicas.html
1010*.gt
1011
1012// gu : http://gadao.gov.gu/registration.txt
1013*.gu
1014
1015// gw : http://en.wikipedia.org/wiki/.gw
1016gw
1017
1018// gy : http://en.wikipedia.org/wiki/.gy
1019// http://registry.gy/
1020gy
1021co.gy
1022com.gy
1023net.gy
1024
1025// hk : https://www.hkdnr.hk
1026// Submitted by registry <hk.tech@hkirc.hk> 2008-06-11
1027hk
1028com.hk
1029edu.hk
1030gov.hk
1031idv.hk
1032net.hk
1033org.hk
1034公司.hk
1035教育.hk
1036敎育.hk
1037政府.hk
1038個人.hk
1039个人.hk
1040箇人.hk
1041網络.hk
1042网络.hk
1043组織.hk
1044網絡.hk
1045网絡.hk
1046组织.hk
1047組織.hk
1048組织.hk
1049
1050// hm : http://en.wikipedia.org/wiki/.hm
1051hm
1052
1053// hn : http://www.nic.hn/politicas/ps02,,05.html
1054hn
1055com.hn
1056edu.hn
1057org.hn
1058net.hn
1059mil.hn
1060gob.hn
1061
1062// hr : http://www.dns.hr/documents/pdf/HRTLD-regulations.pdf
1063hr
1064iz.hr
1065from.hr
1066name.hr
1067com.hr
1068
1069// ht : http://www.nic.ht/info/charte.cfm
1070ht
1071com.ht
1072shop.ht
1073firm.ht
1074info.ht
1075adult.ht
1076net.ht
1077pro.ht
1078org.ht
1079med.ht
1080art.ht
1081coop.ht
1082pol.ht
1083asso.ht
1084edu.ht
1085rel.ht
1086gouv.ht
1087perso.ht
1088
1089// hu : http://www.domain.hu/domain/English/sld.html
1090// Confirmed by registry <pasztor@iszt.hu> 2008-06-12
1091hu
1092co.hu
1093info.hu
1094org.hu
1095priv.hu
1096sport.hu
1097tm.hu
10982000.hu
1099agrar.hu
1100bolt.hu
1101casino.hu
1102city.hu
1103erotica.hu
1104erotika.hu
1105film.hu
1106forum.hu
1107games.hu
1108hotel.hu
1109ingatlan.hu
1110jogasz.hu
1111konyvelo.hu
1112lakas.hu
1113media.hu
1114news.hu
1115reklam.hu
1116sex.hu
1117shop.hu
1118suli.hu
1119szex.hu
1120tozsde.hu
1121utazas.hu
1122video.hu
1123
1124// id : http://en.wikipedia.org/wiki/.id
1125// see also: https://register.pandi.or.id/
1126id
1127ac.id
1128co.id
1129go.id
1130mil.id
1131net.id
1132or.id
1133sch.id
1134web.id
1135
1136// ie : http://en.wikipedia.org/wiki/.ie
1137ie
1138gov.ie
1139
1140// il : http://en.wikipedia.org/wiki/.il
1141*.il
1142
1143// im : https://www.nic.im/pdfs/imfaqs.pdf
1144im
1145co.im
1146ltd.co.im
1147plc.co.im
1148net.im
1149gov.im
1150org.im
1151nic.im
1152ac.im
1153
1154// in : http://en.wikipedia.org/wiki/.in
1155// see also: http://www.inregistry.in/policies/
1156// Please note, that nic.in is not an offical eTLD, but used by most
1157// government institutions.
1158in
1159co.in
1160firm.in
1161net.in
1162org.in
1163gen.in
1164ind.in
1165nic.in
1166ac.in
1167edu.in
1168res.in
1169gov.in
1170mil.in
1171
1172// info : http://en.wikipedia.org/wiki/.info
1173info
1174
1175// int : http://en.wikipedia.org/wiki/.int
1176// Confirmed by registry <iana-questions@icann.org> 2008-06-18
1177int
1178eu.int
1179
1180// io : http://www.nic.io/rules.html
1181// list of other 2nd level tlds ?
1182io
1183com.io
1184
1185// iq : http://www.cmc.iq/english/iq/iqregister1.htm
1186iq
1187gov.iq
1188edu.iq
1189mil.iq
1190com.iq
1191org.iq
1192net.iq
1193
1194// ir : http://www.nic.ir/Terms_and_Conditions_ir,_Appendix_1_Domain_Rules
1195// Also see http://www.nic.ir/Internationalized_Domain_Names
1196// Two <iran>.ir entries added at request of <tech-team@nic.ir>, 2010-04-16
1197ir
1198ac.ir
1199co.ir
1200gov.ir
1201id.ir
1202net.ir
1203org.ir
1204sch.ir
1205// xn--mgba3a4f16a.ir (<iran>.ir, Persian YEH)
1206ایران.ir
1207// xn--mgba3a4fra.ir (<iran>.ir, Arabic YEH)
1208ايران.ir
1209
1210// is : http://www.isnic.is/domain/rules.php
1211// Confirmed by registry <marius@isgate.is> 2008-12-06
1212is
1213net.is
1214com.is
1215edu.is
1216gov.is
1217org.is
1218int.is
1219
1220// it : http://en.wikipedia.org/wiki/.it
1221it
1222gov.it
1223edu.it
1224// list of reserved geo-names :
1225// http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazione-versione-6.0.pdf
1226// (There is also a list of reserved geo-names corresponding to Italian
1227// municipalities : http://www.nic.it/documenti/appendice-c.pdf , but it is
1228// not included here.)
1229agrigento.it
1230ag.it
1231alessandria.it
1232al.it
1233ancona.it
1234an.it
1235aosta.it
1236aoste.it
1237ao.it
1238arezzo.it
1239ar.it
1240ascoli-piceno.it
1241ascolipiceno.it
1242ap.it
1243asti.it
1244at.it
1245avellino.it
1246av.it
1247bari.it
1248ba.it
1249andria-barletta-trani.it
1250andriabarlettatrani.it
1251trani-barletta-andria.it
1252tranibarlettaandria.it
1253barletta-trani-andria.it
1254barlettatraniandria.it
1255andria-trani-barletta.it
1256andriatranibarletta.it
1257trani-andria-barletta.it
1258traniandriabarletta.it
1259bt.it
1260belluno.it
1261bl.it
1262benevento.it
1263bn.it
1264bergamo.it
1265bg.it
1266biella.it
1267bi.it
1268bologna.it
1269bo.it
1270bolzano.it
1271bozen.it
1272balsan.it
1273alto-adige.it
1274altoadige.it
1275suedtirol.it
1276bz.it
1277brescia.it
1278bs.it
1279brindisi.it
1280br.it
1281cagliari.it
1282ca.it
1283caltanissetta.it
1284cl.it
1285campobasso.it
1286cb.it
1287carboniaiglesias.it
1288carbonia-iglesias.it
1289iglesias-carbonia.it
1290iglesiascarbonia.it
1291ci.it
1292caserta.it
1293ce.it
1294catania.it
1295ct.it
1296catanzaro.it
1297cz.it
1298chieti.it
1299ch.it
1300como.it
1301co.it
1302cosenza.it
1303cs.it
1304cremona.it
1305cr.it
1306crotone.it
1307kr.it
1308cuneo.it
1309cn.it
1310dell-ogliastra.it
1311dellogliastra.it
1312ogliastra.it
1313og.it
1314enna.it
1315en.it
1316ferrara.it
1317fe.it
1318fermo.it
1319fm.it
1320firenze.it
1321florence.it
1322fi.it
1323foggia.it
1324fg.it
1325forli-cesena.it
1326forlicesena.it
1327cesena-forli.it
1328cesenaforli.it
1329fc.it
1330frosinone.it
1331fr.it
1332genova.it
1333genoa.it
1334ge.it
1335gorizia.it
1336go.it
1337grosseto.it
1338gr.it
1339imperia.it
1340im.it
1341isernia.it
1342is.it
1343laquila.it
1344aquila.it
1345aq.it
1346la-spezia.it
1347laspezia.it
1348sp.it
1349latina.it
1350lt.it
1351lecce.it
1352le.it
1353lecco.it
1354lc.it
1355livorno.it
1356li.it
1357lodi.it
1358lo.it
1359lucca.it
1360lu.it
1361macerata.it
1362mc.it
1363mantova.it
1364mn.it
1365massa-carrara.it
1366massacarrara.it
1367carrara-massa.it
1368carraramassa.it
1369ms.it
1370matera.it
1371mt.it
1372medio-campidano.it
1373mediocampidano.it
1374campidano-medio.it
1375campidanomedio.it
1376vs.it
1377messina.it
1378me.it
1379milano.it
1380milan.it
1381mi.it
1382modena.it
1383mo.it
1384monza.it
1385monza-brianza.it
1386monzabrianza.it
1387monzaebrianza.it
1388monzaedellabrianza.it
1389monza-e-della-brianza.it
1390mb.it
1391napoli.it
1392naples.it
1393na.it
1394novara.it
1395no.it
1396nuoro.it
1397nu.it
1398oristano.it
1399or.it
1400padova.it
1401padua.it
1402pd.it
1403palermo.it
1404pa.it
1405parma.it
1406pr.it
1407pavia.it
1408pv.it
1409perugia.it
1410pg.it
1411pescara.it
1412pe.it
1413pesaro-urbino.it
1414pesarourbino.it
1415urbino-pesaro.it
1416urbinopesaro.it
1417pu.it
1418piacenza.it
1419pc.it
1420pisa.it
1421pi.it
1422pistoia.it
1423pt.it
1424pordenone.it
1425pn.it
1426potenza.it
1427pz.it
1428prato.it
1429po.it
1430ragusa.it
1431rg.it
1432ravenna.it
1433ra.it
1434reggio-calabria.it
1435reggiocalabria.it
1436rc.it
1437reggio-emilia.it
1438reggioemilia.it
1439re.it
1440rieti.it
1441ri.it
1442rimini.it
1443rn.it
1444roma.it
1445rome.it
1446rm.it
1447rovigo.it
1448ro.it
1449salerno.it
1450sa.it
1451sassari.it
1452ss.it
1453savona.it
1454sv.it
1455siena.it
1456si.it
1457siracusa.it
1458sr.it
1459sondrio.it
1460so.it
1461taranto.it
1462ta.it
1463tempio-olbia.it
1464tempioolbia.it
1465olbia-tempio.it
1466olbiatempio.it
1467ot.it
1468teramo.it
1469te.it
1470terni.it
1471tr.it
1472torino.it
1473turin.it
1474to.it
1475trapani.it
1476tp.it
1477trento.it
1478trentino.it
1479tn.it
1480treviso.it
1481tv.it
1482trieste.it
1483ts.it
1484udine.it
1485ud.it
1486varese.it
1487va.it
1488venezia.it
1489venice.it
1490ve.it
1491verbania.it
1492vb.it
1493vercelli.it
1494vc.it
1495verona.it
1496vr.it
1497vibo-valentia.it
1498vibovalentia.it
1499vv.it
1500vicenza.it
1501vi.it
1502viterbo.it
1503vt.it
1504
1505// je : http://www.channelisles.net/applic/avextn.shtml
1506je
1507co.je
1508org.je
1509net.je
1510sch.je
1511gov.je
1512
1513// jm : http://www.com.jm/register.html
1514*.jm
1515
1516// jo : http://www.dns.jo/Registration_policy.aspx
1517jo
1518com.jo
1519org.jo
1520net.jo
1521edu.jo
1522sch.jo
1523gov.jo
1524mil.jo
1525name.jo
1526
1527// jobs : http://en.wikipedia.org/wiki/.jobs
1528jobs
1529
1530// jp : http://en.wikipedia.org/wiki/.jp
1531// http://jprs.co.jp/en/jpdomain.html
1532// Submitted by registry <yone@jprs.co.jp> 2008-06-11
1533// Updated by registry <yone@jprs.co.jp> 2008-12-04
1534jp
1535// jp organizational type names
1536ac.jp
1537ad.jp
1538co.jp
1539ed.jp
1540go.jp
1541gr.jp
1542lg.jp
1543ne.jp
1544or.jp
1545// jp geographic type names
1546// http://jprs.jp/doc/rule/saisoku-1.html
1547*.aichi.jp
1548*.akita.jp
1549*.aomori.jp
1550*.chiba.jp
1551*.ehime.jp
1552*.fukui.jp
1553*.fukuoka.jp
1554*.fukushima.jp
1555*.gifu.jp
1556*.gunma.jp
1557*.hiroshima.jp
1558*.hokkaido.jp
1559*.hyogo.jp
1560*.ibaraki.jp
1561*.ishikawa.jp
1562*.iwate.jp
1563*.kagawa.jp
1564*.kagoshima.jp
1565*.kanagawa.jp
1566*.kawasaki.jp
1567*.kitakyushu.jp
1568*.kobe.jp
1569*.kochi.jp
1570*.kumamoto.jp
1571*.kyoto.jp
1572*.mie.jp
1573*.miyagi.jp
1574*.miyazaki.jp
1575*.nagano.jp
1576*.nagasaki.jp
1577*.nagoya.jp
1578*.nara.jp
1579*.niigata.jp
1580*.oita.jp
1581*.okayama.jp
1582*.okinawa.jp
1583*.osaka.jp
1584*.saga.jp
1585*.saitama.jp
1586*.sapporo.jp
1587*.sendai.jp
1588*.shiga.jp
1589*.shimane.jp
1590*.shizuoka.jp
1591*.tochigi.jp
1592*.tokushima.jp
1593*.tokyo.jp
1594*.tottori.jp
1595*.toyama.jp
1596*.wakayama.jp
1597*.yamagata.jp
1598*.yamaguchi.jp
1599*.yamanashi.jp
1600*.yokohama.jp
1601!metro.tokyo.jp
1602!pref.aichi.jp
1603!pref.akita.jp
1604!pref.aomori.jp
1605!pref.chiba.jp
1606!pref.ehime.jp
1607!pref.fukui.jp
1608!pref.fukuoka.jp
1609!pref.fukushima.jp
1610!pref.gifu.jp
1611!pref.gunma.jp
1612!pref.hiroshima.jp
1613!pref.hokkaido.jp
1614!pref.hyogo.jp
1615!pref.ibaraki.jp
1616!pref.ishikawa.jp
1617!pref.iwate.jp
1618!pref.kagawa.jp
1619!pref.kagoshima.jp
1620!pref.kanagawa.jp
1621!pref.kochi.jp
1622!pref.kumamoto.jp
1623!pref.kyoto.jp
1624!pref.mie.jp
1625!pref.miyagi.jp
1626!pref.miyazaki.jp
1627!pref.nagano.jp
1628!pref.nagasaki.jp
1629!pref.nara.jp
1630!pref.niigata.jp
1631!pref.oita.jp
1632!pref.okayama.jp
1633!pref.okinawa.jp
1634!pref.osaka.jp
1635!pref.saga.jp
1636!pref.saitama.jp
1637!pref.shiga.jp
1638!pref.shimane.jp
1639!pref.shizuoka.jp
1640!pref.tochigi.jp
1641!pref.tokushima.jp
1642!pref.tottori.jp
1643!pref.toyama.jp
1644!pref.wakayama.jp
1645!pref.yamagata.jp
1646!pref.yamaguchi.jp
1647!pref.yamanashi.jp
1648!city.chiba.jp
1649!city.fukuoka.jp
1650!city.hiroshima.jp
1651!city.kawasaki.jp
1652!city.kitakyushu.jp
1653!city.kobe.jp
1654!city.kyoto.jp
1655!city.nagoya.jp
1656!city.niigata.jp
1657!city.okayama.jp
1658!city.osaka.jp
1659!city.saitama.jp
1660!city.sapporo.jp
1661!city.sendai.jp
1662!city.shizuoka.jp
1663!city.yokohama.jp
1664
1665// ke : http://www.kenic.or.ke/index.php?option=com_content&task=view&id=117&Itemid=145
1666*.ke
1667
1668// kg : http://www.domain.kg/dmn_n.html
1669kg
1670org.kg
1671net.kg
1672com.kg
1673edu.kg
1674gov.kg
1675mil.kg
1676
1677// kh : http://www.mptc.gov.kh/dns_registration.htm
1678*.kh
1679
1680// ki : http://www.ki/dns/index.html
1681ki
1682edu.ki
1683biz.ki
1684net.ki
1685org.ki
1686gov.ki
1687info.ki
1688com.ki
1689
1690// km : http://en.wikipedia.org/wiki/.km
1691// http://www.domaine.km/documents/charte.doc
1692km
1693org.km
1694nom.km
1695gov.km
1696prd.km
1697tm.km
1698edu.km
1699mil.km
1700ass.km
1701com.km
1702// These are only mentioned as proposed suggestions at domaine.km, but
1703// http://en.wikipedia.org/wiki/.km says they're available for registration:
1704coop.km
1705asso.km
1706presse.km
1707medecin.km
1708notaires.km
1709pharmaciens.km
1710veterinaire.km
1711gouv.km
1712
1713// kn : http://en.wikipedia.org/wiki/.kn
1714// http://www.dot.kn/domainRules.html
1715kn
1716net.kn
1717org.kn
1718edu.kn
1719gov.kn
1720
1721// kp : http://www.kcce.kp/en_index.php
1722com.kp
1723edu.kp
1724gov.kp
1725org.kp
1726rep.kp
1727tra.kp
1728
1729// kr : http://en.wikipedia.org/wiki/.kr
1730// see also: http://domain.nida.or.kr/eng/registration.jsp
1731kr
1732ac.kr
1733co.kr
1734es.kr
1735go.kr
1736hs.kr
1737kg.kr
1738mil.kr
1739ms.kr
1740ne.kr
1741or.kr
1742pe.kr
1743re.kr
1744sc.kr
1745// kr geographical names
1746busan.kr
1747chungbuk.kr
1748chungnam.kr
1749daegu.kr
1750daejeon.kr
1751gangwon.kr
1752gwangju.kr
1753gyeongbuk.kr
1754gyeonggi.kr
1755gyeongnam.kr
1756incheon.kr
1757jeju.kr
1758jeonbuk.kr
1759jeonnam.kr
1760seoul.kr
1761ulsan.kr
1762
1763// kw : http://en.wikipedia.org/wiki/.kw
1764*.kw
1765
1766// ky : http://www.icta.ky/da_ky_reg_dom.php
1767// Confirmed by registry <kysupport@perimeterusa.com> 2008-06-17
1768ky
1769edu.ky
1770gov.ky
1771com.ky
1772org.ky
1773net.ky
1774
1775// kz : http://en.wikipedia.org/wiki/.kz
1776// see also: http://www.nic.kz/rules/index.jsp
1777kz
1778org.kz
1779edu.kz
1780net.kz
1781gov.kz
1782mil.kz
1783com.kz
1784
1785// la : http://en.wikipedia.org/wiki/.la
1786// Submitted by registry <gavin.brown@nic.la> 2008-06-10
1787la
1788int.la
1789net.la
1790info.la
1791edu.la
1792gov.la
1793per.la
1794com.la
1795org.la
1796// see http://www.c.la/
1797c.la
1798
1799// lb : http://en.wikipedia.org/wiki/.lb
1800// Submitted by registry <randy@psg.com> 2008-06-17
1801com.lb
1802edu.lb
1803gov.lb
1804net.lb
1805org.lb
1806
1807// lc : http://en.wikipedia.org/wiki/.lc
1808// see also: http://www.nic.lc/rules.htm
1809lc
1810com.lc
1811net.lc
1812co.lc
1813org.lc
1814edu.lc
1815gov.lc
1816
1817// li : http://en.wikipedia.org/wiki/.li
1818li
1819
1820// lk : http://www.nic.lk/seclevpr.html
1821lk
1822gov.lk
1823sch.lk
1824net.lk
1825int.lk
1826com.lk
1827org.lk
1828edu.lk
1829ngo.lk
1830soc.lk
1831web.lk
1832ltd.lk
1833assn.lk
1834grp.lk
1835hotel.lk
1836
1837// local : http://en.wikipedia.org/wiki/.local
1838local
1839
1840// lr : http://psg.com/dns/lr/lr.txt
1841// Submitted by registry <randy@psg.com> 2008-06-17
1842com.lr
1843edu.lr
1844gov.lr
1845org.lr
1846net.lr
1847
1848// ls : http://en.wikipedia.org/wiki/.ls
1849ls
1850co.ls
1851org.ls
1852
1853// lt : http://en.wikipedia.org/wiki/.lt
1854lt
1855// gov.lt : http://www.gov.lt/index_en.php
1856gov.lt
1857
1858// lu : http://www.dns.lu/en/
1859lu
1860
1861// lv : http://www.nic.lv/DNS/En/generic.php
1862lv
1863com.lv
1864edu.lv
1865gov.lv
1866org.lv
1867mil.lv
1868id.lv
1869net.lv
1870asn.lv
1871conf.lv
1872
1873// ly : http://www.nic.ly/regulations.php
1874ly
1875com.ly
1876net.ly
1877gov.ly
1878plc.ly
1879edu.ly
1880sch.ly
1881med.ly
1882org.ly
1883id.ly
1884
1885// ma : http://en.wikipedia.org/wiki/.ma
1886// http://www.anrt.ma/fr/admin/download/upload/file_fr782.pdf
1887ma
1888co.ma
1889net.ma
1890gov.ma
1891org.ma
1892ac.ma
1893press.ma
1894
1895// mc : http://www.nic.mc/
1896mc
1897tm.mc
1898asso.mc
1899
1900// md : http://en.wikipedia.org/wiki/.md
1901md
1902
1903// me : http://en.wikipedia.org/wiki/.me
1904me
1905co.me
1906net.me
1907org.me
1908edu.me
1909ac.me
1910gov.me
1911its.me
1912priv.me
1913
1914// mg : http://www.nic.mg/tarif.htm
1915mg
1916org.mg
1917nom.mg
1918gov.mg
1919prd.mg
1920tm.mg
1921edu.mg
1922mil.mg
1923com.mg
1924
1925// mh : http://en.wikipedia.org/wiki/.mh
1926mh
1927
1928// mil : http://en.wikipedia.org/wiki/.mil
1929mil
1930
1931// mk : http://en.wikipedia.org/wiki/.mk
1932// see also: http://dns.marnet.net.mk/postapka.php
1933mk
1934com.mk
1935org.mk
1936net.mk
1937edu.mk
1938gov.mk
1939inf.mk
1940name.mk
1941
1942// ml : http://www.gobin.info/domainname/ml-template.doc
1943// see also: http://en.wikipedia.org/wiki/.ml
1944ml
1945com.ml
1946edu.ml
1947gouv.ml
1948gov.ml
1949net.ml
1950org.ml
1951presse.ml
1952
1953// mm : http://en.wikipedia.org/wiki/.mm
1954*.mm
1955
1956// mn : http://en.wikipedia.org/wiki/.mn
1957mn
1958gov.mn
1959edu.mn
1960org.mn
1961
1962// mo : http://www.monic.net.mo/
1963mo
1964com.mo
1965net.mo
1966org.mo
1967edu.mo
1968gov.mo
1969
1970// mobi : http://en.wikipedia.org/wiki/.mobi
1971mobi
1972
1973// mp : http://www.dot.mp/
1974// Confirmed by registry <dcamacho@saipan.com> 2008-06-17
1975mp
1976
1977// mq : http://en.wikipedia.org/wiki/.mq
1978mq
1979
1980// mr : http://en.wikipedia.org/wiki/.mr
1981mr
1982gov.mr
1983
1984// ms : http://en.wikipedia.org/wiki/.ms
1985ms
1986
1987// mt : https://www.nic.org.mt/dotmt/
1988*.mt
1989
1990// mu : http://en.wikipedia.org/wiki/.mu
1991mu
1992com.mu
1993net.mu
1994org.mu
1995gov.mu
1996ac.mu
1997co.mu
1998or.mu
1999
2000// museum : http://about.museum/naming/
2001// http://index.museum/
2002museum
2003academy.museum
2004agriculture.museum
2005air.museum
2006airguard.museum
2007alabama.museum
2008alaska.museum
2009amber.museum
2010ambulance.museum
2011american.museum
2012americana.museum
2013americanantiques.museum
2014americanart.museum
2015amsterdam.museum
2016and.museum
2017annefrank.museum
2018anthro.museum
2019anthropology.museum
2020antiques.museum
2021aquarium.museum
2022arboretum.museum
2023archaeological.museum
2024archaeology.museum
2025architecture.museum
2026art.museum
2027artanddesign.museum
2028artcenter.museum
2029artdeco.museum
2030arteducation.museum
2031artgallery.museum
2032arts.museum
2033artsandcrafts.museum
2034asmatart.museum
2035assassination.museum
2036assisi.museum
2037association.museum
2038astronomy.museum
2039atlanta.museum
2040austin.museum
2041australia.museum
2042automotive.museum
2043aviation.museum
2044axis.museum
2045badajoz.museum
2046baghdad.museum
2047bahn.museum
2048bale.museum
2049baltimore.museum
2050barcelona.museum
2051baseball.museum
2052basel.museum
2053baths.museum
2054bauern.museum
2055beauxarts.museum
2056beeldengeluid.museum
2057bellevue.museum
2058bergbau.museum
2059berkeley.museum
2060berlin.museum
2061bern.museum
2062bible.museum
2063bilbao.museum
2064bill.museum
2065birdart.museum
2066birthplace.museum
2067bonn.museum
2068boston.museum
2069botanical.museum
2070botanicalgarden.museum
2071botanicgarden.museum
2072botany.museum
2073brandywinevalley.museum
2074brasil.museum
2075bristol.museum
2076british.museum
2077britishcolumbia.museum
2078broadcast.museum
2079brunel.museum
2080brussel.museum
2081brussels.museum
2082bruxelles.museum
2083building.museum
2084burghof.museum
2085bus.museum
2086bushey.museum
2087cadaques.museum
2088california.museum
2089cambridge.museum
2090can.museum
2091canada.museum
2092capebreton.museum
2093carrier.museum
2094cartoonart.museum
2095casadelamoneda.museum
2096castle.museum
2097castres.museum
2098celtic.museum
2099center.museum
2100chattanooga.museum
2101cheltenham.museum
2102chesapeakebay.museum
2103chicago.museum
2104children.museum
2105childrens.museum
2106childrensgarden.museum
2107chiropractic.museum
2108chocolate.museum
2109christiansburg.museum
2110cincinnati.museum
2111cinema.museum
2112circus.museum
2113civilisation.museum
2114civilization.museum
2115civilwar.museum
2116clinton.museum
2117clock.museum
2118coal.museum
2119coastaldefence.museum
2120cody.museum
2121coldwar.museum
2122collection.museum
2123colonialwilliamsburg.museum
2124coloradoplateau.museum
2125columbia.museum
2126columbus.museum
2127communication.museum
2128communications.museum
2129community.museum
2130computer.museum
2131computerhistory.museum
2132comunicações.museum
2133contemporary.museum
2134contemporaryart.museum
2135convent.museum
2136copenhagen.museum
2137corporation.museum
2138correios-e-telecomunicações.museum
2139corvette.museum
2140costume.museum
2141countryestate.museum
2142county.museum
2143crafts.museum
2144cranbrook.museum
2145creation.museum
2146cultural.museum
2147culturalcenter.museum
2148culture.museum
2149cyber.museum
2150cymru.museum
2151dali.museum
2152dallas.museum
2153database.museum
2154ddr.museum
2155decorativearts.museum
2156delaware.museum
2157delmenhorst.museum
2158denmark.museum
2159depot.museum
2160design.museum
2161detroit.museum
2162dinosaur.museum
2163discovery.museum
2164dolls.museum
2165donostia.museum
2166durham.museum
2167eastafrica.museum
2168eastcoast.museum
2169education.museum
2170educational.museum
2171egyptian.museum
2172eisenbahn.museum
2173elburg.museum
2174elvendrell.museum
2175embroidery.museum
2176encyclopedic.museum
2177england.museum
2178entomology.museum
2179environment.museum
2180environmentalconservation.museum
2181epilepsy.museum
2182essex.museum
2183estate.museum
2184ethnology.museum
2185exeter.museum
2186exhibition.museum
2187family.museum
2188farm.museum
2189farmequipment.museum
2190farmers.museum
2191farmstead.museum
2192field.museum
2193figueres.museum
2194filatelia.museum
2195film.museum
2196fineart.museum
2197finearts.museum
2198finland.museum
2199flanders.museum
2200florida.museum
2201force.museum
2202fortmissoula.museum
2203fortworth.museum
2204foundation.museum
2205francaise.museum
2206frankfurt.museum
2207franziskaner.museum
2208freemasonry.museum
2209freiburg.museum
2210fribourg.museum
2211frog.museum
2212fundacio.museum
2213furniture.museum
2214gallery.museum
2215garden.museum
2216gateway.museum
2217geelvinck.museum
2218gemological.museum
2219geology.museum
2220georgia.museum
2221giessen.museum
2222glas.museum
2223glass.museum
2224gorge.museum
2225grandrapids.museum
2226graz.museum
2227guernsey.museum
2228halloffame.museum
2229hamburg.museum
2230handson.museum
2231harvestcelebration.museum
2232hawaii.museum
2233health.museum
2234heimatunduhren.museum
2235hellas.museum
2236helsinki.museum
2237hembygdsforbund.museum
2238heritage.museum
2239histoire.museum
2240historical.museum
2241historicalsociety.museum
2242historichouses.museum
2243historisch.museum
2244historisches.museum
2245history.museum
2246historyofscience.museum
2247horology.museum
2248house.museum
2249humanities.museum
2250illustration.museum
2251imageandsound.museum
2252indian.museum
2253indiana.museum
2254indianapolis.museum
2255indianmarket.museum
2256intelligence.museum
2257interactive.museum
2258iraq.museum
2259iron.museum
2260isleofman.museum
2261jamison.museum
2262jefferson.museum
2263jerusalem.museum
2264jewelry.museum
2265jewish.museum
2266jewishart.museum
2267jfk.museum
2268journalism.museum
2269judaica.museum
2270judygarland.museum
2271juedisches.museum
2272juif.museum
2273karate.museum
2274karikatur.museum
2275kids.museum
2276koebenhavn.museum
2277koeln.museum
2278kunst.museum
2279kunstsammlung.museum
2280kunstunddesign.museum
2281labor.museum
2282labour.museum
2283lajolla.museum
2284lancashire.museum
2285landes.museum
2286lans.museum
2287läns.museum
2288larsson.museum
2289lewismiller.museum
2290lincoln.museum
2291linz.museum
2292living.museum
2293livinghistory.museum
2294localhistory.museum
2295london.museum
2296losangeles.museum
2297louvre.museum
2298loyalist.museum
2299lucerne.museum
2300luxembourg.museum
2301luzern.museum
2302mad.museum
2303madrid.museum
2304mallorca.museum
2305manchester.museum
2306mansion.museum
2307mansions.museum
2308manx.museum
2309marburg.museum
2310maritime.museum
2311maritimo.museum
2312maryland.museum
2313marylhurst.museum
2314media.museum
2315medical.museum
2316medizinhistorisches.museum
2317meeres.museum
2318memorial.museum
2319mesaverde.museum
2320michigan.museum
2321midatlantic.museum
2322military.museum
2323mill.museum
2324miners.museum
2325mining.museum
2326minnesota.museum
2327missile.museum
2328missoula.museum
2329modern.museum
2330moma.museum
2331money.museum
2332monmouth.museum
2333monticello.museum
2334montreal.museum
2335moscow.museum
2336motorcycle.museum
2337muenchen.museum
2338muenster.museum
2339mulhouse.museum
2340muncie.museum
2341museet.museum
2342museumcenter.museum
2343museumvereniging.museum
2344music.museum
2345national.museum
2346nationalfirearms.museum
2347nationalheritage.museum
2348nativeamerican.museum
2349naturalhistory.museum
2350naturalhistorymuseum.museum
2351naturalsciences.museum
2352nature.museum
2353naturhistorisches.museum
2354natuurwetenschappen.museum
2355naumburg.museum
2356naval.museum
2357nebraska.museum
2358neues.museum
2359newhampshire.museum
2360newjersey.museum
2361newmexico.museum
2362newport.museum
2363newspaper.museum
2364newyork.museum
2365niepce.museum
2366norfolk.museum
2367north.museum
2368nrw.museum
2369nuernberg.museum
2370nuremberg.museum
2371nyc.museum
2372nyny.museum
2373oceanographic.museum
2374oceanographique.museum
2375omaha.museum
2376online.museum
2377ontario.museum
2378openair.museum
2379oregon.museum
2380oregontrail.museum
2381otago.museum
2382oxford.museum
2383pacific.museum
2384paderborn.museum
2385palace.museum
2386paleo.museum
2387palmsprings.museum
2388panama.museum
2389paris.museum
2390pasadena.museum
2391pharmacy.museum
2392philadelphia.museum
2393philadelphiaarea.museum
2394philately.museum
2395phoenix.museum
2396photography.museum
2397pilots.museum
2398pittsburgh.museum
2399planetarium.museum
2400plantation.museum
2401plants.museum
2402plaza.museum
2403portal.museum
2404portland.museum
2405portlligat.museum
2406posts-and-telecommunications.museum
2407preservation.museum
2408presidio.museum
2409press.museum
2410project.museum
2411public.museum
2412pubol.museum
2413quebec.museum
2414railroad.museum
2415railway.museum
2416research.museum
2417resistance.museum
2418riodejaneiro.museum
2419rochester.museum
2420rockart.museum
2421roma.museum
2422russia.museum
2423saintlouis.museum
2424salem.museum
2425salvadordali.museum
2426salzburg.museum
2427sandiego.museum
2428sanfrancisco.museum
2429santabarbara.museum
2430santacruz.museum
2431santafe.museum
2432saskatchewan.museum
2433satx.museum
2434savannahga.museum
2435schlesisches.museum
2436schoenbrunn.museum
2437schokoladen.museum
2438school.museum
2439schweiz.museum
2440science.museum
2441scienceandhistory.museum
2442scienceandindustry.museum
2443sciencecenter.museum
2444sciencecenters.museum
2445science-fiction.museum
2446sciencehistory.museum
2447sciences.museum
2448sciencesnaturelles.museum
2449scotland.museum
2450seaport.museum
2451settlement.museum
2452settlers.museum
2453shell.museum
2454sherbrooke.museum
2455sibenik.museum
2456silk.museum
2457ski.museum
2458skole.museum
2459society.museum
2460sologne.museum
2461soundandvision.museum
2462southcarolina.museum
2463southwest.museum
2464space.museum
2465spy.museum
2466square.museum
2467stadt.museum
2468stalbans.museum
2469starnberg.museum
2470state.museum
2471stateofdelaware.museum
2472station.museum
2473steam.museum
2474steiermark.museum
2475stjohn.museum
2476stockholm.museum
2477stpetersburg.museum
2478stuttgart.museum
2479suisse.museum
2480surgeonshall.museum
2481surrey.museum
2482svizzera.museum
2483sweden.museum
2484sydney.museum
2485tank.museum
2486tcm.museum
2487technology.museum
2488telekommunikation.museum
2489television.museum
2490texas.museum
2491textile.museum
2492theater.museum
2493time.museum
2494timekeeping.museum
2495topology.museum
2496torino.museum
2497touch.museum
2498town.museum
2499transport.museum
2500tree.museum
2501trolley.museum
2502trust.museum
2503trustee.museum
2504uhren.museum
2505ulm.museum
2506undersea.museum
2507university.museum
2508usa.museum
2509usantiques.museum
2510usarts.museum
2511uscountryestate.museum
2512usculture.museum
2513usdecorativearts.museum
2514usgarden.museum
2515ushistory.museum
2516ushuaia.museum
2517uslivinghistory.museum
2518utah.museum
2519uvic.museum
2520valley.museum
2521vantaa.museum
2522versailles.museum
2523viking.museum
2524village.museum
2525virginia.museum
2526virtual.museum
2527virtuel.museum
2528vlaanderen.museum
2529volkenkunde.museum
2530wales.museum
2531wallonie.museum
2532war.museum
2533washingtondc.museum
2534watchandclock.museum
2535watch-and-clock.museum
2536western.museum
2537westfalen.museum
2538whaling.museum
2539wildlife.museum
2540williamsburg.museum
2541windmill.museum
2542workshop.museum
2543york.museum
2544yorkshire.museum
2545yosemite.museum
2546youth.museum
2547zoological.museum
2548zoology.museum
2549ירושלים.museum
2550иком.museum
2551
2552// mv : http://en.wikipedia.org/wiki/.mv
2553// "mv" included because, contra Wikipedia, google.mv exists.
2554mv
2555aero.mv
2556biz.mv
2557com.mv
2558coop.mv
2559edu.mv
2560gov.mv
2561info.mv
2562int.mv
2563mil.mv
2564museum.mv
2565name.mv
2566net.mv
2567org.mv
2568pro.mv
2569
2570// mw : http://www.registrar.mw/
2571mw
2572ac.mw
2573biz.mw
2574co.mw
2575com.mw
2576coop.mw
2577edu.mw
2578gov.mw
2579int.mw
2580museum.mw
2581net.mw
2582org.mw
2583
2584// mx : http://www.nic.mx/
2585// Submitted by registry <farias@nic.mx> 2008-06-19
2586mx
2587com.mx
2588org.mx
2589gob.mx
2590edu.mx
2591net.mx
2592
2593// my : http://www.mynic.net.my/
2594my
2595com.my
2596net.my
2597org.my
2598gov.my
2599edu.my
2600mil.my
2601name.my
2602
2603// mz : http://www.gobin.info/domainname/mz-template.doc
2604*.mz
2605
2606// na : http://www.na-nic.com.na/
2607// http://www.info.na/domain/
2608na
2609info.na
2610pro.na
2611name.na
2612school.na
2613or.na
2614dr.na
2615us.na
2616mx.na
2617ca.na
2618in.na
2619cc.na
2620tv.na
2621ws.na
2622mobi.na
2623co.na
2624com.na
2625org.na
2626
2627// name : has 2nd-level tlds, but there's no list of them
2628name
2629
2630// nc : http://www.cctld.nc/
2631nc
2632asso.nc
2633
2634// ne : http://en.wikipedia.org/wiki/.ne
2635ne
2636
2637// net : http://en.wikipedia.org/wiki/.net
2638net
2639
2640// CentralNic names : http://www.centralnic.com/names/domains
2641// Submitted by registry <gavin.brown@centralnic.com> 2008-06-17
2642gb.net
2643se.net
2644uk.net
2645
2646// ZaNiC names : http://www.za.net/
2647// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03
2648za.net
2649
2650// nf : http://en.wikipedia.org/wiki/.nf
2651nf
2652com.nf
2653net.nf
2654per.nf
2655rec.nf
2656web.nf
2657arts.nf
2658firm.nf
2659info.nf
2660other.nf
2661store.nf
2662
2663// ng : http://psg.com/dns/ng/
2664// Submitted by registry <randy@psg.com> 2008-06-17
2665ac.ng
2666com.ng
2667edu.ng
2668gov.ng
2669net.ng
2670org.ng
2671
2672// ni : http://www.nic.ni/dominios.htm
2673*.ni
2674
2675// nl : http://www.domain-registry.nl/ace.php/c,728,122,,,,Home.html
2676// Confirmed by registry <Antoin.Verschuren@sidn.nl> (with technical
2677// reservations) 2008-06-08
2678nl
2679
2680// BV.nl will be a registry for dutch BV's (besloten vennootschap)
2681bv.nl
2682
2683// the co.nl domain is managed by CoDNS B.V. Added 2010-05-23.
2684co.nl
2685
2686// no : http://www.norid.no/regelverk/index.en.html
2687// The Norwegian registry has declined to notify us of updates. The web pages
2688// referenced below are the official source of the data. There is also an
2689// announce mailing list:
2690// https://postlister.uninett.no/sympa/info/norid-diskusjon
2691no
2692// Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
2693fhs.no
2694vgs.no
2695fylkesbibl.no
2696folkebibl.no
2697museum.no
2698idrett.no
2699priv.no
2700// Non-Norid generic domains : http://www.norid.no/regelverk/vedlegg-d.en.html
2701mil.no
2702stat.no
2703dep.no
2704kommune.no
2705herad.no
2706// no geographical names : http://www.norid.no/regelverk/vedlegg-b.en.html
2707// counties
2708aa.no
2709ah.no
2710bu.no
2711fm.no
2712hl.no
2713hm.no
2714jan-mayen.no
2715mr.no
2716nl.no
2717nt.no
2718of.no
2719ol.no
2720oslo.no
2721rl.no
2722sf.no
2723st.no
2724svalbard.no
2725tm.no
2726tr.no
2727va.no
2728vf.no
2729// primary and lower secondary schools per county
2730gs.aa.no
2731gs.ah.no
2732gs.bu.no
2733gs.fm.no
2734gs.hl.no
2735gs.hm.no
2736gs.jan-mayen.no
2737gs.mr.no
2738gs.nl.no
2739gs.nt.no
2740gs.of.no
2741gs.ol.no
2742gs.oslo.no
2743gs.rl.no
2744gs.sf.no
2745gs.st.no
2746gs.svalbard.no
2747gs.tm.no
2748gs.tr.no
2749gs.va.no
2750gs.vf.no
2751// cities
2752akrehamn.no
2753åkrehamn.no
2754algard.no
2755ålgård.no
2756arna.no
2757brumunddal.no
2758bryne.no
2759bronnoysund.no
2760brønnøysund.no
2761drobak.no
2762drøbak.no
2763egersund.no
2764fetsund.no
2765floro.no
2766florø.no
2767fredrikstad.no
2768hokksund.no
2769honefoss.no
2770hønefoss.no
2771jessheim.no
2772jorpeland.no
2773jørpeland.no
2774kirkenes.no
2775kopervik.no
2776krokstadelva.no
2777langevag.no
2778langevåg.no
2779leirvik.no
2780mjondalen.no
2781mjøndalen.no
2782mo-i-rana.no
2783mosjoen.no
2784mosjøen.no
2785nesoddtangen.no
2786orkanger.no
2787osoyro.no
2788osøyro.no
2789raholt.no
2790råholt.no
2791sandnessjoen.no
2792sandnessjøen.no
2793skedsmokorset.no
2794slattum.no
2795spjelkavik.no
2796stathelle.no
2797stavern.no
2798stjordalshalsen.no
2799stjørdalshalsen.no
2800tananger.no
2801tranby.no
2802vossevangen.no
2803// communities
2804afjord.no
2805åfjord.no
2806agdenes.no
2807al.no
2808ål.no
2809alesund.no
2810ålesund.no
2811alstahaug.no
2812alta.no
2813áltá.no
2814alaheadju.no
2815álaheadju.no
2816alvdal.no
2817amli.no
2818åmli.no
2819amot.no
2820åmot.no
2821andebu.no
2822andoy.no
2823andøy.no
2824andasuolo.no
2825ardal.no
2826årdal.no
2827aremark.no
2828arendal.no
2829ås.no
2830aseral.no
2831åseral.no
2832asker.no
2833askim.no
2834askvoll.no
2835askoy.no
2836askøy.no
2837asnes.no
2838åsnes.no
2839audnedaln.no
2840aukra.no
2841aure.no
2842aurland.no
2843aurskog-holand.no
2844aurskog-høland.no
2845austevoll.no
2846austrheim.no
2847averoy.no
2848averøy.no
2849balestrand.no
2850ballangen.no
2851balat.no
2852bálát.no
2853balsfjord.no
2854bahccavuotna.no
2855báhccavuotna.no
2856bamble.no
2857bardu.no
2858beardu.no
2859beiarn.no
2860bajddar.no
2861bájddar.no
2862baidar.no
2863báidár.no
2864berg.no
2865bergen.no
2866berlevag.no
2867berlevåg.no
2868bearalvahki.no
2869bearalváhki.no
2870bindal.no
2871birkenes.no
2872bjarkoy.no
2873bjarkøy.no
2874bjerkreim.no
2875bjugn.no
2876bodo.no
2877bodø.no
2878badaddja.no
2879bådåddjå.no
2880budejju.no
2881bokn.no
2882bremanger.no
2883bronnoy.no
2884brønnøy.no
2885bygland.no
2886bykle.no
2887barum.no
2888bærum.no
2889bo.telemark.no
2890bø.telemark.no
2891bo.nordland.no
2892bø.nordland.no
2893bievat.no
2894bievát.no
2895bomlo.no
2896bømlo.no
2897batsfjord.no
2898båtsfjord.no
2899bahcavuotna.no
2900báhcavuotna.no
2901dovre.no
2902drammen.no
2903drangedal.no
2904dyroy.no
2905dyrøy.no
2906donna.no
2907dønna.no
2908eid.no
2909eidfjord.no
2910eidsberg.no
2911eidskog.no
2912eidsvoll.no
2913eigersund.no
2914elverum.no
2915enebakk.no
2916engerdal.no
2917etne.no
2918etnedal.no
2919evenes.no
2920evenassi.no
2921evenášši.no
2922evje-og-hornnes.no
2923farsund.no
2924fauske.no
2925fuossko.no
2926fuoisku.no
2927fedje.no
2928fet.no
2929finnoy.no
2930finnøy.no
2931fitjar.no
2932fjaler.no
2933fjell.no
2934flakstad.no
2935flatanger.no
2936flekkefjord.no
2937flesberg.no
2938flora.no
2939fla.no
2940flå.no
2941folldal.no
2942forsand.no
2943fosnes.no
2944frei.no
2945frogn.no
2946froland.no
2947frosta.no
2948frana.no
2949fræna.no
2950froya.no
2951frøya.no
2952fusa.no
2953fyresdal.no
2954forde.no
2955førde.no
2956gamvik.no
2957gangaviika.no
2958gáŋgaviika.no
2959gaular.no
2960gausdal.no
2961gildeskal.no
2962gildeskål.no
2963giske.no
2964gjemnes.no
2965gjerdrum.no
2966gjerstad.no
2967gjesdal.no
2968gjovik.no
2969gjøvik.no
2970gloppen.no
2971gol.no
2972gran.no
2973grane.no
2974granvin.no
2975gratangen.no
2976grimstad.no
2977grong.no
2978kraanghke.no
2979kråanghke.no
2980grue.no
2981gulen.no
2982hadsel.no
2983halden.no
2984halsa.no
2985hamar.no
2986hamaroy.no
2987habmer.no
2988hábmer.no
2989hapmir.no
2990hápmir.no
2991hammerfest.no
2992hammarfeasta.no
2993hámmárfeasta.no
2994haram.no
2995hareid.no
2996harstad.no
2997hasvik.no
2998aknoluokta.no
2999ákŋoluokta.no
3000hattfjelldal.no
3001aarborte.no
3002haugesund.no
3003hemne.no
3004hemnes.no
3005hemsedal.no
3006heroy.more-og-romsdal.no
3007herøy.møre-og-romsdal.no
3008heroy.nordland.no
3009herøy.nordland.no
3010hitra.no
3011hjartdal.no
3012hjelmeland.no
3013hobol.no
3014hobøl.no
3015hof.no
3016hol.no
3017hole.no
3018holmestrand.no
3019holtalen.no
3020holtålen.no
3021hornindal.no
3022horten.no
3023hurdal.no
3024hurum.no
3025hvaler.no
3026hyllestad.no
3027hagebostad.no
3028hægebostad.no
3029hoyanger.no
3030høyanger.no
3031hoylandet.no
3032høylandet.no
3033ha.no
3034hå.no
3035ibestad.no
3036inderoy.no
3037inderøy.no
3038iveland.no
3039jevnaker.no
3040jondal.no
3041jolster.no
3042jølster.no
3043karasjok.no
3044karasjohka.no
3045kárášjohka.no
3046karlsoy.no
3047galsa.no
3048gálsá.no
3049karmoy.no
3050karmøy.no
3051kautokeino.no
3052guovdageaidnu.no
3053klepp.no
3054klabu.no
3055klæbu.no
3056kongsberg.no
3057kongsvinger.no
3058kragero.no
3059kragerø.no
3060kristiansand.no
3061kristiansund.no
3062krodsherad.no
3063krødsherad.no
3064kvalsund.no
3065rahkkeravju.no
3066ráhkkerávju.no
3067kvam.no
3068kvinesdal.no
3069kvinnherad.no
3070kviteseid.no
3071kvitsoy.no
3072kvitsøy.no
3073kvafjord.no
3074kvæfjord.no
3075giehtavuoatna.no
3076kvanangen.no
3077kvænangen.no
3078navuotna.no
3079návuotna.no
3080kafjord.no
3081kåfjord.no
3082gaivuotna.no
3083gáivuotna.no
3084larvik.no
3085lavangen.no
3086lavagis.no
3087loabat.no
3088loabát.no
3089lebesby.no
3090davvesiida.no
3091leikanger.no
3092leirfjord.no
3093leka.no
3094leksvik.no
3095lenvik.no
3096leangaviika.no
3097leaŋgaviika.no
3098lesja.no
3099levanger.no
3100lier.no
3101lierne.no
3102lillehammer.no
3103lillesand.no
3104lindesnes.no
3105lindas.no
3106lindås.no
3107lom.no
3108loppa.no
3109lahppi.no
3110láhppi.no
3111lund.no
3112lunner.no
3113luroy.no
3114lurøy.no
3115luster.no
3116lyngdal.no
3117lyngen.no
3118ivgu.no
3119lardal.no
3120lerdal.no
3121lærdal.no
3122lodingen.no
3123lødingen.no
3124lorenskog.no
3125lørenskog.no
3126loten.no
3127løten.no
3128malvik.no
3129masoy.no
3130måsøy.no
3131muosat.no
3132muosát.no
3133mandal.no
3134marker.no
3135marnardal.no
3136masfjorden.no
3137meland.no
3138meldal.no
3139melhus.no
3140meloy.no
3141meløy.no
3142meraker.no
3143meråker.no
3144moareke.no
3145moåreke.no
3146midsund.no
3147midtre-gauldal.no
3148modalen.no
3149modum.no
3150molde.no
3151moskenes.no
3152moss.no
3153mosvik.no
3154malselv.no
3155målselv.no
3156malatvuopmi.no
3157málatvuopmi.no
3158namdalseid.no
3159aejrie.no
3160namsos.no
3161namsskogan.no
3162naamesjevuemie.no
3163nååmesjevuemie.no
3164laakesvuemie.no
3165nannestad.no
3166narvik.no
3167narviika.no
3168naustdal.no
3169nedre-eiker.no
3170nes.akershus.no
3171nes.buskerud.no
3172nesna.no
3173nesodden.no
3174nesseby.no
3175unjarga.no
3176unjárga.no
3177nesset.no
3178nissedal.no
3179nittedal.no
3180nord-aurdal.no
3181nord-fron.no
3182nord-odal.no
3183norddal.no
3184nordkapp.no
3185davvenjarga.no
3186davvenjárga.no
3187nordre-land.no
3188nordreisa.no
3189raisa.no
3190ráisa.no
3191nore-og-uvdal.no
3192notodden.no
3193naroy.no
3194nærøy.no
3195notteroy.no
3196nøtterøy.no
3197odda.no
3198oksnes.no
3199øksnes.no
3200oppdal.no
3201oppegard.no
3202oppegård.no
3203orkdal.no
3204orland.no
3205ørland.no
3206orskog.no
3207ørskog.no
3208orsta.no
3209ørsta.no
3210os.hedmark.no
3211os.hordaland.no
3212osen.no
3213osteroy.no
3214osterøy.no
3215ostre-toten.no
3216østre-toten.no
3217overhalla.no
3218ovre-eiker.no
3219øvre-eiker.no
3220oyer.no
3221øyer.no
3222oygarden.no
3223øygarden.no
3224oystre-slidre.no
3225øystre-slidre.no
3226porsanger.no
3227porsangu.no
3228porsáŋgu.no
3229porsgrunn.no
3230radoy.no
3231radøy.no
3232rakkestad.no
3233rana.no
3234ruovat.no
3235randaberg.no
3236rauma.no
3237rendalen.no
3238rennebu.no
3239rennesoy.no
3240rennesøy.no
3241rindal.no
3242ringebu.no
3243ringerike.no
3244ringsaker.no
3245rissa.no
3246risor.no
3247risør.no
3248roan.no
3249rollag.no
3250rygge.no
3251ralingen.no
3252rælingen.no
3253rodoy.no
3254rødøy.no
3255romskog.no
3256rømskog.no
3257roros.no
3258røros.no
3259rost.no
3260røst.no
3261royken.no
3262røyken.no
3263royrvik.no
3264røyrvik.no
3265rade.no
3266råde.no
3267salangen.no
3268siellak.no
3269saltdal.no
3270salat.no
3271sálát.no
3272sálat.no
3273samnanger.no
3274sande.more-og-romsdal.no
3275sande.møre-og-romsdal.no
3276sande.vestfold.no
3277sandefjord.no
3278sandnes.no
3279sandoy.no
3280sandøy.no
3281sarpsborg.no
3282sauda.no
3283sauherad.no
3284sel.no
3285selbu.no
3286selje.no
3287seljord.no
3288sigdal.no
3289siljan.no
3290sirdal.no
3291skaun.no
3292skedsmo.no
3293ski.no
3294skien.no
3295skiptvet.no
3296skjervoy.no
3297skjervøy.no
3298skierva.no
3299skiervá.no
3300skjak.no
3301skjåk.no
3302skodje.no
3303skanland.no
3304skånland.no
3305skanit.no
3306skánit.no
3307smola.no
3308smøla.no
3309snillfjord.no
3310snasa.no
3311snåsa.no
3312snoasa.no
3313snaase.no
3314snåase.no
3315sogndal.no
3316sokndal.no
3317sola.no
3318solund.no
3319songdalen.no
3320sortland.no
3321spydeberg.no
3322stange.no
3323stavanger.no
3324steigen.no
3325steinkjer.no
3326stjordal.no
3327stjørdal.no
3328stokke.no
3329stor-elvdal.no
3330stord.no
3331stordal.no
3332storfjord.no
3333omasvuotna.no
3334strand.no
3335stranda.no
3336stryn.no
3337sula.no
3338suldal.no
3339sund.no
3340sunndal.no
3341surnadal.no
3342sveio.no
3343svelvik.no
3344sykkylven.no
3345sogne.no
3346søgne.no
3347somna.no
3348sømna.no
3349sondre-land.no
3350søndre-land.no
3351sor-aurdal.no
3352sør-aurdal.no
3353sor-fron.no
3354sør-fron.no
3355sor-odal.no
3356sør-odal.no
3357sor-varanger.no
3358sør-varanger.no
3359matta-varjjat.no
3360mátta-várjjat.no
3361sorfold.no
3362sørfold.no
3363sorreisa.no
3364sørreisa.no
3365sorum.no
3366sørum.no
3367tana.no
3368deatnu.no
3369time.no
3370tingvoll.no
3371tinn.no
3372tjeldsund.no
3373dielddanuorri.no
3374tjome.no
3375tjøme.no
3376tokke.no
3377tolga.no
3378torsken.no
3379tranoy.no
3380tranøy.no
3381tromso.no
3382tromsø.no
3383tromsa.no
3384romsa.no
3385trondheim.no
3386troandin.no
3387trysil.no
3388trana.no
3389træna.no
3390trogstad.no
3391trøgstad.no
3392tvedestrand.no
3393tydal.no
3394tynset.no
3395tysfjord.no
3396divtasvuodna.no
3397divttasvuotna.no
3398tysnes.no
3399tysvar.no
3400tysvær.no
3401tonsberg.no
3402tønsberg.no
3403ullensaker.no
3404ullensvang.no
3405ulvik.no
3406utsira.no
3407vadso.no
3408vadsø.no
3409cahcesuolo.no
3410čáhcesuolo.no
3411vaksdal.no
3412valle.no
3413vang.no
3414vanylven.no
3415vardo.no
3416vardø.no
3417varggat.no
3418várggát.no
3419vefsn.no
3420vaapste.no
3421vega.no
3422vegarshei.no
3423vegårshei.no
3424vennesla.no
3425verdal.no
3426verran.no
3427vestby.no
3428vestnes.no
3429vestre-slidre.no
3430vestre-toten.no
3431vestvagoy.no
3432vestvågøy.no
3433vevelstad.no
3434vik.no
3435vikna.no
3436vindafjord.no
3437volda.no
3438voss.no
3439varoy.no
3440værøy.no
3441vagan.no
3442vågan.no
3443voagat.no
3444vagsoy.no
3445vågsøy.no
3446vaga.no
3447vågå.no
3448valer.ostfold.no
3449våler.østfold.no
3450valer.hedmark.no
3451våler.hedmark.no
3452
3453// the co.no domain is managed by CoDNS B.V. Added 2010-05-23.
3454co.no
3455
3456// np : http://www.mos.com.np/register.html
3457*.np
3458
3459// nr : http://cenpac.net.nr/dns/index.html
3460// Confirmed by registry <technician@cenpac.net.nr> 2008-06-17
3461nr
3462biz.nr
3463info.nr
3464gov.nr
3465edu.nr
3466org.nr
3467net.nr
3468com.nr
3469
3470// nu : http://en.wikipedia.org/wiki/.nu
3471nu
3472
3473// nz : http://en.wikipedia.org/wiki/.nz
3474*.nz
3475
3476// om : http://en.wikipedia.org/wiki/.om
3477*.om
3478!mediaphone.om
3479!nawrastelecom.om
3480!nawras.om
3481!omanmobile.om
3482!omanpost.om
3483!omantel.om
3484!rakpetroleum.om
3485!siemens.om
3486!songfest.om
3487!statecouncil.om
3488
3489// org : http://en.wikipedia.org/wiki/.org
3490org
3491
3492// CentralNic names : http://www.centralnic.com/names/domains
3493// Submitted by registry <gavin.brown@centralnic.com> 2008-06-17
3494ae.org
3495
3496// ZaNiC names : http://www.za.net/
3497// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03
3498za.org
3499
3500// pa : http://www.nic.pa/
3501// Some additional second level "domains" resolve directly as hostnames, such as
3502// pannet.pa, so we add a rule for "pa".
3503pa
3504ac.pa
3505gob.pa
3506com.pa
3507org.pa
3508sld.pa
3509edu.pa
3510net.pa
3511ing.pa
3512abo.pa
3513med.pa
3514nom.pa
3515
3516// pe : https://www.nic.pe/InformeFinalComision.pdf
3517pe
3518edu.pe
3519gob.pe
3520nom.pe
3521mil.pe
3522org.pe
3523com.pe
3524net.pe
3525
3526// pf : http://www.gobin.info/domainname/formulaire-pf.pdf
3527pf
3528com.pf
3529org.pf
3530edu.pf
3531
3532// pg : http://en.wikipedia.org/wiki/.pg
3533*.pg
3534
3535// ph : http://www.domains.ph/FAQ2.asp
3536// Submitted by registry <jed@email.com.ph> 2008-06-13
3537ph
3538com.ph
3539net.ph
3540org.ph
3541gov.ph
3542edu.ph
3543ngo.ph
3544mil.ph
3545i.ph
3546
3547// pk : http://pk5.pknic.net.pk/pk5/msgNamepk.PK
3548pk
3549com.pk
3550net.pk
3551edu.pk
3552org.pk
3553fam.pk
3554biz.pk
3555web.pk
3556gov.pk
3557gob.pk
3558gok.pk
3559gon.pk
3560gop.pk
3561gos.pk
3562info.pk
3563
3564// pl : http://www.dns.pl/english/
3565pl
3566// NASK functional domains (nask.pl / dns.pl) : http://www.dns.pl/english/dns-funk.html
3567aid.pl
3568agro.pl
3569atm.pl
3570auto.pl
3571biz.pl
3572com.pl
3573edu.pl
3574gmina.pl
3575gsm.pl
3576info.pl
3577mail.pl
3578miasta.pl
3579media.pl
3580mil.pl
3581net.pl
3582nieruchomosci.pl
3583nom.pl
3584org.pl
3585pc.pl
3586powiat.pl
3587priv.pl
3588realestate.pl
3589rel.pl
3590sex.pl
3591shop.pl
3592sklep.pl
3593sos.pl
3594szkola.pl
3595targi.pl
3596tm.pl
3597tourism.pl
3598travel.pl
3599turystyka.pl
3600// ICM functional domains (icm.edu.pl)
36016bone.pl
3602art.pl
3603mbone.pl
3604// Government domains (administred by ippt.gov.pl)
3605gov.pl
3606uw.gov.pl
3607um.gov.pl
3608ug.gov.pl
3609upow.gov.pl
3610starostwo.gov.pl
3611so.gov.pl
3612sr.gov.pl
3613po.gov.pl
3614pa.gov.pl
3615// other functional domains
3616ngo.pl
3617irc.pl
3618usenet.pl
3619// NASK geographical domains : http://www.dns.pl/english/dns-regiony.html
3620augustow.pl
3621babia-gora.pl
3622bedzin.pl
3623beskidy.pl
3624bialowieza.pl
3625bialystok.pl
3626bielawa.pl
3627bieszczady.pl
3628boleslawiec.pl
3629bydgoszcz.pl
3630bytom.pl
3631cieszyn.pl
3632czeladz.pl
3633czest.pl
3634dlugoleka.pl
3635elblag.pl
3636elk.pl
3637glogow.pl
3638gniezno.pl
3639gorlice.pl
3640grajewo.pl
3641ilawa.pl
3642jaworzno.pl
3643jelenia-gora.pl
3644jgora.pl
3645kalisz.pl
3646kazimierz-dolny.pl
3647karpacz.pl
3648kartuzy.pl
3649kaszuby.pl
3650katowice.pl
3651kepno.pl
3652ketrzyn.pl
3653klodzko.pl
3654kobierzyce.pl
3655kolobrzeg.pl
3656konin.pl
3657konskowola.pl
3658kutno.pl
3659lapy.pl
3660lebork.pl
3661legnica.pl
3662lezajsk.pl
3663limanowa.pl
3664lomza.pl
3665lowicz.pl
3666lubin.pl
3667lukow.pl
3668malbork.pl
3669malopolska.pl
3670mazowsze.pl
3671mazury.pl
3672mielec.pl
3673mielno.pl
3674mragowo.pl
3675naklo.pl
3676nowaruda.pl
3677nysa.pl
3678olawa.pl
3679olecko.pl
3680olkusz.pl
3681olsztyn.pl
3682opoczno.pl
3683opole.pl
3684ostroda.pl
3685ostroleka.pl
3686ostrowiec.pl
3687ostrowwlkp.pl
3688pila.pl
3689pisz.pl
3690podhale.pl
3691podlasie.pl
3692polkowice.pl
3693pomorze.pl
3694pomorskie.pl
3695prochowice.pl
3696pruszkow.pl
3697przeworsk.pl
3698pulawy.pl
3699radom.pl
3700rawa-maz.pl
3701rybnik.pl
3702rzeszow.pl
3703sanok.pl
3704sejny.pl
3705siedlce.pl
3706slask.pl
3707slupsk.pl
3708sosnowiec.pl
3709stalowa-wola.pl
3710skoczow.pl
3711starachowice.pl
3712stargard.pl
3713suwalki.pl
3714swidnica.pl
3715swiebodzin.pl
3716swinoujscie.pl
3717szczecin.pl
3718szczytno.pl
3719tarnobrzeg.pl
3720tgory.pl
3721turek.pl
3722tychy.pl
3723ustka.pl
3724walbrzych.pl
3725warmia.pl
3726warszawa.pl
3727waw.pl
3728wegrow.pl
3729wielun.pl
3730wlocl.pl
3731wloclawek.pl
3732wodzislaw.pl
3733wolomin.pl
3734wroclaw.pl
3735zachpomor.pl
3736zagan.pl
3737zarow.pl
3738zgora.pl
3739zgorzelec.pl
3740// TASK geographical domains (www.task.gda.pl/uslugi/dns)
3741gda.pl
3742gdansk.pl
3743gdynia.pl
3744med.pl
3745sopot.pl
3746// other geographical domains
3747gliwice.pl
3748krakow.pl
3749poznan.pl
3750wroc.pl
3751zakopane.pl
3752
3753// co.pl : Mainseek Sp. z o.o. http://www.co.pl
3754co.pl
3755
3756// pn : http://www.government.pn/PnRegistry/policies.htm
3757pn
3758gov.pn
3759co.pn
3760org.pn
3761edu.pn
3762net.pn
3763
3764// pr : http://www.nic.pr/index.asp?f=1
3765pr
3766com.pr
3767net.pr
3768org.pr
3769gov.pr
3770edu.pr
3771isla.pr
3772pro.pr
3773biz.pr
3774info.pr
3775name.pr
3776// these aren't mentioned on nic.pr, but on http://en.wikipedia.org/wiki/.pr
3777est.pr
3778prof.pr
3779ac.pr
3780
3781// pro : http://www.nic.pro/support_faq.htm
3782pro
3783aca.pro
3784bar.pro
3785cpa.pro
3786jur.pro
3787law.pro
3788med.pro
3789eng.pro
3790
3791// ps : http://en.wikipedia.org/wiki/.ps
3792// http://www.nic.ps/registration/policy.html#reg
3793ps
3794edu.ps
3795gov.ps
3796sec.ps
3797plo.ps
3798com.ps
3799org.ps
3800net.ps
3801
3802// pt : http://online.dns.pt/dns/start_dns
3803pt
3804net.pt
3805gov.pt
3806org.pt
3807edu.pt
3808int.pt
3809publ.pt
3810com.pt
3811nome.pt
3812
3813// pw : http://en.wikipedia.org/wiki/.pw
3814pw
3815co.pw
3816ne.pw
3817or.pw
3818ed.pw
3819go.pw
3820belau.pw
3821
3822// py : http://www.nic.py/faq_a.html#faq_b
3823*.py
3824
3825// qa : http://www.qatar.net.qa/services/virtual.htm
3826*.qa
3827
3828// re : http://www.afnic.re/obtenir/chartes/nommage-re/annexe-descriptifs
3829re
3830com.re
3831asso.re
3832nom.re
3833
3834// ro : http://www.rotld.ro/
3835ro
3836com.ro
3837org.ro
3838tm.ro
3839nt.ro
3840nom.ro
3841info.ro
3842rec.ro
3843arts.ro
3844firm.ro
3845store.ro
3846www.ro
3847
3848// rs : http://en.wikipedia.org/wiki/.rs
3849rs
3850co.rs
3851org.rs
3852edu.rs
3853ac.rs
3854gov.rs
3855in.rs
3856
3857// ru : http://www.cctld.ru/ru/docs/aktiv_8.php
3858// Industry domains
3859ru
3860ac.ru
3861com.ru
3862edu.ru
3863int.ru
3864net.ru
3865org.ru
3866pp.ru
3867// Geographical domains
3868adygeya.ru
3869altai.ru
3870amur.ru
3871arkhangelsk.ru
3872astrakhan.ru
3873bashkiria.ru
3874belgorod.ru
3875bir.ru
3876bryansk.ru
3877buryatia.ru
3878cbg.ru
3879chel.ru
3880chelyabinsk.ru
3881chita.ru
3882chukotka.ru
3883chuvashia.ru
3884dagestan.ru
3885dudinka.ru
3886e-burg.ru
3887grozny.ru
3888irkutsk.ru
3889ivanovo.ru
3890izhevsk.ru
3891jar.ru
3892joshkar-ola.ru
3893kalmykia.ru
3894kaluga.ru
3895kamchatka.ru
3896karelia.ru
3897kazan.ru
3898kchr.ru
3899kemerovo.ru
3900khabarovsk.ru
3901khakassia.ru
3902khv.ru
3903kirov.ru
3904koenig.ru
3905komi.ru
3906kostroma.ru
3907krasnoyarsk.ru
3908kuban.ru
3909kurgan.ru
3910kursk.ru
3911lipetsk.ru
3912magadan.ru
3913mari.ru
3914mari-el.ru
3915marine.ru
3916mordovia.ru
3917mosreg.ru
3918msk.ru
3919murmansk.ru
3920nalchik.ru
3921nnov.ru
3922nov.ru
3923novosibirsk.ru
3924nsk.ru
3925omsk.ru
3926orenburg.ru
3927oryol.ru
3928palana.ru
3929penza.ru
3930perm.ru
3931pskov.ru
3932ptz.ru
3933rnd.ru
3934ryazan.ru
3935sakhalin.ru
3936samara.ru
3937saratov.ru
3938simbirsk.ru
3939smolensk.ru
3940spb.ru
3941stavropol.ru
3942stv.ru
3943surgut.ru
3944tambov.ru
3945tatarstan.ru
3946tom.ru
3947tomsk.ru
3948tsaritsyn.ru
3949tsk.ru
3950tula.ru
3951tuva.ru
3952tver.ru
3953tyumen.ru
3954udm.ru
3955udmurtia.ru
3956ulan-ude.ru
3957vladikavkaz.ru
3958vladimir.ru
3959vladivostok.ru
3960volgograd.ru
3961vologda.ru
3962voronezh.ru
3963vrn.ru
3964vyatka.ru
3965yakutia.ru
3966yamal.ru
3967yaroslavl.ru
3968yekaterinburg.ru
3969yuzhno-sakhalinsk.ru
3970// More geographical domains
3971amursk.ru
3972baikal.ru
3973cmw.ru
3974fareast.ru
3975jamal.ru
3976kms.ru
3977k-uralsk.ru
3978kustanai.ru
3979kuzbass.ru
3980magnitka.ru
3981mytis.ru
3982nakhodka.ru
3983nkz.ru
3984norilsk.ru
3985oskol.ru
3986pyatigorsk.ru
3987rubtsovsk.ru
3988snz.ru
3989syzran.ru
3990vdonsk.ru
3991zgrad.ru
3992// State domains
3993gov.ru
3994mil.ru
3995// Technical domains
3996test.ru
3997
3998// rw : http://www.nic.rw/cgi-bin/policy.pl
3999rw
4000gov.rw
4001net.rw
4002edu.rw
4003ac.rw
4004com.rw
4005co.rw
4006int.rw
4007mil.rw
4008gouv.rw
4009
4010// sa : http://www.nic.net.sa/
4011sa
4012com.sa
4013net.sa
4014org.sa
4015gov.sa
4016med.sa
4017pub.sa
4018edu.sa
4019sch.sa
4020
4021// sb : http://www.sbnic.net.sb/
4022// Submitted by registry <lee.humphries@telekom.com.sb> 2008-06-08
4023sb
4024com.sb
4025edu.sb
4026gov.sb
4027net.sb
4028org.sb
4029
4030// sc : http://www.nic.sc/
4031sc
4032com.sc
4033gov.sc
4034net.sc
4035org.sc
4036edu.sc
4037
4038// sd : http://www.isoc.sd/sudanic.isoc.sd/billing_pricing.htm
4039// Submitted by registry <admin@isoc.sd> 2008-06-17
4040sd
4041com.sd
4042net.sd
4043org.sd
4044edu.sd
4045med.sd
4046gov.sd
4047info.sd
4048
4049// se : http://en.wikipedia.org/wiki/.se
4050// Submitted by registry <Patrik.Wallstrom@iis.se> 2008-06-24
4051se
4052a.se
4053ac.se
4054b.se
4055bd.se
4056brand.se
4057c.se
4058d.se
4059e.se
4060f.se
4061fh.se
4062fhsk.se
4063fhv.se
4064g.se
4065h.se
4066i.se
4067k.se
4068komforb.se
4069kommunalforbund.se
4070komvux.se
4071l.se
4072lanbib.se
4073m.se
4074n.se
4075naturbruksgymn.se
4076o.se
4077org.se
4078p.se
4079parti.se
4080pp.se
4081press.se
4082r.se
4083s.se
4084sshn.se
4085t.se
4086tm.se
4087u.se
4088w.se
4089x.se
4090y.se
4091z.se
4092
4093// sg : http://www.nic.net.sg/sub_policies_agreement/2ld.html
4094sg
4095com.sg
4096net.sg
4097org.sg
4098gov.sg
4099edu.sg
4100per.sg
4101
4102// sh : http://www.nic.sh/rules.html
4103// list of 2nd level domains ?
4104sh
4105
4106// si : http://en.wikipedia.org/wiki/.si
4107si
4108
4109// sj : No registrations at this time.
4110// Submitted by registry <jarle@uninett.no> 2008-06-16
4111
4112// sk : http://en.wikipedia.org/wiki/.sk
4113// list of 2nd level domains ?
4114sk
4115
4116// sl : http://www.nic.sl
4117// Submitted by registry <adam@neoip.com> 2008-06-12
4118sl
4119com.sl
4120net.sl
4121edu.sl
4122gov.sl
4123org.sl
4124
4125// sm : http://en.wikipedia.org/wiki/.sm
4126sm
4127
4128// sn : http://en.wikipedia.org/wiki/.sn
4129sn
4130art.sn
4131com.sn
4132edu.sn
4133gouv.sn
4134org.sn
4135perso.sn
4136univ.sn
4137
4138// so : http://www.soregistry.com/
4139so
4140com.so
4141net.so
4142org.so
4143
4144// sr : http://en.wikipedia.org/wiki/.sr
4145sr
4146
4147// st : http://www.nic.st/html/policyrules/
4148st
4149co.st
4150com.st
4151consulado.st
4152edu.st
4153embaixada.st
4154gov.st
4155mil.st
4156net.st
4157org.st
4158principe.st
4159saotome.st
4160store.st
4161
4162// su : http://en.wikipedia.org/wiki/.su
4163su
4164
4165// sv : http://www.svnet.org.sv/svpolicy.html
4166*.sv
4167
4168// sy : http://en.wikipedia.org/wiki/.sy
4169// see also: http://www.gobin.info/domainname/sy.doc
4170sy
4171edu.sy
4172gov.sy
4173net.sy
4174mil.sy
4175com.sy
4176org.sy
4177
4178// sz : http://en.wikipedia.org/wiki/.sz
4179// http://www.sispa.org.sz/
4180sz
4181co.sz
4182ac.sz
4183org.sz
4184
4185// tc : http://en.wikipedia.org/wiki/.tc
4186tc
4187
4188// td : http://en.wikipedia.org/wiki/.td
4189td
4190
4191// tel: http://en.wikipedia.org/wiki/.tel
4192// http://www.telnic.org/
4193tel
4194
4195// tf : http://en.wikipedia.org/wiki/.tf
4196tf
4197
4198// tg : http://en.wikipedia.org/wiki/.tg
4199// http://www.nic.tg/nictg/index.php implies no reserved 2nd-level domains,
4200// although this contradicts wikipedia.
4201tg
4202
4203// th : http://en.wikipedia.org/wiki/.th
4204// Submitted by registry <krit@thains.co.th> 2008-06-17
4205th
4206ac.th
4207co.th
4208go.th
4209in.th
4210mi.th
4211net.th
4212or.th
4213
4214// tj : http://www.nic.tj/policy.htm
4215tj
4216ac.tj
4217biz.tj
4218co.tj
4219com.tj
4220edu.tj
4221go.tj
4222gov.tj
4223int.tj
4224mil.tj
4225name.tj
4226net.tj
4227nic.tj
4228org.tj
4229test.tj
4230web.tj
4231
4232// tk : http://en.wikipedia.org/wiki/.tk
4233tk
4234
4235// tl : http://en.wikipedia.org/wiki/.tl
4236tl
4237gov.tl
4238
4239// tm : http://www.nic.tm/rules.html
4240// list of 2nd level tlds ?
4241tm
4242
4243// tn : http://en.wikipedia.org/wiki/.tn
4244// http://whois.ati.tn/
4245tn
4246com.tn
4247ens.tn
4248fin.tn
4249gov.tn
4250ind.tn
4251intl.tn
4252nat.tn
4253net.tn
4254org.tn
4255info.tn
4256perso.tn
4257tourism.tn
4258edunet.tn
4259rnrt.tn
4260rns.tn
4261rnu.tn
4262mincom.tn
4263agrinet.tn
4264defense.tn
4265turen.tn
4266
4267// to : http://en.wikipedia.org/wiki/.to
4268// Submitted by registry <egullich@colo.to> 2008-06-17
4269to
4270com.to
4271gov.to
4272net.to
4273org.to
4274edu.to
4275mil.to
4276
4277// tr : http://en.wikipedia.org/wiki/.tr
4278*.tr
4279!nic.tr
4280// Used by government in the TRNC
4281// http://en.wikipedia.org/wiki/.nc.tr
4282gov.nc.tr
4283
4284// travel : http://en.wikipedia.org/wiki/.travel
4285travel
4286
4287// tt : http://www.nic.tt/
4288tt
4289co.tt
4290com.tt
4291org.tt
4292net.tt
4293biz.tt
4294info.tt
4295pro.tt
4296int.tt
4297coop.tt
4298jobs.tt
4299mobi.tt
4300travel.tt
4301museum.tt
4302aero.tt
4303name.tt
4304gov.tt
4305edu.tt
4306
4307// tv : http://en.wikipedia.org/wiki/.tv
4308// Not listing any 2LDs as reserved since none seem to exist in practice,
4309// Wikipedia notwithstanding.
4310tv
4311
4312// tw : http://en.wikipedia.org/wiki/.tw
4313tw
4314edu.tw
4315gov.tw
4316mil.tw
4317com.tw
4318net.tw
4319org.tw
4320idv.tw
4321game.tw
4322ebiz.tw
4323club.tw
4324網路.tw
4325組織.tw
4326商業.tw
4327
4328// tz : http://en.wikipedia.org/wiki/.tz
4329// Submitted by registry <randy@psg.com> 2008-06-17
4330// Updated from http://www.tznic.or.tz/index.php/domains.html 2010-10-25
4331ac.tz
4332co.tz
4333go.tz
4334mil.tz
4335ne.tz
4336or.tz
4337sc.tz
4338
4339// ua : http://www.nic.net.ua/
4340ua
4341com.ua
4342edu.ua
4343gov.ua
4344in.ua
4345net.ua
4346org.ua
4347// ua geo-names
4348cherkassy.ua
4349chernigov.ua
4350chernovtsy.ua
4351ck.ua
4352cn.ua
4353crimea.ua
4354cv.ua
4355dn.ua
4356dnepropetrovsk.ua
4357donetsk.ua
4358dp.ua
4359if.ua
4360ivano-frankivsk.ua
4361kh.ua
4362kharkov.ua
4363kherson.ua
4364khmelnitskiy.ua
4365kiev.ua
4366kirovograd.ua
4367km.ua
4368kr.ua
4369ks.ua
4370kv.ua
4371lg.ua
4372lugansk.ua
4373lutsk.ua
4374lviv.ua
4375mk.ua
4376nikolaev.ua
4377od.ua
4378odessa.ua
4379pl.ua
4380poltava.ua
4381rovno.ua
4382rv.ua
4383sebastopol.ua
4384sumy.ua
4385te.ua
4386ternopil.ua
4387uzhgorod.ua
4388vinnica.ua
4389vn.ua
4390zaporizhzhe.ua
4391zp.ua
4392zhitomir.ua
4393zt.ua
4394
4395// ug : http://www.registry.co.ug/
4396ug
4397co.ug
4398ac.ug
4399sc.ug
4400go.ug
4401ne.ug
4402or.ug
4403
4404// uk : http://en.wikipedia.org/wiki/.uk
4405*.uk
4406*.sch.uk
4407!bl.uk
4408!british-library.uk
4409!icnet.uk
4410!jet.uk
4411!mod.uk
4412!nel.uk
4413!nhs.uk
4414!nic.uk
4415!nls.uk
4416!national-library-scotland.uk
4417!parliament.uk
4418!police.uk
4419
4420// us : http://en.wikipedia.org/wiki/.us
4421us
4422dni.us
4423fed.us
4424isa.us
4425kids.us
4426nsn.us
4427// us geographic names
4428ak.us
4429al.us
4430ar.us
4431as.us
4432az.us
4433ca.us
4434co.us
4435ct.us
4436dc.us
4437de.us
4438fl.us
4439ga.us
4440gu.us
4441hi.us
4442ia.us
4443id.us
4444il.us
4445in.us
4446ks.us
4447ky.us
4448la.us
4449ma.us
4450md.us
4451me.us
4452mi.us
4453mn.us
4454mo.us
4455ms.us
4456mt.us
4457nc.us
4458nd.us
4459ne.us
4460nh.us
4461nj.us
4462nm.us
4463nv.us
4464ny.us
4465oh.us
4466ok.us
4467or.us
4468pa.us
4469pr.us
4470ri.us
4471sc.us
4472sd.us
4473tn.us
4474tx.us
4475ut.us
4476vi.us
4477vt.us
4478va.us
4479wa.us
4480wi.us
4481wv.us
4482wy.us
4483// The registrar notes several more specific domains available in each state,
4484// such as state.*.us, dst.*.us, etc., but resolution of these is somewhat
4485// haphazard; in some states these domains resolve as addresses, while in others
4486// only subdomains are available, or even nothing at all. We include the
4487// most common ones where it's clear that different sites are different
4488// entities.
4489k12.ak.us
4490k12.al.us
4491k12.ar.us
4492k12.as.us
4493k12.az.us
4494k12.ca.us
4495k12.co.us
4496k12.ct.us
4497k12.dc.us
4498k12.de.us
4499k12.fl.us
4500k12.ga.us
4501k12.gu.us
4502// k12.hi.us Hawaii has a state-wide DOE login: bug 614565
4503k12.ia.us
4504k12.id.us
4505k12.il.us
4506k12.in.us
4507k12.ks.us
4508k12.ky.us
4509k12.la.us
4510k12.ma.us
4511k12.md.us
4512k12.me.us
4513k12.mi.us
4514k12.mn.us
4515k12.mo.us
4516k12.ms.us
4517k12.mt.us
4518k12.nc.us
4519k12.nd.us
4520k12.ne.us
4521k12.nh.us
4522k12.nj.us
4523k12.nm.us
4524k12.nv.us
4525k12.ny.us
4526k12.oh.us
4527k12.ok.us
4528k12.or.us
4529k12.pa.us
4530k12.pr.us
4531k12.ri.us
4532k12.sc.us
4533k12.sd.us
4534k12.tn.us
4535k12.tx.us
4536k12.ut.us
4537k12.vi.us
4538k12.vt.us
4539k12.va.us
4540k12.wa.us
4541k12.wi.us
4542k12.wv.us
4543k12.wy.us
4544
4545cc.ak.us
4546cc.al.us
4547cc.ar.us
4548cc.as.us
4549cc.az.us
4550cc.ca.us
4551cc.co.us
4552cc.ct.us
4553cc.dc.us
4554cc.de.us
4555cc.fl.us
4556cc.ga.us
4557cc.gu.us
4558cc.hi.us
4559cc.ia.us
4560cc.id.us
4561cc.il.us
4562cc.in.us
4563cc.ks.us
4564cc.ky.us
4565cc.la.us
4566cc.ma.us
4567cc.md.us
4568cc.me.us
4569cc.mi.us
4570cc.mn.us
4571cc.mo.us
4572cc.ms.us
4573cc.mt.us
4574cc.nc.us
4575cc.nd.us
4576cc.ne.us
4577cc.nh.us
4578cc.nj.us
4579cc.nm.us
4580cc.nv.us
4581cc.ny.us
4582cc.oh.us
4583cc.ok.us
4584cc.or.us
4585cc.pa.us
4586cc.pr.us
4587cc.ri.us
4588cc.sc.us
4589cc.sd.us
4590cc.tn.us
4591cc.tx.us
4592cc.ut.us
4593cc.vi.us
4594cc.vt.us
4595cc.va.us
4596cc.wa.us
4597cc.wi.us
4598cc.wv.us
4599cc.wy.us
4600
4601lib.ak.us
4602lib.al.us
4603lib.ar.us
4604lib.as.us
4605lib.az.us
4606lib.ca.us
4607lib.co.us
4608lib.ct.us
4609lib.dc.us
4610lib.de.us
4611lib.fl.us
4612lib.ga.us
4613lib.gu.us
4614lib.hi.us
4615lib.ia.us
4616lib.id.us
4617lib.il.us
4618lib.in.us
4619lib.ks.us
4620lib.ky.us
4621lib.la.us
4622lib.ma.us
4623lib.md.us
4624lib.me.us
4625lib.mi.us
4626lib.mn.us
4627lib.mo.us
4628lib.ms.us
4629lib.mt.us
4630lib.nc.us
4631lib.nd.us
4632lib.ne.us
4633lib.nh.us
4634lib.nj.us
4635lib.nm.us
4636lib.nv.us
4637lib.ny.us
4638lib.oh.us
4639lib.ok.us
4640lib.or.us
4641lib.pa.us
4642lib.pr.us
4643lib.ri.us
4644lib.sc.us
4645lib.sd.us
4646lib.tn.us
4647lib.tx.us
4648lib.ut.us
4649lib.vi.us
4650lib.vt.us
4651lib.va.us
4652lib.wa.us
4653lib.wi.us
4654lib.wv.us
4655lib.wy.us
4656
4657// k12.ma.us contains school districts in Massachusetts. The 4LDs are
4658// managed indepedently except for private (PVT), charter (CHTR) and
4659// parochial (PAROCH) schools. Those are delegated dorectly to the
4660// 5LD operators. <k12-ma-hostmaster _ at _ rsuc.gweep.net>
4661pvt.k12.ma.us
4662chtr.k12.ma.us
4663paroch.k12.ma.us
4664
4665// uy : http://www.antel.com.uy/
4666*.uy
4667
4668// uz : http://www.reg.uz/registerr.html
4669// are there other 2nd level tlds ?
4670uz
4671com.uz
4672co.uz
4673
4674// va : http://en.wikipedia.org/wiki/.va
4675va
4676
4677// vc : http://en.wikipedia.org/wiki/.vc
4678// Submitted by registry <kshah@ca.afilias.info> 2008-06-13
4679vc
4680com.vc
4681net.vc
4682org.vc
4683gov.vc
4684mil.vc
4685edu.vc
4686
4687// ve : http://registro.nic.ve/nicve/registro/index.html
4688*.ve
4689
4690// vg : http://en.wikipedia.org/wiki/.vg
4691vg
4692
4693// vi : http://www.nic.vi/newdomainform.htm
4694// http://www.nic.vi/Domain_Rules/body_domain_rules.html indicates some other
4695// TLDs are "reserved", such as edu.vi and gov.vi, but doesn't actually say they
4696// are available for registration (which they do not seem to be).
4697vi
4698co.vi
4699com.vi
4700k12.vi
4701net.vi
4702org.vi
4703
4704// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp
4705vn
4706com.vn
4707net.vn
4708org.vn
4709edu.vn
4710gov.vn
4711int.vn
4712ac.vn
4713biz.vn
4714info.vn
4715name.vn
4716pro.vn
4717health.vn
4718
4719// vu : http://en.wikipedia.org/wiki/.vu
4720// list of 2nd level tlds ?
4721vu
4722
4723// ws : http://en.wikipedia.org/wiki/.ws
4724// http://samoanic.ws/index.dhtml
4725ws
4726com.ws
4727net.ws
4728org.ws
4729gov.ws
4730edu.ws
4731
4732// IDN ccTLDs
4733// Please sort by ISO 3166 ccTLD, then punicode string
4734// when submitting patches and follow this format:
4735// <Punicode> ("<english word>" <language>) : <ISO 3166 ccTLD>
4736// [optional sponsoring org]
4737// <URL>
4738
4739// xn--mgbaam7a8h ("Emerat" Arabic) : AE
4740//http://nic.ae/english/arabicdomain/rules.jsp
4741امارات
4742
4743// xn--54b7fta0cc ("Bangla" Bangla) : BD
4744বাংলা
4745
4746// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN
4747// CNNIC
4748// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
4749中国
4750
4751// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhonggou>) : CN
4752// CNNIC
4753// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
4754中國
4755
4756// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ
4757الجزائر
4758
4759// xn--wgbh1c ("Egypt" Arabic .masr) : EG
4760// http://www.dotmasr.eg/
4761مصر
4762
4763// xn--node ("ge" Georgian (Mkhedruli)) : GE
4764გე
4765
4766// xn--j6w193g ("Hong Kong" Chinese-Han) : HK
4767// https://www2.hkirc.hk/register/rules.jsp
4768香港
4769
4770// xn--h2brj9c ("Bharat" Devanagari) : IN
4771// India
4772भारत
4773
4774// xn--mgbbh1a71e ("Bharat" Arabic) : IN
4775// India
4776بھارت
4777
4778// xn--fpcrj9c3d ("Bharat" Telugu) : IN
4779// India
4780భారత్
4781
4782// xn--gecrj9c ("Bharat" Gujarati) : IN
4783// India
4784ભારત
4785
4786// xn--s9brj9c ("Bharat" Gurmukhi) : IN
4787// India
4788ਭਾਰਤ
4789
4790// xn--45brj9c ("Bharat" Bengali) : IN
4791// India
4792ভারত
4793
4794// xn--xkc2dl3a5ee0h ("India" Tamil) : IN
4795// India
4796இந்தியா
4797
4798// xn--mgba3a4f16a ("Iran" Persian) : IR
4799ایران
4800
4801// xn--mgba3a4fra ("Iran" Arabic) : IR
4802ايران
4803
4804//xn--mgbayh7gpa ("al-Ordon" Arabic) JO
4805//National Information Technology Center (NITC)
4806//Royal Scientific Society, Al-Jubeiha
4807الاردن
4808
4809// xn--3e0b707e ("Republic of Korea" Hangul) : KR
4810한국
4811
4812// xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK
4813// http://nic.lk
4814ලංකා
4815
4816// xn--xkc2al3hye2a ("Ilangai" Tamil) : LK
4817// http://nic.lk
4818இலங்கை
4819
4820// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA
4821المغرب
4822
4823// xn--mgb9awbf ("Oman" Arabic) : OM
4824عمان
4825
4826// xn--ygbi2ammx ("Falasteen" Arabic) : PS
4827// The Palestinian National Internet Naming Authority (PNINA)
4828// http://www.pnina.ps
4829فلسطين
4830
4831// xn--90a3ac ("srb" Cyrillic) : RS
4832срб
4833
4834// xn--p1ai ("rf" Russian-Cyrillic) : RU
4835// http://www.cctld.ru/en/docs/rulesrf.php
4836рф
4837
4838// xn--wgbl6a ("Qatar" Arabic) : QA
4839// http://www.ict.gov.qa/
4840قطر
4841
4842// xn--mgberp4a5d4ar ("AlSaudiah" Arabic) : SA
4843// http://www.nic.net.sa/
4844السعودية
4845
4846// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA
4847السعودیة
4848
4849// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA
4850السعودیۃ
4851
4852// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA
4853السعوديه
4854
4855// xn--ogbpf8fl ("Syria" Arabic) : SY
4856سورية
4857
4858// xn--mgbtf8fl ("Syria" Arabic) variant : SY
4859سوريا
4860
4861// xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG
4862新加坡
4863
4864// xn--clchc0ea0b2g2a9gcd ("Singapore" Tamil) : SG
4865சிங்கப்பூர்
4866
4867// xn--o3cw4h ("Thai" Thai) : TH
4868// http://www.thnic.co.th
4869ไทย
4870
4871// xn--pgbs0dh ("Tunis") : TN
4872// http://nic.tn
4873تونس
4874
4875// xn--kpry57d ("Taiwan" Chinese-Han-Traditional) : TW
4876// http://www.twnic.net/english/dn/dn_07a.htm
4877台灣
4878
4879// xn--kprw13d ("Taiwan" Chinese-Han-Simplified) : TW
4880// http://www.twnic.net/english/dn/dn_07a.htm
4881台湾
4882
4883// xn--nnx388a ("Taiwan") variant : TW
4884臺灣
4885
4886// xn--j1amh ("ukr" Cyrillic) : UA
4887укр
4888
4889// xn--mgb2ddes ("AlYemen" Arabic) : YE
4890اليمن
4891
4892// xxx : http://icmregistry.com
4893xxx
4894
4895// ye : http://www.y.net.ye/services/domain_name.htm
4896*.ye
4897
4898// yu : http://www.nic.yu/pravilnik-e.html
4899*.yu
4900
4901// za : http://www.zadna.org.za/slds.html
4902*.za
4903
4904// zm : http://en.wikipedia.org/wiki/.zm
4905*.zm
4906
4907// zw : http://en.wikipedia.org/wiki/.zw
4908*.zw
4909
4910// DynDNS.com Dynamic DNS zones : http://www.dyndns.com/services/dns/dyndns/
4911dyndns-at-home.com
4912dyndns-at-work.com
4913dyndns-blog.com
4914dyndns-free.com
4915dyndns-home.com
4916dyndns-ip.com
4917dyndns-mail.com
4918dyndns-office.com
4919dyndns-pics.com
4920dyndns-remote.com
4921dyndns-server.com
4922dyndns-web.com
4923dyndns-wiki.com
4924dyndns-work.com
4925dyndns.biz
4926dyndns.info
4927dyndns.org
4928dyndns.tv
4929at-band-camp.net
4930ath.cx
4931barrel-of-knowledge.info
4932barrell-of-knowledge.info
4933better-than.tv
4934blogdns.com
4935blogdns.net
4936blogdns.org
4937blogsite.org
4938boldlygoingnowhere.org
4939broke-it.net
4940buyshouses.net
4941cechire.com
4942dnsalias.com
4943dnsalias.net
4944dnsalias.org
4945dnsdojo.com
4946dnsdojo.net
4947dnsdojo.org
4948does-it.net
4949doesntexist.com
4950doesntexist.org
4951dontexist.com
4952dontexist.net
4953dontexist.org
4954doomdns.com
4955doomdns.org
4956dvrdns.org
4957dyn-o-saur.com
4958dynalias.com
4959dynalias.net
4960dynalias.org
4961dynathome.net
4962dyndns.ws
4963endofinternet.net
4964endofinternet.org
4965endoftheinternet.org
4966est-a-la-maison.com
4967est-a-la-masion.com
4968est-le-patron.com
4969est-mon-blogueur.com
4970for-better.biz
4971for-more.biz
4972for-our.info
4973for-some.biz
4974for-the.biz
4975forgot.her.name
4976forgot.his.name
4977from-ak.com
4978from-al.com
4979from-ar.com
4980from-az.net
4981from-ca.com
4982from-co.net
4983from-ct.com
4984from-dc.com
4985from-de.com
4986from-fl.com
4987from-ga.com
4988from-hi.com
4989from-ia.com
4990from-id.com
4991from-il.com
4992from-in.com
4993from-ks.com
4994from-ky.com
4995from-la.net
4996from-ma.com
4997from-md.com
4998from-me.org
4999from-mi.com
5000from-mn.com
5001from-mo.com
5002from-ms.com
5003from-mt.com
5004from-nc.com
5005from-nd.com
5006from-ne.com
5007from-nh.com
5008from-nj.com
5009from-nm.com
5010from-nv.com
5011from-ny.net
5012from-oh.com
5013from-ok.com
5014from-or.com
5015from-pa.com
5016from-pr.com
5017from-ri.com
5018from-sc.com
5019from-sd.com
5020from-tn.com
5021from-tx.com
5022from-ut.com
5023from-va.com
5024from-vt.com
5025from-wa.com
5026from-wi.com
5027from-wv.com
5028from-wy.com
5029ftpaccess.cc
5030fuettertdasnetz.de
5031game-host.org
5032game-server.cc
5033getmyip.com
5034gets-it.net
5035go.dyndns.org
5036gotdns.com
5037gotdns.org
5038groks-the.info
5039groks-this.info
5040ham-radio-op.net
5041here-for-more.info
5042hobby-site.com
5043hobby-site.org
5044home.dyndns.org
5045homedns.org
5046homeftp.net
5047homeftp.org
5048homeip.net
5049homelinux.com
5050homelinux.net
5051homelinux.org
5052homeunix.com
5053homeunix.net
5054homeunix.org
5055iamallama.com
5056in-the-band.net
5057is-a-anarchist.com
5058is-a-blogger.com
5059is-a-bookkeeper.com
5060is-a-bruinsfan.org
5061is-a-bulls-fan.com
5062is-a-candidate.org
5063is-a-caterer.com
5064is-a-celticsfan.org
5065is-a-chef.com
5066is-a-chef.net
5067is-a-chef.org
5068is-a-conservative.com
5069is-a-cpa.com
5070is-a-cubicle-slave.com
5071is-a-democrat.com
5072is-a-designer.com
5073is-a-doctor.com
5074is-a-financialadvisor.com
5075is-a-geek.com
5076is-a-geek.net
5077is-a-geek.org
5078is-a-green.com
5079is-a-guru.com
5080is-a-hard-worker.com
5081is-a-hunter.com
5082is-a-knight.org
5083is-a-landscaper.com
5084is-a-lawyer.com
5085is-a-liberal.com
5086is-a-libertarian.com
5087is-a-linux-user.org
5088is-a-llama.com
5089is-a-musician.com
5090is-a-nascarfan.com
5091is-a-nurse.com
5092is-a-painter.com
5093is-a-patsfan.org
5094is-a-personaltrainer.com
5095is-a-photographer.com
5096is-a-player.com
5097is-a-republican.com
5098is-a-rockstar.com
5099is-a-socialist.com
5100is-a-soxfan.org
5101is-a-student.com
5102is-a-teacher.com
5103is-a-techie.com
5104is-a-therapist.com
5105is-an-accountant.com
5106is-an-actor.com
5107is-an-actress.com
5108is-an-anarchist.com
5109is-an-artist.com
5110is-an-engineer.com
5111is-an-entertainer.com
5112is-by.us
5113is-certified.com
5114is-found.org
5115is-gone.com
5116is-into-anime.com
5117is-into-cars.com
5118is-into-cartoons.com
5119is-into-games.com
5120is-leet.com
5121is-lost.org
5122is-not-certified.com
5123is-saved.org
5124is-slick.com
5125is-uberleet.com
5126is-very-bad.org
5127is-very-evil.org
5128is-very-good.org
5129is-very-nice.org
5130is-very-sweet.org
5131is-with-theband.com
5132isa-geek.com
5133isa-geek.net
5134isa-geek.org
5135isa-hockeynut.com
5136issmarterthanyou.com
5137isteingeek.de
5138istmein.de
5139kicks-ass.net
5140kicks-ass.org
5141knowsitall.info
5142land-4-sale.us
5143lebtimnetz.de
5144leitungsen.de
5145likes-pie.com
5146likescandy.com
5147merseine.nu
5148mine.nu
5149misconfused.org
5150mypets.ws
5151myphotos.cc
5152neat-url.com
5153office-on-the.net
5154on-the-web.tv
5155podzone.net
5156podzone.org
5157readmyblog.org
5158saves-the-whales.com
5159scrapper-site.net
5160scrapping.cc
5161selfip.biz
5162selfip.com
5163selfip.info
5164selfip.net
5165selfip.org
5166sells-for-less.com
5167sells-for-u.com
5168sells-it.net
5169sellsyourhome.org
5170servebbs.com
5171servebbs.net
5172servebbs.org
5173serveftp.net
5174serveftp.org
5175servegame.org
5176shacknet.nu
5177simple-url.com
5178space-to-rent.com
5179stuff-4-sale.org
5180stuff-4-sale.us
5181teaches-yoga.com
5182thruhere.net
5183traeumtgerade.de
5184webhop.biz
5185webhop.info
5186webhop.net
5187webhop.org
5188worse-than.tv
5189writesthisblog.com
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 954daf68510..135f01d6268 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,76 @@
12012-04-10 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/autoload.el (autoload-make-program): Remove, unused.
4
5 * international/quail.el: Use dolist and simplify.
6 (quail-define-package, quail-update-keyboard-layout)
7 (quail-define-rules): Use dolist.
8 (quail-insert-kbd-layout, quail-get-translation): CSE.
9
10 * tmm.el: Use dolist, remove left over hook.
11 (tmm-prompt, tmm-define-keys, tmm-shortcut, tmm-get-keybind):
12 Use dolist.
13 (calendar-load-hook): Don't mess with it.
14
15 * vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):
16 Use derived-mode-p. Run the diff asynchronously.
17
182012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
19
20 * obsolete/mouse-sel.el: Add an Obsolete-since header.
21
222012-04-10 Juanma Barranquero <lekktu@gmail.com>
23
24 * misc.el: Display absolute path of loaded DLLs (bug#10424).
25 (list-dynamic-libraries--loaded): New function.
26 (list-dynamic-libraries--refresh): Use it.
27
282012-04-10 Nathan Weizenbaum <nweiz@google.com>
29
30 * progmodes/python.el (python-fill-paragraph):
31 Make python-fill-region in a multiline string work when font-lock is
32 disabled (bug#7018).
33
342012-04-10 Laimonas Vėbra <laimonas.vebra@gmail.com> (tiny change)
35
36 * language/european.el (cp775): Add oem/legacy (en)coding on
37 DOS/MS Windows for the Baltic languages. There are still plenty of
38 texts written in this encoding/codepage (bug#6519).
39
402012-04-10 Glenn Morris <rgm@gnu.org>
41
42 * cus-start.el (eol-mnemonic-unix, eol-mnemonic-dos, eol-mnemonic-mac):
43 Add :standard values, reducing "rogue" customs in emacs -Q a bit more.
44
452012-04-10 Florian Adamsky <florian@adamsky.it> (tiny change)
46
47 * recentf.el (recentf-dialog-mode-map): Add two keybindings for
48 next-line "n" and previous-line "p" in order to make recentf more
49 consistent with ibuffer, dired or org-mode (bug#9387).
50
512012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
52
53 * image.el (put-image): Return the overlay created instead of the
54 optional input string (bug#7834). Note that this may break code
55 that is (for some reason or other) depending on `put-image'
56 returning the string.
57
58 * mouse-sel.el (mouse-sel-mode): Mark as obsolete (bug#6174).
59
60 * simple.el (zap-to-char): Allow zapping using input methods
61 (bug#1580).
62
63 * textmodes/fill.el (fill-region): Leave point and mark where they
64 were before filling (bug#5399).
65
662012-04-09 Glenn Morris <rgm@gnu.org>
67
68 * version.el (emacs-bzr-get-version):
69 Handle lightweight checkouts of local branches.
70
12012-04-09 Andreas Schwab <schwab@linux-m68k.org> 712012-04-09 Andreas Schwab <schwab@linux-m68k.org>
2 72
3 * international/characters.el: Recover lost case pairs. 73 * international/characters.el: Recover lost case pairs. (Bug#11209)
4 (Bug#11209)
5 74
62012-04-09 Chong Yidong <cyd@gnu.org> 752012-04-09 Chong Yidong <cyd@gnu.org>
7 76
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index fbba49951d1..83973e4a534 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -138,9 +138,18 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
138 ;; coding.c 138 ;; coding.c
139 (inhibit-eol-conversion mule boolean) 139 (inhibit-eol-conversion mule boolean)
140 (eol-mnemonic-undecided mule string) 140 (eol-mnemonic-undecided mule string)
141 (eol-mnemonic-unix mule string) 141 ;; startup.el fiddles with the values. IMO, would be
142 (eol-mnemonic-dos mule string) 142 ;; simpler to just use #ifdefs in coding.c.
143 (eol-mnemonic-mac mule string) 143 (eol-mnemonic-unix mule string nil
144 :standard
145 (if (memq system-type '(ms-dos windows-nt))
146 "(Unix)" ":"))
147 (eol-mnemonic-dos mule string nil
148 :standard
149 (if (memq system-type '(ms-dos windows-nt))
150 "\\" "(DOS)"))
151 (eol-mnemonic-mac mule string nil
152 :standard "(Mac)")
144 (file-coding-system-alist 153 (file-coding-system-alist
145 mule 154 mule
146 (alist 155 (alist
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 5af666b9ded..921b08b10a8 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -762,9 +762,6 @@ write its autoloads into the specified file instead."
762(define-obsolete-function-alias 'update-autoloads-from-directories 762(define-obsolete-function-alias 'update-autoloads-from-directories
763 'update-directory-autoloads "22.1") 763 'update-directory-autoloads "22.1")
764 764
765(defvar autoload-make-program (or (getenv "MAKE") "make")
766 "Name of the make program in use during the Emacs build process.")
767
768;;;###autoload 765;;;###autoload
769(defun batch-update-autoloads () 766(defun batch-update-autoloads ()
770 "Update loaddefs.el autoloads in batch mode. 767 "Update loaddefs.el autoloads in batch mode.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 34aa015d7ac..649ab7f3fc2 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,18 @@
12012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * erc-join.el (erc-server-join-channel): New function to look up
4 the channel password via auth-source.
5 (erc-autojoin-channels): Use it.
6 (erc-autojoin-after-ident): Ditto.
7 (erc-autojoin-channels-alist): Mention auth-source.
8
92012-04-10 Deniz Dogan <deniz@dogan.se> (tiny change)
10
11 * erc.el (erc-display-prompt): Adds the field text property to the
12 ERC prompt. This allows users to use `kill-whole-line' to kill
13 all text back to the prompt given that it's on a single line
14 (bug#10841).
15
12012-04-09 Chong Yidong <cyd@gnu.org> 162012-04-09 Chong Yidong <cyd@gnu.org>
2 17
3 * erc.el (erc-cmd-SET): Call custom-variable-p instead of 18 * erc.el (erc-cmd-SET): Call custom-variable-p instead of
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index da894ba5977..85d1edf6427 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -32,6 +32,7 @@
32;;; Code: 32;;; Code:
33 33
34(require 'erc) 34(require 'erc)
35(require 'auth-source)
35(eval-when-compile (require 'cl)) 36(eval-when-compile (require 'cl))
36 37
37(defgroup erc-autojoin nil 38(defgroup erc-autojoin nil
@@ -56,6 +57,13 @@ Every element in the alist has the form (SERVER . CHANNELS).
56SERVER is a regexp matching the server, and channels is the 57SERVER is a regexp matching the server, and channels is the
57list of channels to join. 58list of channels to join.
58 59
60If the channel(s) require channel keys for joining, the passwords
61are found via auth-source. For instance, if you use ~/.authinfo
62as your auth-source backend, then put something like the
63following in that file:
64
65machine irc.example.net login \"#fsf\" password sEcReT
66
59Customize this variable to set the value for your first connect. 67Customize this variable to set the value for your first connect.
60Once you are connected and join and part channels, this alist 68Once you are connected and join and part channels, this alist
61keeps track of what channels you are on, and will join them 69keeps track of what channels you are on, and will join them
@@ -131,7 +139,7 @@ This function is run from `erc-nickserv-identified-hook'."
131 (when (string-match (car l) server) 139 (when (string-match (car l) server)
132 (dolist (chan (cdr l)) 140 (dolist (chan (cdr l))
133 (unless (erc-member-ignore-case chan joined) 141 (unless (erc-member-ignore-case chan joined)
134 (erc-server-send (concat "join " chan)))))))) 142 (erc-server-join-channel server chan)))))))
135 nil) 143 nil)
136 144
137(defun erc-autojoin-channels (server nick) 145(defun erc-autojoin-channels (server nick)
@@ -148,10 +156,25 @@ This function is run from `erc-nickserv-identified-hook'."
148 (dolist (l erc-autojoin-channels-alist) 156 (dolist (l erc-autojoin-channels-alist)
149 (when (string-match (car l) server) 157 (when (string-match (car l) server)
150 (dolist (chan (cdr l)) 158 (dolist (chan (cdr l))
151 (erc-server-send (concat "join " chan)))))) 159 (erc-server-join-channel server chan)))))
152 ;; Return nil to avoid stomping on any other hook funcs. 160 ;; Return nil to avoid stomping on any other hook funcs.
153 nil) 161 nil)
154 162
163(defun erc-server-join-channel (server channel)
164 (let* ((secret (plist-get (nth 0 (auth-source-search
165 :max 1
166 :host server
167 :port "irc"
168 :user channel))
169 :secret))
170 (password (if (functionp secret)
171 (funcall secret)
172 secret)))
173 (erc-server-send (concat "join " channel
174 (if password
175 (concat " " password)
176 "")))))
177
155(defun erc-autojoin-add (proc parsed) 178(defun erc-autojoin-add (proc parsed)
156 "Add the channel being joined to `erc-autojoin-channels-alist'." 179 "Add the channel being joined to `erc-autojoin-channels-alist'."
157 (let* ((chnl (erc-response.contents parsed)) 180 (let* ((chnl (erc-response.contents parsed))
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 62b701204d1..b79c2fd6c5e 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3646,6 +3646,7 @@ If FACE is non-nil, it will be used to propertize the prompt. If it is nil,
3646 'start-open t ; XEmacs 3646 'start-open t ; XEmacs
3647 'rear-nonsticky t ; Emacs 3647 'rear-nonsticky t ; Emacs
3648 'erc-prompt t 3648 'erc-prompt t
3649 'field t
3649 'front-sticky t 3650 'front-sticky t
3650 'read-only t)) 3651 'read-only t))
3651 (erc-put-text-property 0 (1- (length prompt)) 3652 (erc-put-text-property 0 (1- (length prompt))
diff --git a/lisp/image.el b/lisp/image.el
index be1b1ef8f48..b094f2464ec 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -412,7 +412,8 @@ means display it in the right marginal area."
412 (prop (if (null area) image (list (list 'margin area) image)))) 412 (prop (if (null area) image (list (list 'margin area) image))))
413 (put-text-property 0 (length string) 'display prop string) 413 (put-text-property 0 (length string) 'display prop string)
414 (overlay-put overlay 'put-image t) 414 (overlay-put overlay 'put-image t)
415 (overlay-put overlay 'before-string string)))) 415 (overlay-put overlay 'before-string string)
416 overlay)))
416 417
417 418
418;;;###autoload 419;;;###autoload
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 99985fa72c7..1739b1f9ea3 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -576,7 +576,7 @@ with L, LRE, or LRO Unicode bidi character type.")
576 (set-case-syntax-pair from (1+ from) tbl) 576 (set-case-syntax-pair from (1+ from) tbl)
577 (setq from (+ from 2)))))) 577 (setq from (+ from 2))))))
578 578
579 (set-case-syntax-pair ?Ÿ ?ÿ tbl) 579 (set-case-syntax-pair #x178 #x0ff tbl)
580 (set-case-syntax-pair #x189 #x256 tbl) 580 (set-case-syntax-pair #x189 #x256 tbl)
581 (set-case-syntax-pair #x18A #x257 tbl) 581 (set-case-syntax-pair #x18A #x257 tbl)
582 582
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 70e6d4b69cb..4d69e2fdbcb 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -486,19 +486,15 @@ non-Quail commands."
486 (setq translation-keymap (copy-keymap 486 (setq translation-keymap (copy-keymap
487 (if simple quail-simple-translation-keymap 487 (if simple quail-simple-translation-keymap
488 quail-translation-keymap))) 488 quail-translation-keymap)))
489 (while translation-keys 489 (dolist (trans translation-keys)
490 (define-key translation-keymap 490 (define-key translation-keymap (car trans) (cdr trans))))
491 (car (car translation-keys)) (cdr (car translation-keys)))
492 (setq translation-keys (cdr translation-keys))))
493 (setq translation-keymap 491 (setq translation-keymap
494 (if simple quail-simple-translation-keymap 492 (if simple quail-simple-translation-keymap
495 quail-translation-keymap))) 493 quail-translation-keymap)))
496 (when conversion-keys 494 (when conversion-keys
497 (setq conversion-keymap (copy-keymap quail-conversion-keymap)) 495 (setq conversion-keymap (copy-keymap quail-conversion-keymap))
498 (while conversion-keys 496 (dolist (conv conversion-keys)
499 (define-key conversion-keymap 497 (define-key conversion-keymap (car conv) (cdr conv))))
500 (car (car conversion-keys)) (cdr (car conversion-keys)))
501 (setq conversion-keys (cdr conversion-keys))))
502 (quail-add-package 498 (quail-add-package
503 (list name title (list nil) guidance (or docstring "") 499 (list name title (list nil) guidance (or docstring "")
504 translation-keymap 500 translation-keymap
@@ -720,12 +716,11 @@ The command `quail-set-keyboard-layout' usually sets this variable."
720 (setq quail-keyboard-layout-substitution subst-list) 716 (setq quail-keyboard-layout-substitution subst-list)
721 ;; If there are additional key locations, map them to missing 717 ;; If there are additional key locations, map them to missing
722 ;; key locations. 718 ;; key locations.
723 (while missing-list 719 (dolist (missing missing-list)
724 (while (and subst-list (cdr (car subst-list))) 720 (while (and subst-list (cdr (car subst-list)))
725 (setq subst-list (cdr subst-list))) 721 (setq subst-list (cdr subst-list)))
726 (if subst-list 722 (if subst-list
727 (setcdr (car subst-list) (car missing-list))) 723 (setcdr (car subst-list) missing))))))
728 (setq missing-list (cdr missing-list))))))
729 724
730(defcustom quail-keyboard-layout-type "standard" 725(defcustom quail-keyboard-layout-type "standard"
731 "Type of keyboard layout used in Quail base input method. 726 "Type of keyboard layout used in Quail base input method.
@@ -806,9 +801,10 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
806 (if translation 801 (if translation
807 (progn 802 (progn
808 (if (consp translation) 803 (if (consp translation)
809 (if (> (length (cdr translation)) 0) 804 (setq translation
810 (setq translation (aref (cdr translation) 0)) 805 (if (> (length (cdr translation)) 0)
811 (setq translation " "))) 806 (aref (cdr translation) 0)
807 " ")))
812 (setq done-list (cons translation done-list))) 808 (setq done-list (cons translation done-list)))
813 (setq translation (aref kbd-layout i))) 809 (setq translation (aref kbd-layout i)))
814 (aset layout i translation)) 810 (aset layout i translation))
@@ -834,17 +830,19 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
834 (if (< (if (stringp lower) (string-width lower) (char-width lower)) 2) 830 (if (< (if (stringp lower) (string-width lower) (char-width lower)) 2)
835 (insert " ")) 831 (insert " "))
836 (if (characterp lower) 832 (if (characterp lower)
837 (if (eq (get-char-code-property lower 'general-category) 'Mn) 833 (setq lower
838 ;; Pad the left and right of non-spacing characters. 834 (if (eq (get-char-code-property lower 'general-category) 'Mn)
839 (setq lower (compose-string (string lower) 0 1 835 ;; Pad the left and right of non-spacing characters.
840 (format "\t%c\t" lower))) 836 (compose-string (string lower) 0 1
841 (setq lower (string lower)))) 837 (format "\t%c\t" lower))
838 (string lower))))
842 (if (characterp upper) 839 (if (characterp upper)
843 (if (eq (get-char-code-property upper 'general-category) 'Mn) 840 (setq upper
844 ;; Pad the left and right of non-spacing characters. 841 (if (eq (get-char-code-property upper 'general-category) 'Mn)
845 (setq upper (compose-string (string upper) 0 1 842 ;; Pad the left and right of non-spacing characters.
846 (format "\t%c\t" upper))) 843 (compose-string (string upper) 0 1
847 (setq upper (string upper)))) 844 (format "\t%c\t" upper))
845 (string upper))))
848 (insert (bidi-string-mark-left-to-right lower) 846 (insert (bidi-string-mark-left-to-right lower)
849 (propertize " " 'invisible t) 847 (propertize " " 'invisible t)
850 (bidi-string-mark-left-to-right upper)) 848 (bidi-string-mark-left-to-right upper))
@@ -1032,8 +1030,8 @@ the following annotation types are supported.
1032 (let ((map (list nil)) 1030 (let ((map (list nil))
1033 (decode-map (if (not no-decode-map) (list 'decode-map))) 1031 (decode-map (if (not no-decode-map) (list 'decode-map)))
1034 key trans) 1032 key trans)
1035 (while l 1033 (dolist (el l)
1036 (setq key (car (car l)) trans (car (cdr (car l))) l (cdr l)) 1034 (setq key (car el) trans (car (cdr el)))
1037 (quail-defrule-internal key trans map t decode-map props)) 1035 (quail-defrule-internal key trans map t decode-map props))
1038 `(if (prog1 (quail-decode-map) 1036 `(if (prog1 (quail-decode-map)
1039 (quail-install-map ',map)) 1037 (quail-install-map ',map))
@@ -1201,7 +1199,7 @@ function `quail-define-rules' for the detail."
1201 (if (stringp trans) 1199 (if (stringp trans)
1202 (setq trans (string-to-vector trans)))) 1200 (setq trans (string-to-vector trans))))
1203 (let ((new (quail-vunion prevchars trans))) 1201 (let ((new (quail-vunion prevchars trans)))
1204 (setq trans 1202 (setq trans
1205 (if (equal new prevchars) 1203 (if (equal new prevchars)
1206 ;; Nothing to change, get back to orig value. 1204 ;; Nothing to change, get back to orig value.
1207 prev 1205 prev
@@ -1215,10 +1213,8 @@ where VECTOR is a vector of candidates (character or string) for
1215the translation, and INDEX points into VECTOR to specify the currently 1213the translation, and INDEX points into VECTOR to specify the currently
1216selected translation." 1214selected translation."
1217 (if (and def (symbolp def)) 1215 (if (and def (symbolp def))
1218 (if (functionp def) 1216 ;; DEF is a symbol of a function which returns valid translation.
1219 ;; DEF is a symbol of a function which returns valid translation. 1217 (setq def (if (functionp def) (funcall def key len))))
1220 (setq def (funcall def key len))
1221 (setq def nil)))
1222 (if (and (consp def) (not (vectorp (cdr def)))) 1218 (if (and (consp def) (not (vectorp (cdr def))))
1223 (setq def (car def))) 1219 (setq def (car def)))
1224 1220
diff --git a/lisp/language/european.el b/lisp/language/european.el
index b658f93d90f..259c06755a0 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -324,6 +324,14 @@ Latin-9 is sometimes nicknamed `Latin-0'."))
324 :mime-charset 'windows-1257) 324 :mime-charset 'windows-1257)
325(define-coding-system-alias 'cp1257 'windows-1257) 325(define-coding-system-alias 'cp1257 'windows-1257)
326 326
327(define-coding-system 'cp775
328 "DOS codepage 775 (PC Baltic, MS-DOS Baltic Rim)"
329 :coding-type 'charset
330 :mnemonic ?D
331 :charset-list '(cp775)
332 :mime-charset 'cp775)
333(define-coding-system-alias 'ibm775 'cp775)
334
327(define-coding-system 'cp850 335(define-coding-system 'cp850
328 "DOS codepage 850 (Western European)" 336 "DOS codepage 850 (Western European)"
329 :coding-type 'charset 337 :coding-type 'charset
diff --git a/lisp/misc.el b/lisp/misc.el
index 4706c918db3..cb52ecbd36e 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -138,6 +138,19 @@ variation of `C-x M-c M-butterfly' from url `http://xkcd.com/378/'."
138(defvar list-dynamic-libraries--loaded-only-p) 138(defvar list-dynamic-libraries--loaded-only-p)
139(make-variable-buffer-local 'list-dynamic-libraries--loaded-only-p) 139(make-variable-buffer-local 'list-dynamic-libraries--loaded-only-p)
140 140
141(defun list-dynamic-libraries--loaded (from)
142 "Compute the \"Loaded from\" column.
143Internal use only."
144 (if from
145 (let ((name (car from))
146 (path (or (cdr from) "<unknown>")))
147 ;; This is a roundabout way to change the tooltip without
148 ;; having to replace the default printer function
149 (propertize name
150 'display (propertize name
151 'help-echo (concat "Loaded from: " path))))
152 ""))
153
141(defun list-dynamic-libraries--refresh () 154(defun list-dynamic-libraries--refresh ()
142 "Recompute the list of dynamic libraries. 155 "Recompute the list of dynamic libraries.
143Internal use only." 156Internal use only."
@@ -159,7 +172,7 @@ Internal use only."
159 (when (or from 172 (when (or from
160 (not list-dynamic-libraries--loaded-only-p)) 173 (not list-dynamic-libraries--loaded-only-p))
161 (push (list id (vector (symbol-name id) 174 (push (list id (vector (symbol-name id)
162 (or from "") 175 (list-dynamic-libraries--loaded from)
163 (mapconcat 'identity (cdr lib) ", "))) 176 (mapconcat 'identity (cdr lib) ", ")))
164 tabulated-list-entries))))) 177 tabulated-list-entries)))))
165 178
diff --git a/lisp/mouse-sel.el b/lisp/obsolete/mouse-sel.el
index 6323ef03696..45396d30ea5 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/obsolete/mouse-sel.el
@@ -4,6 +4,7 @@
4 4
5;; Author: Mike Williams <mdub@bigfoot.com> 5;; Author: Mike Williams <mdub@bigfoot.com>
6;; Keywords: mouse 6;; Keywords: mouse
7;; Obsolete-since: 24.2
7 8
8;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
9 10
@@ -262,6 +263,8 @@ kill ring; mouse-1 or mouse-3 kills it."
262 interprogram-paste-function 263 interprogram-paste-function
263 mouse-sel-original-interprogram-paste-function)))) 264 mouse-sel-original-interprogram-paste-function))))
264 265
266(make-obsolete 'mouse-sel-mode "use the normal mouse modes" "24.2")
267
265;;=== Internal Variables/Constants ======================================== 268;;=== Internal Variables/Constants ========================================
266 269
267(defvar mouse-sel-primary-thing nil 270(defvar mouse-sel-primary-thing nil
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f7566c31b41..09b89993626 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1959,7 +1959,7 @@ the string's indentation."
1959 ;; paragraph in a multi-line string properly, so narrow 1959 ;; paragraph in a multi-line string properly, so narrow
1960 ;; to the string and then fill around (the end of) the 1960 ;; to the string and then fill around (the end of) the
1961 ;; current line. 1961 ;; current line.
1962 ((eq t (nth 3 syntax)) ; in fenced string 1962 ((nth 3 syntax) ; in fenced string
1963 (goto-char (nth 8 syntax)) ; string start 1963 (goto-char (nth 8 syntax)) ; string start
1964 (setq start (line-beginning-position)) 1964 (setq start (line-beginning-position))
1965 (setq end (condition-case () ; for unbalanced quotes 1965 (setq end (condition-case () ; for unbalanced quotes
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 8b0b36cdddc..636110f41de 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1061,6 +1061,8 @@ Go to the beginning of buffer if not found."
1061 (let ((km (copy-keymap recentf--shortcuts-keymap))) 1061 (let ((km (copy-keymap recentf--shortcuts-keymap)))
1062 (set-keymap-parent km widget-keymap) 1062 (set-keymap-parent km widget-keymap)
1063 (define-key km "q" 'recentf-cancel-dialog) 1063 (define-key km "q" 'recentf-cancel-dialog)
1064 (define-key km "n" 'next-line)
1065 (define-key km "p" 'previous-line)
1064 (define-key km [follow-link] "\C-m") 1066 (define-key km [follow-link] "\C-m")
1065 km) 1067 km)
1066 "Keymap used in recentf dialogs.") 1068 "Keymap used in recentf dialogs.")
diff --git a/lisp/simple.el b/lisp/simple.el
index 9fab1d6dd86..54005ebd2b3 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3487,14 +3487,14 @@ and KILLP is t if a prefix arg was specified."
3487 "Kill up to and including ARGth occurrence of CHAR. 3487 "Kill up to and including ARGth occurrence of CHAR.
3488Case is ignored if `case-fold-search' is non-nil in the current buffer. 3488Case is ignored if `case-fold-search' is non-nil in the current buffer.
3489Goes backward if ARG is negative; error if CHAR not found." 3489Goes backward if ARG is negative; error if CHAR not found."
3490 (interactive "p\ncZap to char: ") 3490 (interactive (list (prefix-numeric-value current-prefix-arg)
3491 (read-char "Zap to char: " t)))
3491 ;; Avoid "obsolete" warnings for translation-table-for-input. 3492 ;; Avoid "obsolete" warnings for translation-table-for-input.
3492 (with-no-warnings 3493 (with-no-warnings
3493 (if (char-table-p translation-table-for-input) 3494 (if (char-table-p translation-table-for-input)
3494 (setq char (or (aref translation-table-for-input char) char)))) 3495 (setq char (or (aref translation-table-for-input char) char))))
3495 (kill-region (point) (progn 3496 (kill-region (point) (progn
3496 (search-forward (char-to-string char) nil nil arg) 3497 (search-forward (char-to-string char) nil nil arg)
3497; (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
3498 (point)))) 3498 (point))))
3499 3499
3500;; kill-line and its subroutines. 3500;; kill-line and its subroutines.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 08254c6f5f7..d0e90c99516 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1011,7 +1011,8 @@ space does not end a sentence, so don't break a line there."
1011 (if current-prefix-arg 'full)))) 1011 (if current-prefix-arg 'full))))
1012 (unless (memq justify '(t nil none full center left right)) 1012 (unless (memq justify '(t nil none full center left right))
1013 (setq justify 'full)) 1013 (setq justify 'full))
1014 (let (max beg fill-pfx) 1014 (let ((start-point (point-marker))
1015 max beg fill-pfx)
1015 (goto-char (max from to)) 1016 (goto-char (max from to))
1016 (when to-eop 1017 (when to-eop
1017 (skip-chars-backward "\n") 1018 (skip-chars-backward "\n")
@@ -1042,6 +1043,8 @@ space does not end a sentence, so don't break a line there."
1042 (setq fill-pfx 1043 (setq fill-pfx
1043 (fill-region-as-paragraph (point) end justify nosqueeze)) 1044 (fill-region-as-paragraph (point) end justify nosqueeze))
1044 (goto-char end)))) 1045 (goto-char end))))
1046 (goto-char start-point)
1047 (set-marker start-point nil)
1045 fill-pfx)) 1048 fill-pfx))
1046 1049
1047 1050
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 2a0d1d3d7de..776e4335376 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -165,14 +165,13 @@ Its value should be an event that has a binding in MENU."
165 ;; tmm-km-list is an alist of (STRING . MEANING). 165 ;; tmm-km-list is an alist of (STRING . MEANING).
166 ;; It has no other elements. 166 ;; It has no other elements.
167 ;; The order of elements in tmm-km-list is the order of the menu bar. 167 ;; The order of elements in tmm-km-list is the order of the menu bar.
168 (mapc (lambda (elt) 168 (dolist (elt menu)
169 (cond 169 (cond
170 ((stringp elt) (setq gl-str elt)) 170 ((stringp elt) (setq gl-str elt))
171 ((listp elt) (tmm-get-keymap elt not-menu)) 171 ((listp elt) (tmm-get-keymap elt not-menu))
172 ((vectorp elt) 172 ((vectorp elt)
173 (dotimes (i (length elt)) 173 (dotimes (i (length elt))
174 (tmm-get-keymap (cons i (aref elt i)) not-menu))))) 174 (tmm-get-keymap (cons i (aref elt i)) not-menu)))))
175 menu)
176 ;; Choose an element of tmm-km-list; put it in choice. 175 ;; Choose an element of tmm-km-list; put it in choice.
177 (if (and not-menu (= 1 (length tmm-km-list))) 176 (if (and not-menu (= 1 (length tmm-km-list)))
178 ;; If this is the top-level of an x-popup-menu menu, 177 ;; If this is the top-level of an x-popup-menu menu,
@@ -313,15 +312,13 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
313(defun tmm-define-keys (minibuffer) 312(defun tmm-define-keys (minibuffer)
314 (let ((map (make-sparse-keymap))) 313 (let ((map (make-sparse-keymap)))
315 (suppress-keymap map t) 314 (suppress-keymap map t)
316 (mapc 315 (dolist (c tmm-short-cuts)
317 (lambda (c) 316 (if (listp tmm-shortcut-style)
318 (if (listp tmm-shortcut-style) 317 (define-key map (char-to-string c) 'tmm-shortcut)
319 (define-key map (char-to-string c) 'tmm-shortcut) 318 ;; only one kind of letters are shortcuts, so map both upcase and
320 ;; only one kind of letters are shortcuts, so map both upcase and 319 ;; downcase input to the same
321 ;; downcase input to the same 320 (define-key map (char-to-string (downcase c)) 'tmm-shortcut)
322 (define-key map (char-to-string (downcase c)) 'tmm-shortcut) 321 (define-key map (char-to-string (upcase c)) 'tmm-shortcut)))
323 (define-key map (char-to-string (upcase c)) 'tmm-shortcut)))
324 tmm-short-cuts)
325 (if minibuffer 322 (if minibuffer
326 (progn 323 (progn
327 (define-key map [pageup] 'tmm-goto-completions) 324 (define-key map [pageup] 'tmm-goto-completions)
@@ -401,14 +398,13 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
401 (choose-completion)) 398 (choose-completion))
402 ;; In minibuffer 399 ;; In minibuffer
403 (delete-region (minibuffer-prompt-end) (point-max)) 400 (delete-region (minibuffer-prompt-end) (point-max))
404 (mapc (lambda (elt) 401 (dolist (elt tmm-km-list)
405 (if (string= 402 (if (string=
406 (substring (car elt) 0 403 (substring (car elt) 0
407 (min (1+ (length tmm-mid-prompt)) 404 (min (1+ (length tmm-mid-prompt))
408 (length (car elt)))) 405 (length (car elt))))
409 (concat (char-to-string c) tmm-mid-prompt)) 406 (concat (char-to-string c) tmm-mid-prompt))
410 (setq s (car elt)))) 407 (setq s (car elt))))
411 tmm-km-list)
412 (insert s) 408 (insert s)
413 (exit-minibuffer))))) 409 (exit-minibuffer)))))
414 410
@@ -540,20 +536,16 @@ of `menu-bar-final-items'."
540 (setq allbind (cons globalbind (cons localbind minorbind))) 536 (setq allbind (cons globalbind (cons localbind minorbind)))
541 537
542 ;; Merge all the elements of ALLBIND into one keymap. 538 ;; Merge all the elements of ALLBIND into one keymap.
543 (mapc (lambda (in) 539 (dolist (in allbind)
544 (if (and (symbolp in) (keymapp in)) 540 (if (and (symbolp in) (keymapp in))
545 (setq in (symbol-function in))) 541 (setq in (symbol-function in)))
546 (and in (keymapp in) 542 (and in (keymapp in)
547 (if (keymapp bind) 543 (setq bind (if (keymapp bind)
548 (setq bind (nconc bind (copy-sequence (cdr in)))) 544 (nconc bind (copy-sequence (cdr in)))
549 (setq bind (copy-sequence in))))) 545 (copy-sequence in)))))
550 allbind)
551 ;; Return that keymap. 546 ;; Return that keymap.
552 bind)))) 547 bind))))
553 548
554;; Huh? What's that about? --Stef
555(add-hook 'calendar-load-hook (lambda () (require 'cal-menu)))
556
557(provide 'tmm) 549(provide 'tmm)
558 550
559;;; tmm.el ends here 551;;; tmm.el ends here
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index d6e25188c69..3c9313e3e7d 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,21 @@
12012-04-10 William Xu <william.xwl@gmail.com> (tiny change)
2
3 * url.el (url-retrieve-internal): Hexify multibye URL string first
4 when necessary (bug#7017).
5
62012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
7
8 * url.el (url-retrieve-internal): Mention utf-8 encoding.
9 (url-retrieve): Ditto.
10
112012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
12
13 * url-domsurf.el: New file (bug#1401).
14
15 * url-cookie.el (url-cookie-two-dot-domains): Remove.
16 (url-cookie-host-can-set-p): Use `url-domsuf-cookie-allowed-p'
17 instead of the variable above.
18
12012-03-25 Lars Magne Ingebrigtsen <larsi@gnus.org> 192012-03-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 20
3 * url-queue.el (url-queue-kill-job): Check whether the buffer has 21 * url-queue.el (url-queue-kill-job): Check whether the buffer has
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index e6ff9bf7dea..aefe8fffd0a 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -25,6 +25,7 @@
25 25
26(require 'url-util) 26(require 'url-util)
27(require 'url-parse) 27(require 'url-parse)
28(require 'url-domsuf)
28 29
29(eval-when-compile (require 'cl)) ; defstruct 30(eval-when-compile (require 'cl)) ; defstruct
30 31
@@ -211,14 +212,6 @@ telling Microsoft that."
211 (concat retval "\r\n") 212 (concat retval "\r\n")
212 ""))) 213 "")))
213 214
214(defvar url-cookie-two-dot-domains
215 (concat "\\.\\("
216 (mapconcat 'identity (list "com" "edu" "net" "org" "gov" "mil" "int")
217 "\\|")
218 "\\)$")
219 "A regexp of top level domains that only require two matching
220'.'s in the domain name in order to set a cookie.")
221
222(defcustom url-cookie-trusted-urls nil 215(defcustom url-cookie-trusted-urls nil
223 "A list of regular expressions matching URLs to always accept cookies from." 216 "A list of regular expressions matching URLs to always accept cookies from."
224 :type '(repeat regexp) 217 :type '(repeat regexp)
@@ -230,30 +223,18 @@ telling Microsoft that."
230 :group 'url-cookie) 223 :group 'url-cookie)
231 224
232(defun url-cookie-host-can-set-p (host domain) 225(defun url-cookie-host-can-set-p (host domain)
233 (let ((numdots 0) 226 (let ((last nil)
234 (last nil) 227 (case-fold-search t))
235 (case-fold-search t) 228 (if (string= host domain) ; Apparently netscape lets you do this
236 (mindots 3)) 229 t
237 (while (setq last (string-match "\\." domain last)) 230 ;; Remove the dot from wildcard domains before matching.
238 (setq numdots (1+ numdots) 231 (when (eq ?. (aref domain 0))
239 last (1+ last))) 232 (setq domain (substring domain 1)))
240 (if (string-match url-cookie-two-dot-domains domain) 233 (and (url-domsuf-cookie-allowed-p domain)
241 (setq mindots 2)) 234 ;; Need to check and make sure the host is actually _in_ the
242 (cond 235 ;; domain it wants to set a cookie for though.
243 ((string= host domain) ; Apparently netscape lets you do this 236 (string-match (concat (regexp-quote domain)
244 t) 237 "$") host)))))
245 ((>= numdots mindots) ; We have enough dots in domain name
246 ;; Need to check and make sure the host is actually _in_ the
247 ;; domain it wants to set a cookie for though.
248 (string-match (concat (regexp-quote
249 ;; Remove the dot from wildcard domains
250 ;; before matching.
251 (if (eq ?. (aref domain 0))
252 (substring domain 1)
253 domain))
254 "$") host))
255 (t
256 nil))))
257 238
258(defun url-cookie-handle-set-cookie (str) 239(defun url-cookie-handle-set-cookie (str)
259 (setq url-cookies-changed-since-last-save t) 240 (setq url-cookies-changed-since-last-save t)
diff --git a/lisp/url/url-domsuf.el b/lisp/url/url-domsuf.el
new file mode 100644
index 00000000000..29fc166e30b
--- /dev/null
+++ b/lisp/url/url-domsuf.el
@@ -0,0 +1,98 @@
1;;; url-domsuf.el --- Say what domain names can have cookies set.
2
3;; Copyright (C) 2012 Free Software Foundation, Inc.
4
5;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
6
7;; Keywords: comm, data, processes, hypermedia
8
9;; This file is part of GNU Emacs.
10;;
11;; GNU Emacs is free software: you can redistribute it and/or modify
12;; it under the terms of the GNU General Public License as published by
13;; the Free Software Foundation, either version 3 of the License, or
14;; (at your option) any later version.
15
16;; GNU Emacs is distributed in the hope that it will be useful,
17;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19;; GNU General Public License for more details.
20
21;; You should have received a copy of the GNU General Public License
22;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
23
24;;; Commentary:
25
26;; The rules for what domains can have cookies set is defined here:
27;; http://publicsuffix.org/list/
28
29;;; Code:
30
31(defvar url-domsuf-domains nil)
32
33(defun url-domsuf-parse-file ()
34 (with-temp-buffer
35 (insert-file-contents
36 (expand-file-name "publicsuffix.txt" data-directory))
37 (let ((domains nil)
38 domain exception)
39 (while (not (eobp))
40 (when (not (looking-at "[/\n\t ]"))
41 ;; !pref.aichi.jp means that it's allowed.
42 (if (not (eq (following-char) ?!))
43 (setq exception nil)
44 (setq exception t)
45 (forward-char 1))
46 (setq domain (buffer-substring (point) (line-end-position)))
47 (cond
48 ((string-match "\\`\\*\\." domain)
49 (setq domain (substring domain 2))
50 (push (cons domain (1+ (length (split-string domain "[.]"))))
51 domains))
52 (exception
53 (push (cons domain t) domains))
54 (t
55 (push (cons domain nil) domains))))
56 (forward-line 1))
57 (setq url-domsuf-domains (nreverse domains)))))
58
59(defun url-domsuf-cookie-allowed-p (domain)
60 (unless url-domsuf-domains
61 (url-domsuf-parse-file))
62 (let* ((allowedp t)
63 (domain-bits (split-string domain "[.]"))
64 (length (length domain-bits))
65 (upper-domain (mapconcat 'identity (cdr domain-bits) "."))
66 entry modifier)
67 (dolist (elem url-domsuf-domains)
68 (setq entry (car elem)
69 modifier (cdr elem))
70 (cond
71 ;; "com"
72 ((and (null modifier)
73 (string= domain entry))
74 (setq allowedp nil))
75 ;; "!pref.hokkaido.jp"
76 ((and (eq modifier t)
77 (string= domain entry))
78 (setq allowedp t))
79 ;; "*.ar"
80 ((and (numberp modifier)
81 (= length modifier)
82 (string= entry upper-domain))
83 (setq allowedp nil))))
84 allowedp))
85
86;; Tests:
87
88;; (url-domsuf-cookie-allowed-p "com") => nil
89;; (url-domsuf-cookie-allowed-p "foo.bar.ar") => t
90;; (url-domsuf-cookie-allowed-p "bar.ar") => nil
91;; (url-domsuf-cookie-allowed-p "co.uk") => nil
92;; (url-domsuf-cookie-allowed-p "foo.bar.hokkaido.jo") => t
93;; (url-domsuf-cookie-allowed-p "bar.hokkaido.jp") => nil
94;; (url-domsuf-cookie-allowed-p "pref.hokkaido.jp") => t
95
96(provide 'url-domsuf)
97
98;;; url-domsuf.el ends here
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 848eb66e54b..d12bd5447fa 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -330,8 +330,7 @@ forbidden in URL encoding."
330 " ") 330 " ")
331 (t (byte-to-string code)))) 331 (t (byte-to-string code))))
332 str (substring str (match-end 0))))) 332 str (substring str (match-end 0)))))
333 (setq tmp (concat tmp str)) 333 (concat tmp str)))
334 tmp))
335 334
336(defconst url-unreserved-chars 335(defconst url-unreserved-chars
337 '( 336 '(
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 5ced789e4e4..f3ef553bbce 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -149,7 +149,9 @@ take effect.
149 149
150If SILENT, then don't message progress reports and the like. 150If SILENT, then don't message progress reports and the like.
151If INHIBIT-COOKIES, cookies will neither be stored nor sent to 151If INHIBIT-COOKIES, cookies will neither be stored nor sent to
152the server." 152the server.
153If URL is a multibyte string, it will be encoded as utf-8 and
154URL-encoded before it's used."
153;;; XXX: There is code in Emacs that does dynamic binding 155;;; XXX: There is code in Emacs that does dynamic binding
154;;; of the following variables around url-retrieve: 156;;; of the following variables around url-retrieve:
155;;; url-standalone-mode, url-gateway-unplugged, w3-honor-stylesheets, 157;;; url-standalone-mode, url-gateway-unplugged, w3-honor-stylesheets,
@@ -171,11 +173,16 @@ the list of events, as described in the docstring of `url-retrieve'.
171 173
172If SILENT, don't message progress reports and the like. 174If SILENT, don't message progress reports and the like.
173If INHIBIT-COOKIES, cookies will neither be stored nor sent to 175If INHIBIT-COOKIES, cookies will neither be stored nor sent to
174the server." 176the server.
177If URL is a multibyte string, it will be encoded as utf-8 and
178URL-encoded before it's used."
175 (url-do-setup) 179 (url-do-setup)
176 (url-gc-dead-buffers) 180 (url-gc-dead-buffers)
177 (if (stringp url) 181 (if (stringp url)
178 (set-text-properties 0 (length url) nil url)) 182 (set-text-properties 0 (length url) nil url))
183 (when (multibyte-string-p url)
184 (let ((url-unreserved-chars (append '(?: ?/) url-unreserved-chars)))
185 (setq url (url-hexify-string url))))
179 (if (not (vectorp url)) 186 (if (not (vectorp url))
180 (setq url (url-generic-parse-url url))) 187 (setq url (url-generic-parse-url url)))
181 (if (not (functionp callback)) 188 (if (not (functionp callback))
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index a1dd807d828..f4964ef85cc 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -522,12 +522,12 @@ the file in question, search for the log entry required and move point."
522 (car rev-at-line) t 1))))))) 522 (car rev-at-line) t 1)))))))
523 523
524(defun vc-annotate-show-diff-revision-at-line-internal (filediff) 524(defun vc-annotate-show-diff-revision-at-line-internal (filediff)
525 (if (not (equal major-mode 'vc-annotate-mode)) 525 (if (not (derived-mode-p 'vc-annotate-mode))
526 (message "Cannot be invoked outside of a vc annotate buffer") 526 (message "Cannot be invoked outside of a vc annotate buffer")
527 (let* ((rev-at-line (vc-annotate-extract-revision-at-line)) 527 (let* ((rev-at-line (vc-annotate-extract-revision-at-line))
528 (prev-rev nil) 528 (prev-rev nil)
529 (rev (car rev-at-line)) 529 (rev (car rev-at-line))
530 (fname (cdr rev-at-line))) 530 (fname (cdr rev-at-line)))
531 (if (not rev-at-line) 531 (if (not rev-at-line)
532 (message "Cannot extract revision number from the current line") 532 (message "Cannot extract revision number from the current line")
533 (setq prev-rev 533 (setq prev-rev
@@ -535,17 +535,15 @@ the file in question, search for the log entry required and move point."
535 (if filediff fname nil) rev)) 535 (if filediff fname nil) rev))
536 (if (not prev-rev) 536 (if (not prev-rev)
537 (message "Cannot diff from any revision prior to %s" rev) 537 (message "Cannot diff from any revision prior to %s" rev)
538 (save-window-excursion 538 (vc-diff-internal
539 (vc-diff-internal 539 t
540 nil 540 ;; The value passed here should follow what
541 ;; The value passed here should follow what 541 ;; `vc-deduce-fileset' returns.
542 ;; `vc-deduce-fileset' returns. 542 (list vc-annotate-backend
543 (list vc-annotate-backend 543 (if filediff
544 (if filediff 544 (list fname)
545 (list fname) 545 nil))
546 nil)) 546 prev-rev rev))))))
547 prev-rev rev))
548 (switch-to-buffer "*vc-diff*"))))))
549 547
550(defun vc-annotate-show-diff-revision-at-line () 548(defun vc-annotate-show-diff-revision-at-line ()
551 "Visit the diff of the revision at line from its previous revision." 549 "Visit the diff of the revision at line from its previous revision."
diff --git a/lisp/version.el b/lisp/version.el
index a4bc4fd54a6..56e19147b2c 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -85,19 +85,35 @@ String giving the bzr revision number from which this Emacs was built.
85This is nil if Emacs was not built from a bzr checkout, or if we could 85This is nil if Emacs was not built from a bzr checkout, or if we could
86not determine the revision.") 86not determine the revision.")
87 87
88(defun emacs-bzr-get-version () "\ 88(defun emacs-bzr-get-version (&optional dir) "\
89Try to return as a string the bzr revision number of the Emacs sources. 89Try to return as a string the bzr revision number of the Emacs sources.
90Returns nil if the sources do not seem to be under bzr, or if we could 90Returns nil if the sources do not seem to be under bzr, or if we could
91not determine the revision. Note that this reports on the current state 91not determine the revision. Note that this reports on the current state
92of the sources, which may not correspond to the running Emacs." 92of the sources, which may not correspond to the running Emacs.
93 (let ((file (expand-file-name ".bzr/branch/last-revision" source-directory))) 93
94 (if (file-readable-p file) 94Optional argument DIR is a directory to use instead of `source-directory'."
95 (with-temp-buffer 95 (or dir (setq dir source-directory))
96 (insert-file-contents file) 96 (when (file-directory-p (setq dir (expand-file-name ".bzr/branch" dir)))
97 (goto-char (point-max)) 97 (let (file loc)
98 (if (looking-back "\n") 98 (cond ((file-readable-p
99 (delete-char -1)) 99 (setq file (expand-file-name "last-revision" dir)))
100 (buffer-string))))) 100 (with-temp-buffer
101 (insert-file-contents file)
102 (goto-char (point-max))
103 (if (looking-back "\n")
104 (delete-char -1))
105 (buffer-string)))
106 ;; OK, no last-revision. Is it a lightweight checkout?
107 ((file-readable-p
108 (setq file (expand-file-name "location" dir)))
109 ;; If the parent branch is local, try looking there for the revid.
110 (if (setq loc (with-temp-buffer
111 (insert-file-contents file)
112 (if (looking-at "file://\\(.*\\)")
113 (match-string 1))))
114 (emacs-bzr-get-version loc)))
115 ;; Could fall back to eg `bzr testament' at this point.
116 ))))
101 117
102;; We put version info into the executable in the form that `ident' uses. 118;; We put version info into the executable in the form that `ident' uses.
103(or (eq system-type 'windows-nt) 119(or (eq system-type 'windows-nt)
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 349a43fe692..c7b94e64083 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
12012-04-10 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (emacs, misc, lispref, lispintro): New targets,
4 each runs makeinfo in its own subdirectory of 'doc'.
5 (info-gmake): Depend on these new targets.
6
12012-04-07 Glenn Morris <rgm@gnu.org> 72012-04-07 Glenn Morris <rgm@gnu.org>
2 8
3 * config.nt, makefile.w32-in, emacs.rc, emacsclient.rc: 9 * config.nt, makefile.w32-in, emacs.rc, emacsclient.rc:
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index f090849e6a9..fcf57e8046d 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -307,11 +307,11 @@ info-nmake:
307 $(MAKE) $(MFLAGS) info 307 $(MAKE) $(MFLAGS) info
308 cd $(MAKEDIR) 308 cd $(MAKEDIR)
309 309
310info-gmake: 310info-gmake: emacs misc lispref lispintro
311 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs info 311
312 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc info 312emacs misc lispref lispintro:
313 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref info 313 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/$@ info
314 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro info 314
315# 315#
316# Maintenance 316# Maintenance
317# 317#
diff --git a/src/ChangeLog b/src/ChangeLog
index 5abf92bc4e1..2b6a0b2246e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
12012-04-09 Paul Eggert <eggert@cs.ucla.edu> 12012-04-10 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 configure: new option --enable-gcc-warnings (Bug#11207) 3 configure: new option --enable-gcc-warnings (Bug#11207)
4 * Makefile.in (C_WARNINGS_SWITCH): Remove. 4 * Makefile.in (C_WARNINGS_SWITCH): Remove.
@@ -11,6 +11,17 @@
11 the Emacs and Gnulib regex code is merged. 11 the Emacs and Gnulib regex code is merged.
12 (xmalloc, xrealloc): Now static. 12 (xmalloc, xrealloc): Now static.
13 13
142012-04-10 "Jason S. Cornez" <jcornez@ravenpack.com> (tiny change)
15
16 * keyboard.c: Override inhibit-quit after the third C-g (bug#6585).
17 (force_quit_count): New var.
18 (handle_interrupt): Use it.
19
202012-04-10 Juanma Barranquero <lekktu@gmail.com>
21
22 * w32.c (w32_delayed_load): Record the full path of the library
23 being loaded (bug#10424).
24
142012-04-09 Glenn Morris <rgm@gnu.org> 252012-04-09 Glenn Morris <rgm@gnu.org>
15 26
16 * doc.c (Fsnarf_documentation): Check variables, functions are bound, 27 * doc.c (Fsnarf_documentation): Check variables, functions are bound,
@@ -25,8 +36,8 @@
25 * process.h: Add integer `gnutls_handshakes_tried' member to 36 * process.h: Add integer `gnutls_handshakes_tried' member to
26 process struct. 37 process struct.
27 38
28 * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit. Add 39 * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit.
29 convenience `GNUTLS_LOG2i' macro. 40 Add convenience `GNUTLS_LOG2i' macro.
30 41
31 * gnutls.c (gnutls_log_function2i): Convenience log function. 42 * gnutls.c (gnutls_log_function2i): Convenience log function.
32 (emacs_gnutls_read): Use new log functions, 43 (emacs_gnutls_read): Use new log functions,
@@ -112,8 +123,8 @@
112 (xml_cleanup_parser): New function, export for fn_xmlCleanupParser. 123 (xml_cleanup_parser): New function, export for fn_xmlCleanupParser.
113 Calls xmlCleanupParser only if libxml2 was loaded (or statically 124 Calls xmlCleanupParser only if libxml2 was loaded (or statically
114 linked in). 125 linked in).
115 (Flibxml_parse_html_region, Flibxml_parse_xml_region): Call 126 (Flibxml_parse_html_region, Flibxml_parse_xml_region):
116 init_libxml2_functions before calling libxml2 functions. 127 Call init_libxml2_functions before calling libxml2 functions.
117 (syms_of_xml) <Qlibxml2_dll>: DEFSYM it. 128 (syms_of_xml) <Qlibxml2_dll>: DEFSYM it.
118 129
119 * emacs.c: Don't include libxml/parser.h. 130 * emacs.c: Don't include libxml/parser.h.
diff --git a/src/keyboard.c b/src/keyboard.c
index 50b2ade8ee4..9ff19d61d41 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10213,7 +10213,7 @@ DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
10213 10213
10214 memset (keybuf, 0, sizeof keybuf); 10214 memset (keybuf, 0, sizeof keybuf);
10215 GCPRO1 (keybuf[0]); 10215 GCPRO1 (keybuf[0]);
10216 gcpro1.nvars = (sizeof keybuf/sizeof (keybuf[0])); 10216 gcpro1.nvars = (sizeof keybuf / sizeof (keybuf[0]));
10217 10217
10218 if (NILP (continue_echo)) 10218 if (NILP (continue_echo))
10219 { 10219 {
@@ -10227,7 +10227,7 @@ DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
10227 cancel_hourglass (); 10227 cancel_hourglass ();
10228#endif 10228#endif
10229 10229
10230 i = read_key_sequence (keybuf, (sizeof keybuf/sizeof (keybuf[0])), 10230 i = read_key_sequence (keybuf, (sizeof keybuf / sizeof (keybuf[0])),
10231 prompt, ! NILP (dont_downcase_last), 10231 prompt, ! NILP (dont_downcase_last),
10232 ! NILP (can_return_switch_frame), 0); 10232 ! NILP (can_return_switch_frame), 0);
10233 10233
@@ -10918,6 +10918,11 @@ interrupt_signal (int signalnum) /* If we don't have an argument, some */
10918 errno = old_errno; 10918 errno = old_errno;
10919} 10919}
10920 10920
10921/* If Emacs is stuck because `inhibit-quit' is true, then keep track
10922 of the number of times C-g has been requested. If C-g is pressed
10923 enough times, then quit anyway. See bug#6585. */
10924static int force_quit_count;
10925
10921/* This routine is called at interrupt level in response to C-g. 10926/* This routine is called at interrupt level in response to C-g.
10922 10927
10923 It is called from the SIGINT handler or kbd_buffer_store_event. 10928 It is called from the SIGINT handler or kbd_buffer_store_event.
@@ -11036,8 +11041,16 @@ handle_interrupt (void)
11036 UNGCPRO; 11041 UNGCPRO;
11037 } 11042 }
11038 else 11043 else
11039 /* Else request quit when it's safe */ 11044 { /* Else request quit when it's safe. */
11040 Vquit_flag = Qt; 11045 if (NILP (Vquit_flag))
11046 force_quit_count = 0;
11047 if (++force_quit_count == 3)
11048 {
11049 immediate_quit = 1;
11050 Vinhibit_quit = Qnil;
11051 }
11052 Vquit_flag = Qt;
11053 }
11041 } 11054 }
11042 11055
11043/* TODO: The longjmp in this call throws the NS event loop integration off, 11056/* TODO: The longjmp in this call throws the NS event loop integration off,
diff --git a/src/w32.c b/src/w32.c
index 3d3d33453c6..248a91463e8 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -5816,7 +5816,15 @@ w32_delayed_load (Lisp_Object libraries, Lisp_Object library_id)
5816 CHECK_STRING_CAR (dlls); 5816 CHECK_STRING_CAR (dlls);
5817 if ((library_dll = LoadLibrary (SDATA (XCAR (dlls))))) 5817 if ((library_dll = LoadLibrary (SDATA (XCAR (dlls)))))
5818 { 5818 {
5819 found = XCAR (dlls); 5819 char name[MAX_PATH];
5820 DWORD len;
5821
5822 len = GetModuleFileNameA (library_dll, name, sizeof (name));
5823 found = Fcons (XCAR (dlls),
5824 (len > 0)
5825 /* Possibly truncated */
5826 ? make_specified_string (name, -1, len, 1)
5827 : Qnil);
5820 break; 5828 break;
5821 } 5829 }
5822 } 5830 }
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-21 03:25:55 +0000