From a0d5f7a4a3c9136ba9b2ab6deec28222c0c8b513 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 4 Nov 2013 15:45:36 -0500 Subject: [PATCH] * lisp/rect.el (rectangle--highlight-for-redisplay): * lisp/emacs-lisp/smie.el (smie--next-indent-change): Use buffer-chars-modified-tick. --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/smie.el | 4 ++-- lisp/rect.el | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 66051898dd3..3d8520b1b74 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2013-11-04 Stefan Monnier + * rect.el (rectangle--highlight-for-redisplay): + * emacs-lisp/smie.el (smie--next-indent-change): + Use buffer-chars-modified-tick. + * emacs-lisp/byte-run.el (defmacro, defun): Set their `indent' property. * electric.el (electric-indent-post-self-insert-function): diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 26a72d7f3a7..f025a8b400b 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1833,9 +1833,9 @@ KEYWORDS are additional arguments, which can use the following keywords: "Go to the next line that needs to be reindented (and reindent it)." (interactive) (while - (let ((tick (buffer-modified-tick))) + (let ((tick (buffer-chars-modified-tick))) (indent-according-to-mode) - (eq tick (buffer-modified-tick))) + (eq tick (buffer-chars-modified-tick))) (forward-line 1))) ;;; User configuration diff --git a/lisp/rect.el b/lisp/rect.el index 5f4f1672bdd..4335bb25409 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -481,7 +481,7 @@ Activates the region if needed. Only lasts until the region is deactivated." ((not rectangle-mark-mode) (funcall orig start end window rol)) ((and (eq 'rectangle (car-safe rol)) - (eq (nth 1 rol) (buffer-modified-tick)) + (eq (nth 1 rol) (buffer-chars-modified-tick)) (eq start (nth 2 rol)) (eq end (nth 3 rol))) rol) @@ -562,7 +562,7 @@ Activates the region if needed. Only lasts until the region is deactivated." (push ol nrol)) (forward-line 1)) (mapc #'delete-overlay old) - `(rectangle ,(buffer-modified-tick) ,start ,end ,@nrol)))))) + `(rectangle ,(buffer-chars-modified-tick) ,start ,end ,@nrol)))))) (defun rectangle--unhighlight-for-redisplay (orig rol) (if (not (eq 'rectangle (car-safe rol))) -- 2.11.4.GIT