mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-13 01:20:28 -08:00
Remove a few more redundant `:group` args. Make use of lexical scoping to replace `(lambda...) with proper closures. * lisp/cedet/ede/custom.el (ede-project-sort-targets-list): Use `dotimes` and replace `(lambda..) with closures. * lisp/cedet/ede/proj-comp.el (proj-comp-insert-variable-once): * lisp/cedet/ede/pmake.el (ede-pmake-insert-variable-once): Remove unused var `addcr`. * lisp/cedet/semantic/complete.el: Use lexical-binding. (semantic-displayer-show-request): Remove unused var `typing-count`. Use `equal` instead of `stringp+string=`. * lisp/cedet/semantic/db-ebrowse.el: Use lexical-binding. (semanticdb-create-ebrowse-database): Remove unused vars `mma` and `regexp`. (semanticdb-ebrowse-strip-trees): Remove unused var `class` and `filename`. (semanticdb-ebrowse-add-globals-to-table): Remove unused var `fname`. * lisp/cedet/semantic/db-find.el: Use lexical-binding. (semanticdb-find-adebug-insert-scanned-tag-cons): Remove always-nil var `tip`. * lisp/cedet/semantic/db-global.el: Use lexical-binding. (semanticdb-enable-gnu-global-databases): Access local var `semantic--ih` by sticking its value in the code passed to `eval` rather than by dynamic scoping. * lisp/cedet/semantic/db-typecache.el: Use lexical-binding. (semanticdb-db-typecache-dump): Remove unused var `junk`. * lisp/cedet/semantic/debug.el: Use lexical-binding. * lisp/cedet/semantic/dep.el: Use lexical-binding. (semantic-add-system-include): Avoid `add-to-list` on a local variable. Access local var `value` by sticking its value in the code passed to `eval` rather than by dynamic scoping. (semantic-remove-system-include): Don't use `delete` on a list received from elsewhere. Access local var `value` by sticking its value in the code passed to `eval` rather than by dynamic scoping. (semantic-reset-system-include): Simplify a bit. * lisp/cedet/semantic/ede-grammar.el: Use lexical-binding. (project-compile-target): Remove unused vars `csrc` and `cb`. Use `cl-incf`. Remove apparently unneeded `with-no-warnings`. * lisp/cedet/semantic/edit.el: Use lexical-binding. (semantic-edits-change-over-tags): Remove unused var `inner-start`. (semantic-edits-incremental-parser-1): Silence warnings about intentionally unused var `last-cond`. * lisp/cedet/semantic/fw.el: Use lexical-binding. (recentf-exclude, semantic-init-hook, ede-auto-add-method) (flymake-start-syntax-check-on-find-file, auto-insert): Declare vars. * lisp/cedet/semantic/ia-sb.el: Use lexical-binding. (semantic-ia-sb-key-map): Move initialization into declaration. (semantic-ia-sb-more-buttons): Remove unused var `idx`. (semantic-ia-sb-line-path): Simplify `if` -> `or`. * lisp/cedet/semantic/idle.el (semantic-idle-breadcrumbs--tag-function): Make it a function returning a closure. * lisp/cedet/semantic/senator.el: Use lexical-binding. (senator-search-set-tag-class-filter): Replace `(lambda..) with a closure. * lisp/cedet/semantic/sort.el: Use lexical-binding. (semanticdb-search-system-databases): Declare var. (semantic-tag-external-member-children-default): Replace `(lambda..) with a closure. * lisp/cedet/semantic/tag-ls.el: Use lexical-binding. (semantic-tag-protection-default, semantic-tag-abstract-p-default): Simplify with `member`. * lisp/cedet/semantic/util.el: Use lexical-binding. (semantic-something-to-tag-table): Declare function `semanticdb-abstract-table--eieio-childp` called via `cl-typep`. * lisp/cedet/semantic/bovine/scm.el (semantic-default-scheme-setup): Remove duplicate setting of `imenu-create-index-function`. * lisp/cedet/semantic/decorate/mode.el (semantic-decoration-build-style-menu): Replace `(lambda..) with a closure. * lisp/cedet/srecode/cpp.el (srecode-semantic-apply-tag-to-dict): Remove always-t variable `member`. * lisp/cedet/srecode/mode.el (srecode-minor-mode-templates-menu): Replace `(lambda..) with a closure. Use `push`. * lisp/cedet/semantic/chart.el: Use lexical-binding. * lisp/cedet/semantic/db-debug.el: Use lexical-binding. * lisp/cedet/semantic/db-el.el: Use lexical-binding. * lisp/cedet/semantic/db-file.el: Use lexical-binding. * lisp/cedet/semantic/db-javascript.el: Use lexical-binding. * lisp/cedet/semantic/db-mode.el: Use lexical-binding. * lisp/cedet/semantic/db-ref.el: Use lexical-binding. * lisp/cedet/semantic/decorate.el: Use lexical-binding. * lisp/cedet/semantic/doc.el: Use lexical-binding. * lisp/cedet/semantic/find.el: Use lexical-binding. * lisp/cedet/semantic/format.el: Use lexical-binding. * lisp/cedet/semantic/html.el: Use lexical-binding. * lisp/cedet/semantic/ia.el: Use lexical-binding. * lisp/cedet/semantic/imenu.el: Use lexical-binding. * lisp/cedet/semantic/java.el: Use lexical-binding. * lisp/cedet/semantic/mru-bookmark.el: Use lexical-binding. * lisp/cedet/semantic/symref.el: Use lexical-binding. * lisp/cedet/semantic/tag-file.el: Use lexical-binding. * lisp/cedet/semantic/tag-write.el: Use lexical-binding. * lisp/cedet/semantic/texi.el: Use lexical-binding. * lisp/cedet/semantic/util-modes.el: Use lexical-binding.
182 lines
6.4 KiB
EmacsLisp
182 lines
6.4 KiB
EmacsLisp
;;; ede-proj-info.el --- EDE Generic Project texinfo support -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 1998-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
|
;; Keywords: project, make
|
|
|
|
;; 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:
|
|
;;
|
|
;; Handle texinfo in and EDE Project file.
|
|
|
|
(require 'ede/pmake)
|
|
|
|
;;; Code:
|
|
(defclass ede-proj-target-makefile-info (ede-proj-target-makefile)
|
|
((menu :initform nil)
|
|
(keybindings :initform nil)
|
|
(availablecompilers :initform '(ede-makeinfo-compiler
|
|
ede-texi2html-compiler))
|
|
(sourcetype :initform '(ede-makeinfo-source))
|
|
(mainmenu :initarg :mainmenu
|
|
:initform ""
|
|
:type string
|
|
:custom string
|
|
:documentation "The main menu resides in this file.
|
|
All other sources should be included independently."))
|
|
"Target for a single info file.")
|
|
|
|
(defvar ede-makeinfo-source
|
|
(ede-sourcecode :name "Texinfo"
|
|
:sourcepattern "\\.texi?$"
|
|
:garbagepattern '("*.info*" "*.html"))
|
|
"Texinfo source code definition.")
|
|
|
|
(defvar ede-makeinfo-compiler
|
|
(ede-compiler
|
|
:name "makeinfo"
|
|
:variables '(("MAKEINFO" . "makeinfo"))
|
|
:commands '("$(MAKEINFO) $<")
|
|
:autoconf '(("AC_CHECK_PROG" . "MAKEINFO, makeinfo"))
|
|
:sourcetype '(ede-makeinfo-source)
|
|
)
|
|
"Compile texinfo files into info files.")
|
|
|
|
(defvar ede-texi2html-compiler
|
|
(ede-compiler
|
|
:name "texi2html"
|
|
:variables '(("TEXI2HTML" . "makeinfo -html"))
|
|
:commands '("makeinfo -o $@ $<")
|
|
:sourcetype '(ede-makeinfo-source)
|
|
)
|
|
"Compile texinfo files into html files.")
|
|
|
|
;;; Makefile generation
|
|
;;
|
|
(cl-defmethod ede-proj-configure-add-missing
|
|
((_this ede-proj-target-makefile-info))
|
|
"Query if any files needed by THIS provided by automake are missing.
|
|
Results in --add-missing being passed to automake."
|
|
(not (ede-expand-filename (ede-toplevel) "texinfo.tex")))
|
|
|
|
(cl-defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-info))
|
|
"Return the variable name for THIS's sources."
|
|
(concat (ede-pmake-varname this) "_TEXINFOS"))
|
|
|
|
(cl-defmethod ede-proj-makefile-insert-source-variables
|
|
((this ede-proj-target-makefile-info) &optional moresource)
|
|
"Insert the source variables needed by THIS info target.
|
|
Optional argument MORESOURCE is a list of additional sources to add to the
|
|
sources variable.
|
|
Does the usual for Makefile mode, but splits source into two variables
|
|
when working in Automake mode."
|
|
(if (not (ede-proj-automake-p))
|
|
(cl-call-next-method)
|
|
(let* ((sv (ede-proj-makefile-sourcevar this))
|
|
(src (copy-sequence (oref this source)))
|
|
(menu (or (oref this menu) (car src))))
|
|
(setq src (delq menu src))
|
|
;; the info_TEXINFOS variable is probably shared
|
|
(ede-pmake-insert-variable-shared "info_TEXINFOS"
|
|
(insert menu))
|
|
;; Now insert the rest of the source elsewhere
|
|
(ede-pmake-insert-variable-shared sv
|
|
(insert (mapconcat #'identity src " ")))
|
|
(if moresource
|
|
(error "Texinfo files should not have moresource")))))
|
|
|
|
(defun ede-makeinfo-find-info-filename (source)
|
|
"Find the info filename produced by SOURCE texinfo file."
|
|
(let ((opened (get-file-buffer source))
|
|
(buffer (or (get-file-buffer source)
|
|
(find-file-noselect source nil t)))
|
|
info)
|
|
(with-current-buffer buffer
|
|
(save-excursion
|
|
(goto-char (point-min))
|
|
(and (re-search-forward "^@setfilename\\s-+\\([^.]+\\).info$" nil t)
|
|
(setq info (match-string 1)))))
|
|
(unless (eq buffer opened)
|
|
(kill-buffer buffer))
|
|
info))
|
|
|
|
(cl-defmethod ede-proj-makefile-target-name ((this ede-proj-target-makefile-info))
|
|
"Return the name of the main target for THIS target."
|
|
;; The target should be the main-menu file name translated to .info.
|
|
(let* ((source (if (not (string= (oref this mainmenu) ""))
|
|
(oref this mainmenu)
|
|
(car (oref this source))))
|
|
(info (ede-makeinfo-find-info-filename source)))
|
|
(concat (or info (file-name-sans-extension source)) ".info")))
|
|
|
|
(cl-defmethod ede-proj-makefile-insert-dist-dependencies ((this ede-proj-target-makefile-info))
|
|
"Insert any symbols that the DIST rule should depend on.
|
|
Texinfo files want to insert generated `.info' files.
|
|
Argument THIS is the target which needs to insert an info file."
|
|
;; In some cases, this is ONLY the index file. That should generally
|
|
;; be ok.
|
|
(insert " " (ede-proj-makefile-target-name this))
|
|
)
|
|
|
|
(cl-defmethod ede-proj-makefile-insert-dist-filepatterns ((this ede-proj-target-makefile-info))
|
|
"Insert any symbols that the DIST rule should depend on.
|
|
Texinfo files want to insert generated `.info' files.
|
|
Argument THIS is the target which needs to insert an info file."
|
|
;; In some cases, this is ONLY the index file. That should generally
|
|
;; be ok.
|
|
(insert " " (ede-proj-makefile-target-name this) "*")
|
|
)
|
|
|
|
; (let ((n (ede-name this)))
|
|
; (if (string-match "\\.info$" n)
|
|
; n
|
|
; (concat n ".info"))))
|
|
|
|
(cl-defmethod object-write ((this ede-proj-target-makefile-info))
|
|
"Before committing any change to THIS, make sure the mainmenu is first."
|
|
(let ((mm (oref this mainmenu))
|
|
(s (oref this source))
|
|
(nl nil))
|
|
(if (or (string= mm "") (not mm) (string= mm (car s)))
|
|
nil
|
|
;; Make sure that MM is first in the list of items.
|
|
(setq nl (cons mm (delq mm s)))
|
|
(oset this source nl)))
|
|
(cl-call-next-method))
|
|
|
|
(cl-defmethod ede-documentation ((this ede-proj-target-makefile-info))
|
|
"Return a list of files that provides documentation.
|
|
Documentation is not for object THIS, but is provided by THIS for other
|
|
files in the project."
|
|
(let* ((src (oref this source))
|
|
(proj (ede-target-parent this))
|
|
(dir (oref proj directory))
|
|
(out nil)
|
|
)
|
|
;; convert src to full file names.
|
|
(while src
|
|
(setq out (cons
|
|
(expand-file-name (car src) dir)
|
|
out))
|
|
(setq src (cdr src)))
|
|
;; Return it
|
|
out))
|
|
|
|
(provide 'ede/proj-info)
|
|
|
|
;;; ede/proj-info.el ends here
|