mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-13 23:49:02 +00: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.
214 lines
7.7 KiB
EmacsLisp
214 lines
7.7 KiB
EmacsLisp
;;; ede/custom.el --- customization of EDE projects. -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2010-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:
|
|
;;
|
|
;; Customization commands/hooks for EDE.
|
|
;;
|
|
;; EIEIO supports customizing objects, and EDE uses this to allow
|
|
;; users to change basic settings in their projects.
|
|
;;
|
|
|
|
;;; Code:
|
|
;;; Customization
|
|
;;
|
|
;; Routines for customizing projects and targets.
|
|
|
|
(require 'ede)
|
|
(eval-when-compile (require 'eieio-custom))
|
|
|
|
(defvar eieio-ede-old-variables nil
|
|
"The old variables for a project.")
|
|
|
|
;;; Customization Commands
|
|
;;
|
|
;; These commands initialize customization of EDE control objects.
|
|
|
|
;;;###autoload
|
|
(defun ede-customize-project ()
|
|
"Edit fields of the current project through EIEIO & Custom."
|
|
(interactive)
|
|
(require 'eieio-custom)
|
|
(let* ((ov (oref (ede-current-project) local-variables))
|
|
(cp (ede-current-project)))
|
|
(ede-customize cp)
|
|
(setq-local eieio-ede-old-variables ov)))
|
|
|
|
;;;###autoload
|
|
(defalias 'customize-project #'ede-customize-project)
|
|
|
|
;;;###autoload
|
|
(defun ede-customize-current-target()
|
|
"Edit fields of the current target through EIEIO & Custom."
|
|
(interactive)
|
|
(require 'eieio-custom)
|
|
(if (not (obj-of-class-p ede-object 'ede-target))
|
|
(error "Current file is not part of a target"))
|
|
(ede-customize-target ede-object))
|
|
|
|
;;;###autoload
|
|
(defalias 'customize-target #'ede-customize-current-target)
|
|
|
|
(defun ede-customize-target (obj)
|
|
"Edit fields of the current target through EIEIO & Custom.
|
|
OBJ is the target object to customize."
|
|
(require 'eieio-custom)
|
|
(if (and obj (not (obj-of-class-p obj 'ede-target)))
|
|
(error "No logical target to customize"))
|
|
(ede-customize obj))
|
|
|
|
(cl-defmethod ede-customize ((proj ede-project))
|
|
"Customize the EDE project PROJ."
|
|
(eieio-customize-object proj 'default))
|
|
|
|
(cl-defmethod ede-customize ((target ede-target))
|
|
"Customize the EDE TARGET."
|
|
(eieio-customize-object target 'default))
|
|
|
|
;;; Target Sorting
|
|
;;
|
|
;; Target order can be important, but custom doesn't support a way
|
|
;; to resort items in a list. This function by David Engster allows
|
|
;; targets to be re-arranged.
|
|
|
|
(defvar ede-project-sort-targets-order nil
|
|
"Variable for tracking target order in `ede-project-sort-targets'.")
|
|
|
|
;;;###autoload
|
|
(defun ede-project-sort-targets ()
|
|
"Create a custom-like buffer for sorting targets of current project."
|
|
(interactive)
|
|
(let ((proj (ede-current-project))
|
|
;; (count 1)
|
|
) ;; current order
|
|
(switch-to-buffer (get-buffer-create "*EDE sort targets*"))
|
|
(erase-buffer)
|
|
(setq ede-object-project proj)
|
|
(widget-create 'push-button
|
|
:notify (lambda (&rest _ignore)
|
|
(let ((targets (oref ede-object-project targets))
|
|
cur newtargets)
|
|
(while (setq cur (pop ede-project-sort-targets-order))
|
|
(setq newtargets (append newtargets
|
|
(list (nth cur targets)))))
|
|
(oset ede-object-project targets newtargets))
|
|
(ede-commit-project ede-object-project)
|
|
(kill-buffer))
|
|
" Accept ")
|
|
(widget-insert " ")
|
|
(widget-create 'push-button
|
|
:notify (lambda (&rest _ignore)
|
|
(kill-buffer))
|
|
" Cancel ")
|
|
(widget-insert "\n\n")
|
|
(setq ede-project-sort-targets-order nil)
|
|
(mapc (lambda (x)
|
|
(add-to-ordered-list
|
|
'ede-project-sort-targets-order
|
|
x x))
|
|
(number-sequence 0 (1- (length (oref proj targets)))))
|
|
(ede-project-sort-targets-list)
|
|
(use-local-map widget-keymap)
|
|
(widget-setup)
|
|
(goto-char (point-min))))
|
|
|
|
(defun ede-project-sort-targets-list ()
|
|
"Sort the target list while using `ede-project-sort-targets'."
|
|
(save-excursion
|
|
(let ((targets (oref ede-object-project targets))
|
|
(inhibit-read-only t)
|
|
(inhibit-modification-hooks t))
|
|
(goto-char (point-min))
|
|
(forward-line 2)
|
|
(delete-region (point) (point-max))
|
|
(dotimes (count (length targets))
|
|
(if (> count 0)
|
|
(widget-create 'push-button
|
|
:notify (lambda (&rest _ignore)
|
|
(let ((cur ede-project-sort-targets-order))
|
|
(add-to-ordered-list
|
|
'ede-project-sort-targets-order
|
|
(nth count cur)
|
|
(1- count))
|
|
(add-to-ordered-list
|
|
'ede-project-sort-targets-order
|
|
(nth (1- count) cur) count))
|
|
(ede-project-sort-targets-list))
|
|
" Up ")
|
|
(widget-insert " "))
|
|
(if (< count (1- (length targets)))
|
|
(widget-create 'push-button
|
|
:notify (lambda (&rest _ignore)
|
|
(let ((cur ede-project-sort-targets-order))
|
|
(add-to-ordered-list
|
|
'ede-project-sort-targets-order
|
|
(nth count cur) (1+ count))
|
|
(add-to-ordered-list
|
|
'ede-project-sort-targets-order
|
|
(nth (1+ count) cur) count))
|
|
(ede-project-sort-targets-list))
|
|
" Down ")
|
|
(widget-insert " "))
|
|
(widget-insert (concat " " (number-to-string (1+ count)) ".: "
|
|
(oref (nth (nth count ede-project-sort-targets-order)
|
|
targets)
|
|
name)
|
|
"\n"))))))
|
|
|
|
;;; Customization hooks
|
|
;;
|
|
;; These hooks are used when finishing up a customization.
|
|
(cl-defmethod eieio-done-customizing ((proj ede-project))
|
|
"Call this when a user finishes customizing PROJ."
|
|
(let ((ov eieio-ede-old-variables)
|
|
(nv (oref proj local-variables)))
|
|
(setq eieio-ede-old-variables nil)
|
|
(while ov
|
|
(if (not (assoc (car (car ov)) nv))
|
|
(save-excursion
|
|
(mapc (lambda (b)
|
|
(set-buffer b)
|
|
(kill-local-variable (car (car ov))))
|
|
(ede-project-buffers proj))))
|
|
(setq ov (cdr ov)))
|
|
(mapc (lambda (b) (ede-set-project-variables proj b))
|
|
(ede-project-buffers proj))))
|
|
|
|
;; These two methods should be implemented by subclasses of
|
|
;; project and targets in order to account for user specified
|
|
;; changes.
|
|
(cl-defmethod eieio-done-customizing ((_target ede-target))
|
|
"Call this when a user finishes customizing TARGET."
|
|
nil)
|
|
|
|
(cl-defmethod ede-commit-project ((_proj ede-project))
|
|
"Commit any change to PROJ to its file."
|
|
nil
|
|
)
|
|
|
|
(provide 'ede/custom)
|
|
|
|
;; Local variables:
|
|
;; generated-autoload-file: "loaddefs.el"
|
|
;; generated-autoload-load-name: "ede/custom"
|
|
;; End:
|
|
|
|
;;; ede/custom.el ends here
|