emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

caddr => cl-caddr

Browse source
This commit is contained in:
Henrik Lissner 2017-02-13 04:41:27 -05:00
parent 6f67dff8f2
commit b4e9f1312d
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/autoload/packages.el
View file

@ -230,7 +230,7 @@ appropriate."
(format "+ %s %s -> %s" (format "+ %s %s -> %s"
(s-pad-right (+ -max-len 2) " " (symbol-name (car pkg))) (s-pad-right (+ -max-len 2) " " (symbol-name (car pkg)))
(s-pad-right 14 " " (doom--version-list-str (cadr pkg))) (s-pad-right 14 " " (doom--version-list-str (cadr pkg)))
(doom--version-list-str (caddr pkg)))) (doom--version-list-str (cl-caddr pkg))))
(--sort (string-lessp (symbol-name (car it)) (--sort (string-lessp (symbol-name (car it))
(symbol-name (car other))) (symbol-name (car other)))
packages) packages)
@ -319,7 +319,7 @@ calls."
(if (y-or-n-p (format "%s will be updated from %s to %s. Update?" (if (y-or-n-p (format "%s will be updated from %s to %s. Update?"
(car desc) (car desc)
(doom--version-list-str (cadr desc)) (doom--version-list-str (cadr desc))
(doom--version-list-str (caddr desc)))) (doom--version-list-str (cl-caddr desc))))
(message "%s %s" (message "%s %s"
(if (doom-update-package package) (if (doom-update-package package)
"Updated" "Updated"

1
core/core-lib.el
View file

@ -3,6 +3,7 @@
(require 'dash) (require 'dash)
(require 's) (require 's)
(require 'f) (require 'f)
(eval-when-compile (require 'cl-lib))
(defvar __DIR__ nil "The directory of the currently loaded file (set by `@load')") (defvar __DIR__ nil "The directory of the currently loaded file (set by `@load')")
(defvar __FILE__ nil "The full path of the currently loaded file (set by `@load')") (defvar __FILE__ nil "The full path of the currently loaded file (set by `@load')")

2
modules/feature/evil/autoload/evil.el
View file

@ -10,7 +10,7 @@ flags."
"\\(\\(?::\\(?:[phtreS~.]\\|g?s[^: $]+\\)\\)*\\)")) "\\(\\(?::\\(?:[phtreS~.]\\|g?s[^: $]+\\)\\)*\\)"))
case-fold-search) case-fold-search)
(dolist (match (s-match-strings-all regexp file-name)) (dolist (match (s-match-strings-all regexp file-name))
(let ((flags (split-string (caddr match) ":" t)) (let ((flags (split-string (cl-caddr match) ":" t))
(path (file-relative-name (path (file-relative-name
(pcase (cadr match) (pcase (cadr match)
("@" (doom-project-root)) ("@" (doom-project-root))

4
modules/feature/file-templates/config.el
View file

@ -102,8 +102,8 @@
(require 'yasnippet) (require 'yasnippet)
(unless yas-minor-mode (unless yas-minor-mode
(yas-minor-mode-on)) (yas-minor-mode-on))
(let ((snippet (let ((template (cdar (mapcan #'(lambda (table) (yas--fetch table key)) (let ((snippet (let ((template (cdar (cl-mapcan #'(lambda (table) (yas--fetch table key))
(yas--get-snippet-tables mode))))) (yas--get-snippet-tables mode)))))
(if template (yas--template-content template) nil)))) (if template (yas--template-content template) nil))))
(when (and yas-minor-mode snippet) (when (and yas-minor-mode snippet)
(yas-expand-snippet snippet) (yas-expand-snippet snippet)