aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-11-04 15:45:36 -0500
committerStefan Monnier2013-11-04 15:45:36 -0500
commita0d5f7a4a3c9136ba9b2ab6deec28222c0c8b513 (patch)
tree480340d948463635b02cdec6c157d11b604bcfc3
parentc93f3f5c5c7d682faf14f908e960632f451cb847 (diff)
downloademacs-a0d5f7a4a3c9136ba9b2ab6deec28222c0c8b513.tar.gz
emacs-a0d5f7a4a3c9136ba9b2ab6deec28222c0c8b513.zip
* lisp/rect.el (rectangle--highlight-for-redisplay):
* lisp/emacs-lisp/smie.el (smie--next-indent-change): Use buffer-chars-modified-tick.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/smie.el4
-rw-r--r--lisp/rect.el4
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 @@
12013-11-04 Stefan Monnier <monnier@iro.umontreal.ca> 12013-11-04 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * rect.el (rectangle--highlight-for-redisplay):
4 * emacs-lisp/smie.el (smie--next-indent-change):
5 Use buffer-chars-modified-tick.
6
3 * emacs-lisp/byte-run.el (defmacro, defun): Set their `indent' property. 7 * emacs-lisp/byte-run.el (defmacro, defun): Set their `indent' property.
4 8
5 * electric.el (electric-indent-post-self-insert-function): 9 * 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:
1833 "Go to the next line that needs to be reindented (and reindent it)." 1833 "Go to the next line that needs to be reindented (and reindent it)."
1834 (interactive) 1834 (interactive)
1835 (while 1835 (while
1836 (let ((tick (buffer-modified-tick))) 1836 (let ((tick (buffer-chars-modified-tick)))
1837 (indent-according-to-mode) 1837 (indent-according-to-mode)
1838 (eq tick (buffer-modified-tick))) 1838 (eq tick (buffer-chars-modified-tick)))
1839 (forward-line 1))) 1839 (forward-line 1)))
1840 1840
1841;;; User configuration 1841;;; 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."
481 ((not rectangle-mark-mode) 481 ((not rectangle-mark-mode)
482 (funcall orig start end window rol)) 482 (funcall orig start end window rol))
483 ((and (eq 'rectangle (car-safe rol)) 483 ((and (eq 'rectangle (car-safe rol))
484 (eq (nth 1 rol) (buffer-modified-tick)) 484 (eq (nth 1 rol) (buffer-chars-modified-tick))
485 (eq start (nth 2 rol)) 485 (eq start (nth 2 rol))
486 (eq end (nth 3 rol))) 486 (eq end (nth 3 rol)))
487 rol) 487 rol)
@@ -562,7 +562,7 @@ Activates the region if needed. Only lasts until the region is deactivated."
562 (push ol nrol)) 562 (push ol nrol))
563 (forward-line 1)) 563 (forward-line 1))
564 (mapc #'delete-overlay old) 564 (mapc #'delete-overlay old)
565 `(rectangle ,(buffer-modified-tick) ,start ,end ,@nrol)))))) 565 `(rectangle ,(buffer-chars-modified-tick) ,start ,end ,@nrol))))))
566 566
567(defun rectangle--unhighlight-for-redisplay (orig rol) 567(defun rectangle--unhighlight-for-redisplay (orig rol)
568 (if (not (eq 'rectangle (car-safe rol))) 568 (if (not (eq 'rectangle (car-safe rol)))