aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2011-12-23 01:44:27 +0100
committerJuanma Barranquero2011-12-23 01:44:27 +0100
commit60ff536cc3ed1f53a6fd2d453894beca63888a72 (patch)
treed75d27f839b3e2c0894f75eb13f09ed82eb59591
parentdb7ab02fe1ddf4ba6a5d523c4462afdb3fd11dc5 (diff)
downloademacs-60ff536cc3ed1f53a6fd2d453894beca63888a72.tar.gz
emacs-60ff536cc3ed1f53a6fd2d453894beca63888a72.zip
lisp/desktop.el (desktop-internal-v2s): Fix typos in docstring (bug#10353).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/desktop.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2967979eff6..834244dcc72 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-12-23 Juanma Barranquero <lekktu@gmail.com>
2
3 * desktop.el (desktop-internal-v2s): Fix typos in docstring (bug#10353).
4
12011-12-22 Juri Linkov <juri@jurta.org> 52011-12-22 Juri Linkov <juri@jurta.org>
2 6
3 * progmodes/grep.el (rgrep): Fix docstring. (Bug#10185) 7 * progmodes/grep.el (rgrep): Fix docstring. (Bug#10185)
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 8a61bec0eea..34a51eb51dc 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -702,9 +702,9 @@ is nil, ask the user where to save the desktop."
702;; ---------------------------------------------------------------------------- 702;; ----------------------------------------------------------------------------
703(defun desktop-internal-v2s (value) 703(defun desktop-internal-v2s (value)
704 "Convert VALUE to a pair (QUOTE . TXT); (eval (read TXT)) gives VALUE. 704 "Convert VALUE to a pair (QUOTE . TXT); (eval (read TXT)) gives VALUE.
705TXT is a string that when read and evaluated yields value. 705TXT is a string that when read and evaluated yields VALUE.
706QUOTE may be `may' (value may be quoted), 706QUOTE may be `may' (value may be quoted),
707`must' (values must be quoted), or nil (value may not be quoted)." 707`must' (value must be quoted), or nil (value must not be quoted)."
708 (cond 708 (cond
709 ((or (numberp value) (null value) (eq t value) (keywordp value)) 709 ((or (numberp value) (null value) (eq t value) (keywordp value))
710 (cons 'may (prin1-to-string value))) 710 (cons 'may (prin1-to-string value)))