mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Code Issues Releases Activity

(electric-layout-post-self-insert-function-1): Simplify.

Browse Source 
Call electric--after-char-pos right from the start, and take advantage of the
fact that it guarantees to return the right position or nil.
This commit is contained in:
Stefan Monnier 2019-01-18 17:20:21 -05:00
parent 0621591687
commit 78725e49d2
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lisp/electric.el
View File

@ -394,28 +394,23 @@ If multiple rules match, only first one is executed.")
;; for edebug's sake, a separate function
(defun electric-layout-post-self-insert-function-1 ()
(let* (pos
(let* ((pos (electric--after-char-pos))
probe
(rules electric-layout-rules)
(rule
(catch 'done
(while (setq probe (pop rules))
(cond ((and (consp probe)
(eq (car probe) last-command-event))
(throw 'done (cdr probe)))
((functionp probe)
(let ((res
(save-excursion
(goto-char
(or pos (setq pos (electric--after-char-pos))))
;; Ensure probe is called at the
;; promised place. FIXME: maybe warn if
;; it isn't
(when (eq (char-before) last-command-event)
(funcall probe last-command-event)))))
(when res (throw 'done res)))))))))
(when pos
(while (setq probe (pop rules))
(cond ((and (consp probe)
(eq (car probe) last-command-event))
(throw 'done (cdr probe)))
((functionp probe)
(let ((res
(save-excursion
(goto-char pos)
(funcall probe last-command-event))))
(when res (throw 'done res))))))))))
(when (and rule
(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)