Commit 8d4901dc authored by Stefan Monnier's avatar Stefan Monnier

* 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.
parent 092c12b2
2014-03-04 Stefan Monnier <monnier@iro.umontreal.ca> 2014-03-04 Stefan Monnier <monnier@iro.umontreal.ca>
* 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.
* electric.el (electric-indent-mode-has-been-called): Remove.
(electric-indent-mode): Fix accordingly.
* files.el (hack-local-variables): Mention file name in warning. * files.el (hack-local-variables): Mention file name in warning.
* htmlfontify.el (hfy-fontify-buffer): Drop `invis-range' message. * htmlfontify.el (hfy-fontify-buffer): Drop `invis-range' message.
......
...@@ -286,9 +286,7 @@ mode set `electric-indent-inhibit', but this can be used as a workaround.") ...@@ -286,9 +286,7 @@ mode set `electric-indent-inhibit', but this can be used as a workaround.")
(let ((electric-indent-mode nil)) (let ((electric-indent-mode nil))
(newline arg 'interactive))) (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 ;;;###autoload
(define-minor-mode electric-indent-mode (define-minor-mode electric-indent-mode
"Toggle on-the-fly reindentation (Electric Indent mode). "Toggle on-the-fly reindentation (Electric Indent mode).
...@@ -302,8 +300,6 @@ insert a character from `electric-indent-chars'." ...@@ -302,8 +300,6 @@ insert a character from `electric-indent-chars'."
:global t :group 'electricity :global t :group 'electricity
:initialize 'custom-initialize-delay :initialize 'custom-initialize-delay
:init-value t :init-value t
(setq electric-indent-mode-has-been-called
(1+ electric-indent-mode-has-been-called))
(if (not electric-indent-mode) (if (not electric-indent-mode)
(progn (progn
(when (eq (lookup-key global-map [?\C-j]) (when (eq (lookup-key global-map [?\C-j])
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
;; For Emacs < 22.2. ;; For Emacs < 22.2.
(eval-and-compile (eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) (unless (fboundp 'declare-function) (defmacro declare-function (&rest _r))))
(eval-when-compile (eval-when-compile
(let ((load-path (let ((load-path
...@@ -190,11 +190,10 @@ control). See \"cc-mode.el\" for more info." ...@@ -190,11 +190,10 @@ control). See \"cc-mode.el\" for more info."
(add-hook 'change-major-mode-hook 'c-leave-cc-mode-mode) (add-hook 'change-major-mode-hook 'c-leave-cc-mode-mode)
(setq c-initialization-ok t) (setq c-initialization-ok t)
;; Connect up with Emacs's electric-indent-mode, for >= Emacs 24.4 ;; Connect up with Emacs's electric-indent-mode, for >= Emacs 24.4
(when (fboundp 'electric-indent-mode) (when (fboundp 'electric-indent-local-mode)
(add-hook 'electric-indent-mode-hook 'c-electric-indent-mode-hook) (add-hook 'electric-indent-mode-hook 'c-electric-indent-mode-hook)
(when (fboundp 'electric-indent-local-mode) (add-hook 'electric-indent-local-mode-hook
(add-hook 'electric-indent-local-mode-hook 'c-electric-indent-local-mode-hook)))
'c-electric-indent-local-mode-hook))))
;; Will try initialization hooks again if they failed. ;; Will try initialization hooks again if they failed.
(put 'c-initialize-cc-mode initprop c-initialization-ok)))) (put 'c-initialize-cc-mode initprop c-initialization-ok))))
...@@ -588,8 +587,9 @@ that requires a literal mode spec at compile time." ...@@ -588,8 +587,9 @@ that requires a literal mode spec at compile time."
;; messing up CC Mode's, and set `c-electric-flag' if `electric-indent-mode' ;; messing up CC Mode's, and set `c-electric-flag' if `electric-indent-mode'
;; has been called by the user. ;; has been called by the user.
(when (boundp 'electric-indent-inhibit) (setq electric-indent-inhibit t)) (when (boundp 'electric-indent-inhibit) (setq electric-indent-inhibit t))
(when (and (boundp 'electric-indent-mode-has-been-called) ;; CC-mode should obey Emacs's generic preferences, tho only do it if
(> electric-indent-mode-has-been-called 1)) ;; Emacs's generic preferences can be set per-buffer (Emacs>=24.4).
(when (fboundp 'electric-indent-local-mode)
(setq c-electric-flag electric-indent-mode)) (setq c-electric-flag electric-indent-mode))
;; ;; Put submode indicators onto minor-mode-alist, but only once. ;; ;; Put submode indicators onto minor-mode-alist, but only once.
...@@ -1165,7 +1165,7 @@ Note that the style variables are always made local to the buffer." ...@@ -1165,7 +1165,7 @@ Note that the style variables are always made local to the buffer."
(backward-char)) (backward-char))
new-pos)) ; back over (, [, <. new-pos)) ; back over (, [, <.
(defun c-change-set-fl-decl-start (beg end old-len) (defun c-change-set-fl-decl-start (_beg _end _old-len)
;; Set c-new-BEG to the beginning of a "local" declaration if it('s BOL) is ;; Set c-new-BEG to the beginning of a "local" declaration if it('s BOL) is
;; inside one. This is called from an after-change-function, but the ;; inside one. This is called from an after-change-function, but the
;; parameters BEG END and OLD-LEN are ignored. See `c-set-fl-decl-start' ;; parameters BEG END and OLD-LEN are ignored. See `c-set-fl-decl-start'
...@@ -1239,7 +1239,7 @@ This function is called from `c-common-init', once per mode initialization." ...@@ -1239,7 +1239,7 @@ This function is called from `c-common-init', once per mode initialization."
(make-local-hook 'font-lock-mode-hook)) (make-local-hook 'font-lock-mode-hook))
(add-hook 'font-lock-mode-hook 'c-after-font-lock-init nil t)) (add-hook 'font-lock-mode-hook 'c-after-font-lock-init nil t))
(defun c-extend-after-change-region (beg end old-len) (defun c-extend-after-change-region (_beg _end _old-len)
"Extend the region to be fontified, if necessary." "Extend the region to be fontified, if necessary."
;; Note: the parameters are ignored here. This somewhat indirect ;; Note: the parameters are ignored here. This somewhat indirect
;; implementation exists because it is minimally different from the ;; implementation exists because it is minimally different from the
...@@ -1256,15 +1256,13 @@ This function is called from `c-common-init', once per mode initialization." ...@@ -1256,15 +1256,13 @@ This function is called from `c-common-init', once per mode initialization."
(defun c-electric-indent-mode-hook () (defun c-electric-indent-mode-hook ()
;; Emacs has en/disabled `electric-indent-mode'. Propagate this through to ;; Emacs has en/disabled `electric-indent-mode'. Propagate this through to
;; each CC Mode buffer. ;; each CC Mode buffer.
(when (and (boundp 'electric-indent-mode-has-been-called) (mapc (lambda (buf)
(> electric-indent-mode-has-been-called 1)) (with-current-buffer buf
(mapc (lambda (buf) (when c-buffer-is-cc-mode
(with-current-buffer buf ;; Don't use `c-toggle-electric-state' here due to recursion.
(when c-buffer-is-cc-mode (setq c-electric-flag electric-indent-mode)
;; Don't use `c-toggle-electric-state' here due to recursion. (c-update-modeline))))
(setq c-electric-flag electric-indent-mode) (buffer-list)))
(c-update-modeline))))
(buffer-list))))
(defun c-electric-indent-local-mode-hook () (defun c-electric-indent-local-mode-hook ()
;; Emacs has en/disabled `electric-indent-local-mode' for this buffer. ;; Emacs has en/disabled `electric-indent-local-mode' for this buffer.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment