# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1121816466 0
# Node ID a9ca2e64f9c12d2b9123af2ea041a516acbf58ee
# Parent  7b82147924c70140b3072671e33adbfffc187374
(desktop-enable, desktop-basefilename): Declare with
`define-obsolete-variable-alias'.
(desktop-internal-v2s): Don't quote keywords.
(desktop-clear): "?\ " -> "?\s".

diff -r 7b82147924c7 -r a9ca2e64f9c1 lisp/desktop.el
--- a/lisp/desktop.el	Tue Jul 19 23:37:03 2005 +0000
+++ b/lisp/desktop.el	Tue Jul 19 23:41:06 2005 +0000
@@ -106,8 +106,7 @@
   :group 'desktop)
 
 ;; Maintained for backward compatibility
-(defvaralias 'desktop-enable 'desktop-save-mode)
-(make-obsolete-variable 'desktop-enable 'desktop-save-mode "22.1")
+(define-obsolete-variable-alias 'desktop-enable 'desktop-save-mode "22.1")
 
 (defcustom desktop-save 'ask-if-new
   "*Specifies whether the desktop should be saved when it is killed.
@@ -137,7 +136,7 @@
   "Name of file for Emacs desktop, excluding the directory part."
   :type 'file
   :group 'desktop)
-(defvaralias 'desktop-basefilename 'desktop-base-file-name)
+(define-obsolete-variable-alias 'desktop-basefilename 'desktop-base-file-name "22.1")
 
 (defcustom desktop-path '("." "~")
   "List of directories to search for the desktop file.
@@ -399,7 +398,7 @@
            (string-match desktop-clear-preserve-buffers-regexp bufname)
            (member bufname desktop-clear-preserve-buffers)
            ;; Don't kill buffers made for internal purposes.
-           (and (not (equal bufname "")) (eq (aref bufname 0) ?\ ))
+           (and (not (equal bufname "")) (eq (aref bufname 0) ?\s))
            (kill-buffer (car buffers))))
       (setq buffers (cdr buffers))))
   (delete-other-windows))
@@ -454,7 +453,7 @@
 QUOTE may be `may' (value may be quoted),
 `must' (values must be quoted), or nil (value may not be quoted)."
   (cond
-   ((or (numberp value) (null value) (eq t value))
+   ((or (numberp value) (null value) (eq t value) (keywordp value))
     (cons 'may (prin1-to-string value)))
    ((stringp value)
     (let ((copy (copy-sequence value)))