diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/electric.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/electric.el')
| -rw-r--r-- | lisp/electric.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/electric.el b/lisp/electric.el index 6701a36d8bb..4394fae4366 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -245,10 +245,7 @@ or comment." 'electric-indent-functions last-command-event) (memq last-command-event electric-indent-chars)))) - (not - (or (memq act '(nil no-indent)) - ;; In a string or comment. - (unless (eq act 'do-indent) (nth 8 (syntax-ppss)))))))) + (not (memq act '(nil no-indent)))))) ;; If we error during indent, silently give up since this is an ;; automatic action that the user didn't explicitly request. ;; But we don't want to suppress errors from elsewhere in *this* |