aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorIvan Shmakov2015-01-17 18:42:31 +0000
committerIvan Shmakov2015-01-17 19:32:26 +0000
commit22441b69cb6b81b7bf8914556563087ec6d5def3 (patch)
tree871823e91226587ecf30175628cd880a767e06c0 /lisp
parentca80ebc736346e196badd95ac524150b5c318683 (diff)
downloademacs-22441b69cb6b81b7bf8914556563087ec6d5def3.tar.gz
emacs-22441b69cb6b81b7bf8914556563087ec6d5def3.zip
Ignore print-length and print-level while formatting url-cookie data.
* lisp/url/url-cookie.el (url-cookie-write-file): Let-bind print-length and print-level to nil to avoid writing a garbled list. Fixes: debbugs:16805
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/url/url-cookie.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82cb1fa00b7..9e3cedd50a1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-01-17 Ivan Shmakov <ivan@siamics.net>
2
3 * url/url-cookie.el (url-cookie-write-file): Let-bind print-length
4 and print-level to nil to avoid writing a garbled list. (Bug#16805)
5
12015-01-17 Stefan Monnier <monnier@iro.umontreal.ca> 62015-01-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * emacs-lisp/eieio-core.el (eieio--class-constructor): Rename from 8 * emacs-lisp/eieio-core.el (eieio--class-constructor): Rename from
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index ccb2606c528..a7b3d16d46d 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -104,9 +104,10 @@ telling Microsoft that."
104 (insert ";; Emacs-W3 HTTP cookies file\n" 104 (insert ";; Emacs-W3 HTTP cookies file\n"
105 ";; Automatically generated file!!! DO NOT EDIT!!!\n\n" 105 ";; Automatically generated file!!! DO NOT EDIT!!!\n\n"
106 "(setq url-cookie-storage\n '") 106 "(setq url-cookie-storage\n '")
107 (pp url-cookie-storage (current-buffer)) 107 (let ((print-length nil) (print-level nil))
108 (insert ")\n(setq url-cookie-secure-storage\n '") 108 (pp url-cookie-storage (current-buffer))
109 (pp url-cookie-secure-storage (current-buffer)) 109 (insert ")\n(setq url-cookie-secure-storage\n '")
110 (pp url-cookie-secure-storage (current-buffer)))
110 (insert ")\n") 111 (insert ")\n")
111 (insert " \n;; Local Variables:\n" 112 (insert " \n;; Local Variables:\n"
112 ";; version-control: never\n" 113 ";; version-control: never\n"