Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to cl-lib #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to cl-lib #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions auto-complete-c-headers.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
;;; Code:

;; For `remove-duplicates'
(require 'cl)
(require 'cl-lib)
(require 'auto-complete)
(require 'tramp)

Expand Down Expand Up @@ -71,7 +71,7 @@ please consider to make your own function and set it to
(defun achead:get-include-directories-from-options (cmd-line-options)
"Extract include directory names from command line options
like (\"-I~/.local/include/\" \"-I~/src/include/\")."
(loop for option in cmd-line-options
(cl-loop for option in cmd-line-options
when (let (case-fold-search)
(string-match "^-I\\(.*\\)" option))
collect (match-string 1 option)))
Expand All @@ -89,7 +89,7 @@ please consider to make your own function and set it to

(defun achead:path-should-be-displayed (path)
"Decide `path' should be displayed as a candidate."
(loop for include-pattern in achead:include-patterns
(cl-loop for include-pattern in achead:include-patterns
when (string-match-p include-pattern path)
return t))

Expand All @@ -99,11 +99,11 @@ enabled for directories returned by
`achead:get-include-directories-function'."
(let ((remote (and achead:inspect-remote-directories
(file-remote-p default-directory))))
(loop with dir-suffix = (or basedir "")
with include-base-dirs = (delete-duplicates (funcall achead:get-include-directories-function)
(cl-loop with dir-suffix = (or basedir "")
with include-base-dirs = (cl-delete-duplicates (funcall achead:get-include-directories-function)
:test 'string=)
for include-base in include-base-dirs
append (loop with dir = (file-name-directory (concat (file-name-as-directory include-base)
append (cl-loop with dir = (file-name-directory (concat (file-name-as-directory include-base)
dir-suffix))
with files = (achead:file-list-for-directory (concat remote dir))
for file in files
Expand Down Expand Up @@ -138,7 +138,7 @@ just returns the path and content of the header file which
"Candidate-collecting function for `auto-complete'."
(ignore-errors
(setq achead:ac-latest-results-alist (achead:get-include-file-candidates (file-name-directory ac-prefix)))
(loop for (candidate . path) in achead:ac-latest-results-alist
(cl-loop for (candidate . path) in achead:ac-latest-results-alist
collect candidate)))

(ac-define-source c-headers
Expand Down