From 0f85f2c0e54894a5d7edbffb0d8b29033f4a2af7 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 5 Mar 2021 21:00:00 -0500 Subject: * lisp/cedet/srecode/*.el: Use lexical-binding * lisp/cedet/srecode/compile.el (srecode-compile-inserter): Use `make-instance` instead of the class name-as-function. * lisp/cedet/srecode/fields.el (srecode-field-behind-hook): Remove unused var `field`. * lisp/cedet/srecode/find.el (srecode-load-tables-for-mode): Simplify. * lisp/cedet/srecode/getset.el (srecode-semantic-selected-tag): Declare var. * lisp/cedet/srecode/mode.el (srecode-minor-mode): Mark references to non-existing `srecode-m3-items` function. * lisp/cedet/srecode/srt-mode.el (srecode-parse-this-macro): Remove unused var `raw`. --- lisp/cedet/srecode/fields.el | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'lisp/cedet/srecode/fields.el') diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index 71613bcc2a3..e65e3194320 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el @@ -1,4 +1,4 @@ -;;; srecode/fields.el --- Handling type-in fields in a buffer. +;;; srecode/fields.el --- Handling type-in fields in a buffer. -*- lexical-binding: t; -*- ;; ;; Copyright (C) 2009-2021 Free Software Foundation, Inc. ;; @@ -193,7 +193,7 @@ If SET-TO is a string, then replace the text of OLAID with SET-TO." "Manage a buffer region in which fields exist.") (cl-defmethod initialize-instance ((ir srecode-template-inserted-region) - &rest args) + &rest _args) "Initialize IR, capturing the active fields, and creating the overlay." ;; Fill in the fields (oset ir fields srecode-field-archive) @@ -221,7 +221,7 @@ If SET-TO is a string, then replace the text of OLAID with SET-TO." (oset ir active-region ir) ;; Setup the post command hook. - (add-hook 'post-command-hook 'srecode-field-post-command t t) + (add-hook 'post-command-hook #'srecode-field-post-command t t) ) (cl-defmethod srecode-delete ((ir srecode-template-inserted-region)) @@ -229,12 +229,11 @@ If SET-TO is a string, then replace the text of OLAID with SET-TO." ;; Clear us out of the baseclass. (oset ir active-region nil) ;; Clear our fields. - (mapc 'srecode-delete (oref ir fields)) + (mapc #'srecode-delete (oref ir fields)) ;; Call to our base (cl-call-next-method) ;; Clear our hook. - (remove-hook 'post-command-hook 'srecode-field-post-command t) - ) + (remove-hook 'post-command-hook #'srecode-field-post-command t)) (defsubst srecode-active-template-region () "Return the active region for template fields." @@ -246,7 +245,7 @@ If SET-TO is a string, then replace the text of OLAID with SET-TO." ) (if (not ar) ;; Find a bug and fix it. - (remove-hook 'post-command-hook 'srecode-field-post-command t) + (remove-hook 'post-command-hook #'srecode-field-post-command t) (if (srecode-point-in-region-p ar) nil ;; Keep going ;; We moved out of the template. Cancel the edits. @@ -277,16 +276,16 @@ Try to use this to provide useful completion when available.") (defvar srecode-field-keymap (let ((km (make-sparse-keymap))) - (define-key km "\C-i" 'srecode-field-next) - (define-key km "\M-\C-i" 'srecode-field-prev) - (define-key km "\C-e" 'srecode-field-end) - (define-key km "\C-a" 'srecode-field-start) - (define-key km "\M-m" 'srecode-field-start) - (define-key km "\C-c\C-c" 'srecode-field-exit-ask) + (define-key km "\C-i" #'srecode-field-next) + (define-key km "\M-\C-i" #'srecode-field-prev) + (define-key km "\C-e" #'srecode-field-end) + (define-key km "\C-a" #'srecode-field-start) + (define-key km "\M-m" #'srecode-field-start) + (define-key km "\C-c\C-c" #'srecode-field-exit-ask) km) "Keymap applied to field overlays.") -(cl-defmethod initialize-instance ((field srecode-field) &optional args) +(cl-defmethod initialize-instance ((field srecode-field) &optional _args) "Initialize FIELD, being sure it archived." (add-to-list 'srecode-field-archive field t) (cl-call-next-method) @@ -327,7 +326,7 @@ Try to use this to provide useful completion when available.") (defvar srecode-field-replication-max-size 100 "Maximum size of a field before canceling replication.") -(defun srecode-field-mod-hook (ol after start end &optional pre-len) +(defun srecode-field-mod-hook (ol after _start _end &optional _pre-len) "Modification hook for the field overlay. OL is the overlay. AFTER is non-nil if it is called after the change. @@ -374,7 +373,7 @@ AFTER is non-nil if it is called after the change. START and END are the bounds of the change. PRE-LEN is used in the after mode for the length of the changed text." (when after - (let* ((field (overlay-get ol 'srecode)) + (let* (;; (field (overlay-get ol 'srecode)) ) (move-overlay ol (overlay-start ol) end) (srecode-field-mod-hook ol after start end pre-len)) -- cgit v1.2.3