[Emacs-diffs] scratch/raeburn-startup 2653005 5/7: Support dumping variable aliases.

[Ken Raeburn]

branch: scratch/raeburn-startup
commit 2653005f2aa7d15680caf0e986f58dde3586cb1a
Author: Ken Raeburn <address@hidden>
Commit: Ken Raeburn <address@hidden>

    Support dumping variable aliases.
    
    * lisp/loadup.el: If a variable is an alias, emit a defvaralias
    command, and don't process its default value.
---
 lisp/loadup.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 0d67323..9379057 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -506,6 +506,9 @@ lost after dumping")))
                    (push `(fset ',s (symbol-function ',(intern (subr-name 
(symbol-function s))))) cmds))
                (push `(fset ',s ,(macroexp-quote (symbol-function s)))
                      cmds)))
+           (if (not (eq (indirect-variable s) s))
+               (push `(defvaralias ',s ',(indirect-variable s))
+                     cmds))
            (when (and (default-boundp s)
                       (not (macroexp--const-symbol-p s 'any-value))
                       ;; I think we don't need/want these!
@@ -524,8 +527,8 @@ lost after dumping")))
                                      charsets charset-aliases unified-charsets
                                      abbrev-tables abbrev-counter
                                      abbrev-make-cmds abbrev-assign-cmds
-                                     cmds))))
-             ;; FIXME: Handle varaliases!
+                                     cmds)))
+                      (eq (indirect-variable s) s))
              (let ((v (default-value s)))
                (push `(set-default
                        ',s