[Emacs-diffs] Changes to emacs/lisp/desktop.el

[Juanma Barranquero]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.86 emacs/lisp/desktop.el:1.87
*** emacs/lisp/desktop.el:1.86  Tue Jul 19 09:52:55 2005
--- emacs/lisp/desktop.el       Tue Jul 19 23:41:06 2005
***************
*** 106,113 ****
    :group 'desktop)
  
  ;; Maintained for backward compatibility
! (defvaralias 'desktop-enable 'desktop-save-mode)
! (make-obsolete-variable 'desktop-enable 'desktop-save-mode "22.1")
  
  (defcustom desktop-save 'ask-if-new
    "*Specifies whether the desktop should be saved when it is killed.
--- 106,112 ----
    :group 'desktop)
  
  ;; Maintained for backward compatibility
! (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,143 ****
    "Name of file for Emacs desktop, excluding the directory part."
    :type 'file
    :group 'desktop)
! (defvaralias 'desktop-basefilename 'desktop-base-file-name)
  
  (defcustom desktop-path '("." "~")
    "List of directories to search for the desktop file.
--- 136,142 ----
    "Name of file for Emacs desktop, excluding the directory part."
    :type 'file
    :group 'desktop)
! (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,405 ****
             (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) ?\ ))
             (kill-buffer (car buffers))))
        (setq buffers (cdr buffers))))
    (delete-other-windows))
--- 398,404 ----
             (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) ?\s))
             (kill-buffer (car buffers))))
        (setq buffers (cdr buffers))))
    (delete-other-windows))
***************
*** 454,460 ****
  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))
      (cons 'may (prin1-to-string value)))
     ((stringp value)
      (let ((copy (copy-sequence value)))
--- 453,459 ----
  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) (keywordp value))
      (cons 'may (prin1-to-string value)))
     ((stringp value)
      (let ((copy (copy-sequence value)))