aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/indent.el5
-rw-r--r--test/lisp/emacs-lisp/lisp-mode-tests.el1
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/indent.el b/lisp/indent.el
index 398585e1f90..db811cf35cc 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -300,8 +300,9 @@ only if necessary. It leaves point at end of indentation."
300 (progn (skip-chars-backward " ") (point)))) 300 (progn (skip-chars-backward " ") (point))))
301 (indent-to column)) 301 (indent-to column))
302 ((> cur-col column) ; too far right (after tab?) 302 ((> cur-col column) ; too far right (after tab?)
303 (delete-region (progn (move-to-column column t) (point)) 303 (let ((cur-indent (point)))
304 (progn (backward-to-indentation 0) (point))))))) 304 (delete-region (progn (move-to-column column t) (point))
305 cur-indent))))))
305 306
306(defun current-left-margin () 307(defun current-left-margin ()
307 "Return the left margin to use for this line. 308 "Return the left margin to use for this line.
diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el b/test/lisp/emacs-lisp/lisp-mode-tests.el
index 2ac0e5ce1d4..8598d419788 100644
--- a/test/lisp/emacs-lisp/lisp-mode-tests.el
+++ b/test/lisp/emacs-lisp/lisp-mode-tests.el
@@ -226,7 +226,6 @@ Expected initialization file: `%s'\"
226 226
227(ert-deftest lisp-indent-with-read-only-field () 227(ert-deftest lisp-indent-with-read-only-field ()
228 "Test indentation on line with read-only field (Bug#32014)." 228 "Test indentation on line with read-only field (Bug#32014)."
229 :expected-result :failed
230 (with-temp-buffer 229 (with-temp-buffer
231 (insert (propertize "prompt> " 'field 'output 'read-only t 230 (insert (propertize "prompt> " 'field 'output 'read-only t
232 'rear-nonsticky t 'front-sticky '(read-only))) 231 'rear-nonsticky t 'front-sticky '(read-only)))