HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Silence some url compilation warnings on systems without zlib
[bpt/emacs.git]
/
lisp
/
url
/
url-vars.el
diff --git
a/lisp/url/url-vars.el
b/lisp/url/url-vars.el
index
42d3355
..
a34111c
100644
(file)
--- a/
lisp/url/url-vars.el
+++ b/
lisp/url/url-vars.el
@@
-1,6
+1,7
@@
;;; url-vars.el --- Variables for Uniform Resource Locator tool
;;; url-vars.el --- Variables for Uniform Resource Locator tool
-;; Copyright (C) 1996-1999, 2001, 2004-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2001, 2004-2013 Free Software Foundation,
+;; Inc.
;; Keywords: comm, data, processes, hypermedia
;; Keywords: comm, data, processes, hypermedia
@@
-21,8
+22,6
@@
;;; Code:
;;; Code:
-(require 'mm-util)
-
(defconst url-version "Emacs"
"Version number of URL package.")
(defconst url-version "Emacs"
"Version number of URL package.")
@@
-62,7
+61,6
@@
(mapc 'make-variable-buffer-local
'(
url-current-object
(mapc 'make-variable-buffer-local
'(
url-current-object
- url-current-referer
url-current-mime-headers
))
url-current-mime-headers
))
@@
-155,7
+153,8
@@
variable."
(".uue" . "x-uuencoded")
(".hqx" . "x-hqx")
(".Z" . "x-compress")
(".uue" . "x-uuencoded")
(".hqx" . "x-hqx")
(".Z" . "x-compress")
- (".bz2" . "x-bzip2"))
+ (".bz2" . "x-bzip2")
+ (".xz" . "x-xz"))
"An alist of file extensions and appropriate content-transfer-encodings."
:type '(repeat (cons :format "%v"
(string :tag "Extension")
"An alist of file extensions and appropriate content-transfer-encodings."
:type '(repeat (cons :format "%v"
(string :tag "Extension")
@@
-211,9
+210,13
@@
Should be an assoc list of headers/contents.")
(defvar url-request-method nil "The method to use for the next request.")
(defvar url-request-method nil "The method to use for the next request.")
-;; FIXME!! (RFC 2616 gives examples like `compress, gzip'.)
-(defvar url-mime-encoding-string nil
- "*String to send in the Accept-encoding: field in HTTP requests.")
+(defvar url-mime-encoding-string (and (fboundp 'zlib-available-p)
+ (zlib-available-p)
+ "gzip")
+ "String to send in the Accept-encoding: field in HTTP requests.")
+
+(defvar mm-mime-mule-charset-alist)
+(declare-function mm-coding-system-p "mm-util" (cs))
;; Perhaps the first few should actually be given decreasing `q's and
;; the list should be trimmed significantly.
;; Perhaps the first few should actually be given decreasing `q's and
;; the list should be trimmed significantly.
@@
-222,6
+225,7
@@
Should be an assoc list of headers/contents.")
(defun url-mime-charset-string ()
"Generate a list of preferred MIME charsets for HTTP requests.
Generated according to current coding system priorities."
(defun url-mime-charset-string ()
"Generate a list of preferred MIME charsets for HTTP requests.
Generated according to current coding system priorities."
+ (require 'mm-util)
(if (fboundp 'sort-coding-systems)
(let ((ordered (sort-coding-systems
(let (accum)
(if (fboundp 'sort-coding-systems)
(let ((ordered (sort-coding-systems
(let (accum)
@@
-234,7
+238,7
@@
Generated according to current coding system priorities."
";q=0.5"))))
(defvar url-mime-charset-string nil
";q=0.5"))))
(defvar url-mime-charset-string nil
- "
*
String to send in the Accept-charset: field in HTTP requests.
+ "String to send in the Accept-charset: field in HTTP requests.
The MIME charset corresponding to the most preferred coding system is
given priority 1 and the rest are given priority 0.5.")
The MIME charset corresponding to the most preferred coding system is
given priority 1 and the rest are given priority 0.5.")
@@
-305,8
+309,12
@@
undefined."
:type '(choice (const :tag "None" :value nil) string)
:group 'url)
:type '(choice (const :tag "None" :value nil) string)
:group 'url)
+;; From RFC3986: Scheme names consist of a sequence of characters
+;; beginning with a letter and followed by any combination of letters,
+;; digits, plus ("+"), period ("."), or hyphen ("-").
+
(defvar url-nonrelative-link
(defvar url-nonrelative-link
- "\\`\\([
-a-zA-Z0-9+.]+
:\\)"
+ "\\`\\([
a-zA-Z][-a-zA-Z0-9+.]*
:\\)"
"A regular expression that will match an absolute URL.")
(defcustom url-max-redirections 30
"A regular expression that will match an absolute URL.")
(defcustom url-max-redirections 30
@@
-335,7
+343,7
@@
Currently supported methods:
`socks': Connect through a socks server;
`tls': Connect with TLS;
`ssl': Connect with SSL (deprecated, use `tls' instead);
`socks': Connect through a socks server;
`tls': Connect with TLS;
`ssl': Connect with SSL (deprecated, use `tls' instead);
-`native': Connect directy."
+`native': Connect direct
l
y."
:type '(radio (const :tag "Telnet to gateway host" :value telnet)
(const :tag "Rlogin to gateway host" :value rlogin)
(const :tag "Use SOCKS proxy" :value socks)
:type '(radio (const :tag "Telnet to gateway host" :value telnet)
(const :tag "Rlogin to gateway host" :value rlogin)
(const :tag "Use SOCKS proxy" :value socks)
@@
-365,7
+373,7
@@
Currently supported methods:
(defvar url-parse-syntax-table
(copy-syntax-table emacs-lisp-mode-syntax-table)
(defvar url-parse-syntax-table
(copy-syntax-table emacs-lisp-mode-syntax-table)
- "
*
A syntax table for parsing URLs.")
+ "A syntax table for parsing URLs.")
(modify-syntax-entry ?' "\"" url-parse-syntax-table)
(modify-syntax-entry ?` "\"" url-parse-syntax-table)
(modify-syntax-entry ?' "\"" url-parse-syntax-table)
(modify-syntax-entry ?` "\"" url-parse-syntax-table)
@@
-373,8
+381,10
@@
Currently supported methods:
(modify-syntax-entry ?> ")<" url-parse-syntax-table)
(modify-syntax-entry ?/ " " url-parse-syntax-table)
(modify-syntax-entry ?> ")<" url-parse-syntax-table)
(modify-syntax-entry ?/ " " url-parse-syntax-table)
-(defvar url-load-hook nil
- "*Hooks to be run after initializing the URL library.")
+(defcustom url-load-hook nil
+ "Hook run after initializing the URL library."
+ :group 'url
+ :type 'hook)
;;; Make OS/2 happy - yeeks
;; (defvar tcp-binary-process-input-services nil
;;; Make OS/2 happy - yeeks
;; (defvar tcp-binary-process-input-services nil