From dac1a48240a14c41e2d2792443eac62ea50e1f66 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sat, 21 Sep 2024 14:44:06 +0200 Subject: [PATCH] Delete redundant declarations of 'electric' variables * lisp/progmodes/js.el (electric-layout-rules): * lisp/progmodes/octave.el (electric-layout-rules): * lisp/progmodes/python.el (electric-indent-inhibit): * lisp/textmodes/rst.el (electric-indent-inhibit): Delete redundant declarations; 'electric' is preloaded since Emacs 24.4. --- lisp/progmodes/js.el | 1 - lisp/progmodes/octave.el | 2 -- lisp/progmodes/python.el | 1 - lisp/textmodes/rst.el | 2 -- 4 files changed, 6 deletions(-) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 14ae4068263..f74b8ab1c46 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -62,7 +62,6 @@ (require 'rx)) (defvar ido-cur-list) -(defvar electric-layout-rules) (declare-function ido-mode "ido" (&optional arg)) (declare-function treesit-parser-create "treesit.c") (declare-function treesit-induce-sparse-tree "treesit.c") diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index cc47880bcbb..68b1b9bfc9d 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -536,8 +536,6 @@ Non-nil means always go to the next Octave code line after sending." (put-text-property (match-beginning 1) (match-end 1) 'syntax-table (string-to-syntax "\"'"))))) -(defvar electric-layout-rules) - ;; FIXME: cc-mode.el also adds an entry for .m files, mapping them to ;; objc-mode. We here rely on the fact that loaddefs.el is filled in ;; alphabetical order, so cc-mode.el comes before octave-mode.el, which lets diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index a5cab4a07e5..6a258892f16 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -7050,7 +7050,6 @@ Add import for undefined name `%s' (empty to skip): " (eq (char-after) last-command-event)) (save-excursion (insert (make-string 2 last-command-event))))) -(defvar electric-indent-inhibit) (defvar prettify-symbols-alist) (defvar python--installed-grep-hook nil) diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 06e7b337d6d..25b04e55253 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -1323,8 +1323,6 @@ The hook for `text-mode' is run before this one." ;; Pull in variable definitions silencing byte-compiler. (require 'newcomment) -(defvar electric-indent-inhibit) - ;; Use rst-mode for *.rst and *.rest files. Many ReStructured-Text files ;; use *.txt, but this is too generic to be set as a default. ;;;###autoload (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode)))