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 @@
+2014-04-27  Juri Linkov  <juri@jurta.org>
+
+        * desktop.el (desktop-value-to-string): Let-bind `print-length'
+        and `print-level' to nil.  (Bug#17351)
+
 2014-04-25  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
 
         * 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),
   "Convert VALUE to a string that when read evaluates to the same value.
 Not all types of values are supported."
   (let* ((print-escape-newlines t)
+         (print-length nil)
+         (print-level nil)
          (float-output-format nil)
          (quote.sexp (desktop--v2s value))
          (quote (car quote.sexp))
-         (txt
-          (let ((print-quoted t))
-            (prin1-to-string (cdr quote.sexp)))))
+         (print-quoted t)
+         (txt (prin1-to-string (cdr quote.sexp))))
     (if (eq quote 'must)
         (concat "'" txt)
       txt)))