Mercurial > emacs
changeset 64519:a9ca2e64f9c1
(desktop-enable, desktop-basefilename): Declare with
`define-obsolete-variable-alias'.
(desktop-internal-v2s): Don't quote keywords.
(desktop-clear): "?\ " -> "?\s".
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 19 Jul 2005 23:41:06 +0000 |
| parents | 7b82147924c7 |
| children | a5708472e1f6 |
| files | lisp/desktop.el |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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)))