* lisp/electric.el (electric-indent-mode-has-been-called): Remove.

(electric-indent-mode): Fix accordingly.
* lisp/progmodes/cc-mode.el (c-initialize-cc-mode): Only hook into
electric-indent-mode-hook if we obey electric-indent-mode.
(c-basic-common-init): Use (fboundp 'electric-indent-local-mode) to
decide whether we obey electric-indent-mode.
(c-change-set-fl-decl-start, c-extend-after-change-region):
Silence warnings.
(c-electric-indent-mode-hook): Assume we do want to obey
electric-indent-mode.

1 files changed, 1 insertions, 5 deletions

diff --git a/lisp/electric.el b/lisp/electric.el
index 992553685e2..3e19d9b23b1 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -286,9 +286,7 @@ mode set `electric-indent-inhibit', but this can be used as a workaround.")
   (let ((electric-indent-mode nil))
     (newline arg 'interactive)))
 
-(defvar electric-indent-mode-has-been-called 0
-  "How many times has `electric-indent-mode' been called?
-It's > 1 if it's been called at least once by the user.")
+
 ;;;###autoload
 (define-minor-mode electric-indent-mode
   "Toggle on-the-fly reindentation (Electric Indent mode).
@@ -302,8 +300,6 @@ insert a character from `electric-indent-chars'."
   :global t :group 'electricity
   :initialize 'custom-initialize-delay
   :init-value t
-  (setq electric-indent-mode-has-been-called
-        (1+ electric-indent-mode-has-been-called))
   (if (not electric-indent-mode)
       (progn
         (when (eq (lookup-key global-map [?\C-j])