Commit b4784440 authored by Stephen Leake's avatar Stephen Leake

Enhance 'pcomplete/make' to complete on targets in included makefiles

* lisp/pcmpl-gnu.el (pcmpl-gnu-makefile-includes): New.
(pcmpl-gnu-make-targets): New, factored out of pcmpl-gnu-make-all-targets.
(pcmpl-gnu-make-includes): New.
(pcmpl-gnu-make-all-targets): Use new functions.
parent 3d442312
......@@ -1456,6 +1456,11 @@ available for output of asynchronous shell commands.
*** The function 'pcomplete-uniquify-list' has been renamed from
*** 'pcomplete/make' now completes on targets in included files, recursively.
To recover the previous behavior, set new user option
`pcmpl-gnu-makefile-includes' to nil.
** Auth-source
......@@ -40,6 +40,13 @@
:type '(repeat regexp)
:group 'pcmpl-gnu)
(defcustom pcmpl-gnu-makefile-includes t
"If non-nil, `pcomplete/make' completes on targets in included files."
:type 'boolean
:group 'pcmpl-gnu
:version 27.1
:safe 'booleanp)
;; Functions:
......@@ -108,8 +115,41 @@
"Return a list of possible makefile names."
(pcomplete-entries (mapconcat 'identity pcmpl-gnu-makefile-regexps "\\|")))
(defun pcmpl-gnu-make-targets (targets)
"Add to TARGETS the list of makefile targets in the current buffer.
Return the new list."
(goto-char (point-min))
(while (re-search-forward
"^\\s-*\\([^\n#%.$][^:=\n]*\\)\\s-*:[^=]" nil t)
(setq targets (nconc (split-string (match-string-no-properties 1))
(defun pcmpl-gnu-make-includes ()
"Return a list of all included file names in the current buffer."
(let (filenames)
(goto-char (point-min))
(while (search-forward-regexp "^include +\\(.*\\)$" nil t)
(push (match-string-no-properties 1) filenames))
(defun pcmpl-gnu-make-all-targets (makefile targets)
"Add to TARGETS the list of target names in MAKEFILE and files it includes.
Return the new list."
(with-demoted-errors ;Could be a directory or something.
(insert-file-contents makefile))
(let ((filenames (when pcmpl-gnu-makefile-includes (pcmpl-gnu-make-includes))))
(setq targets (pcmpl-gnu-make-targets targets))
(dolist (file filenames)
(when (file-readable-p file)
(setq targets (pcmpl-gnu-make-all-targets file targets))))
(defun pcmpl-gnu-make-rule-names ()
"Return a list of possible make rule names in MAKEFILE."
"Return a list of possible make targets in a makefile in the current directory."
(let* ((minus-f (member "-f" pcomplete-args))
(makefile (or (cadr minus-f)
......@@ -119,12 +159,7 @@
(if (not (file-readable-p makefile))
(unless minus-f (list "-f"))
(ignore-errors ;Could be a directory or something.
(insert-file-contents makefile))
(while (re-search-forward
(concat "^\\s-*\\([^\n#%.$][^:=\n]*\\)\\s-*:[^=]") nil t)
(setq rules (append (split-string (match-string 1)) rules))))
(setq rules (pcmpl-gnu-make-all-targets makefile rules))
(pcomplete-uniquify-list rules))))
(defcustom pcmpl-gnu-tarfile-regexp
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment