* lisp/startup.el (command-line): Make sure 'user-emacs-directory'
has the form of a directory.
(setq init-file-user nil))
((member argi '("-init-directory"))
(setq user-emacs-directory (or argval (pop args))
+ user-emacs-directory (if (stringp user-emacs-directory)
+ (file-name-as-directory
+ user-emacs-directory)
+ user-emacs-directory)
argval nil))
((member argi '("-u" "-user"))
(setq init-file-user (or argval (pop args))