diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/startup.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 13463107d2e..20f25a8de38 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -544,7 +544,11 @@ It is the default value of the variable `top-level'." (set-buffer elt) (if default-directory (setq default-directory - (decode-coding-string default-directory coding t))))) + (if (eq system-type 'windows-nt) + ;; Convert backslashes to forward slashes. + (expand-file-name + (decode-coding-string default-directory coding t)) + (decode-coding-string default-directory coding t)))))) ;; Decode all the important variables and directory lists, now ;; that we know the locale's encoding. This is because the @@ -1426,9 +1430,8 @@ settings will be marked as \"CHANGED outside of Customize\"." (put 'cursor 'face-modified t)))) (defcustom initial-scratch-message (purecopy "\ -;; This buffer is for notes you don't want to save, and for Lisp evaluation. -;; If you want to create a file, visit that file with \\[find-file], -;; then enter the text in that file's own buffer. +;; This buffer is for text that is not saved, and for Lisp evaluation. +;; To create a file, visit it with \\[find-file] and enter text in its buffer. ") "Initial documentation displayed in *scratch* buffer at startup. |