diff options
| author | João Távora <joaotavora@gmail.com> | 2018-12-29 18:34:53 +0000 |
|---|---|---|
| committer | João Távora <joaotavora@gmail.com> | 2018-12-29 18:34:53 +0000 |
| commit | 80a19b8b7a0f48eac410f66653d975c623d3c79c (patch) | |
| tree | d2bcbd73f4f8a1758ca0ec4437112a51ecd89c68 | |
| parent | ba97dad7c427f3d6c1861b0ff1e139e7a3226bc0 (diff) | |
| download | emacs-scratch/fix-33794-extend-electric-layout-mode.tar.gz | |
Another iteration for an improved electric-layout-modescratch/fix-33794-extend-electric-layout-mode
* lisp/electric.el (electric-layout-rules): Add nil back to
symbols list.
(electric-layout-post-self-insert-function-1): Call function in
correct position.
| -rw-r--r-- | lisp/electric.el | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/electric.el b/lisp/electric.el index b52efb07c7b..0484319ed47 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -372,7 +372,8 @@ just inserted was CHAR. WHERE can be: -* one of the symbols `before', `after', `around', `after-stay'. +* one of the symbols `before', `after', `around', `after-stay', + or nil. * a list of the preceding symbols, processed in order of appearance to insert multiple newlines; @@ -408,10 +409,14 @@ If multiple rules match, only first one is executed.") (eq (car probe) last-command-event)) (throw 'done (cdr probe))) ((functionp probe) - (let ((res (funcall probe last-command-event))) + (let ((res + (save-excursion + (goto-char + (or pos (setq pos (electric--after-char-pos)))) + (funcall probe last-command-event)))) (when res (throw 'done res))))))))) (when (and rule - (setq pos (electric--after-char-pos)) + (or pos (setq pos (electric--after-char-pos))) ;; Not in a string or comment. (not (nth 8 (save-excursion (syntax-ppss pos))))) (goto-char pos) |