Aidan Kehoe avatar Aidan Kehoe committed 3b785ee

Merge upstream changes into the W3 package, get them running.

ChangeLog addition:

2012-05-11 Aidan Kehoe <kehoea@parhasard.net>;

* lisp/url-queue.el (float-time): Make this available if it's
unbound, 21.4 doesn't have it.

* lisp/url-http.el (url-http-create-request): We don't have
#'string-as-unibyte, mapconcat with #'identity instead.

* lisp/url-cookie.el (url-cookie-host-can-set-p): Don't bind an
unused, non-special variable.

* lisp/url-util.el (url-generate-unique-filename): Don't use
with-no-warnings.
(url-unhex-string): #'char-to-string, we don't have
#'byte-to-string.

* lisp/css.el (css-color-light-p): Don't bind an unused,
non-special variable.
(css-specificity): Ditto.
(css-display): Ditto.

* lisp/w3.el (w3-document-information):
* lisp/w3-imap.el (w3-image-loadable-p):
Call #'file-attributes, not #'url-file-attributes, in these two
files.

* lisp/url-cookie.el (url-cookie-handle-set-cookie): XEmacs;
url-parse-args downcased the assoc list keys, no need for
assoc-string rather than assoc.

* lisp/url.el (url-retrieve-internal): (save-match-data
(string-match "[^\x00-\x7f]" url)), not #'multibyte-string-p.
(url-retrieve-internal): Change the documentation to reflect this.

* lisp/url-file.el:

* lisp/w3-keymap.el: Add this, from upstream.

* lisp/w3-speak-table.el: Don't load cl-extra.el at compile time,
it's dumped in XEmacs.

* lisp/w3-fast-parse.el: Add this file, from upstream.

* lisp/w3-parse.el (w3-parse-munge-ethiopic-text):
default-enable-multibyte-characters isn't available on XEmacs,
don't look for it.

2012-05-10 Aidan Kehoe <kehoea@parhasard.net>;

* lisp/w3-mouse.el (w3-mouse-button1, w3-mouse-button2)
(w3-mouse-button3, not): Check for (featurep 'xemacs), not
w3-running-xemacs

* lisp/w3-hot.el (w3-grok-html-bookmarks): Add special
declarations to this function, too.

2012-05-09 Aidan Kehoe <kehoea@parhasard.net>;

* lisp/w3-display.el (w3-display-line-break): Remove binding for
width, unused.

* lisp/images.el (image-normalize): Bind coding-system-for-read on
calling a process, rather than file-coding-system.

* lisp/docomp.el (emacs-build-custom-load):
#'Custom-make-dependencies, not #'custom-make-dependencies

2012-05-11 Aidan Kehoe <kehoea@parhasard.net>;

Incorporate the following changes from upstream:

2008-05-20 Magnus Henoch <mange@freemail.hu>;

* lisp/w3.el (w3-do-setup): Change homepage link.

2008-03-26 Magnus Henoch <mange@freemail.hu>;

* lisp/w3.el (w3-fetch-callback): Don't disable multibyte.
(w3-decode-charset): Don't reenable multibyte.

2008-03-10 Magnus Henoch <mange@freemail.hu>;

* lisp/w3-display.el (w3-display-table): Guard against empty
colspan and rowspan elements.
(w3-display-table-dimensions): Ditto.

2008-03-01 Magnus Henoch <mange@freemail.hu>;

* lisp/w3-speak-table.el: Modernize backquotes.

* lisp/w3-parse.el: Modernize backquotes.

* lisp/w3-java.el: Modernize backquotes.

* lisp/w3-forms.el: Modernize backquotes.

* lisp/Makefile.in (UTIL_SOURCES): Remove base64.el, md5.el,
socks.el

* lisp/base64.el: Remove. Emacs has this builtin.

* lisp/md5.el: Remove. Emacs has this builtin.

* lisp/socks.el: Remove. Emacs already has it.

* lisp/ssl.el: Don't require base64.

* lisp/url-vars.el: Remove. Emacs already has it.

2008-02-04 Magnus Henoch <mange@freemail.hu>;

* lisp/font.el (font-x-font-regexp-foundry-and-family): Add from
last version of w3-sysdp.
(x-font-create-object): Use it instead of
x-font-regexp-foundry-and-family.

* lisp/Makefile.in (EXTRAS): Remove w3-sysdp.el.
(W3_SOURCES): Add w3-compat.el.

2007-12-09 Magnus Henoch <mange@freemail.hu>;

* lisp/w3-compat.el (w3-url-file-nondirectory): Fix thinko: alias
to url-file-nondirectory, not url-file-directory.

2007-11-16 Magnus Henoch <mange@freemail.hu>;

* lisp/w3-compat.el (w3-alist-to-plist): Define.

* lisp/w3-display.el (w3-parse-link)
(w3-display-normalize-form-info, w3-display-node): Use
w3-alist-to-plist instead of alist-to-plist.

2007-11-15 Magnus Henoch <mange@freemail.hu>;

* lisp/w3-display.el: Use w3-url-file-nondirectory instead of
url-basepath (in many places).

* lisp/w3.el: Require w3-compat.
(w3-download-url): Use w3-url-file-nondirectory instead of
url-basepath.

* lisp/w3-compat.el: New file.
(w3-url-file-nondirectory): New function.

* lisp/images.el: Don't require w3-sysdp.

* lisp/css.el: Ditto.
(css-rule-specificity-internal): Drop old-style backquotes.
(css-symbol-list-as-regexp): Ditto.

* lisp/w3-dired.el: Don't require w3-sysdp.

* lisp/w3-display.el: Ditto. Also drop old-style backquotes.

* lisp/w3-menu.el: Ditto.

* lisp/w3.el: Ditto.
(w3-download-callback): Skip HTTP headers when saving file.

* lisp/w3-sysdp.el: Remove.

2007-03-09 Magnus Henoch <mange@freemail.hu>;

* lisp/css.el (css-expand-color): Catch errors and display a
warning instead.

2006-12-15 Klaus Straubinger <KSNetz@UseNet.ArcorNews.DE>; (tiny change)

* lisp/font.el (font-spatial-to-canonical): Fix conversion from
pixels to points.

* lisp/css.el (css-expand-length): Treat character based size
specifications as such.

2006-12-07 Magnus Henoch <mange@freemail.hu>;

* lisp/w3.el (w3-fetch-callback): Treat application/xhtml+xml as
text/html.

2006-11-29 Magnus Henoch <mange@freemail.hu>;

* lisp/w3.el (w3-download-redirect-callback): New function.
(w3-download-url): Use it instead of w3-download-callback.

2006-11-01 Magnus Henoch <mange@freemail.hu>;

* lisp/w3.el (w3-fetch-redirect-callback): Handle both old and new
style of `url-retrieve' callback.

* lisp/w3-display.el (w3-finalize-image-download-skip-redirects):
Ditto.

2006-10-17 Magnus Henoch <mange@freemail.hu>;

* lisp/w3.el (w3-save-url): Use kill-new.

* lisp/w3-xemac.el (w3-store-in-clipboard): Remove.

2006-10-13 Magnus Henoch <mange@freemail.hu>;

* lisp/w3-parse.el (w3-slow-parse-buffer): Don't call
w3-element-content-model on nil values.

2006-10-12 Magnus Henoch <mange@freemail.hu>;

* lisp/w3-imap.el (w3-image-loadable-p): Ignore errors in
url-file-attributes.

* lisp/w3-display.el (w3-finalize-image-download-skip-redirects):
New function.
(w3-maybe-start-background-image-download)
(w3-maybe-start-image-download): Use it instead of
w3-finalize-image-download.

2006-10-11 Magnus Henoch <mange@freemail.hu>;

* lisp/w3.el (w3-fetch-redirect-callback): New function.
(w3-fetch): Use it as url-retrieve callback instead of
w3-fetch-callback.

2006-10-09 Magnus Henoch <mange@freemail.hu>;

* lisp/w3.el: Require mm-decode here too.

2006-10-08 Magnus Henoch <mange@freemail.hu>;

* lisp/w3-display.el: Require mm-decode when compiling.

2006-04-28 Dave Love <fx@gnu.org>;

* texi/w3.txi: Change licence to GFDL.

2003-06-26 Sam Steingold <sds@gnu.org>;

* lisp/w3-imap.el (w3-image-loadable-p): fixed the logic

2003-01-12 Wolfgang Jenkner <wjenkner@inode.at>;

* lisp/w3.el (w3-fetch-callback)
(w3-nasty-disgusting-http-equiv-handling): When searching for the
':' meaning we are past the 'http/1.x' response, make sure that we
save-execursion around it, or bad things happen.

2002-10-28 Dave Love <fx@gnu.org>;

* lisp/w3-display.el (w3-display-node): Don't use
font-running-xemacs.

2002-10-27 William M. Perry <wmperry@gnu.org>;

* lisp/w3.el (w3-nasty-disgusting-http-equiv-handling): Now takes
a second parameter, which is the URL that is being processed.
This allows us to set url-current-object in the temporary buffer.
This fixes the bug where a not-fully-qualified URL would cause
url-expand-filename to get 'confused' and throw an error.
(w3-fetch-callback): Pass the new URL argument to
w3-nasty-disgusting-*

2002-10-22 William M. Perry <wmperry@gnu.org>;

* lisp/w3-forms.el (w3-form-create-option-list): Invalid call to
truncate-string-to-width caused all reasonably sized <option>
elements in a <select> to be invisible.
(w3-form-default-button-update): Similar problem for buttons.

2002-09-17 William M. Perry <wmperry@gnu.org>;

* lisp/w3.el (w3-fetch-callback): Removed set-cookie handling.
This needs to be handled in the HTTP protocol loader so that
cookies that get set on redirects are honored. This seems to be
why my.yahoo.com has stopped working.

2002-09-15 William M. Perry <wmperry@gnu.org>;

* lisp/w3.el (w3-nasty-disgusting-http-equiv-handling): Need to
make sure that we skip the 'HTTP/1.x' line at the top of the
buffer (due to changes in the url library), or we end up confusing
mail-header-extract if there are any <meta> elements with
http-equiv headers in them.
(w3-fetch-callback): I'm an idiot and was trying to compare the
VALUE of a header against the actual header name for doing cookie
handling. Arguably this cookie handling should all be done in the
HTTP handler itself. Should move it somebday.

2002-02-01 William M. Perry <wmperry@gnu.org>;

* lisp/w3.el (w3-fetch-callback): Fiddling with how to display XML
by default.

* lisp/w3-widget.el: Attempt to make images work with Emacs 21.

* lisp/w3-display.el (w3-display-node): Revert change for <hr>
handling.

* lisp/images.el: Use (featurep 'xemacs) instead of
string-matching on emacs-version.

2001-12-11 William M. Perry <wmperry@gnu.org>;

* lisp/devices.el: Remove ancient NextStep support.

* lisp/font.el: Merge with the version from XEmacs 21.5. This
pulls in lots of GTK fixes that I made ages ago. Also removes
ancient, unworking NextStep support. Use new backquote syntax
(emacs 19 can go away now).

2002-01-22 Dave Love <fx@gnu.org>;

* lisp/css.el (css-color-values): Maybe use `color-values'.

* lisp/socks.el: Require cl only when compiling. Require wid-edit
when compiling.

* lisp/font.el: Require cl only when compiling. Remove second
(require 'disp-table). Wrap definitions of << & al in
eval-and-compile. Doc fixes.
(font-set-font-encoding): Renamed from set-font-encoding (which is
in fontset.el).

* lisp/devices.el: Require cl only when compiling.

* lisp/w3-java.el (url-util): Require.
(w3-java-run-applet): Use url-generate-unique-filename, not
non-existent mailcap-generate-unique-filename.

* lisp/w3-menu.el (w3-first-n-items, w3-only-links)
(w3-fix-spaces): Autoload to avoid compiler warnings.
(w3-menu-filters-supported-p): Include Emacs 21.
(w3-menu-links-constructor): Use modern backquote syntax.

* lisp/ssl.el: Require cl only when compiling. Require url. Doc
fixes.
(ssl-view-certificate-program-arguments): Modify :type.
(top-level): Delete custom compatibility code since we require a
modern Emacs.
(open-ssl-stream): Use modern backquote syntax.

* lisp/w3-display.el (top-level): Declarations and autoloads to
avoid compiler warnings.
(w3-display-node): Use copy-sequence, not CL runtime copy-tree.

* lisp/w3-parse.el (decode-char): Modify logic for compiler
warning.

* lisp/w3.el (w3-nasty-disgusting-http-equiv-handling): Make
buffer arg compulsory and always set the buffer. Parse a copy of
the head region, since w3-parse-region widens the buffer and may
mung it.
(w3-fetch-callback): Give w3-nasty-disgusting-http-equiv-handling
an arg.

2001-12-04 William M. Perry <wmperry@gnu.org>;

* lisp/w3-display.el (w3-display-node): Explicitly put in breaks
for <hr> - <p> is not always inferred before and after (like when
using w3-fast-parse.

2001-11-25 William M. Perry <wmperry@gnu.org>;

* lisp/w3-parse.el (w3-parse-buffer): Add : to the allowed tag
names to deal with Microsoft XHTML.
(w3-parse-buffer): Allow : in attribute names for XHTML

2001-11-24 William M. Perry <wmperry@gnu.org>;

* lisp/font.el (font-set-face-font-new-redisplay): Doh! Fix my
last font-size checking screwup. *sigh*

* lisp/ssl.el (ssl-get-command): New routine to handle wrapping
the ssl program inside something that will redirect stderr to
/dev/null. Do this only on non-dos, non-windows, and non-vms
system types. This is necessary because the -quiet switch to
openssl's s_client program doesn't do what it is supposed to do.
*sigh*

* lisp/font.el (font-set-face-font-new-redisplay): Check font-size
for == 0, not just non-nil.

2001-11-21 William M. Perry <wmperry@gnu.org>;

* lisp/w3.el (w3-mode): Don't bother calling
kill-all-local-variables. It screws up too many things, namely
emacspeak personality properties and XEmacs' buffer-local faces.

* lisp/w3-display.el (w3-handle-string-content): Just go ahead an
always put the personality (aural properties) on text.

* lisp/w3-parse.el (w3-parse-buffer): Patch from Joe Wells to
handle XHTML a little bit better. Still a hack, but it will now
work at all.

* lisp/w3-display.el (w3-display-node): Add support for 'start'
element on list start elements. Some sites use this instead of
seqnum.

2001-10-31 Dave Love <fx@gnu.org>;

* lisp/w3.el (w3-decode-charset): DTRT for explicit ascii charset.

2001-10-11 Dave Love <fx@gnu.org>;

* lisp/w3-style.el (cl): Require only when compiling.

* lisp/w3-cus.el: Doc fixes.
(w3-delay-image-loads): Fix default for Emacs 21.
(w3-mule-charset-to-coding-alist): Remove.

* lisp/w3.el (w3-parse-hotlist, w3-menu-install-menus): Autoload.
(w3-explicit-coding-system): Move definition.
(w3-decode-charset, w3-fetch-callback): Use it.

2001-10-01 Dave Love <fx@gnu.org>;

* lisp/w3-vars.el: Doc fixes.
(w3-meta-content-type-charset-regexp)
(w3-meta-charset-content-type-regexp): Removed.
(w3-persistent-variables): Add url-current-mime-headers.

* lisp/w3.el (w3-setup-reload-timer, w3-handle-refresh-header):
New function.
(w3-fetch-callback): Handle refresh and cookies. Set
url-current-object. Don't destroy external parts immediately.
For inlines, use w3-mode, require mm-view, lose cursor for images.

(w3-document-information): Fix for current url stuff.
(w3-replace-invalid-chars): Remove.

* lisp/w3-display.el (w3-display-node): Fix <meta> and <link>
handling.

2001-09-24 Dave Love <fx@gnu.org>;

* lisp/w3.el (w3-http-equiv-headers): New function.
(w3-nasty-disgusting-http-equiv-handling): Use it to fix
http-equiv handling.

2001-09-09 Dave Love <fx@gnu.org>;

* lisp/w3-display.el (w3-mode, w3-add-delayed-graphic)
(w3-find-specific-link, w3-fix-spaces): Autoload.

* lisp/w3-props.el (w3-fillin-text-property): Renamed from
`fillin-text-property'.

2001-08-24 Dave Love <fx@gnu.org>;

* lisp/font.el (font-spatial-to-canonical): Don't choke if
font-default-size-for-device returns nil, convert it to 0.
From Jim Meyering <meyering@lucent.com>;

2001-07-19 Dave Love <fx@gnu.org>;

* lisp/w3-toolbar.el (w3-toolbar-map): Don't lose on non-graphical
display with tool-bar-mode t.

2001-06-21 Dave Love <fx@gnu.org>;

* lisp/w3-menu.el (w3-menu-hotlist-constructor): Require w3-hot,
not w3-hotlist.

2001-06-14 Dave Love <fx@gnu.org>;

* lisp/Makefile.in (W3_SOURCES): Add w3-emacs.el, remove files it
obsoletes.

2001-06-07 Dave Love <fx@gnu.org>;

* lisp/w3-print.el (mule-sysdp): Don't require.

* lisp/w3-parse.el (mule-sysdp): Don't require.

* lisp/w3-latex.el (mule-sysdp): Don't require.
(w3-show-dvi): Avoid mule-write-region-no-coding-system.

* lisp/w3-display.el (mule-sysdp): Don't require.
(w3-display-get-cookie, w3-finalize-image-download): Avoid
mule-write-region-no-coding-system.

* lisp/w3-cus.el (mule-sysdp): Don't require.
(w3-force-conversion-alist): Use binary, not
mule-no-coding-system.

* lisp/images.el (mule-sysdp): Don't require.
(image-normalize): Use binary, not mule-no-coding-system.

* lisp/w3-forms.el (wid-edit): Require unconditionally.
(custom-magic-reset, w3-warn): Autoload.
(w3-form-keymap): Use substitute-key-definition, not
cl-map-keymap.
(w3-form-create-custom): Require cus-edit unconditionally.
(w3-all-widgets): Move definition.
(w3-form-create-file-browser, w3-form-create-option-list)
(w3-form-default-button-update): Avoid mule-truncate-string.
(mule-sysdp): Don't require.
(w3-form-encode-xwfu): Avoid mule-encode-string.

* lisp/w3-emacs.el: New file.

* lisp/w3-e19.el, lisp/w3-e20.el, lisp/w3-e21.el: Deleted in
favour of w3-emacs. (Avoid defadvice.)

* lisp/w3.el (w3-load-flavors): Remove Emacs version-specifics --
just require w3-emacs.

* lisp/w3-toolbar.el (w3-toolbar-file-icon)
(w3-toolbar-printer-icon, w3-toolbar-file-icon): New variable.
(w3-toolbar-map): Transform `toolbar-' symbols into `w3-toolbar-'.

* lisp/w3-sysdp.el (copy-tree): Fix cl- functions.
(truncate-string-to-width): New.

2001-06-05 Dave Love <fx@gnu.org>;

* lisp/w3-display.el: Require cl only when compiling.
(w3-line-breaks-vector): Deleted.
(w3-display-line-break): Use justification arg of
fill-region-as-paragraph. Use insert-char.

* lisp/css.el (w3-sysdp): Require.
(url-expand-file-name, url-insert-file-contents, url-view-url):
Autoload.
(css-running-xemacs): Removed. Change callers to use featurep.
(css-handle-import, css-parse): Declare url-current-object
special.
(css-active-device-types): Use display-multi-font-p, not
font-running-emacs-new-redisplay.

* lisp/w3-parse.el (w3-invalid-sgml-char-replacement): Doc fix.
(w3-resolve-numeric-char): Renamed from
w3-resolve-numeric-entity. Callers changed.

* lisp/w3-vars.el (w3-version-number): Fix regexp, doc.
(w3-html-entities): Modified per W3C entity list.

* lisp/w3-toolbar.el (w3-toolbar-back-icon, w3-toolbar-forw-icon)
(w3-toolbar-home-icon, w3-toolbar-reld-icon)
(w3-toolbar-imag-icon, w3-toolbar-open-icon)
(w3-toolbar-print-icon, w3-toolbar-find-icon)
(w3-toolbar-stop-icon, w3-toolbar-help-icon)
(w3-toolbar-hotl-icon) [(featurep 'tool-bar)]: Initialize to names
of Emacs 21 icons.
(toolbar-make-button-list) [(featurep 'tool-bar)]: Don't define.
(w3-toolbar-make-buttons): Do nothing if (featurep 'tool-bar).
(w3-toolbar-map): New variable.
(w3-add-toolbar-to-buffer): Use it.

2001-06-01 Dave Love <fx@gnu.org>;

* lisp/w3-display.el (widget-convert-text): Only advise it if
we're in Emacspeak.
(append-suffixes-hack, w3-java-run-applet, mm-inline-text):
Autoload.
(w3-display-get-cookie): Use url-generate-unique-filename.
(w3-display-table): Use copy-sequence, not copy-seq.

* lisp/w3.el (w3-decode-charset): Set buffer file coding system.

2001-05-31 Dave Love <fx@gnu.org>;

* lisp/w3-menu.el (w3-menu-file-menu): Fix
"---:shadowDoubleEtchedIn". From Pavel Janík.

* lisp/w3-parse.el (decode-char): Define with older Mule-UCS.
(w3-expand-entity-at-point-maybe): Sanitize regexp for numeric
entity. Don't lose trailing space. Grok hex form.

2001-05-30 Dave Love <fx@gnu.org>;

* lisp/w3-menu.el: Require w3-sysdp.
(w3-popup-menu): Revert last change.

2001-05-29 Dave Love <fx@gnu.org>;

* lisp/w3-sysdp.el: Remove lots of unused stuff.

* lisp/w3.el: Require cl only when compiling. Doc and message
fixes.

* lisp/w3-toolbar.el (w3-toolbar): Bind w3-hotlist-view, not
w3-show-hotlist.

* lisp/w3-menu.el (w3-menu-hotlist-constructor): Require
w3-hotlist.
(w3-menu-bookmark-menu): Bind w3-hotlist-view, not
w3-show-hotlist.
(w3-popup-menu): In Emacs, use copy-keymap, not copy-tree.

* lisp/w3-hotindex.el (w3-hotindex-query): Call w3-hotlist-view,
not w3-show-hotlist.

* lisp/w3-emulate.el (url-vars): Require.
(w3-lynx-emulation-minor-mode-map)
(w3-netscape-emulation-minor-mode-map): Bind w3-hotlist-view, not
w3-show-hotlist.

* lisp/w3-dired.el (w3-open-local, w3-fetch): Autoload.
(add-minor-mode): Remove definition in favour of autoload.

* lisp/w3-keymap.el (w3-mode-map): Bind w3-hotlist-view, not
w3-show-hotlist.

* lisp/w3-parse.el (w3-parse-buffer): Use
w3-resolve-numeric-entity for bogus characters.

2001-05-25 William M. Perry <wmperry@gnu.org>;

* lisp/w3-speak-table.el: Make sure to load cl-extra at load time
to work around a byte-optimizer bug in Emacs 21 that caused this
module to fail to byte-compile.

2001-05-24 Pavel Janík <Pavel@janik.cz>;

* lisp/w3-display.el (w3-resurrect-hyperlinks): Look for next
single property change from `st' instead of `nd' to avoid
potential infinite loops.

2001-05-24 William M. Perry <wmperry@gnu.org>;

* lisp/w3-cus.el (w3-honor-stylesheets): Turn off stylesheets for
now - url-retrieve-synchronously seems to be acting quite
strange.

2001-05-22 William M. Perry <wmperry@gnu.org>;

* lisp/css.el (css-handle-import): Use ignore-errors around url
loading.
(css-parse): Ditto.

* lisp/docomp.el: Remove a bunch of the autoloading crap - it
isn't needed anymore.

2001-05-17 William M. Perry <wmperry@gnu.org>;

* lisp/w3-parse.el w3-int-to-char: Deal with XEmacs more nicely.
int-to-char does error checking, so passing in ?~ tends to blow
things up. Do better error checking for characters passed in, and
for integers that are not capable of being converted to
characters.

* lisp/w3-display.el (w3-dingbats): Deal with a mule-less XEmacs
in our conditions.

2001-05-16 Dave Love <fx@gnu.org>;

* lisp/w3.el (w3-decode-charset): Re-write.
(w3-fetch-callback): Partly re-write for coding conversion.
(w3-convert-code-for-mule, w3-coding-system-for-mime-charset):
Deleted.
(w3-save-as, w3-download-callback): Avoid
mule-write-region-no-coding-system.
(w3-mode): Do kill-all-local-variables in Emacs.

2001-05-15 Dave Love <fx@gnu.org>;

* lisp/w3-display.el (w3-sysdp): Require.
(flatten): Autoload unconditionally.

* lisp/w3-parse.el (w3-invalid-sgml-char-replacement): Redefined.
(w3-resolve-numeric-entity): New function.
(html-entities): Consider string and non-string returns from
w3-resolve-numeric-entity.
(w3-p-s-var-def): Use w3-resolve-numeric-entity.
(w3-parse-hooks): Fix typo.
(w3-int-to-char): New alias.

2001-05-14 Dave Love <fx@gnu.org>;

* lisp/w3-sysdp.el: Don't define extent-related functions, to
avoid trouble with other packages.

* lisp/w3.el: Don't require mule-sysdp.
(w3-decode-charset): Remove prompting stuff. Avoid
gnus-strip-whitespace. Use mm-charset-to-coding-system and return
coding system used.
(w3-fetch-callback): Bind and set mule-retrieval-coding-system.
Call mm-enable-multibyte.
(w3-widget-button-click): Add Emacs case.
(w3-warn): Wrap definition in eval-and-compile.

* lisp/w3-imap.el: Use new backquote syntax.
(w3-image-invalid-glyph-p): Test for Emacs images.

* lisp/w3-widget.el: Use (featurep 'xemacs). Use modern backquote
syntax.
(widget): Don't require cl.
(w3-vars): Require.
(w3-point-in-map, w3-point-in-map): Autoload.
(widget-image-value-set): Add Emacs 21 image test.
(widget-image-usemap): Avoid a string-match.
(widget-image-value-create): Use align property. Fix call of
image-type-available-p. Some simplification. Use `insert-image'
in Emacs.
(widget-image-delete): Maybe use delete-overlay.
(widget-glyphp): Test for Emacs image.
(widget-image-button-press): Add code for Emacs.

* lisp/w3-display.el: Use (featurep 'xemacs), not
w3-running-xemacs. Use modern backquote syntax.
(w3-maybe-start-image-download): Use display-graphic-p. Don't use
make-glyph in Emacs.
(w3-maybe-start-background-image-download): Fix typo `mesage'.
Don't use make-glyph in Emacs.
(w3-finalize-image-download): For Emacs, grok `align' attribute.
Use unibyte for image data in Emacs. Only do xbm stuff in XEmacs.
Don't do make-glyph by default. Only call set-glyph-image if it's
defined.
(w3-handle-image): Use `align'.
(w3-dingbats): Define without using mule-sysdep-version.
(w3-make-char): Likewise.
(w3-display-node): Minor logic simplification.

* lisp/w3-menu.el (cl): Require cl when compiling. Use (featurep
'xemacs), not w3-running-xemacs.
(w3-menu-file-menu): Allow ---:shadowDoubleEtchedIn in Emacs 21.
(w3-menu-options-menu): Comment-out `download to disk'
(w3-dump-to-disk not defined).

* lisp/w3-parse.el (url-expand-file-name): Autoload.
(cl): Require when compiling.
(w3-invalid-sgml-char-replacement): Defvar when compiling.
(w3-parse-munge-ethiopic-text): Don't bother supporting MULE 2.
(w3-parse-hooks): Customize. Default to nil, with
w3-parse-munge-ethiopic-text as an option.

* lisp/w3-dired.el (w3-dired-find-file-mouse): Use mouse-set-point.
(dired-get-filename): Autoload.
(w3-dired-find-file-dired): New function, renamed from second
occurrence of w3-dired-find-file.

* lisp/w3-hot.el (cl): Require when compiling.

2001-05-10 Dave Love <fx@gnu.org>;

* lisp/w3-menu.el (w3-menu-go-menu): Use url-history-track, not
url-keep-history.

* lisp/mule-sysdp.el: Removed in favour of one in url package.

2001-01-04 Dave Love <fx@gnu.org>;

* lisp/w3-toolbar.el (w3-add-toolbar-to-buffer) <featurep 'tool-bar>:
Test display-graphic-p and tool-bar-lines. Use mapc, not mapcar.

2001-01-03 Dave Love <fx@gnu.org>;

* lisp/w3-toolbar.el (w3-add-toolbar-to-buffer): In Emacs, test
for graphic display and non-zero tool bar lines.

2001-01-02 Sam Steingold <sds@gnu.org>;

* lisp/docomp.el (load-path): Gnus and URL are two levels
above w3/lisp by default.

2000-12-20 Dave Love <fx@gnu.org>;

* lisp/w3-sysdp.el: Use sysdep-defalias, not sysdep-fset.

* lisp/w3-widget.el: Use defalias, not fset.

* lisp/w3.el (w3-maybe-follow-link): Fix call of
widget-button-press.

* lisp/w3-parse.el (w3-char-int): New alias instead of char-int.

* lisp/w3-menu.el (w3-event-glyph): New alias instead of
event-glyph.

* lisp/w3-display.el: Use defalias, not fset.
(w3-widget-echo): Revert last change, following Emacs change.

* lisp/mule-sysdp.el (cl): Require only when compiling.

* lisp/font.el: Use defalias, not fset. Don't use cl-...hash.

* lisp/devices.el (device-class): Try display-color-p first.

* lisp/socks.el (socks-char-int): New alias instead of char-int.
Callers changed.
(socks-original-open-network-stream, open-network-stream): Use
defalias, not fset.
(socks-wait-for-state-change, socks-filter)
(socks-open-connection, socks-open-connection)
(socks-send-command, socks-parse-services)
(socks-find-services-entry, socks-open-network-stream)
(socks-username/password-auth-filter)
(socks-username/password-auth): Don't use cl-...hash.

* lisp/css.el (css-get-internal, css-copy-stylesheet)
(css-store-rule, css-display): Don't use cl-...hash.

2000-11-15 William M. Perry <wmperry@aventail.com>;

* lisp/w3-mouse.el (not): Don't ever try to grab mouse-movement
events if we are running Emacs 21.

* lisp/w3-display.el (w3-decimal-to-alpha): Don't try to inline
this - it called itself recursively and so blew up Emacs'
byte-compiler.
(w3-decimal-to-alpha): Also fixed bug where large numbers did not
get converted correctly (3 letters or more were completely screwed
up).
(w3-decimal-to-roman): Don't inline this one either, just for
safety.

2000-10-16 William M. Perry <wmperry@aventail.com>;

* lisp/w3-e21.el (toolbar-file-icon): added definitions of
toolbar-file-icon and toolbar-printer-icon

2000-10-02 William M. Perry <wmperry@aventail.com>;

* lisp/w3-e21.el (w3-setup-version-specifics): Advise this
function to create toolbar buttons in Emacs 21.x with toolbar
support.
(w3-mode-version-specifics): Advise this function to actually add
the toolbars to each buffer.

* lisp/w3-toolbar.el (w3-add-toolbar-to-buffer): Deal with
toolbars in Emacs 21.

2000-07-28 Sam Steingold <sds@gnu.org>;

* lisp/Makefile.in: added w3-e21.el to W3_SOURCES

2000-07-10 William M. Perry <wmperry@aventail.com>;

* lisp/w3-parse.el (w3-expand-entity-at-point-maybe): Wrap
inserting of &#xxx; entities inside a condition-case so that we
won't choke and die when parsing a bad document.

1999-12-23 William M. Perry <wmperry@aventail.com>;

* lisp/w3-speak-table.el (w3-table-focus-on-this-cell): Synch'd up
with Thierry & Raman. Provide default value for at-depth.
Resurrect hyperlinks and images when focusing on a cell.
(w3-table-setup-keys): New bindings for `,' and `.' to focus on
and speak table cells.

1999-12-22 William M. Perry <wmperry@aventail.com>;

* lisp/w3-parse.el (w3-parse-buffer): Allow ':' in attribute
names, to deal with stupid quasi-HTML/XML data output by MS Word
9.x
(w3-parse-buffer): Removed progress bar stuff, since it is causing
XEmacs 21.2 betas to crash.

1999-12-06 William M. Perry <wmperry@aventail.com>;

* lisp/w3-display.el (w3-prepare-tree): Analog to
w3-prepare-buffer, but works on a ready-made parse tree instead of
parsing it on the fly.

* lisp/w3.el (w3-fetch-callback): Added in special case for
handling content-type of application/x-elisp-parsed-html, for when
we want to

* lisp/css.el (css-handle-import): Protect against
url-insert-file-contents signalling an error.
(css-handle-import): Use url-insert-file-contents instead of the
old url-retrieve interface. We cannot retrieve stylesheets
asynchronously (for now).
(css-expand-value): Nuke quotes around URL attributes.

1999-12-05 William M. Perry <wmperry@aventail.com>;

* lisp/w3-display.el (w3-prepare-buffer): Don't do the history
stuff - this died a long time ago anyway.

1999-12-05 Dave Love <fx@gnu.org>;

* lisp/Makefile.in (W3_OBJECTS): Use W3_SOURCES, not SOURCES.

1999-12-05 William M. Perry <wmperry@aventail.com>;

* lisp/w3.el (w3-fetch): Urk, call w3-notify-when-ready if we
found a buffer visiting the URL, otherwise nothing happens.
User just silently gets no feedback about the operation.

* w3.el: Lots of changes to work with the new URL package.

* w3-vars.el: Removed lots of old varialbes. Updated to use new
URL package where necessary.
(w3-graphlink-menu): Removed the 'info' menu item. Not
(re)implemented yet.
(w3-hyperlink-menu): Ditto.

* w3-toolbar.el (w3-mouse-print-this-url): Ditto.

* w3-print.el (w3-print-this-url): Removed LaTeX as an option.

* w3-style.el, w3-parse.el: Deal with using new URL package.

* w3-menu.el: Removed LaTeX-related menu entries.
(w3-menu-links-constructor): Expand the URL in the menu
constructor if necessary, don't use url-maybe-relative anymore.

* w3-keymap.el: New separate file just for keymaps

* w3-java.el: Deal with removal of old 'mm' file and use
mailcap.el functions.

* w3-forms.el: Removed gopher query support.

* w3-emulate.el: Remove arena masquerade code. Does anybody even
use this masquerading code?

* w3-jscript.el, w3-elisp.el, w3-script.el: Removed files related
to scripting.

* w3-xemac.el (w3-mouse-handler): Ditto.

* w3-e19.el (w3-mouse-handler): Don't bother with scripting
elements yet.

* w3-display.el: Lots of changes to deal with the new URL package
and using the new mailcap.el file from Gnus.

* w3-cus.el: Removed lots of obsolete variables

* w3-hot.el (w3-hotlist-add-document): Disable due to default use
of html bookmark files now.
(w3-hotlist-delete): Ditto.
(w3-hotlist-apropos): Use new URL-based hotlist interface
(w3-hotlist-view): Ditto.
(w3-use-hotlist): Now deals with html-based bookmark lists.
(w3-hot-convert-to-alist): New function to conver an internal
bookmark list to an assoc list with oddly formatted keys.
(w3-read-html-bookmarks): Don't set w3-html-bookmarks any more -
this will be the main format now.
(w3-hot-push-now-item): Don't push a menu-object onto the list,
use a regular format we can convert to a menu when necessary.

* url-hotlist.el: New URL-based interface for searching your
hotlist.

1999-12-04 William M. Perry <wmperry@aventail.com>;

* lisp/base64.el: Updated to latest base64.el from Kyle. Now no conflicts
between this and the Gnus-distributed version.

1999-12-03 William M. Perry <wmperry@aventail.com>;

* lisp/font.el (font-set-face-font-new-redisplay): Don't set the :family
face attribute if it is nil. The new redisplay doesn't like that.

Comments (0)

Files changed (86)

+2012-05-11  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lisp/url-queue.el (float-time): Make this available if it's
+	unbound, 21.4 doesn't have it.
+
+	* lisp/url-http.el (url-http-create-request): We don't have
+	#'string-as-unibyte, mapconcat with #'identity instead.
+
+	* lisp/url-cookie.el (url-cookie-host-can-set-p): Don't bind an
+	unused, non-special variable.
+
+	* lisp/url-util.el (url-generate-unique-filename): Don't use
+	with-no-warnings.
+	(url-unhex-string): #'char-to-string, we don't have
+	#'byte-to-string.
+
+	* lisp/css.el (css-color-light-p): Don't bind an unused,
+	non-special variable.
+	(css-specificity): Ditto.
+	(css-display): Ditto.
+
+	* lisp/w3.el (w3-document-information):
+	* lisp/w3-imap.el (w3-image-loadable-p):
+	Call #'file-attributes, not #'url-file-attributes, in these two
+	files.
+
+	* lisp/url-cookie.el (url-cookie-handle-set-cookie): XEmacs;
+	url-parse-args downcased the assoc list keys, no need for
+	assoc-string rather than assoc.
+
+	* lisp/url.el (url-retrieve-internal): (save-match-data
+	(string-match "[^\x00-\x7f]" url)), not #'multibyte-string-p.
+	(url-retrieve-internal): Change the documentation to reflect this.
+
+	* lisp/url-file.el: 
+
+	* lisp/w3-keymap.el: Add this, from upstream.
+
+	* lisp/w3-speak-table.el: Don't load cl-extra.el at compile time,
+	it's dumped in XEmacs.
+
+	* lisp/w3-fast-parse.el: Add this file, from upstream.
+
+	* lisp/w3-parse.el (w3-parse-munge-ethiopic-text):
+	default-enable-multibyte-characters isn't available on XEmacs,
+	don't look for it.
+
+2012-05-10  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lisp/w3-mouse.el (w3-mouse-button1, w3-mouse-button2)
+	(w3-mouse-button3, not): Check for (featurep 'xemacs), not
+	w3-running-xemacs
+
+	* lisp/w3-hot.el (w3-grok-html-bookmarks): Add special
+	declarations to this function, too.
+
+2012-05-09  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lisp/w3-display.el (w3-display-line-break): Remove binding for
+	width, unused.
+
+	* lisp/images.el (image-normalize): Bind coding-system-for-read on
+	calling a process, rather than file-coding-system.
+
+	* lisp/docomp.el (emacs-build-custom-load):
+	#'Custom-make-dependencies, not #'custom-make-dependencies
+
+2012-05-11  Aidan Kehoe  <kehoea@parhasard.net>
+
+	Incorporate the following changes from upstream:
+
+    2008-05-20  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3.el (w3-do-setup): Change homepage link.
+
+    2008-03-26  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3.el (w3-fetch-callback): Don't disable multibyte.
+	(w3-decode-charset): Don't reenable multibyte.
+
+    2008-03-10  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3-display.el (w3-display-table): Guard against empty
+	colspan and rowspan elements.
+	(w3-display-table-dimensions): Ditto.
+
+    2008-03-01  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3-speak-table.el: Modernize backquotes.
+
+	* lisp/w3-parse.el: Modernize backquotes.
+
+	* lisp/w3-java.el: Modernize backquotes.
+
+	* lisp/w3-forms.el: Modernize backquotes.
+
+	* lisp/Makefile.in (UTIL_SOURCES): Remove base64.el, md5.el,
+	socks.el
+
+	* lisp/base64.el: Remove.  Emacs has this builtin.
+
+	* lisp/md5.el: Remove.  Emacs has this builtin.
+
+	* lisp/socks.el: Remove.  Emacs already has it.
+
+	* lisp/ssl.el: Don't require base64.
+
+	* lisp/url-vars.el: Remove.  Emacs already has it.
+
+    2008-02-04  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/font.el (font-x-font-regexp-foundry-and-family): Add from
+	last version of w3-sysdp.
+	(x-font-create-object): Use it instead of
+	x-font-regexp-foundry-and-family.
+
+	* lisp/Makefile.in (EXTRAS): Remove w3-sysdp.el.
+	(W3_SOURCES): Add w3-compat.el.
+
+    2007-12-09  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3-compat.el (w3-url-file-nondirectory): Fix thinko: alias
+	to url-file-nondirectory, not url-file-directory.
+
+    2007-11-16  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3-compat.el (w3-alist-to-plist): Define.
+
+	* lisp/w3-display.el (w3-parse-link)
+	(w3-display-normalize-form-info, w3-display-node): Use
+	w3-alist-to-plist instead of alist-to-plist.
+
+    2007-11-15  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3-display.el: Use w3-url-file-nondirectory instead of
+	url-basepath (in many places).
+
+	* lisp/w3.el: Require w3-compat.
+	(w3-download-url): Use w3-url-file-nondirectory instead of
+	url-basepath.
+
+	* lisp/w3-compat.el: New file.
+	(w3-url-file-nondirectory): New function.
+
+	* lisp/images.el: Don't require w3-sysdp.
+
+	* lisp/css.el: Ditto.
+	(css-rule-specificity-internal): Drop old-style backquotes.
+	(css-symbol-list-as-regexp): Ditto.
+
+	* lisp/w3-dired.el: Don't require w3-sysdp.
+
+	* lisp/w3-display.el: Ditto.  Also drop old-style backquotes.
+
+	* lisp/w3-menu.el: Ditto.
+
+	* lisp/w3.el: Ditto.
+	(w3-download-callback): Skip HTTP headers when saving file.
+
+	* lisp/w3-sysdp.el: Remove.
+
+    2007-03-09  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/css.el (css-expand-color): Catch errors and display a
+	warning instead.
+
+    2006-12-15  Klaus Straubinger <KSNetz@UseNet.ArcorNews.DE> (tiny change)
+
+	* lisp/font.el (font-spatial-to-canonical): Fix conversion from
+	pixels to points.
+
+	* lisp/css.el (css-expand-length): Treat character based size
+	specifications as such.
+
+    2006-12-07  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3.el (w3-fetch-callback): Treat application/xhtml+xml as
+	text/html.
+
+    2006-11-29  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3.el (w3-download-redirect-callback): New function.
+	(w3-download-url): Use it instead of w3-download-callback.
+
+    2006-11-01  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3.el (w3-fetch-redirect-callback): Handle both old and new
+	style of `url-retrieve' callback.
+
+	* lisp/w3-display.el (w3-finalize-image-download-skip-redirects):
+	Ditto.
+
+    2006-10-17  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3.el (w3-save-url): Use kill-new.
+
+	* lisp/w3-xemac.el (w3-store-in-clipboard): Remove.
+
+    2006-10-13  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3-parse.el (w3-slow-parse-buffer): Don't call
+	w3-element-content-model on nil values.
+
+    2006-10-12  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3-imap.el (w3-image-loadable-p): Ignore errors in
+	url-file-attributes.
+
+	* lisp/w3-display.el (w3-finalize-image-download-skip-redirects):
+	New function.
+	(w3-maybe-start-background-image-download)
+	(w3-maybe-start-image-download): Use it instead of
+	w3-finalize-image-download.
+
+    2006-10-11  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3.el (w3-fetch-redirect-callback): New function.
+	(w3-fetch): Use it as url-retrieve callback instead of
+	w3-fetch-callback.
+
+    2006-10-09  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3.el: Require mm-decode here too.
+
+    2006-10-08  Magnus Henoch  <mange@freemail.hu>
+
+	* lisp/w3-display.el: Require mm-decode when compiling.
+
+    2006-04-28  Dave Love  <fx@gnu.org>
+
+	* texi/w3.txi: Change licence to GFDL. 
+
+    2003-06-26  Sam Steingold  <sds@gnu.org>
+
+	* lisp/w3-imap.el (w3-image-loadable-p): fixed the logic
+
+    2003-01-12  Wolfgang Jenkner <wjenkner@inode.at>
+
+	* lisp/w3.el (w3-fetch-callback)
+	(w3-nasty-disgusting-http-equiv-handling): When searching for the
+	':' meaning we are past the 'http/1.x' response, make sure that we
+	save-execursion around it, or bad things happen.
+
+    2002-10-28  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-display.el (w3-display-node): Don't use
+	font-running-xemacs.
+
+    2002-10-27  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3.el (w3-nasty-disgusting-http-equiv-handling): Now takes
+	a second parameter, which is the URL that is being processed.
+	This allows us to set url-current-object in the temporary buffer.
+	This fixes the bug where a not-fully-qualified URL would cause
+	url-expand-filename to get 'confused' and throw an error.
+	(w3-fetch-callback): Pass the new URL argument to
+	w3-nasty-disgusting-*
+
+    2002-10-22  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3-forms.el (w3-form-create-option-list): Invalid call to
+	truncate-string-to-width caused all reasonably sized <option>
+	elements in a <select> to be invisible.
+	(w3-form-default-button-update): Similar problem for buttons.
+
+    2002-09-17  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3.el (w3-fetch-callback): Removed set-cookie handling.
+	This needs to be handled in the HTTP protocol loader so that
+	cookies that get set on redirects are honored.  This seems to be
+	why my.yahoo.com has stopped working.
+
+    2002-09-15  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3.el (w3-nasty-disgusting-http-equiv-handling): Need to
+	make sure that we skip the 'HTTP/1.x' line at the top of the
+	buffer (due to changes in the url library), or we end up confusing
+	mail-header-extract if there are any <meta> elements with
+	http-equiv headers in them.
+	(w3-fetch-callback): I'm an idiot and was trying to compare the
+	VALUE of a header against the actual header name for doing cookie
+	handling.  Arguably this cookie handling should all be done in the
+	HTTP handler itself.  Should move it somebday.
+
+    2002-02-01  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3.el (w3-fetch-callback): Fiddling with how to display XML
+	by default.
+
+	* lisp/w3-widget.el: Attempt to make images work with Emacs 21.
+
+	* lisp/w3-display.el (w3-display-node): Revert change for <hr>
+	handling.
+
+	* lisp/images.el: Use (featurep 'xemacs) instead of
+	string-matching on emacs-version.
+
+    2001-12-11  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/devices.el: Remove ancient NextStep support.
+
+	* lisp/font.el: Merge with the version from XEmacs 21.5.  This
+	pulls in lots of GTK fixes that I made ages ago.  Also removes
+	ancient, unworking NextStep support.  Use new backquote syntax
+	(emacs 19 can go away now).
+
+    2002-01-22  Dave Love  <fx@gnu.org>
+
+	* lisp/css.el (css-color-values): Maybe use `color-values'.
+
+	* lisp/socks.el: Require cl only when compiling.  Require wid-edit
+	when compiling.
+
+	* lisp/font.el: Require cl only when compiling.  Remove second
+	(require 'disp-table).  Wrap definitions of << & al in
+	eval-and-compile.  Doc fixes.
+	(font-set-font-encoding): Renamed from set-font-encoding (which is
+	in fontset.el).
+
+	* lisp/devices.el: Require cl only when compiling.
+
+	* lisp/w3-java.el (url-util): Require.
+	(w3-java-run-applet): Use url-generate-unique-filename, not
+	non-existent mailcap-generate-unique-filename.
+
+	* lisp/w3-menu.el (w3-first-n-items, w3-only-links)
+	(w3-fix-spaces): Autoload to avoid compiler warnings.
+	(w3-menu-filters-supported-p): Include Emacs 21.
+	(w3-menu-links-constructor): Use modern backquote syntax.
+
+	* lisp/ssl.el: Require cl only when compiling.  Require url.  Doc
+	fixes.
+	(ssl-view-certificate-program-arguments): Modify :type.
+	(top-level): Delete custom compatibility code since we require a
+	modern Emacs.
+	(open-ssl-stream): Use modern backquote syntax.
+
+	* lisp/w3-display.el (top-level): Declarations and autoloads to
+	avoid compiler warnings.
+	(w3-display-node): Use copy-sequence, not CL runtime copy-tree.
+
+	* lisp/w3-parse.el (decode-char): Modify logic for compiler
+	warning.
+
+	* lisp/w3.el (w3-nasty-disgusting-http-equiv-handling): Make
+	buffer arg compulsory and always set the buffer.  Parse a copy of
+	the head region, since w3-parse-region widens the buffer and may
+	mung it.
+	(w3-fetch-callback): Give w3-nasty-disgusting-http-equiv-handling
+	an arg.
+
+    2001-12-04  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3-display.el (w3-display-node): Explicitly put in breaks
+	for <hr> - <p> is not always inferred before and after (like when
+	using w3-fast-parse.
+
+    2001-11-25  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3-parse.el (w3-parse-buffer): Add : to the allowed tag
+	names to deal with Microsoft XHTML.
+	(w3-parse-buffer): Allow : in attribute names for XHTML
+
+    2001-11-24  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/font.el (font-set-face-font-new-redisplay): Doh!  Fix my
+	last font-size checking screwup.  *sigh*
+
+	* lisp/ssl.el (ssl-get-command): New routine to handle wrapping
+	the ssl program inside something that will redirect stderr to
+	/dev/null.  Do this only on non-dos, non-windows, and non-vms
+	system types.  This is necessary because the -quiet switch to
+	openssl's s_client program doesn't do what it is supposed to do.
+	*sigh*
+
+	* lisp/font.el (font-set-face-font-new-redisplay): Check font-size
+	for == 0, not just non-nil.
+
+    2001-11-21  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3.el (w3-mode): Don't bother calling
+	kill-all-local-variables.  It screws up too many things, namely
+	emacspeak personality properties and XEmacs' buffer-local faces.
+
+	* lisp/w3-display.el (w3-handle-string-content): Just go ahead an
+	always put the personality (aural properties) on text.
+
+	* lisp/w3-parse.el (w3-parse-buffer): Patch from Joe Wells to
+	handle XHTML a little bit better.  Still a hack, but it will now
+	work at all.
+
+	* lisp/w3-display.el (w3-display-node): Add support for 'start'
+	element on list start elements.  Some sites use this instead of
+	seqnum.
+
+    2001-10-31  Dave Love  <fx@gnu.org>
+
+	* lisp/w3.el (w3-decode-charset): DTRT for explicit ascii charset.
+
+    2001-10-11  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-style.el (cl): Require only when compiling.
+
+	* lisp/w3-cus.el: Doc fixes.
+	(w3-delay-image-loads): Fix default for Emacs 21.
+	(w3-mule-charset-to-coding-alist): Remove.
+
+	* lisp/w3.el (w3-parse-hotlist, w3-menu-install-menus): Autoload.
+	(w3-explicit-coding-system): Move definition.
+	(w3-decode-charset, w3-fetch-callback): Use it.
+
+    2001-10-01  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-vars.el: Doc fixes.
+	(w3-meta-content-type-charset-regexp)
+	(w3-meta-charset-content-type-regexp): Removed.
+	(w3-persistent-variables): Add url-current-mime-headers.
+
+	* lisp/w3.el (w3-setup-reload-timer, w3-handle-refresh-header):
+	New function.
+	(w3-fetch-callback): Handle refresh and cookies.  Set
+	url-current-object.  Don't destroy external parts immediately.
+	For inlines, use w3-mode, require mm-view, lose cursor for images.
+
+	(w3-document-information): Fix for current url stuff.
+	(w3-replace-invalid-chars): Remove.
+
+	* lisp/w3-display.el (w3-display-node): Fix <meta> and <link>
+	handling.
+
+    2001-09-24  Dave Love  <fx@gnu.org>
+
+	* lisp/w3.el (w3-http-equiv-headers): New function.
+	(w3-nasty-disgusting-http-equiv-handling): Use it to fix
+	http-equiv handling.
+
+    2001-09-09  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-display.el (w3-mode, w3-add-delayed-graphic)
+	(w3-find-specific-link, w3-fix-spaces): Autoload.
+
+	* lisp/w3-props.el (w3-fillin-text-property): Renamed from
+	`fillin-text-property'.
+
+    2001-08-24  Dave Love  <fx@gnu.org>
+
+	* lisp/font.el (font-spatial-to-canonical): Don't choke if
+	font-default-size-for-device returns nil, convert it to 0.
+	From Jim Meyering <meyering@lucent.com>
+
+    2001-07-19  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-toolbar.el (w3-toolbar-map): Don't lose on non-graphical
+	display with tool-bar-mode t.
+
+    2001-06-21  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-menu.el (w3-menu-hotlist-constructor): Require w3-hot,
+	not w3-hotlist.
+
+    2001-06-14  Dave Love  <fx@gnu.org>
+
+	* lisp/Makefile.in (W3_SOURCES): Add w3-emacs.el, remove files it
+	obsoletes.
+
+    2001-06-07  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-print.el (mule-sysdp): Don't require.
+
+	* lisp/w3-parse.el (mule-sysdp): Don't require.
+
+	* lisp/w3-latex.el (mule-sysdp): Don't require.
+	(w3-show-dvi): Avoid mule-write-region-no-coding-system.
+
+	* lisp/w3-display.el (mule-sysdp): Don't require.
+	(w3-display-get-cookie, w3-finalize-image-download): Avoid
+	mule-write-region-no-coding-system.
+
+	* lisp/w3-cus.el (mule-sysdp): Don't require.
+	(w3-force-conversion-alist): Use binary, not
+	mule-no-coding-system.
+
+	* lisp/images.el (mule-sysdp): Don't require.
+	(image-normalize): Use binary, not mule-no-coding-system.
+
+	* lisp/w3-forms.el (wid-edit): Require unconditionally.
+	(custom-magic-reset, w3-warn): Autoload.
+	(w3-form-keymap): Use substitute-key-definition, not
+	cl-map-keymap.
+	(w3-form-create-custom): Require cus-edit unconditionally.
+	(w3-all-widgets): Move definition.
+	(w3-form-create-file-browser, w3-form-create-option-list)
+	(w3-form-default-button-update): Avoid mule-truncate-string.
+	(mule-sysdp): Don't require.
+	(w3-form-encode-xwfu): Avoid mule-encode-string.
+
+	* lisp/w3-emacs.el: New file.
+
+	* lisp/w3-e19.el, lisp/w3-e20.el, lisp/w3-e21.el: Deleted in
+	favour of w3-emacs.  (Avoid defadvice.)
+
+	* lisp/w3.el (w3-load-flavors): Remove Emacs version-specifics --
+	just require w3-emacs.
+
+	* lisp/w3-toolbar.el (w3-toolbar-file-icon)
+	(w3-toolbar-printer-icon, w3-toolbar-file-icon): New variable.
+	(w3-toolbar-map): Transform `toolbar-' symbols into `w3-toolbar-'.
+
+	* lisp/w3-sysdp.el (copy-tree): Fix cl- functions.
+	(truncate-string-to-width): New.
+
+    2001-06-05  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-display.el: Require cl only when compiling.
+	(w3-line-breaks-vector): Deleted.
+	(w3-display-line-break): Use justification arg of
+	fill-region-as-paragraph.  Use insert-char.
+
+	* lisp/css.el (w3-sysdp): Require.
+	(url-expand-file-name, url-insert-file-contents, url-view-url):
+	Autoload.
+	(css-running-xemacs): Removed.  Change callers to use featurep.
+	(css-handle-import, css-parse): Declare url-current-object
+	special.
+	(css-active-device-types): Use display-multi-font-p, not
+	font-running-emacs-new-redisplay.
+
+	* lisp/w3-parse.el (w3-invalid-sgml-char-replacement): Doc fix.
+	(w3-resolve-numeric-char): Renamed from
+	w3-resolve-numeric-entity.  Callers changed.
+
+	* lisp/w3-vars.el (w3-version-number): Fix regexp, doc.
+	(w3-html-entities): Modified per W3C entity list.
+
+	* lisp/w3-toolbar.el (w3-toolbar-back-icon, w3-toolbar-forw-icon)
+	(w3-toolbar-home-icon, w3-toolbar-reld-icon)
+	(w3-toolbar-imag-icon, w3-toolbar-open-icon)
+	(w3-toolbar-print-icon, w3-toolbar-find-icon)
+	(w3-toolbar-stop-icon, w3-toolbar-help-icon)
+	(w3-toolbar-hotl-icon) [(featurep 'tool-bar)]: Initialize to names
+	of Emacs 21 icons.
+	(toolbar-make-button-list) [(featurep 'tool-bar)]: Don't define.
+	(w3-toolbar-make-buttons): Do nothing if (featurep 'tool-bar).
+	(w3-toolbar-map): New variable.
+	(w3-add-toolbar-to-buffer): Use it.
+
+    2001-06-01  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-display.el (widget-convert-text): Only advise it if
+	we're in Emacspeak.
+	(append-suffixes-hack, w3-java-run-applet, mm-inline-text):
+	Autoload.
+	(w3-display-get-cookie): Use url-generate-unique-filename.
+	(w3-display-table): Use copy-sequence, not copy-seq.
+
+	* lisp/w3.el (w3-decode-charset): Set buffer file coding system.
+
+    2001-05-31  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-menu.el (w3-menu-file-menu): Fix
+	"---:shadowDoubleEtchedIn".  From Pavel Janík.
+
+	* lisp/w3-parse.el (decode-char): Define with older Mule-UCS.
+	(w3-expand-entity-at-point-maybe): Sanitize regexp for numeric
+	entity.  Don't lose trailing space.  Grok hex form.
+
+    2001-05-30  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-menu.el: Require w3-sysdp.
+	(w3-popup-menu): Revert last change.
+
+    2001-05-29  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-sysdp.el: Remove lots of unused stuff.
+
+	* lisp/w3.el: Require cl only when compiling.  Doc and message
+	fixes.
+
+	* lisp/w3-toolbar.el (w3-toolbar): Bind w3-hotlist-view, not
+	w3-show-hotlist.
+
+	* lisp/w3-menu.el (w3-menu-hotlist-constructor): Require
+	w3-hotlist.
+	(w3-menu-bookmark-menu): Bind w3-hotlist-view, not
+	w3-show-hotlist.
+	(w3-popup-menu): In Emacs, use copy-keymap, not copy-tree.
+
+	* lisp/w3-hotindex.el (w3-hotindex-query): Call w3-hotlist-view,
+	not w3-show-hotlist.
+
+	* lisp/w3-emulate.el (url-vars): Require.
+	(w3-lynx-emulation-minor-mode-map)
+	(w3-netscape-emulation-minor-mode-map): Bind w3-hotlist-view, not
+	w3-show-hotlist.
+
+	* lisp/w3-dired.el (w3-open-local, w3-fetch): Autoload.
+	(add-minor-mode): Remove definition in favour of autoload.
+
+	* lisp/w3-keymap.el (w3-mode-map): Bind w3-hotlist-view, not
+	w3-show-hotlist.
+
+	* lisp/w3-parse.el (w3-parse-buffer): Use
+	w3-resolve-numeric-entity for bogus characters.
+
+    2001-05-25  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3-speak-table.el: Make sure to load cl-extra at load time
+	to work around a byte-optimizer bug in Emacs 21 that caused this
+	module to fail to byte-compile.
+
+    2001-05-24  Pavel Janík <Pavel@janik.cz>
+
+	* lisp/w3-display.el (w3-resurrect-hyperlinks): Look for next
+	single property change from `st' instead of `nd' to avoid
+	potential infinite loops.
+
+    2001-05-24  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3-cus.el (w3-honor-stylesheets): Turn off stylesheets for
+	now - url-retrieve-synchronously seems to be acting quite
+	strange.
+
+    2001-05-22  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/css.el (css-handle-import): Use ignore-errors around url
+	loading.
+	(css-parse): Ditto.
+
+	* lisp/docomp.el: Remove a bunch of the autoloading crap - it
+	isn't needed anymore.
+
+    2001-05-17  William M. Perry  <wmperry@gnu.org>
+
+	* lisp/w3-parse.el w3-int-to-char: Deal with XEmacs more nicely.
+	int-to-char does error checking, so passing in ?~ tends to blow
+	things up.  Do better error checking for characters passed in, and
+	for integers that are not capable of being converted to
+	characters.
+
+	* lisp/w3-display.el (w3-dingbats): Deal with a mule-less XEmacs
+	in our conditions.
+
+    2001-05-16  Dave Love  <fx@gnu.org>
+
+	* lisp/w3.el (w3-decode-charset): Re-write.
+	(w3-fetch-callback): Partly re-write for coding conversion.
+	(w3-convert-code-for-mule, w3-coding-system-for-mime-charset):
+	Deleted.
+	(w3-save-as, w3-download-callback): Avoid
+	mule-write-region-no-coding-system.
+	(w3-mode): Do kill-all-local-variables in Emacs.
+
+    2001-05-15  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-display.el (w3-sysdp): Require.
+	(flatten): Autoload unconditionally.
+
+	* lisp/w3-parse.el (w3-invalid-sgml-char-replacement): Redefined.
+	(w3-resolve-numeric-entity): New function.
+	(html-entities): Consider string and non-string returns from
+	w3-resolve-numeric-entity.
+	(w3-p-s-var-def): Use w3-resolve-numeric-entity.
+	(w3-parse-hooks): Fix typo.
+	(w3-int-to-char): New alias.
+
+    2001-05-14  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-sysdp.el: Don't define extent-related functions, to
+	avoid trouble with other packages.
+
+	* lisp/w3.el: Don't require mule-sysdp.
+	(w3-decode-charset): Remove prompting stuff.  Avoid
+	gnus-strip-whitespace.  Use mm-charset-to-coding-system and return
+	coding system used.
+	(w3-fetch-callback): Bind and set mule-retrieval-coding-system.
+	Call mm-enable-multibyte.
+	(w3-widget-button-click): Add Emacs case.
+	(w3-warn): Wrap definition in eval-and-compile.
+
+	* lisp/w3-imap.el: Use new backquote syntax.
+	(w3-image-invalid-glyph-p): Test for Emacs images.
+
+	* lisp/w3-widget.el: Use (featurep 'xemacs).  Use modern backquote
+	syntax.
+	(widget): Don't require cl.
+	(w3-vars): Require.
+	(w3-point-in-map, w3-point-in-map): Autoload.
+	(widget-image-value-set): Add Emacs 21 image test.
+	(widget-image-usemap): Avoid a string-match.
+	(widget-image-value-create): Use align property.  Fix call of
+	image-type-available-p.  Some simplification.  Use `insert-image'
+	in Emacs.
+	(widget-image-delete): Maybe use delete-overlay.
+	(widget-glyphp): Test for Emacs image.
+	(widget-image-button-press): Add code for Emacs.
+
+	* lisp/w3-display.el: Use (featurep 'xemacs), not
+	w3-running-xemacs.  Use modern backquote syntax.
+	(w3-maybe-start-image-download): Use display-graphic-p.  Don't use
+	make-glyph in Emacs.
+	(w3-maybe-start-background-image-download): Fix typo `mesage'.
+	Don't use make-glyph in Emacs.
+	(w3-finalize-image-download): For Emacs, grok `align' attribute.
+	Use unibyte for image data in Emacs.  Only do xbm stuff in XEmacs.
+	Don't do make-glyph by default.  Only call set-glyph-image if it's
+	defined.
+	(w3-handle-image): Use `align'.
+	(w3-dingbats): Define without using mule-sysdep-version.
+	(w3-make-char): Likewise.
+	(w3-display-node): Minor logic simplification.
+
+	* lisp/w3-menu.el (cl): Require cl when compiling.  Use (featurep
+	'xemacs), not w3-running-xemacs.
+	(w3-menu-file-menu): Allow ---:shadowDoubleEtchedIn in Emacs 21.
+	(w3-menu-options-menu): Comment-out `download to disk'
+	(w3-dump-to-disk not defined).
+
+	* lisp/w3-parse.el (url-expand-file-name): Autoload.
+	(cl): Require when compiling.
+	(w3-invalid-sgml-char-replacement): Defvar when compiling.
+	(w3-parse-munge-ethiopic-text): Don't bother supporting MULE 2.
+	(w3-parse-hooks): Customize.  Default to nil, with
+	w3-parse-munge-ethiopic-text as an option.
+
+	* lisp/w3-dired.el (w3-dired-find-file-mouse): Use mouse-set-point.
+	(dired-get-filename): Autoload.
+	(w3-dired-find-file-dired): New function, renamed from second
+	occurrence of w3-dired-find-file.
+
+	* lisp/w3-hot.el (cl): Require when compiling.
+
+    2001-05-10  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-menu.el (w3-menu-go-menu): Use url-history-track, not
+	url-keep-history.
+
+	* lisp/mule-sysdp.el: Removed in favour of one in url package.
+
+    2001-01-04  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-toolbar.el (w3-add-toolbar-to-buffer) <featurep 'tool-bar>:
+	Test display-graphic-p and tool-bar-lines.  Use mapc, not mapcar.
+
+    2001-01-03  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-toolbar.el (w3-add-toolbar-to-buffer): In Emacs, test
+	for graphic display and non-zero tool bar lines.
+
+    2001-01-02  Sam Steingold  <sds@gnu.org>
+
+	* lisp/docomp.el (load-path): Gnus and URL are two levels
+	above w3/lisp by default.
+
+    2000-12-20  Dave Love  <fx@gnu.org>
+
+	* lisp/w3-sysdp.el: Use sysdep-defalias, not sysdep-fset.
+
+	* lisp/w3-widget.el: Use defalias, not fset.
+
+	* lisp/w3.el (w3-maybe-follow-link): Fix call of
+	widget-button-press.
+
+	* lisp/w3-parse.el (w3-char-int): New alias instead of char-int.
+
+	* lisp/w3-menu.el (w3-event-glyph): New alias instead of
+	event-glyph.
+
+	* lisp/w3-display.el: Use defalias, not fset.
+	(w3-widget-echo): Revert last change, following Emacs change.
+
+	* lisp/mule-sysdp.el (cl): Require only when compiling.
+
+	* lisp/font.el: Use defalias, not fset.  Don't use cl-...hash.
+
+	* lisp/devices.el (device-class): Try display-color-p first.
+
+	* lisp/socks.el (socks-char-int): New alias instead of char-int.
+	Callers changed.
+	(socks-original-open-network-stream, open-network-stream): Use
+	defalias, not fset.
+	(socks-wait-for-state-change, socks-filter)
+	(socks-open-connection, socks-open-connection)
+	(socks-send-command, socks-parse-services)
+	(socks-find-services-entry, socks-open-network-stream)
+	(socks-username/password-auth-filter)
+	(socks-username/password-auth): Don't use cl-...hash.
+
+	* lisp/css.el (css-get-internal, css-copy-stylesheet)
+	(css-store-rule, css-display): Don't use cl-...hash.
+
+    2000-11-15  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/w3-mouse.el (not): Don't ever try to grab mouse-movement
+	events if we are running Emacs 21.
+
+	* lisp/w3-display.el (w3-decimal-to-alpha): Don't try to inline
+	this - it called itself recursively and so blew up Emacs'
+	byte-compiler.
+	(w3-decimal-to-alpha): Also fixed bug where large numbers did not
+	get converted correctly (3 letters or more were completely screwed
+	up).
+	(w3-decimal-to-roman): Don't inline this one either, just for
+	safety.
+
+    2000-10-16  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/w3-e21.el (toolbar-file-icon): added definitions of
+	toolbar-file-icon and toolbar-printer-icon
+
+    2000-10-02  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/w3-e21.el (w3-setup-version-specifics): Advise this
+	function to create toolbar buttons in Emacs 21.x with toolbar
+	support.
+	(w3-mode-version-specifics): Advise this function to actually add
+	the toolbars to each buffer.
+
+	* lisp/w3-toolbar.el (w3-add-toolbar-to-buffer): Deal with
+	toolbars in Emacs 21.
+
+    2000-07-28  Sam Steingold  <sds@gnu.org>
+
+	* lisp/Makefile.in: added w3-e21.el to W3_SOURCES
+
+    2000-07-10  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/w3-parse.el (w3-expand-entity-at-point-maybe): Wrap
+	inserting of &#xxx; entities inside a condition-case so that we
+	won't choke and die when parsing a bad document.
+
+    1999-12-23  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/w3-speak-table.el (w3-table-focus-on-this-cell): Synch'd up
+	with Thierry & Raman.  Provide default value for at-depth.
+	Resurrect hyperlinks and images when focusing on a cell.
+	(w3-table-setup-keys): New bindings for `,' and `.' to focus on
+	and speak table cells.
+
+    1999-12-22  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/w3-parse.el (w3-parse-buffer): Allow ':' in attribute
+	names, to deal with stupid quasi-HTML/XML data output by MS Word
+	9.x
+	(w3-parse-buffer): Removed progress bar stuff, since it is causing
+	XEmacs 21.2 betas to crash.
+
+    1999-12-06  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/w3-display.el (w3-prepare-tree): Analog to
+	w3-prepare-buffer, but works on a ready-made parse tree instead of
+	parsing it on the fly.
+
+	* lisp/w3.el (w3-fetch-callback): Added in special case for
+	handling content-type of application/x-elisp-parsed-html, for when
+	we want to
+
+	* lisp/css.el (css-handle-import): Protect against
+	url-insert-file-contents signalling an error.
+	(css-handle-import): Use url-insert-file-contents instead of the
+	old url-retrieve interface.  We cannot retrieve stylesheets
+	asynchronously (for now).
+	(css-expand-value): Nuke quotes around URL attributes.
+
+    1999-12-05  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/w3-display.el (w3-prepare-buffer): Don't do the history
+	stuff - this died a long time ago anyway.
+
+    1999-12-05  Dave Love  <fx@gnu.org>
+
+	* lisp/Makefile.in (W3_OBJECTS): Use W3_SOURCES, not SOURCES.
+
+    1999-12-05  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/w3.el (w3-fetch): Urk, call w3-notify-when-ready if we
+	found a buffer visiting the URL, otherwise nothing happens.
+	User just silently gets no feedback about the operation.
+
+	* w3.el: Lots of changes to work with the new URL package.
+
+	* w3-vars.el: Removed lots of old varialbes.  Updated to use new
+	URL package where necessary.
+	(w3-graphlink-menu): Removed the 'info' menu item.  Not
+	(re)implemented yet.
+	(w3-hyperlink-menu): Ditto.
+
+	* w3-toolbar.el (w3-mouse-print-this-url): Ditto.
+
+	* w3-print.el (w3-print-this-url): Removed LaTeX as an option.
+
+	* w3-style.el, w3-parse.el: Deal with using new URL package.
+
+	* w3-menu.el: Removed LaTeX-related menu entries.
+	(w3-menu-links-constructor): Expand the URL in the menu
+	constructor if necessary, don't use url-maybe-relative anymore.
+
+	* w3-keymap.el: New separate file just for keymaps
+
+	* w3-java.el: Deal with removal of old 'mm' file and use
+	mailcap.el functions.
+
+	* w3-forms.el: Removed gopher query support.
+
+	* w3-emulate.el: Remove arena masquerade code.  Does anybody even
+	use this masquerading code?
+
+	* w3-jscript.el, w3-elisp.el, w3-script.el: Removed files related
+	to scripting.
+
+	* w3-xemac.el (w3-mouse-handler): Ditto.
+
+	* w3-e19.el (w3-mouse-handler): Don't bother with scripting
+	elements yet.
+
+	* w3-display.el: Lots of changes to deal with the new URL package
+	and using the new mailcap.el file from Gnus.
+
+	* w3-cus.el: Removed lots of obsolete variables
+
+	* w3-hot.el (w3-hotlist-add-document): Disable due to default use
+	of html bookmark files now.
+	(w3-hotlist-delete): Ditto.
+	(w3-hotlist-apropos): Use new URL-based hotlist interface
+	(w3-hotlist-view): Ditto.
+	(w3-use-hotlist): Now deals with html-based bookmark lists.
+	(w3-hot-convert-to-alist): New function to conver an internal
+	bookmark list to an assoc list with oddly formatted keys.
+	(w3-read-html-bookmarks): Don't set w3-html-bookmarks any more -
+	this will be the main format now.
+	(w3-hot-push-now-item): Don't push a menu-object onto the list,
+	use a regular format we can convert to a menu when necessary.
+
+	* url-hotlist.el: New URL-based interface for searching your
+	hotlist.
+
+    1999-12-04  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/base64.el: Updated to latest base64.el from Kyle.  Now no conflicts
+	between this and the Gnus-distributed version.
+
+    1999-12-03  William M. Perry  <wmperry@aventail.com>
+
+	* lisp/font.el (font-set-face-font-new-redisplay): Don't set the :family
+	face attribute if it is nil.  The new redisplay doesn't like that.
+	
 2012-01-10  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.36 released.
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = w3
 PKG_TYPE = regular
-REQUIRES = w3 mail-lib xemacs-base ecrypto
+REQUIRES = w3 mail-lib xemacs-base ecrypto gnus net-utils sh-script fsf-compat eterm
 CATEGORY = standard
 
-ELCS =  lisp/css.elc lisp/dsssl-flow.elc \
-	lisp/dsssl.elc lisp/images.elc lisp/mm.elc \
-	lisp/mule-sysdp.elc lisp/socks.elc lisp/ssl.elc lisp/url-auth.elc \
-	lisp/url-cache.elc lisp/url-cookie.elc lisp/url-file.elc \
-	lisp/url-gopher.elc lisp/url-gw.elc lisp/url-http.elc \
-	lisp/url-irc.elc lisp/url-mail.elc lisp/url-misc.elc \
-	lisp/url-news.elc lisp/url-nfs.elc lisp/url-ns.elc lisp/url-parse.elc \
-	lisp/url-vars.elc lisp/url.elc lisp/url-ldap.elc lisp/url-cid.elc \
-	lisp/w3-about.elc lisp/w3-auto.elc \
-	lisp/w3-cus.elc lisp/w3-display.elc lisp/w3-e19.elc lisp/w3-e20.elc \
-	lisp/w3-elisp.elc lisp/w3-emulate.elc lisp/w3-forms.elc \
-	lisp/w3-hot.elc lisp/w3-hotindex.elc lisp/w3-imap.elc \
-	lisp/w3-java.elc lisp/w3-jscript.elc \
-	lisp/w3-keyword.elc lisp/w3-latex.elc lisp/w3-menu.elc \
-	lisp/w3-mouse.elc lisp/w3-parse.elc \
-	lisp/w3-print.elc lisp/w3-props.elc lisp/w3-script.elc \
-	lisp/w3-speak.elc lisp/w3-speak-table.elc lisp/w3-style.elc \
-	lisp/w3-sysdp.elc \
-	lisp/w3-toolbar.elc lisp/w3-vars.elc lisp/w3-widget.elc \
-	lisp/w3-xemac.elc lisp/w3.elc lisp/w3-cfg.elc
+ELCS =  lisp/css.elc lisp/devices.elc lisp/docomp.elc lisp/dsssl-flow.elc    \
+	lisp/dsssl.elc lisp/images.elc lisp/socks.elc lisp/ssl.elc	     \
+	lisp/url-about.elc lisp/url-auth.elc lisp/url-cache.elc		     \
+	lisp/url-cid.elc lisp/url-cookie.elc lisp/url-dav.elc		     \
+	lisp/url-dired.elc lisp/url-domsuf.elc lisp/url-expand.elc	     \
+	lisp/url-file.elc lisp/url-ftp.elc lisp/url-future.elc		     \
+	lisp/url-gw.elc lisp/url-handlers.elc lisp/url-history.elc	     \
+	lisp/url-http.elc lisp/url-imap.elc lisp/url-irc.elc		     \
+	lisp/url-ldap.elc lisp/url-mailto.elc lisp/url-methods.elc	     \
+	lisp/url-misc.elc lisp/url-news.elc lisp/url-nfs.elc lisp/url-ns.elc \
+	lisp/url-parse.elc lisp/url-privacy.elc lisp/url-proxy.elc	     \
+	lisp/url-queue.elc lisp/url-util.elc lisp/url-vars.elc lisp/url.elc  \
+	lisp/w3-cfg.elc lisp/w3-compat.elc lisp/w3-cus.elc		     \
+	lisp/w3-display.elc lisp/w3-emulate.elc lisp/w3-fast-parse.elc	     \
+	lisp/w3-forms.elc lisp/w3-hot.elc lisp/w3-hotindex.elc		     \
+	lisp/w3-imap.elc lisp/w3-java.elc lisp/w3-keymap.elc		     \
+	lisp/w3-latex.elc lisp/w3-menu.elc lisp/w3-mouse.elc		     \
+	lisp/w3-parse.elc lisp/w3-print.elc lisp/w3-props.elc		     \
+	lisp/w3-speak-table.elc lisp/w3-speak.elc lisp/w3-style.elc	     \
+	lisp/w3-toolbar.elc lisp/w3-vars.elc lisp/w3-widget.elc		     \
+	lisp/w3-xemac.elc lisp/w3.elc
 
 EXTRA_SOURCES = BUGS HOWTO INSTALL README README.NT README.VMS TODO \
 	lisp/md5.el.upstream
 
-DATA_FILES = stylesheet $(wildcard images/*.x?m)
+DATA_FILES = stylesheet $(wildcard images/*.x?m) etc/publicsuffix.txt
 DATA_DEST = $(PACKAGE)
 
 EXPLICIT_DOCS = texi/w3-faq.txi texi/w3.txi
 stylesheet: etc/default.css
 	rm -f stylesheet
 	$(RCOPY) etc/default.css stylesheet
+

etc/publicsuffix.txt

+// ***** BEGIN LICENSE BLOCK *****
+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
+// 
+// The contents of this file are subject to the Mozilla Public License Version 
+// 1.1 (the "License"); you may not use this file except in compliance with 
+// the License. You may obtain a copy of the License at 
+// http://www.mozilla.org/MPL/
+// 
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+// 
+// The Original Code is the Public Suffix List.
+// 
+// The Initial Developer of the Original Code is
+// Jo Hermans <jo.hermans@gmail.com>.
+// Portions created by the Initial Developer are Copyright (C) 2007
+// the Initial Developer. All Rights Reserved.
+// 
+// Contributor(s):
+//   Ruben Arakelyan <ruben@rubenarakelyan.com>
+//   Gervase Markham <gerv@gerv.net>
+//   Pamela Greene <pamg.bugs@gmail.com>
+//   David Triendl <david@triendl.name>
+//   Jothan Frakes <jothan@gmail.com>
+//   The kind representatives of many TLD registries
+// 
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 2 or later (the "GPL"), or
+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+// in which case the provisions of the GPL or the LGPL are applicable instead
+// of those above. If you wish to allow use of your version of this file only
+// under the terms of either the GPL or the LGPL, and not to allow others to
+// use your version of this file under the terms of the MPL, indicate your
+// decision by deleting the provisions above and replace them with the notice
+// and other provisions required by the GPL or the LGPL. If you do not delete
+// the provisions above, a recipient may use your version of this file under
+// the terms of any one of the MPL, the GPL or the LGPL.
+// 
+// ***** END LICENSE BLOCK *****
+
+// ac : http://en.wikipedia.org/wiki/.ac
+ac
+com.ac
+edu.ac
+gov.ac
+net.ac
+mil.ac
+org.ac
+
+// ad : http://en.wikipedia.org/wiki/.ad
+ad
+nom.ad
+
+// ae : http://en.wikipedia.org/wiki/.ae
+// see also: "Domain Name Eligibility Policy" at http://www.aeda.ae/eng/aepolicy.php
+ae
+co.ae
+net.ae
+org.ae
+sch.ae
+ac.ae
+gov.ae
+mil.ae
+
+// aero : see http://www.information.aero/index.php?id=66
+aero
+accident-investigation.aero
+accident-prevention.aero
+aerobatic.aero
+aeroclub.aero
+aerodrome.aero
+agents.aero
+aircraft.aero
+airline.aero
+airport.aero
+air-surveillance.aero
+airtraffic.aero
+air-traffic-control.aero
+ambulance.aero
+amusement.aero
+association.aero
+author.aero
+ballooning.aero
+broker.aero
+caa.aero
+cargo.aero
+catering.aero
+certification.aero
+championship.aero
+charter.aero
+civilaviation.aero
+club.aero
+conference.aero
+consultant.aero
+consulting.aero
+control.aero
+council.aero
+crew.aero
+design.aero
+dgca.aero
+educator.aero
+emergency.aero
+engine.aero
+engineer.aero
+entertainment.aero
+equipment.aero
+exchange.aero
+express.aero
+federation.aero
+flight.aero
+freight.aero
+fuel.aero
+gliding.aero
+government.aero
+groundhandling.aero
+group.aero
+hanggliding.aero
+homebuilt.aero
+insurance.aero
+journal.aero
+journalist.aero
+leasing.aero
+logistics.aero
+magazine.aero
+maintenance.aero
+marketplace.aero
+media.aero
+microlight.aero
+modelling.aero
+navigation.aero
+parachuting.aero
+paragliding.aero
+passenger-association.aero
+pilot.aero
+press.aero
+production.aero
+recreation.aero
+repbody.aero
+res.aero
+research.aero
+rotorcraft.aero
+safety.aero
+scientist.aero
+services.aero
+show.aero
+skydiving.aero
+software.aero
+student.aero
+taxi.aero
+trader.aero
+trading.aero
+trainer.aero
+union.aero
+workinggroup.aero
+works.aero
+
+// af : http://www.nic.af/help.jsp
+af
+gov.af
+com.af
+org.af
+net.af
+edu.af
+
+// ag : http://www.nic.ag/prices.htm
+ag
+com.ag
+org.ag
+net.ag
+co.ag
+nom.ag
+
+// ai : http://nic.com.ai/
+ai
+off.ai
+com.ai
+net.ai
+org.ai
+
+// al : http://www.ert.gov.al/ert_alb/faq_det.html?Id=31
+al
+com.al
+edu.al
+gov.al
+mil.al
+net.al
+org.al
+
+// am : http://en.wikipedia.org/wiki/.am
+am
+
+// an : http://www.una.an/an_domreg/default.asp
+an
+com.an
+net.an
+org.an
+edu.an
+
+// ao : http://en.wikipedia.org/wiki/.ao
+// http://www.dns.ao/REGISTR.DOC
+ao
+ed.ao
+gv.ao
+og.ao
+co.ao
+pb.ao
+it.ao
+
+// aq : http://en.wikipedia.org/wiki/.aq
+aq
+
+// ar : http://en.wikipedia.org/wiki/.ar
+*.ar
+!congresodelalengua3.ar
+!educ.ar
+!gobiernoelectronico.ar
+!mecon.ar
+!nacion.ar
+!nic.ar
+!promocion.ar
+!retina.ar
+!uba.ar
+
+// arpa : http://en.wikipedia.org/wiki/.arpa
+// Confirmed by registry <iana-questions@icann.org> 2008-06-18
+e164.arpa
+in-addr.arpa
+ip6.arpa
+iris.arpa
+uri.arpa
+urn.arpa
+
+// as : http://en.wikipedia.org/wiki/.as
+as
+gov.as
+
+// asia: http://en.wikipedia.org/wiki/.asia
+asia
+
+// at : http://en.wikipedia.org/wiki/.at
+// Confirmed by registry <it@nic.at> 2008-06-17
+at
+ac.at
+co.at
+gv.at
+or.at
+
+// http://www.info.at/
+biz.at
+info.at
+
+// priv.at : http://www.nic.priv.at/
+// Submitted by registry <lendl@nic.at> 2008-06-09
+priv.at
+
+// au : http://en.wikipedia.org/wiki/.au
+*.au
+// au geographical names (vic.au etc... are covered above)
+act.edu.au
+nsw.edu.au
+nt.edu.au
+qld.edu.au
+sa.edu.au
+tas.edu.au
+vic.edu.au
+wa.edu.au
+act.gov.au
+// Removed at request of Shae.Donelan@services.nsw.gov.au, 2010-03-04
+// nsw.gov.au
+nt.gov.au
+qld.gov.au
+sa.gov.au
+tas.gov.au
+vic.gov.au
+wa.gov.au
+// CGDNs - http://www.aucd.org.au/
+act.au
+nsw.au
+nt.au
+qld.au
+sa.au
+tas.au
+vic.au
+wa.au
+
+// aw : http://en.wikipedia.org/wiki/.aw
+aw
+com.aw
+
+// ax : http://en.wikipedia.org/wiki/.ax
+ax
+
+// az : http://en.wikipedia.org/wiki/.az
+az
+com.az
+net.az
+int.az
+gov.az
+org.az
+edu.az
+info.az
+pp.az
+mil.az
+name.az
+pro.az
+biz.az
+
+// ba : http://en.wikipedia.org/wiki/.ba
+ba
+org.ba
+net.ba
+edu.ba
+gov.ba
+mil.ba
+unsa.ba
+unbi.ba
+co.ba
+com.ba
+rs.ba
+
+// bb : http://en.wikipedia.org/wiki/.bb
+bb
+biz.bb
+com.bb
+edu.bb
+gov.bb
+info.bb
+net.bb
+org.bb
+store.bb
+
+// bd : http://en.wikipedia.org/wiki/.bd
+*.bd
+
+// be : http://en.wikipedia.org/wiki/.be
+// Confirmed by registry <tech@dns.be> 2008-06-08
+be
+ac.be
+
+// bf : http://en.wikipedia.org/wiki/.bf
+bf
+gov.bf
+
+// bg : http://en.wikipedia.org/wiki/.bg
+// https://www.register.bg/user/static/rules/en/index.html
+bg
+a.bg
+b.bg
+c.bg
+d.bg
+e.bg
+f.bg
+g.bg
+h.bg
+i.bg
+j.bg
+k.bg
+l.bg
+m.bg
+n.bg
+o.bg
+p.bg
+q.bg
+r.bg
+s.bg
+t.bg
+u.bg
+v.bg
+w.bg
+x.bg
+y.bg
+z.bg
+0.bg
+1.bg
+2.bg
+3.bg
+4.bg
+5.bg
+6.bg
+7.bg
+8.bg
+9.bg	 	 	
+
+// bh : http://en.wikipedia.org/wiki/.bh
+bh
+com.bh
+edu.bh
+net.bh
+org.bh
+gov.bh
+
+// bi : http://en.wikipedia.org/wiki/.bi
+// http://whois.nic.bi/
+bi
+co.bi
+com.bi
+edu.bi
+or.bi
+org.bi
+
+// biz : http://en.wikipedia.org/wiki/.biz
+biz
+
+// bj : http://en.wikipedia.org/wiki/.bj
+bj
+asso.bj
+barreau.bj
+gouv.bj
+
+// bm : http://www.bermudanic.bm/dnr-text.txt
+bm
+com.bm
+edu.bm
+gov.bm
+net.bm
+org.bm
+
+// bn : http://en.wikipedia.org/wiki/.bn
+*.bn
+
+// bo : http://www.nic.bo/
+bo
+com.bo
+edu.bo
+gov.bo
+gob.bo
+int.bo
+org.bo
+net.bo
+mil.bo
+tv.bo
+
+// br : http://registro.br/dominio/dpn.html
+// Updated by registry <fneves@registro.br> 2011-03-01
+br
+adm.br
+adv.br
+agr.br
+am.br
+arq.br
+art.br
+ato.br
+b.br
+bio.br
+blog.br
+bmd.br
+can.br
+cim.br
+cng.br
+cnt.br
+com.br
+coop.br
+ecn.br
+edu.br
+emp.br
+eng.br
+esp.br
+etc.br
+eti.br
+far.br
+flog.br
+fm.br
+fnd.br
+fot.br
+fst.br
+g12.br
+ggf.br
+gov.br
+imb.br
+ind.br
+inf.br
+jor.br
+jus.br
+lel.br
+mat.br
+med.br
+mil.br
+mus.br
+net.br
+nom.br
+not.br
+ntr.br
+odo.br
+org.br
+ppg.br
+pro.br
+psc.br
+psi.br
+qsl.br
+radio.br
+rec.br
+slg.br
+srv.br
+taxi.br
+teo.br
+tmp.br
+trd.br
+tur.br
+tv.br
+vet.br
+vlog.br
+wiki.br
+zlg.br
+
+// bs : http://www.nic.bs/rules.html
+bs
+com.bs
+net.bs
+org.bs
+edu.bs
+gov.bs
+
+// bt : http://en.wikipedia.org/wiki/.bt
+bt
+com.bt
+edu.bt
+gov.bt
+net.bt
+org.bt
+
+// bv : No registrations at this time.
+// Submitted by registry <jarle@uninett.no> 2006-06-16
+
+// bw : http://en.wikipedia.org/wiki/.bw
+// http://www.gobin.info/domainname/bw.doc
+// list of other 2nd level tlds ?
+bw
+co.bw
+org.bw
+
+// by : http://en.wikipedia.org/wiki/.by
+// http://tld.by/rules_2006_en.html
+// list of other 2nd level tlds ?
+by
+gov.by
+mil.by
+// Official information does not indicate that com.by is a reserved
+// second-level domain, but it's being used as one (see www.google.com.by and
+// www.yahoo.com.by, for example), so we list it here for safety's sake.
+com.by
+
+// http://hoster.by/
+of.by
+
+// bz : http://en.wikipedia.org/wiki/.bz
+// http://www.belizenic.bz/
+bz
+com.bz
+net.bz
+org.bz
+edu.bz
+gov.bz
+
+// ca : http://en.wikipedia.org/wiki/.ca
+ca
+// ca geographical names
+ab.ca
+bc.ca
+mb.ca
+nb.ca
+nf.ca
+nl.ca
+ns.ca
+nt.ca
+nu.ca
+on.ca
+pe.ca
+qc.ca
+sk.ca
+yk.ca
+// gc.ca: http://en.wikipedia.org/wiki/.gc.ca
+// see also: http://registry.gc.ca/en/SubdomainFAQ
+gc.ca
+
+// cat : http://en.wikipedia.org/wiki/.cat
+cat
+
+// cc : http://en.wikipedia.org/wiki/.cc
+cc
+
+// cd : http://en.wikipedia.org/wiki/.cd
+// see also: https://www.nic.cd/domain/insertDomain_2.jsp?act=1
+cd
+gov.cd
+
+// cf : http://en.wikipedia.org/wiki/.cf
+cf
+
+// cg : http://en.wikipedia.org/wiki/.cg
+cg
+
+// ch : http://en.wikipedia.org/wiki/.ch
+ch
+
+// ci : http://en.wikipedia.org/wiki/.ci
+// http://www.nic.ci/index.php?page=charte
+ci
+org.ci
+or.ci
+com.ci
+co.ci
+edu.ci
+ed.ci
+ac.ci
+net.ci
+go.ci
+asso.ci
+aéroport.ci
+int.ci
+presse.ci
+md.ci
+gouv.ci
+
+// ck : http://en.wikipedia.org/wiki/.ck
+*.ck
+
+// cl : http://en.wikipedia.org/wiki/.cl
+cl
+gov.cl
+gob.cl
+
+// cm : http://en.wikipedia.org/wiki/.cm
+cm
+gov.cm
+
+// cn : http://en.wikipedia.org/wiki/.cn
+// Submitted by registry <tanyaling@cnnic.cn> 2008-06-11
+cn
+ac.cn
+com.cn
+edu.cn
+gov.cn
+net.cn
+org.cn
+mil.cn
+公司.cn
+网络.cn
+網絡.cn
+// cn geographic names
+ah.cn
+bj.cn
+cq.cn
+fj.cn
+gd.cn
+gs.cn
+gz.cn
+gx.cn
+ha.cn
+hb.cn
+he.cn
+hi.cn
+hl.cn
+hn.cn
+jl.cn
+js.cn
+jx.cn
+ln.cn
+nm.cn
+nx.cn
+qh.cn
+sc.cn
+sd.cn
+sh.cn
+sn.cn
+sx.cn
+tj.cn
+xj.cn
+xz.cn
+yn.cn
+zj.cn
+hk.cn
+mo.cn
+tw.cn
+
+// co : http://en.wikipedia.org/wiki/.co
+// Submitted by registry <tecnico@uniandes.edu.co> 2008-06-11
+co
+arts.co
+com.co
+edu.co
+firm.co
+gov.co
+info.co
+int.co
+mil.co
+net.co
+nom.co
+org.co
+rec.co
+web.co
+
+// com : http://en.wikipedia.org/wiki/.com
+com
+
+// CentralNic names : http://www.centralnic.com/names/domains
+// Confirmed by registry <gavin.brown@centralnic.com> 2008-06-09
+ar.com
+br.com
+cn.com
+de.com
+eu.com
+gb.com
+hu.com
+jpn.com
+kr.com
+no.com
+qc.com
+ru.com
+sa.com
+se.com
+uk.com
+us.com
+uy.com
+za.com
+
+// Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26
+operaunite.com
+
+// Requested by Eduardo Vela <evn@google.com> 2010-09-06
+appspot.com
+
+// coop : http://en.wikipedia.org/wiki/.coop
+coop
+
+// cr : http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
+cr
+ac.cr
+co.cr
+ed.cr
+fi.cr
+go.cr
+or.cr
+sa.cr
+
+// cu : http://en.wikipedia.org/wiki/.cu
+cu
+com.cu
+edu.cu
+org.cu
+net.cu
+gov.cu
+inf.cu
+
+// cv : http://en.wikipedia.org/wiki/.cv
+cv
+
+// cx : http://en.wikipedia.org/wiki/.cx
+// list of other 2nd level tlds ?
+cx
+gov.cx
+
+// cy : http://en.wikipedia.org/wiki/.cy
+*.cy
+
+// cz : http://en.wikipedia.org/wiki/.cz
+cz
+
+// de : http://en.wikipedia.org/wiki/.de
+// Confirmed by registry <ops@denic.de> (with technical
+// reservations) 2008-07-01
+de
+
+// dj : http://en.wikipedia.org/wiki/.dj
+dj
+
+// dk : http://en.wikipedia.org/wiki/.dk
+// Confirmed by registry <robert@dk-hostmaster.dk> 2008-06-17
+dk
+
+// dm : http://en.wikipedia.org/wiki/.dm
+dm
+com.dm
+net.dm
+org.dm
+edu.dm
+gov.dm
+
+// do : http://en.wikipedia.org/wiki/.do
+do
+art.do
+com.do
+edu.do
+gob.do
+gov.do
+mil.do
+net.do
+org.do
+sld.do
+web.do
+
+// dz : http://en.wikipedia.org/wiki/.dz
+dz
+com.dz
+org.dz
+net.dz
+gov.dz
+edu.dz
+asso.dz
+pol.dz
+art.dz
+
+// ec : http://www.nic.ec/reg/paso1.asp
+// Submitted by registry <vabboud@nic.ec> 2008-07-04
+ec
+com.ec
+info.ec
+net.ec
+fin.ec
+k12.ec
+med.ec
+pro.ec
+org.ec
+edu.ec
+gov.ec
+gob.ec
+mil.ec
+
+// edu : http://en.wikipedia.org/wiki/.edu
+edu
+
+// ee : http://www.eenet.ee/EENet/dom_reeglid.html#lisa_B
+ee
+edu.ee
+gov.ee
+riik.ee
+lib.ee
+med.ee
+com.ee
+pri.ee
+aip.ee
+org.ee
+fie.ee
+
+// eg : http://en.wikipedia.org/wiki/.eg
+eg  
+com.eg
+edu.eg
+eun.eg
+gov.eg
+mil.eg
+name.eg
+net.eg
+org.eg
+sci.eg
+
+// er : http://en.wikipedia.org/wiki/.er
+*.er
+
+// es : https://www.nic.es/site_ingles/ingles/dominios/index.html
+es
+com.es
+nom.es
+org.es
+gob.es
+edu.es
+
+// et : http://en.wikipedia.org/wiki/.et
+*.et
+
+// eu : http://en.wikipedia.org/wiki/.eu
+eu
+
+// fi : http://en.wikipedia.org/wiki/.fi
+fi
+// aland.fi : http://en.wikipedia.org/wiki/.ax
+// This domain is being phased out in favor of .ax. As there are still many
+// domains under aland.fi, we still keep it on the list until aland.fi is
+// completely removed.
+// TODO: Check for updates (expected to be phased out around Q1/2009)
+aland.fi
+// iki.fi : Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
+iki.fi
+
+// fj : http://en.wikipedia.org/wiki/.fj
+*.fj
+
+// fk : http://en.wikipedia.org/wiki/.fk
+*.fk
+
+// fm : http://en.wikipedia.org/wiki/.fm
+fm
+
+// fo : http://en.wikipedia.org/wiki/.fo
+fo
+
+// fr : http://www.afnic.fr/
+// domaines descriptifs : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-descriptifs
+fr
+com.fr
+asso.fr
+nom.fr
+prd.fr
+presse.fr
+tm.fr
+// domaines sectoriels : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-sectoriels
+aeroport.fr
+assedic.fr
+avocat.fr
+avoues.fr
+cci.fr
+chambagri.fr
+chirurgiens-dentistes.fr
+experts-comptables.fr
+geometre-expert.fr
+gouv.fr
+greta.fr
+huissier-justice.fr
+medecin.fr
+notaires.fr
+pharmacien.fr
+port.fr
+veterinaire.fr
+
+// ga : http://en.wikipedia.org/wiki/.ga
+ga
+
+// gb : This registry is effectively dormant
+// Submitted by registry <Damien.Shaw@ja.net> 2008-06-12
+
+// gd : http://en.wikipedia.org/wiki/.gd
+gd
+
+// ge : http://www.nic.net.ge/policy_en.pdf
+ge
+com.ge
+edu.ge
+gov.ge
+org.ge
+mil.ge
+net.ge
+pvt.ge
+
+// gf : http://en.wikipedia.org/wiki/.gf
+gf
+
+// gg : http://www.channelisles.net/applic/avextn.shtml
+gg
+co.gg
+org.gg
+net.gg
+sch.gg
+gov.gg
+
+// gh : http://en.wikipedia.org/wiki/.gh
+// see also: http://www.nic.gh/reg_now.php
+// Although domains directly at second level are not possible at the moment,
+// they have been possible for some time and may come back.
+gh
+com.gh
+edu.gh
+gov.gh
+org.gh
+mil.gh
+
+// gi : http://www.nic.gi/rules.html
+gi
+com.gi
+ltd.gi
+gov.gi
+mod.gi
+edu.gi
+org.gi
+
+// gl : http://en.wikipedia.org/wiki/.gl
+// http://nic.gl
+gl
+
+// gm : http://www.nic.gm/htmlpages%5Cgm-policy.htm
+gm
+
+// gn : http://psg.com/dns/gn/gn.txt
+// Submitted by registry <randy@psg.com> 2008-06-17
+ac.gn
+com.gn
+edu.gn
+gov.gn
+org.gn
+net.gn
+
+// gov : http://en.wikipedia.org/wiki/.gov
+gov
+
+// gp : http://www.nic.gp/index.php?lang=en
+gp
+com.gp
+net.gp
+mobi.gp
+edu.gp
+org.gp
+asso.gp
+
+// gq : http://en.wikipedia.org/wiki/.gq
+gq
+
+// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
+// Submitted by registry <segred@ics.forth.gr> 2008-06-09
+gr
+com.gr
+edu.gr
+net.gr
+org.gr
+gov.gr
+
+// gs : http://en.wikipedia.org/wiki/.gs
+gs
+
+// gt : http://www.gt/politicas.html
+*.gt
+
+// gu : http://gadao.gov.gu/registration.txt
+*.gu
+
+// gw : http://en.wikipedia.org/wiki/.gw
+gw
+
+// gy : http://en.wikipedia.org/wiki/.gy
+// http://registry.gy/
+gy
+co.gy
+com.gy
+net.gy
+
+// hk : https://www.hkdnr.hk
+// Submitted by registry <hk.tech@hkirc.hk> 2008-06-11
+hk
+com.hk
+edu.hk
+gov.hk
+idv.hk
+net.hk
+org.hk
+公司.hk
+教育.hk
+敎育.hk
+政府.hk
+個人.hk
+个人.hk
+箇人.hk
+網络.hk
+网络.hk
+组織.hk
+網絡.hk
+网絡.hk
+组织.hk
+組織.hk
+組织.hk 
+
+// hm : http://en.wikipedia.org/wiki/.hm
+hm
+
+// hn : http://www.nic.hn/politicas/ps02,,05.html
+hn
+com.hn
+edu.hn
+org.hn
+net.hn
+mil.hn
+gob.hn
+
+// hr : http://www.dns.hr/documents/pdf/HRTLD-regulations.pdf
+hr
+iz.hr
+from.hr
+name.hr
+com.hr
+
+// ht : http://www.nic.ht/info/charte.cfm
+ht
+com.ht
+shop.ht
+firm.ht
+info.ht
+adult.ht
+net.ht
+pro.ht
+org.ht
+med.ht
+art.ht
+coop.ht
+pol.ht
+asso.ht
+edu.ht
+rel.ht
+gouv.ht
+perso.ht
+
+// hu : http://www.domain.hu/domain/English/sld.html
+// Confirmed by registry <pasztor@iszt.hu> 2008-06-12
+hu
+co.hu
+info.hu
+org.hu
+priv.hu
+sport.hu
+tm.hu
+2000.hu
+agrar.hu
+bolt.hu
+casino.hu
+city.hu
+erotica.hu
+erotika.hu
+film.hu
+forum.hu
+games.hu
+hotel.hu
+ingatlan.hu
+jogasz.hu
+konyvelo.hu
+lakas.hu
+media.hu