aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAurélien Aptel2012-08-06 17:50:25 -0400
committerStefan Monnier2012-08-06 17:50:25 -0400
commit5a4c42ba3066ef7403af30c404fbc4ab881e2573 (patch)
treef1eba5e1c84dec1992423182649f638e6dc0cebb /doc
parent074945e333a5f33616a2506f0728e5e42e8315de (diff)
downloademacs-5a4c42ba3066ef7403af30c404fbc4ab881e2573.tar.gz
emacs-5a4c42ba3066ef7403af30c404fbc4ab881e2573.zip
* doc/misc/url.texi (Parsed URLs): Adjust to the code's use of defstruct.
Fixes: debbugs:12096
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/url.texi35
2 files changed, 23 insertions, 17 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a4ecfab92fc..5a414e66f9a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12012-08-06 Aurélien Aptel <aurelien.aptel@gmail.com>
2
3 * url.texi (Parsed URLs): Adjust to the code's use of defstruct
4 (bug#12096).
5
12012-07-28 Eli Zaretskii <eliz@gnu.org> 62012-07-28 Eli Zaretskii <eliz@gnu.org>
2 7
3 * faq.texi (Right-to-left alphabets): Update for Emacs 24. 8 * faq.texi (Right-to-left alphabets): Update for Emacs 24.
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 680f1921479..898a9994a86 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -126,10 +126,10 @@ directory in @code{user-emacs-directory}, which is normally
126@section Parsed URLs 126@section Parsed URLs
127@cindex parsed URLs 127@cindex parsed URLs
128The library functions typically operate on @dfn{parsed} versions of 128The library functions typically operate on @dfn{parsed} versions of
129URLs. These are actually vectors of the form: 129URLs. These are actually CL structures (vectors) of the form:
130 130
131@example 131@example
132[@var{type} @var{user} @var{password} @var{host} @var{port} @var{file} @var{target} @var{attributes} @var{full}] 132[cl-struct-url @var{type} @var{user} @var{password} @var{host} @var{port} @var{filename} @var{target} @var{attributes} @var{fullness} @var{use-cookies}]
133@end example 133@end example
134 134
135@noindent where 135@noindent where
@@ -144,16 +144,19 @@ is the user password associated with it, or @code{nil};
144is the host name associated with it, or @code{nil}; 144is the host name associated with it, or @code{nil};
145@item port 145@item port
146is the port number associated with it, or @code{nil}; 146is the port number associated with it, or @code{nil};
147@item file 147@item filename
148is the ``file'' part of it, or @code{nil}. This doesn't necessarily 148is the ``file'' part of it, or @code{nil}. This doesn't necessarily
149actually refer to a file; 149actually refer to a file;
150@item target 150@item target
151is the target part, or @code{nil}; 151is the target part, or @code{nil};
152@item attributes 152@item attributes
153is the attributes associated with it, or @code{nil}; 153is the attributes associated with it, or @code{nil};
154@item full 154@item fullness
155is @code{t} for a fully-specified URL, with a host part indicated by 155is @code{t} for a fully-specified URL, with a host part indicated by
156@samp{//} after the scheme part. 156@samp{//} after the scheme part.
157@item use-cookies
158is @code{nil} to neither send or store cookies to the server, @code{t}
159otherwise.
157@end table 160@end table
158 161
159@findex url-type 162@findex url-type
@@ -161,23 +164,21 @@ is @code{t} for a fully-specified URL, with a host part indicated by
161@findex url-password 164@findex url-password
162@findex url-host 165@findex url-host
163@findex url-port 166@findex url-port
164@findex url-file 167@findex url-filename
165@findex url-target 168@findex url-target
166@findex url-attributes 169@findex url-attributes
167@findex url-full 170@findex url-fullness
168@findex url-set-type
169@findex url-set-user
170@findex url-set-password
171@findex url-set-host
172@findex url-set-port
173@findex url-set-file
174@findex url-set-target
175@findex url-set-attributes
176@findex url-set-full
177These attributes have accessors named @code{url-@var{part}}, where 171These attributes have accessors named @code{url-@var{part}}, where
178@var{part} is the name of one of the elements above, e.g., 172@var{part} is the name of one of the elements above, e.g.,
179@code{url-host}. Similarly, there are setters of the form 173@code{url-host}. These attributes can be set with the same accessors
180@code{url-set-@var{part}}. 174using @code{setf}:
175
176@example
177(setf (url-port url) 80)
178@end example
179
180If @var{port} is @var{nil}, @code{url-port} returns the default port
181of the protocol.
181 182
182There are functions for parsing and unparsing between the string and 183There are functions for parsing and unparsing between the string and
183vector forms. 184vector forms.