(setq last-command-event (aref cmd (1- (length cmd)))
this-command (key-binding cmd t)
cmd this-command)
- ;; This makes universal-argument-other-key work.
- (setq universal-argument-num-events 0)
(if (or (prog1 quit-flag (setq quit-flag nil))
(eq last-input-event ?\C-g))
(progn (setq unread-command-events nil
(eq (char-before) last-command-event)))))
pos)))
-;; Electric indentation.
+;;; Electric indentation.
;; Autoloading variables is generally undesirable, but major modes
;; should usually set this variable by adding elements to the default
point right after that char, and it should return t to cause indentation,
`no-indent' to prevent indentation or nil to let other functions decide.")
+(defvar-local electric-indent-inhibit nil
+ "If non-nil, reindentation is not appropriate for this buffer.
+This should be set by major modes such as `python-mode' since
+Python does not lend itself to fully automatic indentation.")
+
+(defvar electric-indent-functions-without-reindent
+ '(indent-relative indent-to-left-margin indent-relative-maybe
+ py-indent-line coffee-indent-line org-indent-line
+ haskell-indentation-indent-line haskell-indent-cycle haskell-simple-indent)
+ "List of indent functions that can't reindent.
+If `line-indent-function' is one of those, then `electric-indent-mode' will
+not try to reindent lines. It is normally better to make the major
+mode set `electric-indent-inhibit', but this can be used as a workaround.")
+
(defun electric-indent-post-self-insert-function ()
;; FIXME: This reindents the current line, but what we really want instead is
;; to reindent the whole affected text. That's the current line for simple
(unless (eq act 'do-indent) (nth 8 (syntax-ppss))))))))
;; For newline, we want to reindent both lines and basically behave like
;; reindent-then-newline-and-indent (whose code we hence copied).
- (when (< (1- pos) (line-beginning-position))
+ (when (<= pos (line-beginning-position))
(let ((before (copy-marker (1- pos) t)))
(save-excursion
- (unless (memq indent-line-function
- '(indent-relative indent-to-left-margin
- indent-relative-maybe))
+ (unless (or (memq indent-line-function
+ electric-indent-functions-without-reindent)
+ electric-indent-inhibit)
;; Don't reindent the previous line if the indentation function
;; is not a real one.
(goto-char before)
;; whereas we need `move after insertion', so we do the
;; save/restore by hand.
(goto-char before)
- ;; Remove the trailing whitespace after indentation because
- ;; indentation may (re)introduce the whitespace.
- (delete-horizontal-space t))))
- (unless (memq indent-line-function '(indent-to-left-margin))
+ (when (eolp)
+ ;; Remove the trailing whitespace after indentation because
+ ;; indentation may (re)introduce the whitespace.
+ (delete-horizontal-space t)))))
+ (unless (and electric-indent-inhibit
+ (> pos (line-beginning-position)))
(indent-according-to-mode)))))
;;;###autoload
the hook `electric-indent-functions' returns non-nil, or you
insert a character from `electric-indent-chars'."
:global t
- :group 'electricity
(if (not electric-indent-mode)
(remove-hook 'post-self-insert-hook
#'electric-indent-post-self-insert-function)
(delq #'electric-indent-post-self-insert-function
(cdr bp))))))))
-;; Electric pairing.
+;;;###autoload
+(define-minor-mode electric-indent-local-mode
+ "Toggle `electric-indent-mode' only in this buffer."
+ :variable (buffer-local-value 'electric-indent-mode (current-buffer))
+ (cond
+ ((eq electric-indent-mode (default-value 'electric-indent-mode))
+ (kill-local-variable 'electric-indent-mode))
+ ((not (default-value 'electric-indent-mode))
+ ;; Locally enabled, but globally disabled.
+ (electric-indent-mode 1) ; Setup the hooks.
+ (setq-default electric-indent-mode nil) ; But keep it globally disabled.
+ )))
+
+;;; Electric pairing.
(defcustom electric-pair-pairs
'((?\" . ?\"))
"Alist of pairs that should be used regardless of major mode."
- :group 'electricity
:version "24.1"
:type '(repeat (cons character character)))
just skip that character instead, so that hitting ( followed by ) results
in \"()\" rather than \"())\".
This can be convenient for people who find it easier to hit ) than C-f."
- :group 'electricity
:version "24.1"
:type 'boolean)
See options `electric-pair-pairs' and `electric-pair-skip-self'."
:global t
- :group 'electricity
(if electric-pair-mode
(progn
(add-hook 'post-self-insert-hook
(remove-hook 'self-insert-uses-region-functions
#'electric-pair-will-use-region)))
-;; Automatically add newlines after/before/around some chars.
+;;; Electric newlines after/before/around some chars.
(defvar electric-layout-rules '()
"List of rules saying where to automatically insert newlines.
the mode if ARG is omitted or nil.
The variable `electric-layout-rules' says when and how to insert newlines."
:global t
- :group 'electricity
(if electric-layout-mode
(add-hook 'post-self-insert-hook
#'electric-layout-post-self-insert-function)