diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-14 02:51:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-14 02:51:30 -0800 |
| commit | 59815c02506eb39b61e672528ed03885749ba529 (patch) | |
| tree | 08770ed78fae3dc1a0996250d61e127ebfd135fd /lisp/url/url-cookie.el | |
| parent | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (diff) | |
| parent | 898169a2d88c3538cdfd41feb0b16267165065bd (diff) | |
| download | emacs-59815c02506eb39b61e672528ed03885749ba529.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/url/url-cookie.el')
| -rw-r--r-- | lisp/url/url-cookie.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index f8417791ce5..746a4dc77b5 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -316,7 +316,7 @@ telling Microsoft that." (set (if (> trusted untrusted) 'untrusted 'trusted) nil)) (cond (untrusted - ;; The site was explicity marked as untrusted by the user. + ;; The site was explicitly marked as untrusted by the user. nil) ((or (eq url-privacy-level 'paranoid) (and (listp url-privacy-level) (memq 'cookies url-privacy-level))) |