diff options
author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/url/url-util.el | |
parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
download | emacs-25-merge.tar.gz |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/url/url-util.el')
-rw-r--r-- | lisp/url/url-util.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index 54b02e98c97..65a24a5bbb7 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el @@ -160,7 +160,7 @@ conversion. Replaces these characters as follows: ;;;###autoload (defun url-normalize-url (url) - "Return a 'normalized' version of URL. + "Return a \"normalized\" version of URL. Strips out default port numbers, etc." (let (type data retval) (setq data (url-generic-parse-url url) @@ -188,7 +188,7 @@ Will not do anything if `url-show-status' is nil." ;;;###autoload (defun url-get-normalized-date (&optional specified-time) - "Return a 'real' date string that most HTTP servers can understand." + "Return a date string that most HTTP servers can understand." (let ((system-time-locale "C")) (format-time-string "%a, %d %b %Y %T GMT" specified-time t))) |