Commit fbe58183 authored by Karl Heuer's avatar Karl Heuer

(desktop-internal-v2s): Make structure match docstring.

parent 6a608e8e
...@@ -191,7 +191,7 @@ If the function returns t then the buffer is considered created.") ...@@ -191,7 +191,7 @@ If the function returns t then the buffer is considered created.")
;; ---------------------------------------------------------------------------- ;; ----------------------------------------------------------------------------
(defun desktop-internal-v2s (val) (defun desktop-internal-v2s (val)
"Convert VALUE to a pair (quote . txt) where txt is a string that when read "Convert VALUE to a pair (quote . txt) where txt is a string that when read
and evaluated yields value. quote may be 'may (value may be quoted), and evaluated yields value. quote may be 'may (value may be quoted),
'must (values must be quoted), or nil (value may not be quoted)." 'must (values must be quoted), or nil (value may not be quoted)."
(cond (cond
((or (numberp val) (stringp val) (null val) (eq t val)) ((or (numberp val) (stringp val) (null val) (eq t val))
...@@ -222,13 +222,13 @@ and evaluated yields value. quote may be 'may (value may be quoted), ...@@ -222,13 +222,13 @@ and evaluated yields value. quote may be 'may (value may be quoted),
(cdr-q.txt (desktop-internal-v2s (cdr val)))) (cdr-q.txt (desktop-internal-v2s (cdr val))))
(cond (cond
((or (null (car car-q.txt)) (null (car cdr-q.txt))) ((or (null (car car-q.txt)) (null (car cdr-q.txt)))
(cons nil (concat "(cons " (cons nil (concat "(cons "
(if (eq (car car-q.txt) 'must) "'") (if (eq (car car-q.txt) 'must) "'")
(cdr car-q.txt) " " (cdr car-q.txt) " "
(if (eq (car cdr-q.txt) 'must) "'") (if (eq (car cdr-q.txt) 'must) "'")
(cdr cdr-q.txt) ")"))) (cdr cdr-q.txt) ")")))
((consp (cdr val)) ((consp (cdr val))
(cons 'must (concat "(" (cdr car-q.txt) (cons 'must (concat "(" (cdr car-q.txt)
" " (substring (cdr cdr-q.txt) 1 -1) ")"))) " " (substring (cdr cdr-q.txt) 1 -1) ")")))
((null (cdr val)) ((null (cdr val))
(cons 'must (concat "(" (cdr car-q.txt) ")"))) (cons 'must (concat "(" (cdr car-q.txt) ")")))
...@@ -246,7 +246,7 @@ and evaluated yields value. quote may be 'may (value may be quoted), ...@@ -246,7 +246,7 @@ and evaluated yields value. quote may be 'may (value may be quoted),
" (list 'lambda '() (list 'set-marker mk " " (list 'lambda '() (list 'set-marker mk "
pos " (get-buffer " buf ")))) mk)")))) pos " (get-buffer " buf ")))) mk)"))))
(t ; save as text (t ; save as text
(prin1-to-string (prin1-to-string val))))) (cons nil (prin1-to-string (prin1-to-string val))))))
(defun desktop-value-to-string (val) (defun desktop-value-to-string (val)
"Convert VALUE to a string that when read evaluates to the same value. Not "Convert VALUE to a string that when read evaluates to the same value. Not
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment