(desktop-enable, desktop-basefilename): Declare with

`define-obsolete-variable-alias'.
(desktop-internal-v2s): Don't quote keywords.
(desktop-clear): "?\ " -> "?\s".

2 files changed, 20 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6511ab2cdd1..268547ca204 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,16 +1,27 @@
+2005-07-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop-enable, desktop-basefilename):
+        Declare with `define-obsolete-variable-alias'.
+        (desktop-internal-v2s): Don't quote keywords.
+        (desktop-clear): "?\ " -> "?\s".
+
+        * textmodes/org.el (org-table-formula-substitute-names)
+        (org-table-get-vertical-vector): Doc fixes.
+        (org-table-recalculate): Remove unused argument to `message'.
+
 2005-07-19  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: (org-table-column-names,
-        org-table-column-name-regexp)
+        * textmodes/org.el (org-table-column-names)
+        (org-table-column-name-regexp)
         (org-table-named-field-locations): New variables.
         (org-archive-subtree): Protect `this-command' when calling
         `org-copy-subtree' and `org-cut-subtree', to avoid appending to
         the kill buffer.
-        (org-complete): Removed fixed-formula completion.
+        (org-complete): Remove fixed-formula completion.
         (org-edit-formulas-map): New variable.
         (org-table-edit-formulas): New command.
-        (org-finish-edit-formulas, org-abort-edit-formulas,
-        org-show-variable, org-table-get-vertical-vector): New functions.
+        (org-finish-edit-formulas, org-abort-edit-formulas)
+        (org-show-variable, org-table-get-vertical-vector): New functions.
         (org-table-maybe-eval-formula): Handle `:=' fields.
         (org-table-get-stored-formulas, org-table-store-formulas)
         (org-table-get-formula, org-table-modify-formulas)
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 2c50f2323b2..d1673b0e7d1 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -106,8 +106,7 @@ desktop is saved."
   :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 @@ determine where the desktop is saved."
   "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 @@ variables listed in `desktop-globals-to-clear'."
            (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 @@ TXT is a string that when read and evaluated yields value.
 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)))