mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-16 00:40:06 +00:00

Remove a few redundant `:group` arguments as well. * lisp/cedet/ede.el: Use lexical-binding. Don't load `ede/files` at compile-time. (ede-speedbar): Declare function. (ede-load-project-file): Allow `rootreturn` to be a reference rather than a symbol. (ede-initialize-state-current-buffer): Pass `ROOT` as a reference rather than a symbol to `ede-directory-get-open-project` and `ede-load-project-file` so we don't need to make it dynamically scoped. (ede-flush-deleted-projects): Avoid `add-to-list` on a local var. * lisp/cedet/ede/files.el: Use lexical-binding. (ede-directory-get-open-project): Allow `rootreturn` to be a reference rather than a symbol. (ede-project-root-directory): Remove unused var `root`. (ede-expand-filename-impl): Remove unused vars `path` and `proj`. * lisp/cedet/cedet-idutils.el: Use lexical-binding. (cedet-idutils-search): Remove always-nil variable `scopeflags`. * lisp/cedet/data-debug.el: Use lexical-binding. (data-debug-insert-overlay-button, data-debug-insert-overlay-list-button) (data-debug-insert-buffer-button, data-debug-insert-buffer-list-button) (data-debug-insert-process-button): Remove always-nil variable `tip`. (data-debug-insert-ring-button): Remove unused var `ringthing`. (data-debug-insert-widget-properties): Remove unused var `type`. * lisp/cedet/semantic.el: Use lexical-binding. (semantic-mode): Strength-reduce `eval` to `symbol-value`. * lisp/cedet/ede/custom.el: Use lexical-binding. (ede-project-sort-targets): Remove unused vars `count`, `current`, and `order`. * lisp/cedet/ede/pconf.el: Use lexical-binding. (ede-proj-configure-synchronize): Remove unused var `add-missing`. * lisp/cedet/ede/pmake.el (ede-proj-makefile-garbage-patterns): Simplify via η-reduction. (ede-proj-makefile-dependencies): Use `seq-some` rather than `eval+or`. * lisp/cedet/ede/proj-elisp.el: Use lexical-binding. (project-compile-target): Remove unused var `elc`. (ede-update-version-in-source): Remove unused var `match`. (project-compile-target): Declare function `cedet-update-autoloads` from file we don't have. * lisp/cedet/cedet-cscope.el: Use lexical-binding. * lisp/cedet/cedet-files.el: Use lexical-binding. * lisp/cedet/cedet-global.el: Use lexical-binding. * lisp/cedet/cedet.el: Use lexical-binding. * lisp/cedet/ede/auto.el: Use lexical-binding. * lisp/cedet/ede/autoconf-edit.el: Use lexical-binding. * lisp/cedet/ede/config.el: Use lexical-binding. * lisp/cedet/ede/cpp-root.el: Use lexical-binding. * lisp/cedet/ede/detect.el: Use lexical-binding. * lisp/cedet/ede/generic.el: Use lexical-binding. * lisp/cedet/ede/linux.el: Use lexical-binding. * lisp/cedet/ede/locate.el: Use lexical-binding. * lisp/cedet/ede/makefile-edit.el: Use lexical-binding. * lisp/cedet/ede/proj-info.el: Use lexical-binding. * lisp/cedet/ede/proj-obj.el: Use lexical-binding. * lisp/cedet/ede/proj-prog.el: Use lexical-binding. * lisp/cedet/ede/proj-shared.el: Use lexical-binding. * lisp/cedet/ede/proj.el: Use lexical-binding. * lisp/cedet/ede/shell.el: Use lexical-binding. * lisp/cedet/ede/simple.el: Use lexical-binding. * lisp/cedet/ede/source.el: Use lexical-binding. * lisp/cedet/ede/speedbar.el: Use lexical-binding. * lisp/cedet/ede/util.el: Use lexical-binding.
131 lines
4 KiB
EmacsLisp
131 lines
4 KiB
EmacsLisp
;;; makefile-edit.el --- Makefile editing/scanning commands. -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2009-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;;
|
|
;; Utilities for editing a Makefile for EDE Makefile management commands.
|
|
;;
|
|
;; Derived from project-am.el.
|
|
;;
|
|
;; Makefile editing and scanning commands
|
|
;;
|
|
;; Formatting of a makefile
|
|
;;
|
|
;; 1) Creating an automakefile, stick in a top level comment about
|
|
;; being created by emacs
|
|
;; 2) Leave order of variable contents alone, except for SOURCE
|
|
;; SOURCE always keep in the order of .c, .h, the other stuff.
|
|
|
|
;;; Things to do
|
|
;; makefile-fill-paragraph -- refill a macro w/ backslashes
|
|
;; makefile-insert-macro -- insert "foo = "
|
|
|
|
|
|
;;; Code:
|
|
|
|
(defun makefile-beginning-of-command ()
|
|
"Move to the beginning of the current command."
|
|
(interactive)
|
|
(if (save-excursion
|
|
(forward-line -1)
|
|
(makefile-line-continued-p))
|
|
(forward-line -1))
|
|
(beginning-of-line)
|
|
(if (not (makefile-line-continued-p))
|
|
nil
|
|
(while (and (makefile-line-continued-p)
|
|
(not (bobp)))
|
|
(forward-line -1))
|
|
(forward-line 1)))
|
|
|
|
(defun makefile-end-of-command ()
|
|
"Move to the end of the current command."
|
|
(interactive)
|
|
(end-of-line)
|
|
(while (and (makefile-line-continued-p)
|
|
(not (eobp)))
|
|
(forward-line 1)
|
|
(end-of-line)))
|
|
|
|
(defun makefile-line-continued-p ()
|
|
"Return non-nil if the current line ends in continuation."
|
|
(save-excursion
|
|
(end-of-line)
|
|
(= (preceding-char) ?\\)))
|
|
|
|
;;; Programmatic editing of a Makefile
|
|
;;
|
|
(defun makefile-move-to-macro (macro &optional next)
|
|
"Move to the definition of MACRO. Return t if found.
|
|
If NEXT is non-nil, move to the next occurrence of MACRO."
|
|
(let ((oldpt (point)))
|
|
(when (not next) (goto-char (point-min)))
|
|
(if (re-search-forward (concat "^\\s-*" (regexp-quote macro) "\\s-*[+:?]?=")
|
|
nil t)
|
|
t
|
|
(goto-char oldpt)
|
|
nil)))
|
|
|
|
(defun makefile-navigate-macro (stop-before)
|
|
"In a list of files, move forward until STOP-BEFORE is reached.
|
|
STOP-BEFORE is a regular expression matching a file name."
|
|
(save-excursion
|
|
(makefile-beginning-of-command)
|
|
(let ((e (save-excursion
|
|
(makefile-end-of-command)
|
|
(point))))
|
|
(if (re-search-forward stop-before nil t)
|
|
(goto-char (match-beginning 0))
|
|
(goto-char e)))))
|
|
|
|
(defun makefile-macro-file-list (macro)
|
|
"Return a list of all files in MACRO."
|
|
(save-excursion
|
|
(goto-char (point-min))
|
|
(let ((lst nil)
|
|
(case-fold-search nil))
|
|
(while (makefile-move-to-macro macro t)
|
|
(let ((e (save-excursion
|
|
(makefile-end-of-command)
|
|
(point))))
|
|
(while (re-search-forward "\\s-*\\([-a-zA-Z0-9./_@$%(){}]+\\)\\s-*" e t)
|
|
(let ((var nil)(varexp nil)
|
|
(match (buffer-substring-no-properties
|
|
(match-beginning 1)
|
|
(match-end 1))))
|
|
(if (not (setq var (makefile-extract-varname-from-text match)))
|
|
(setq lst (cons match lst))
|
|
(setq varexp (makefile-macro-file-list var))
|
|
(dolist (V varexp)
|
|
(setq lst (cons V lst))))))))
|
|
(nreverse lst))))
|
|
|
|
(defun makefile-extract-varname-from-text (text)
|
|
"Extract the variable name from TEXT if it is a variable reference.
|
|
Return nil if it isn't a variable."
|
|
(save-match-data
|
|
(when (string-match "\\$\\s(\\([A-Za-z0-9_]+\\)\\s)" text)
|
|
(match-string 1 text))))
|
|
|
|
|
|
(provide 'ede/makefile-edit)
|
|
|
|
;;; ede/makefile-edit.el ends here
|