gergely/my-emacs-d
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix whitespaces in xdg-paths.el

Browse Source
This commit is contained in:
Gergely Polonkai 2019-09-09 17:44:32 +02:00
parent 26a65a7bd4
commit cf9dd26378
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lisp/xdg-paths.el
View File

@ -151,7 +151,7 @@ This directory is added to \\[load-path].")
If the command fails, return NIL." If the command fails, return NIL."
(let ((command (concat "xdg-user-dir " dirname))) (let ((command (concat "xdg-user-dir " dirname)))
(if (zerop (shell-command command)) (if (zerop (shell-command command))
(substring (shell-command-to-string command) 0 -1) (substring (shell-command-to-string command) 0 -1)
nil))) nil)))
@ -171,13 +171,13 @@ If 'documents, it will be located in user-documents-directory.
If the category is wrong, an error will be signaled. If the category is wrong, an error will be signaled.
" "
(expand-file-name filename (expand-file-name filename
(case type (case type
((nil data) user-emacs-data-directory) ((nil data) user-emacs-data-directory)
('config user-emacs-config-directory) ('config user-emacs-config-directory)
('lisp user-emacs-lisp-directory) ('lisp user-emacs-lisp-directory)
('cache user-emacs-cache-directory) ('cache user-emacs-cache-directory)
('documents user-documents-directory) ('documents user-documents-directory)
(t (error "The category %s is not valid" type))))) (t (error "The category %s is not valid" type)))))
(defun locate-user-config-file (filename) (defun locate-user-config-file (filename)
@ -208,10 +208,10 @@ it to `load-path`."
;; Set the default variables if they have no name. ;; Set the default variables if they have no name.
(macrolet ((setq-if-null (variable value) (macrolet ((setq-if-null (variable value)
`(if (null ,variable) `(if (null ,variable)
(setf ,variable ,value))) (setf ,variable ,value)))
(getdir (variable fallback) (getdir (variable fallback)
`(expand-file-name "emacs/" (or (getenv ,variable) ,fallback)))) `(expand-file-name "emacs/" (or (getenv ,variable) ,fallback))))
(setq-if-null user-emacs-config-directory (getdir "XDG_CONFIG_HOME" "~/.config/")) (setq-if-null user-emacs-config-directory (getdir "XDG_CONFIG_HOME" "~/.config/"))
(setq-if-null user-emacs-data-directory (getdir "XDG_DATA_HOME" "~/.local/share/")) (setq-if-null user-emacs-data-directory (getdir "XDG_DATA_HOME" "~/.local/share/"))
(setq-if-null user-emacs-cache-directory (getdir "XDG_CACHE_HOME" "~/.cache/")) (setq-if-null user-emacs-cache-directory (getdir "XDG_CACHE_HOME" "~/.cache/"))