From b9fbc03b862413bfee2728b1760f959bfc912e56 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Wed, 20 Dec 2017 01:42:49 +0200 Subject: [PATCH] Widen in indent-for-tab-command in the normal case, too Fixing this obvious omission. * lisp/indent.el (indent--funcall-widened): New function. (indent-for-tab-command): Use it. --- lisp/indent.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lisp/indent.el b/lisp/indent.el index ccf0e99c08b..400280f615a 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -142,13 +142,11 @@ prefix argument is ignored." (old-indent (current-indentation))) ;; Indent the line. - (or (not (eq (funcall indent-line-function) 'noindent)) + (or (not (eq (indent--funcall-widened indent-line-function) 'noindent)) (indent--default-inside-comment) (when (or (<= (current-column) (current-indentation)) (not (eq tab-always-indent 'complete))) - (save-restriction - (widen) - (funcall (default-value 'indent-line-function))))) + (indent--funcall-widened (default-value 'indent-line-function)))) (cond ;; If the text was already indented right, try completion. @@ -170,6 +168,11 @@ prefix argument is ignored." (< (point) end-marker)) (indent-rigidly (point) end-marker indentation-change)))))))))) +(defun indent--funcall-widened (func) + (save-restriction + (widen) + (funcall func))) + (defun insert-tab (&optional arg) (let ((count (prefix-numeric-value arg))) (if (and abbrev-mode -- 2.39.2