X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/59f7af816e98a74abf42d724bcfdfa9bfe9964ce..de27f8abfdf28005f578e316321e823337fecae3:/lisp/url/url-parse.el diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el index cb61a02125..1628290a35 100644 --- a/lisp/url/url-parse.el +++ b/lisp/url/url-parse.el @@ -1,6 +1,6 @@ ;;; url-parse.el --- Uniform Resource Locator parser -;; Copyright (C) 1996-1999, 2004-2012 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2004-2013 Free Software Foundation, Inc. ;; Keywords: comm, data, processes @@ -39,16 +39,17 @@ silent (use-cookies t)) (defsubst url-port (urlobj) - "Return the port number for the URL specified by URLOBJ." + "Return the port number for the URL specified by URLOBJ. +If the port spec is nil (i.e. URLOBJ specifies no port number), +return the default port number for URLOBJ's scheme." (declare (gv-setter (lambda (port) `(setf (url-portspec ,urlobj) ,port)))) (or (url-portspec urlobj) (if (url-type urlobj) (url-scheme-get-property (url-type urlobj) 'default-port)))) - (defun url-path-and-query (urlobj) "Return the path and query components of URLOBJ. -These two components are store together in the FILENAME slot of +These two components are stored together in the FILENAME slot of the object. The return value of this function is (PATH . QUERY), where each of PATH and QUERY are strings or nil." (let ((name (url-filename urlobj))