mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
* lisp/cedet: Convert remaining files to lexical-binding
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.
This commit is contained in:
parent
2d12df3926
commit
371fdd4f1b
64 changed files with 516 additions and 549 deletions
|
|
@ -1038,21 +1038,20 @@ be called."
|
|||
(popup-menu semantic-idle-breadcrumbs-popup-menu)
|
||||
(select-window old-window)))
|
||||
|
||||
(defmacro semantic-idle-breadcrumbs--tag-function (function)
|
||||
(defun semantic-idle-breadcrumbs--tag-function (function)
|
||||
"Return lambda expression calling FUNCTION when called from a popup."
|
||||
`(lambda (event)
|
||||
(interactive "e")
|
||||
(let* ((old-window (selected-window))
|
||||
(window (semantic-event-window event))
|
||||
(column (car (nth 6 (nth 1 event)))) ;; TODO semantic-event-column?
|
||||
(tag (progn
|
||||
(select-window window t)
|
||||
(plist-get
|
||||
(text-properties-at column header-line-format)
|
||||
'tag))))
|
||||
(,function tag)
|
||||
(select-window old-window)))
|
||||
)
|
||||
(lambda (event)
|
||||
(interactive "e")
|
||||
(let* ((old-window (selected-window))
|
||||
(window (semantic-event-window event))
|
||||
(column (car (nth 6 (nth 1 event)))) ;; TODO semantic-event-column?
|
||||
(tag (progn
|
||||
(select-window window t)
|
||||
(plist-get
|
||||
(text-properties-at column header-line-format)
|
||||
'tag))))
|
||||
(funcall function tag)
|
||||
(select-window old-window))))
|
||||
|
||||
;; TODO does this work for mode-line case?
|
||||
(defvar semantic-idle-breadcrumbs-popup-map
|
||||
|
|
@ -1060,8 +1059,7 @@ be called."
|
|||
;; mouse-1 goes to clicked tag
|
||||
(define-key map
|
||||
[ header-line mouse-1 ]
|
||||
(semantic-idle-breadcrumbs--tag-function
|
||||
semantic-go-to-tag))
|
||||
(semantic-idle-breadcrumbs--tag-function #'semantic-go-to-tag))
|
||||
;; mouse-3 pops up a context menu
|
||||
(define-key map
|
||||
[ header-line mouse-3 ]
|
||||
|
|
@ -1077,8 +1075,7 @@ be called."
|
|||
"Breadcrumb Tag"
|
||||
(vector
|
||||
"Go to Tag"
|
||||
(semantic-idle-breadcrumbs--tag-function
|
||||
semantic-go-to-tag)
|
||||
(semantic-idle-breadcrumbs--tag-function #'semantic-go-to-tag)
|
||||
:active t
|
||||
:help "Jump to this tag")
|
||||
;; TODO these entries need minor changes (optional tag argument) in
|
||||
|
|
@ -1086,37 +1083,32 @@ be called."
|
|||
;; (semantic-menu-item
|
||||
;; (vector
|
||||
;; "Copy Tag"
|
||||
;; (semantic-idle-breadcrumbs--tag-function
|
||||
;; senator-copy-tag)
|
||||
;; (semantic-idle-breadcrumbs--tag-function #'senator-copy-tag)
|
||||
;; :active t
|
||||
;; :help "Copy this tag"))
|
||||
;; (semantic-menu-item
|
||||
;; (vector
|
||||
;; "Kill Tag"
|
||||
;; (semantic-idle-breadcrumbs--tag-function
|
||||
;; senator-kill-tag)
|
||||
;; (semantic-idle-breadcrumbs--tag-function #'senator-kill-tag)
|
||||
;; :active t
|
||||
;; :help "Kill tag text to the kill ring, and copy the tag to
|
||||
;; the tag ring"))
|
||||
;; (semantic-menu-item
|
||||
;; (vector
|
||||
;; "Copy Tag to Register"
|
||||
;; (semantic-idle-breadcrumbs--tag-function
|
||||
;; senator-copy-tag-to-register)
|
||||
;; (semantic-idle-breadcrumbs--tag-function #'senator-copy-tag-to-register)
|
||||
;; :active t
|
||||
;; :help "Copy this tag"))
|
||||
;; (semantic-menu-item
|
||||
;; (vector
|
||||
;; "Narrow to Tag"
|
||||
;; (semantic-idle-breadcrumbs--tag-function
|
||||
;; senator-narrow-to-defun)
|
||||
;; (semantic-idle-breadcrumbs--tag-function #'senator-narrow-to-defun)
|
||||
;; :active t
|
||||
;; :help "Narrow to the bounds of the current tag"))
|
||||
;; (semantic-menu-item
|
||||
;; (vector
|
||||
;; "Fold Tag"
|
||||
;; (semantic-idle-breadcrumbs--tag-function
|
||||
;; senator-fold-tag-toggle)
|
||||
;; (semantic-idle-breadcrumbs--tag-function #'senator-fold-tag-toggle)
|
||||
;; :active t
|
||||
;; :style 'toggle
|
||||
;; :selected '(let ((tag (semantic-current-tag)))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue