aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Oteiza2017-09-06 11:20:21 -0400
committerMark Oteiza2017-09-06 11:20:21 -0400
commitda3e1016349b2f552f149ccf577b60e377c3095a (patch)
treed8f7f876271a492cad7854904247b36a5d175f03
parent01a82957d25e7fc3fe4ec799f3c05f22a4278428 (diff)
downloademacs-da3e1016349b2f552f149ccf577b60e377c3095a.tar.gz
emacs-da3e1016349b2f552f149ccf577b60e377c3095a.zip
; Try not to affect match data
* lisp/xdg.el (xdg-user-dir): Use save-match-data.
-rw-r--r--lisp/xdg.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/xdg.el b/lisp/xdg.el
index 4973065f91a..916de00d5e2 100644
--- a/lisp/xdg.el
+++ b/lisp/xdg.el
@@ -140,9 +140,10 @@ This should be called at the beginning of a line."
140(defun xdg-user-dir (name) 140(defun xdg-user-dir (name)
141 "Return the path of user directory referred to by NAME." 141 "Return the path of user directory referred to by NAME."
142 (when (null xdg-user-dirs) 142 (when (null xdg-user-dirs)
143 (setq xdg-user-dirs 143 (save-match-data
144 (xdg--user-dirs-parse-file 144 (setq xdg-user-dirs
145 (expand-file-name "user-dirs.dirs" (xdg-config-home))))) 145 (xdg--user-dirs-parse-file
146 (expand-file-name "user-dirs.dirs" (xdg-config-home))))))
146 (let ((dir (cdr (assoc name xdg-user-dirs)))) 147 (let ((dir (cdr (assoc name xdg-user-dirs))))
147 (when dir (expand-file-name dir)))) 148 (when dir (expand-file-name dir))))
148 149