Commits

Anonymous committed bec8b8f Merge

Misuse of the list widget type

Comments (0)

Files changed (3)

+2007-09-04  Didier Verna  <didier@xemacs.org>
+
+	* lisp/ssl.el (ssl-view-certificate-program-arguments): Fix misuse
+	of the list widget type.
+	* lisp/ssl.el (ssl-program-arguments): Ditto.
+	* lisp/w3-java.el (w3-java-vm-arguments): Ditto.
+
 2006-05-17  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.33 released.
 	* Makefile (VERSION): XEmacs package 1.23 released.
 
 	* Makefile (PRELOADS): No need to push anything into the
-	load-path. 
+	load-path.
 
 2002-04-28  Steve Youngs  <youngs@xemacs.org>
 
 
 2002-04-21  Steve Youngs  <youngs@xemacs.org>
 
-	* lisp/url.el: Remove duplicate autoload for 'url-is-cached'.  
+	* lisp/url.el: Remove duplicate autoload for 'url-is-cached'.
 
 2002-03-25  Steve Youngs  <youngs@xemacs.org>
 
   'codebase' attribute.
 
 * lisp/w3-display.el (w3-auto-run-java): New variable to control whether
-  Java applets are run 
+  Java applets are run
   (w3-display-handle-java): New function to convert our internal parse
   structure into something that `w3-java-run-applet' can understand.
   (w3-display-node): Use it.
 
 1999-09-16  Michael Sperber [Mr. Preprocessor]  <sperber@informatik.uni-tuebingen.de>
 
-* lisp/url-cache.el: 
-* lisp/w3-display.el: 
+* lisp/url-cache.el:
+* lisp/w3-display.el:
 * lisp/w3.el: Added (require 'url-parse) because of the macros
   defined there.
 
 1999-08-07  Bob Weiner  <weiner@beopen.com>
 
 * w3-menu.el (w3-menu-make-xemacs-menubar): Fixed to work with
-  BeOpen.com InfoDock.  Old code allowed multiple 'nil's to creep into the 
+  BeOpen.com InfoDock.  Old code allowed multiple 'nil's to creep into the
   menubar which would cause a hang in the XEmacs menubar code.
 
 1999-08-04  William M. Perry  <wmperry@aventail.com>
 1999-08-03  William M. Perry  <wmperry@aventail.com>
 
 * lisp/mule-sysdp.el (mule-sysdep-version): Make
-  enable-multibyte-characters buffer-local when in XEmacs, to better mimic 
+  enable-multibyte-characters buffer-local when in XEmacs, to better mimic
   the Emacs 20.x behaviour.
 
 1999-07-19  William M. Perry  <wmperry@aventail.com>
   (w3-parse-munge-ethiopic-text): Moved the old ethiopic munging stuff
   into hook form.
 
-* lisp/url-mail.el (url-mailto): Allow adding of more 'to' headers via the 
+* lisp/url-mail.el (url-mailto): Allow adding of more 'to' headers via the
   query interface for mailto URLs.  Would generate corrup To: headers
   otherwise.
 
 1999-06-15  William M. Perry  <wmperry@aventail.com>
 
-* lisp/url-ldap.el (url-ldap-attribute-formatters): Format naming contexts 
+* lisp/url-ldap.el (url-ldap-attribute-formatters): Format naming contexts
   as hyperlinks back into the directory.
   (url-ldap-certificate-formatter): Save certificate data to a file.
 
 
 * lisp/w3-display.el (w3-widget-echo): Use buffer-substring --rather than
   buffer-substring-no-properties when picking out the text under the
-  current link. 
+  current link.
 
   This is good for emacspeak because you can then tell while
   tabbing through a  page whether the link you just hit has
   EMACSDIR on the command line.
 
 * lisp/docomp.el (byte-compile-dest-file): Downcase file names if we are
-  in windows of any flavor.  Sometimes we get foo.EL instead of foo.el and 
+  in windows of any flavor.  Sometimes we get foo.EL instead of foo.el and
   we were just naming the output file foo.EL.elc
   (compile-it): Make sure we get *.EL from directory-files as well.
   (emacs-build-autoloads): Ditto.  %!@!ing windows file systems.
 
 1998-12-30  Milan Zamazal <pdm@pvt.net>
 
-* lisp/url-auth.el (url-basic-auth): Make sure to use base64-encode-string 
+* lisp/url-auth.el (url-basic-auth): Make sure to use base64-encode-string
   instead of base64-encode to work with new Emacs/XEmacs that have native
   base64 encoding/decoding primitives.
 
   system.
 
 * Emacs/W3 4.0pre37 released
-	
+
 * lisp/socks.el (socks-find-route): Fixed bug where we would not honor the
   '!' at the front of the regexp to mean _do_ redirect the connection.  I
   need to finish the socks-redirection-rules stuff sometime soon.
   causes an error, the buffer will still be thrown into w3-mode
   (w3-region): Make w3-region interactive and give it a doc string.
   (w3-pause): Mark the buffer as temporarily read-only, so that
-  self-inserting keystrokes will signal an error, which will be caught and 
+  self-inserting keystrokes will signal an error, which will be caught and
   ignored by the condition-case.
   (w3-widget-buffer): New function to get the buffer a widget is in.
   (w3-widget-echo): Use it, since with Gnus, it is very likely that you
 
 1998-12-26  William M. Perry  <wmperry@aventail.com>
 
-* lisp/url.el (url-expand-file-name): Make sure to normalize the 'default' 
+* lisp/url.el (url-expand-file-name): Make sure to normalize the 'default'
   value before we get to the point of bailing out if we get the empty
   string, otherwise the vector-ized version of the URL could sneak out,
   and the 'nil' default case would screw us too.
   and base64-decode-string -> base64-decode, for compatibility with
   Emacs/XEmacs with native base64 support.
 
-* lisp/w3-about.el: Use base64-encode-string instead of base64-encode, for 
+* lisp/w3-about.el: Use base64-encode-string instead of base64-encode, for
   compatibility with Emacs/XEmacs with native base64 support.
 
 1998-12-25  William M. Perry  <wmperry@aventail.com>
 
 * lisp/url-ldap.el: New file to implement LDAP support ala RFC2255
 
-* lisp/url.el (url-do-setup): Register the LDAP URL handler if the feature 
+* lisp/url.el (url-do-setup): Register the LDAP URL handler if the feature
   is present.
 
 * Emacs/W3 4.0pre36 released
 
 * lisp/url.el (url-default-expander): Make sure that we remove any query
   strings from the URL before we remove relative links.
-  (url-remove-relative-links): Tack on a trailing '/' if necessary so that 
+  (url-remove-relative-links): Tack on a trailing '/' if necessary so that
   we don't fail any URL parsing tests on things like 'g/.', which should
   be normalized to just 'g/'
 
   (w3-display-background-useless-p): Use it.
   (w3-display-foreground-useless-p): Use it.
 
-* lisp/w3.el (w3-reload-document): Avoid using interactive spec 'Z', since 
+* lisp/w3.el (w3-reload-document): Avoid using interactive spec 'Z', since
   it doesn't exist in older versions of Emacs (19.xx)
 
 * lisp/w3-parse.el (w3-parse-buffer): Add ',' to the `whitespace' at the
   can do horrible nasty things like <input type="foo", name="bar"> and
   still have it work.  Sometimes I feel so... unclean.
 
-* lisp/url-news.el (url-check-gnus-version): Use gnus-continuum-version if 
-  at all possible.  This way I will never have to add another string-match 
+* lisp/url-news.el (url-check-gnus-version): Use gnus-continuum-version if
+  at all possible.  This way I will never have to add another string-match
   to the list of acceptable versions (at least not until another 15
   releases of Gnus.
 
 
 1998-12-22  William Perry  <wmperry@aventail.com>
 
-* lisp/w3-display.el (w3-display-table): Backed out old change to use less 
+* lisp/w3-display.el (w3-display-table): Backed out old change to use less
   space for borderless tables - it was screwing up spacing at the
   beginning of celles.
 
 
 1998-12-21  William M. Perry  <wmperry@aventail.com>
 
-* lisp/docomp.el: If WIDGETDIR is not set, or set to `no', then scream and 
+* lisp/docomp.el: If WIDGETDIR is not set, or set to `no', then scream and
   bitch and die, to avoid more arcane errors later on.
   (emacs-build-custom-load): Try to work around emacs19 that doesn't have
   cus-dep installed.
 
 * lisp/w3.el (w3-fetch): Avoid use of with-current-buffer, since it
-  doesn't exist in Emacs 19.xx 
+  doesn't exist in Emacs 19.xx
   (w3-convert-code-for-mule): Finished rename to mule-coding-system-p
 
 1998-12-20  Bertil Askelid <bertil@ioc.net>
 
 1998-12-18  William M. Perry  <wmperry@aventail.com>
 
-* lisp/Makefile.in: No longer include auto-autoloads.el and custom-load in 
+* lisp/Makefile.in: No longer include auto-autoloads.el and custom-load in
   the distribution.  We can rebuild it anywhere now.
 
 * aclocal.m4 (AC_CHECK_CUSTOMLOADS): Use the new functions in the
   (mule-coding-system-with-invalid-chars): New function.
   (mule-write-region-no-coding-system): Fix argument of write-region for
   Mule 2.3.
- 
+
 1998-12-17  William M. Perry  <wmperry@aventail.com>
 
 * Emacs/W3 4.0pre32 released
 1998-12-03  William M. Perry  <wmperry@aventail.com>
 
 * Updated all copyright dates and now specify that this _is_ a
-  part of Emacs, since it soon will be.  Maybe.  If I get ambitious.  what 
+  part of Emacs, since it soon will be.  Maybe.  If I get ambitious.  what
   are the odds posted in vegas?
 
-* lisp/w3-display.el (w3-display-infer-contrasting-color): New function to 
+* lisp/w3-display.el (w3-display-infer-contrasting-color): New function to
   chooise black or white as an appropriate color if the author of an HTML
-  page was stupid enough to do something like: <body bgcolor="white"> (ie: 
+  page was stupid enough to do something like: <body bgcolor="white"> (ie:
   not specifying the foreground color as well).  If this conflicts with
   the users foreground, the text used to be invisible.  Now it will be
   whichever contrasts best (black on mint cream, white on dark red, etc)
-  (w3-display-node): If the foreground specified conflicts with the users' 
+  (w3-display-node): If the foreground specified conflicts with the users'
   background, ignore it.
-  (w3-display-node): If the background specified conflicts with the users' 
+  (w3-display-node): If the background specified conflicts with the users'
   foreground, infer an appropriate foreground.
 
 * Emacs/W3 4.0pre31 released
   XEmacs), and unifont if it cannot.
 
 * lisp/font.el (font-set-face-font-new-redisplay): New function for
-  dealing with the new Emacs redisplay font abstraction.  You can now beat 
-  the crap out of the new redisplay engine with Emacs/W3.  Ahh, feels like 
+  dealing with the new Emacs redisplay font abstraction.  You can now beat
+  the crap out of the new redisplay engine with Emacs/W3.  Ahh, feels like
   the heady old days of Lucid Emacs 19.10 and XEmacs 19.12.
 
 1998-12-02  Simon Josefsson <jas@pdc.kth.se>
   Gnus.
 
 * lisp/w3-display.el (w3-finalize-image-download): Make sure we call
-  url-uncompress in w3-finalize-image-download, or content-id and data URL 
+  url-uncompress in w3-finalize-image-download, or content-id and data URL
   based images won't get uncompressed correctly.  Arguably this should be
   done in url-default-callback, but I'm not sure what that would fubar
   right now.
 * lisp/w3.el (w3-fetch): set w3-current-last-buffer for reused URLs.
   (w3-pass-to-viewer): set w3-current-last-buffer to w3-current-buffer.
   (w3-fetch): bind w3-current-buffer to (current-buffer).
-        Make history work with url-be-asynchronous t.	
+	Make history work with url-be-asynchronous t.
 
 1998-09-25  Gareth Jones  <gdj1@gdjones.demon.co.uk>
 
-* lisp/w3-vars.el (w3-mode-map): Bind [backspace] to scroll-down.	
+* lisp/w3-vars.el (w3-mode-map): Bind [backspace] to scroll-down.
 
 1998-09-09  Gareth Jones  <gdj1@gdjones.demon.co.uk>
 
   "generator" makes more sense than "parser".
 
 * lisp/url.el (url-do-setup): ditto for url-cookie-file and
-  url-global-history-file.	
+  url-global-history-file.
 
 * lisp/url-cache.el (url-cache-directory): use w3-configuration-directory
   rather than hardwire "~/.w3/"
 
 1998-10-28  William M. Perry  <wmperry@aventail.com>
 
-* lisp/mule-sysdp.el (mule-code-convert-region): Try to avoid lossage when 
+* lisp/mule-sysdp.el (mule-code-convert-region): Try to avoid lossage when
   point-max changes due to a set-buffer-multibyte operation.
 
 1998-10-28  Laurent Martelli <martelli@iie.cnam.fr>
 
 1998-06-13  William M. Perry  <wmperry@aventail.com>
 
-* lisp/w3-hot.el (finish-submenu): Ignore empty strings when searching for 
+* lisp/w3-hot.el (finish-submenu): Ignore empty strings when searching for
   sublist titles.  Reading netscape bookmark files works correctly again.
 
 1998-06-12  William M. Perry  <wmperry@aventail.com>
   this shit any more. :)
 
 * lisp/w3-menu.el (w3-menu-breakup): Moved into this file because it is
-  where it belongs.  Also changed so that 'more...' menu items are spliced 
+  where it belongs.  Also changed so that 'more...' menu items are spliced
   in at the end of the menu where they belong.
   All the filter menus should work under Emacs 20.3 now.
   (w3-popup-menu): No longer use 'popup-menu' - this removes the need
 
 1998-06-10  William M. Perry  <wmperry@aventail.com>
 
-* lisp/w3-menu.el (w3-menu-filters-supported-p): New variable to determine 
+* lisp/w3-menu.el (w3-menu-filters-supported-p): New variable to determine
   whether this flavor of Emacs supports the :filter keyword on
   menus.  Emacs 20.3 will support the :filter keyword, so lets use it.
   (w3-menu-go-menu): Use it.
   (w3-menu-e19-show-links-menu): Ditto.
   (w3-menu-e19-show-hotlist-menu): Ditto.
 
-* lisp/w3-xemac.el (w3-store-in-clipboard): Make this work under mswindows 
+* lisp/w3-xemac.el (w3-store-in-clipboard): Make this work under mswindows
   devices.
 
 1998-06-09  William M. Perry  <wmperry@aventail.com>
 
 * lisp/url-http.el (url-create-mime-request): New behaviour wrt
   url-mime-language-string - if it is nil, then no accept-language header
-  will be sent.  This is to work around problem when dealing with apache - 
+  will be sent.  This is to work around problem when dealing with apache -
   the old default of '*' would cause the server to return the first
   version of a document it could find (w3c site would typically send out
-  danish or japanese) - definitely suboptimal.  I don't know how this will 
+  danish or japanese) - definitely suboptimal.  I don't know how this will
   impact you MULE folks though - speak up!
 
 * lisp/url-vars.el (url-mime-language-string): Better customization of
   the tree.
 
 * lisp/xml.el: New way to parse XML documents using an external process
-  and some new support tools based upon 'expat', the XML parser from James 
+  and some new support tools based upon 'expat', the XML parser from James
   Clark.
 
 * aclocal.m4 (AC_EMACS_PACKAGES): resurrected the --with-package-dir
 * lisp/docomp.el: Use w3-load-flavors and w3-setup-version-specifics in
   docomp.el, just to make sure everything works.
 
-* lisp/w3.el (w3-load-flavors): Don't bitch about XEmacs being unsupported 
+* lisp/w3.el (w3-load-flavors): Don't bitch about XEmacs being unsupported
   on windows anymore, because it is again!
 
 * lisp/w3-xemac.el: Force loading of new widget/custom libraries on
 
 * lisp/socks.el: Added socks v4 support.  To do this I had to change how
   socks servers are defined - try the new customization support: C-u M-x
-  customize [RET] socks to see what has changed. 
+  customize [RET] socks to see what has changed.
 
 * lisp/mule-sysdp.el (mule-sysdep-version): Try to deal with MBSK Emacs
   not really being mule, but still mostly lying about it.
 
 1998-01-29  Dieter Maurer <dieter@hit.handshake.de>
 
-* lisp/mm.el (mm-parse-mime-headers): Handle continuation lines in headers 
+* lisp/mm.el (mm-parse-mime-headers): Handle continuation lines in headers
 
 1998-01-29  William M. Perry  <wmperry@aventail.com>
 
   to avoid weirdness that gets shoved to stdout/stderr by the various
   emacsen.
 
-* lisp/w3-cus.el (w3-image-mappings): Use imagick for everything if XEmacs 
+* lisp/w3-cus.el (w3-image-mappings): Use imagick for everything if XEmacs
   was compiled with it.
 
 * lisp/w3-display.el (w3-maybe-start-image-download): Protect against bad
   img:link    { color: goldenrod  }
   img:active  { color: goldenrod  }
   img:visited { color: firebrick  }
-	
+
   the `alt' tag of image maps is displayed, to ease visual
   recognition,
 
   comparing system-type.
 
 * lisp/w3-e19.el (w3-store-in-clipboard): Deal gracefully with
-  interprogram-cut-function being bound, but nil - we should fall back to 
+  interprogram-cut-function being bound, but nil - we should fall back to
   the device-specific stuff, not just do nothing.
 
 1997-10-20  William M. Perry  <wmperry@aventail.com>
 
-* texi/w3-faq.txi (Runtime FAQ): New FAQ about Mule 20.x and \201 in front 
+* texi/w3-faq.txi (Runtime FAQ): New FAQ about Mule 20.x and \201 in front
   of everything.
 
 1997-10-17  William M. Perry  <wmperry@aventail.com>
 
 1997-10-17  Colin Rafferty <craffert@ml.com>
 
-* lisp/url-auth.el (url-auth-user-prompt): New function to create a pretty 
+* lisp/url-auth.el (url-auth-user-prompt): New function to create a pretty
   prompt that shows the realm or URL that the user should be
   authenticating to.
 
 
 1997-10-16  William M. Perry  <wmperry@aventail.com>
 * lisp/w3-display.el (w3-insert-terminal-char): better handling of HR
-  within borderless tables 
+  within borderless tables
 
 * lisp/w3-parse.el (w3-p-s-entity): Don't cons up a string just to insert
   a single character.
 
 1997-10-13  William M. Perry  <wmperry@aventail.com>
 
-* lisp/w3-toolbar.el (w3-toolbar-make-buttons): Default to using text only 
+* lisp/w3-toolbar.el (w3-toolbar-make-buttons): Default to using text only
   buttons if w3-toolbar-icon-directory doesn't exist (or is nil if
   locate-data-directory fails)
 
 1997-10-04  SL Baur  <steve@altair.xemacs.org>
 
-* lisp/w3.el (w3-find-default-stylesheets): Use `locate-data-directory' if 
+* lisp/w3.el (w3-find-default-stylesheets): Use `locate-data-directory' if
   it exists.
 
 * lisp/w3-toolbar.el (w3-toolbar-make-buttons): Use `locate-data-directory'
 * lisp/cus-face.el: Path to make cus-face.el play nice with
   emacs 19 without X support.
 
-* lisp/w3-e19.el (w3-mode-version-specifics): Dont' do read-only 
+* lisp/w3-e19.el (w3-mode-version-specifics): Dont' do read-only
 
 1997-08-10  Thierry Emery <Thierry.Emery@aar.alcatel-alsthom.fr>
 
   rectangular ascii art for table borders.
 
 * lisp/socks.el (socks-find-route): Allow negation of regexps by
-  prepending a ! to them for a 'proxy if they match' type rule.  The whole 
+  prepending a ! to them for a 'proxy if they match' type rule.  The whole
   configuration of this module needs to change.
 
 1997-08-08  Istvan Marko <istvan@cmdmail.amd.com>
 
 Tue Jun 24 11:44:59 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
 
-* w3.el (w3-mode): Avoid calling the global bindings for RET and mouse-2. 
+* w3.el (w3-mode): Avoid calling the global bindings for RET and mouse-2.
 
 1997-06-24  William M. Perry  <wmperry@aventail.com>
 
 * Synch'd up to custom/widget 1.9936
-	
+
 * Emacs/W3 3.0.90 released
 
 * Moved the documentation into its own subdirectory
 
-* w3-menu.el: Slightly less complete version of id-menubar-set when not in 
+* w3-menu.el: Slightly less complete version of id-menubar-set when not in
   InfoDock - was causing lots of errors in XEmacs when trying to run a
   non-existent hook.  Bleah.
 
   (w3-balloon-help-callback): Ditto.
   (w3-maybe-start-image-download): Ditto.
   (w3-handle-image): Use new keywords.
-  (w3-display-convert-arglist): New function to convert an assoc list into 
+  (w3-display-convert-arglist): New function to convert an assoc list into
   a property list with real CL-style keywords.
   (w3-display-node): Use it when building a hyperlink.
-  (w3-resurrect-hyperlinks): Now uses widget-convert-text instead of nasty 
+  (w3-resurrect-hyperlinks): Now uses widget-convert-text instead of nasty
   knowledge of internals of the widget library.
 
 Tue Jun 17 21:45:06 1997  William M. Perry  <wmperry@aventail.com>
 * w3-display.el (w3-maybe-start-background-image-download): New function
   that takes a URL and a face and does its best to set the background
   pixmap of that face to the image pointed to by the URL.
-  (w3-display-node): Implemented 'background' property on 'body' or 'html' 
+  (w3-display-node): Implemented 'background' property on 'body' or 'html'
   tags.
-  (w3-finalize-image-download): Changed a fair bit - shared between normal 
+  (w3-finalize-image-download): Changed a fair bit - shared between normal
   image downloads and background image downloads.
   (w3-display-node): w3-user-colors-take-precedence now controls whether
   background faces are retrieved or not.
-  (w3-face-for-element): Stylesheets use of background-image should almost 
+  (w3-face-for-element): Stylesheets use of background-image should almost
   work now.
   (w3-display-node): Stylesheets use of background-image should work
   completely now.
 
 * w3-display.el: Make sure we don't try to redefine the w3-dingbats
   character set when loading this file more than once.
-  (w3-display-node): Rearranged some of the insert-before handling so that 
+  (w3-display-node): Rearranged some of the insert-before handling so that
   any text inserted does _not_ have the properties of the tag on it
   (colors on hyperlinks won't bleed anymore)
   (w3-resurrect-hyperlinks): New semi-working way of resurrecting
 
 * w3.el (w3-save-as): Make sure to require ps-print before trying to
   save/mail a document as postscript.  The local binding of
-  ps-spool-buffer-name was causing the defvar not to happen, and you would 
+  ps-spool-buffer-name was causing the defvar not to happen, and you would
   get errors when trying to kill emacs later.  Ugh.
   (w3-document-information): Make sure to escape entities for meta and
   other info we throw in.
   own special character set.  This means that the table border chars work
   again in XEmacs/mule
 
-* devices.el: Added magic to not optimize this file under XEmacs - its not 
+* devices.el: Added magic to not optimize this file under XEmacs - its not
   actually used, so no damage.  It wouldn't compile under XEmacs because
   it has subrs for all these, and our declaring them as defsubsts
   thoroughly confuses the byte-compiler.
 
 * w3-widget.el (widget-image-value-create): set tab-order to -1 on the
   choice-items of client-side imagemaps to avoid having tab stop on them
-  three times, (it still stops on them twice) 
+  three times, (it still stops on them twice)
 
 * Makefile: add "make fast" rule to not run a bazillion emacsen
 
   (w3-table-graphic-border-chars): New variable
   (w3-terminal-properties): New variable
   (w3-insert-terminal-char): New inline function
-  (w3-horizontal-rule-char): New inline function 
+  (w3-horizontal-rule-char): New inline function
   (w3-setup-terminal-chars): Set up all of these and make using graphic
   characters work on XEmacs using text properties (and optionally use text
-  properties on FSF Emacs too). 
+  properties on FSF Emacs too).
   (w3-table-hack-borders): Remove, obsoleted by w3-setup-terminal-chars
   (w3-table-unhack-borders): don't have to fiddle with
   w3-horizontal-rule-char any more.
   (w3-display-node):  Use w3-horizontal-rule-char, w3-insert-terminal-char,
   uhm, i'm not sure if it was correct to remove the handle-content
 * w3-forms.el (w3-fixup-eol-faces): try to remove mouse-face from end-of-lines as
-  well, uhm, this doesn't seem to work though. 
-  (w3-form-determine-size): add keygen 
+  well, uhm, this doesn't seem to work though.
+  (w3-form-determine-size): add keygen
   (w3-form-encode-helper): add keygen support for the day when the ssl code
-  itself is released. 
+  itself is released.
 * w3-widget.el (widget-image-value-create): use 'item widgets instead of
   'push-button widgets and specify the format ourselves so we don't get
   widget.el's arbitrary formatting.
 * mm.el added x-x509-ca-cert and x-x509-user-cert viewers but the tests
   will fail so no one should should see this change until i release the
   functions.
-	
+
 Fri Mar 21 18:52:31 1997  William M. Perry  <wmperry@aventail.com>
 
 * css.el (css-expand-length): Better support for percentage values in
 
 * url-vars.el: Removed obsolete variable url-use-hypertext-dired
 
-* url-file.el (url-dired-find-file-mouse): fixed bad typo of 
+* url-file.el (url-dired-find-file-mouse): fixed bad typo of
   (interactive...) spec, added documentation to a few functions.
   (url-file): Removed refs to obsolete variable url-use-hypertext-dired
 
 
 * url-file.el (url-file): Patch to tell ange-ftp and/or efs the password
   in a file/ftp URL so that you won't be prompted for the password, even
-  if one was specified in the URL 
+  if one was specified in the URL
 
 * url-parse.el (url-generic-parse-url): Fixed bug where specifying a
   username and password in the URL would downcase the username and
 Mon Dec 30 06:25:28 1996  William M. Perry  <wmperry@aventail.com>
 
 * w3-menu.el (w3-popup-menu): context-sensitive menus over delayed images
-  work again 
+  work again
 
 * w3-display.el (w3-parse-link): New way to store <link> information from
   an HTML document.
 
 Sun Dec 29 00:07:39 1996  Takahiro Hayata <hayata@sc511t.s.kobe-u.ac.jp>
 
-* mule-sysdp.el (mule-write-region-no-coding-system): Patch for Mule 2.3 
+* mule-sysdp.el (mule-write-region-no-coding-system): Patch for Mule 2.3
 
 Sun Dec 29 00:07:39 1996  William M. Perry  <wmperry@aventail.com>
 
 Thu Dec 19 13:52:35 1996  William Perry  <wmperry@aventail.com>
 
 * Emacs-W3 3.0.39 released
-	
+
 * w3-forms.el (w3-form-encode-xwfu): Ditto.
 
 * url.el (url-hexify-string): Updated to use url-unreserved-chars when
   (w3-display-table-dimensions): major bug if the last column rowspans
   (w3-table-lookup-char): new function
   (w3-table-hack-borders): new function makes table borders use pretty
-  graphic characters instead of ascii characters. 
+  graphic characters instead of ascii characters.
   (w3-table-unhack-borders): new function restore lame ascii borders.
   (w3-display-table): Major changes to support drawing better borders
   also fix various bugs and tweak various things.
 
 * w3-parse.el: remove = from set of characters that terminate an attribute
-               when guessing about an syntactically invalid attribute. 
+	       when guessing about an syntactically invalid attribute.
 	       (didn't this get changed once already?)
 
-* w3.el (w3-sentinel): hack around bug that bit w3-preview-this-buffer 
-                       but I don't know what the right thing for Mule.
+* w3.el (w3-sentinel): hack around bug that bit w3-preview-this-buffer
+		       but I don't know what the right thing for Mule.
 
 Thu Dec 12 08:36:01 1996  William Perry  <wmperry@aventail.com>
 * Synch'd up to widget 1.13
 * Emacs-w3 3.0.34 Released
 
 * w3-display.el: New macro w3-get-attribute to replace
-  (cdr (assq 'blah args)), just in case I ever decide to replace the 
+  (cdr (assq 'blah args)), just in case I ever decide to replace the
   assoc list currently used.
 
 * New file mule-sysdp.el, to make supporting Mule 2.3, Mule 2.4, and
 
 * docomp.el: increase max-specpdl-size so it can compile w3-display
 
-* url.el (url-sentinel): avoid save-excursion around switch-buffer 
+* url.el (url-sentinel): avoid save-excursion around switch-buffer
 
 * w3-display (w3-display-line-break): if we're in nowrap mode but the
   region doesn't end on a newline insert an extra newline, otherwise <br>
-  gets ignored inside a <pre> or nowrap environment. 
-  Also protect against fill-column less than the length of fill-prefix. 
+  gets ignored inside a <pre> or nowrap environment.
+  Also protect against fill-column less than the length of fill-prefix.
   Also avoid infloop in right justification, and
   fix bug that caused right justification to never be executed.
 
-* w3-display (table-cut table-dimensions w3-display-table): 
+* w3-display (table-cut table-dimensions w3-display-table):
   lots of new code to handle rowspan and autolayout.
 
 * (w3-display-fix-widgets): be more agressive adjust even markers that have
 
 * w3-display (w3-display-node): These changes are important for tables
   Don't insert insert-before on <a> tags before the class is adjusted
-  Don't insert more than one class into an <a> tag when we adjust it. 
+  Don't insert more than one class into an <a> tag when we adjust it.
   Protect against a negative fill-column when drawing <hr>s
   Set adaptive-fill-mode (what's filladapt-mode?)
 
   handling table cells whose first tag is a <font> without discarding the
   implied <p> tag.
 
-* w3-parse.el: skip-chars-forward "^>" when parsing end tags 
+* w3-parse.el: skip-chars-forward "^>" when parsing end tags
   (some people seem to think you can put attributes in end tags)
 
 Fri Dec  6 14:08:30 1996  William M. Perry  <wmperry@cs.indiana.edu>
 
 * css.el: Better handling of text-decoration, to go along with the new version
   of set-font-style-by-keywords
-	
+
 * font.el: Faster version of set-font-style-by-keywords.
   Fixed RGB spec. problem if you used non-floats.
 
 
 * w3-display.el: Implemented a few more CSS properties.
 list-style - control how list items are displayed.  Ordered lists are
-             now different from unordered only in their list-style.
-             Need to implement contextual selectors to get ordered
-             lists to work out of the box though.
+	     now different from unordered only in their list-style.
+	     Need to implement contextual selectors to get ordered
+	     lists to work out of the box though.
 white-space - control whether whitespace is collapsed or not, and
-              whether text is wrapped.  <pre> <xmp> and <plaintext>
-              are now all specified to use this in the default
-              stylesheet.
+	      whether text is wrapped.  <pre> <xmp> and <plaintext>
+	      are now all specified to use this in the default
+	      stylesheet.
 text-align - this replaces the old 'align' attribute
 
 Reimplemented inlined styles.
     ;; We have the old custom-library, hack around it!
     (defmacro defgroup (&rest args)
       nil)
-    (defmacro defcustom (var value doc &rest args) 
+    (defmacro defcustom (var value doc &rest args)
       (` (defvar (, var) (, value) (, doc))))))
 
 (defgroup ssl nil
   "Support for `Secure Sockets Layer' encryption."
   :group 'comm)
-  
+
 (defcustom ssl-certificate-directory "~/.w3/certs/"
   "*Directory to store CA certificates in"
   :group 'ssl
 The certificate is piped to it.
 Maybe a way of passing a file should be implemented"
   :group 'ssl
-  :type 'list)
+  :type '(repeat string))
 
 (defcustom ssl-certificate-directory-style 'ssleay
   "*Style of cert database to use, the only valid value right now is `ssleay'.
   "*Arguments that should be passed to the program `ssl-program-name'.
 This should be used if your SSL program needs command line switches to
 specify any behaviour (certificate file locations, etc).
-The special symbols 'host and 'port may be used in the list of arguments
-and will be replaced with the hostname and service/port that will be connected
-to."
+The special symbols 'host and 'service may be used in the list of
+arguments and will be replaced with the hostname and service/port that
+will be connected to."
   :group 'ssl
-  :type 'list)
+  :type '(repeat (choice string
+			 (const :tag "Host" :value host)
+			 (const :tag "Service" :value service)
+			 (const :tag "SSL certificate directory"
+				:value ssl-certificate-directory)
+			 sexp)))
 
 (defun ssl-certificate-information (der)
   "Return an assoc list of information about a certificate in DER format."
 	  (while (re-search-forward "^\\([^=\n\r]+\\)\\s *=\\s *\\(.*\\)" nil t)
 	    (push (cons (match-string 1) (match-string 2)) vals))
 	  vals)))))
-  
+
 (defun ssl-accept-ca-certificate ()
   "Ask if the user is willing to accept a new CA certificate. The buffer-name
 should be the intended name of the certificate, and the buffer should probably
   (let* ((process-connection-type nil)
 	 (tmpbuf (generate-new-buffer "X509 CA Certificate Information"))
 	 (response (save-excursion
-		     (and (eq 0 
+		     (and (eq 0
 			      (apply 'call-process-region
-				     (point-min) (point-max) 
-				     ssl-view-certificate-program-name 
+				     (point-min) (point-max)
+				     ssl-view-certificate-program-name
 				     nil tmpbuf t
 				     ssl-view-certificate-program-arguments))
 			  (switch-to-buffer tmpbuf)
 The special symbol 'file may be used in the list of arguments and will
 be replaced with the name of a file containing the commands to run a
 Java applet."
-  :type 'list
+  :type 'sexp
   :group 'w3-java)
 
 (defun w3-java-run-applet (options params)