aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2014-04-27 11:22:11 +0300
committerJuri Linkov2014-04-27 11:22:11 +0300
commit8e554df009bc64b4e5e75028f36c397ba78596b4 (patch)
tree530ee9f2833d62d279319a2a1ce17f77c1a98e8a
parent5d46972532b89f90bfde68953cc95889851ee005 (diff)
downloademacs-8e554df009bc64b4e5e75028f36c397ba78596b4.tar.gz
emacs-8e554df009bc64b4e5e75028f36c397ba78596b4.zip
* lisp/desktop.el (desktop-value-to-string): Let-bind `print-length' and `print-level' to nil.
Fixes: debbugs:17351
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/desktop.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9943884c372..94a80120ed8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-04-27 Juri Linkov <juri@jurta.org>
2
3 * desktop.el (desktop-value-to-string): Let-bind `print-length'
4 and `print-level' to nil. (Bug#17351)
5
12014-04-25 Nicolas Richard <theonewiththeevillook@yahoo.fr> 62014-04-25 Nicolas Richard <theonewiththeevillook@yahoo.fr>
2 7
3 * battery.el (battery-update): Handle the case where battery 8 * battery.el (battery-update): Handle the case where battery
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 5e43c03ade7..ded73c065f0 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -844,12 +844,13 @@ QUOTE may be `may' (value may be quoted),
844 "Convert VALUE to a string that when read evaluates to the same value. 844 "Convert VALUE to a string that when read evaluates to the same value.
845Not all types of values are supported." 845Not all types of values are supported."
846 (let* ((print-escape-newlines t) 846 (let* ((print-escape-newlines t)
847 (print-length nil)
848 (print-level nil)
847 (float-output-format nil) 849 (float-output-format nil)
848 (quote.sexp (desktop--v2s value)) 850 (quote.sexp (desktop--v2s value))
849 (quote (car quote.sexp)) 851 (quote (car quote.sexp))
850 (txt 852 (print-quoted t)
851 (let ((print-quoted t)) 853 (txt (prin1-to-string (cdr quote.sexp))))
852 (prin1-to-string (cdr quote.sexp)))))
853 (if (eq quote 'must) 854 (if (eq quote 'must)
854 (concat "'" txt) 855 (concat "'" txt)
855 txt))) 856 txt)))