From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 21 Sep 2024 12:44:06 +0000 (+0200)
Subject: Delete redundant declarations of 'electric' variables
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e624f2c114c5360cd7ccde9246f389b9c4d34e4;p=emacs.git

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.

(cherry picked from commit dac1a48240a14c41e2d2792443eac62ea50e1f66)
---

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2fd392c2756..7ee45b4bb7c 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -7049,7 +7049,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)))