aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-07-17 07:40:23 -0400
committerStefan Monnier2012-07-17 07:40:23 -0400
commit2143fa32671374cdef26fdb24355bf690728a344 (patch)
treef55bd46957047f3bd1ef4144ef8689a1f8a6f32e
parent5476a9a481cf3dfd3c986dedae55bb70156af171 (diff)
downloademacs-2143fa32671374cdef26fdb24355bf690728a344.tar.gz
emacs-2143fa32671374cdef26fdb24355bf690728a344.zip
* lisp/progmodes/cc-engine.el (c-forward-sws, c-backward-sws):
Avoid spuriously marking the buffer as modified because of c-is-sws.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/cc-engine.el6
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2516d775243..04cf8291dff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> 12012-07-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * progmodes/cc-engine.el (c-forward-sws, c-backward-sws):
4 Avoid spuriously marking the buffer as modified because of c-is-sws.
5
3 * progmodes/sh-script.el (sh-syntax-propertize-function): Mark "${#VAR" 6 * progmodes/sh-script.el (sh-syntax-propertize-function): Mark "${#VAR"
4 as not-a-comment (bug#11946). 7 as not-a-comment (bug#11946).
5 8
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 82aee7bdbb9..142ec4cdd66 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1688,6 +1688,7 @@ comment at the start of cc-engine.el for more info."
1688 ;; high as possible. 1688 ;; high as possible.
1689 (setq rung-pos (point))) 1689 (setq rung-pos (point)))
1690 1690
1691 (with-silent-modifications
1691 (while 1692 (while
1692 (progn 1693 (progn
1693 (while 1694 (while
@@ -1843,7 +1844,7 @@ comment at the start of cc-engine.el for more info."
1843 (1- last-put-in-sws-pos)) 1844 (1- last-put-in-sws-pos))
1844 (c-remove-is-and-in-sws (1- last-put-in-sws-pos) 1845 (c-remove-is-and-in-sws (1- last-put-in-sws-pos)
1845 last-put-in-sws-pos)))) 1846 last-put-in-sws-pos))))
1846 ))) 1847 ))))
1847 1848
1848(defun c-backward-sws () 1849(defun c-backward-sws ()
1849 ;; Used by `c-backward-syntactic-ws' to implement the unbounded search. 1850 ;; Used by `c-backward-syntactic-ws' to implement the unbounded search.
@@ -1881,6 +1882,7 @@ comment at the start of cc-engine.el for more info."
1881 (goto-char (setq rung-pos rung-is-marked)) 1882 (goto-char (setq rung-pos rung-is-marked))
1882 (goto-char simple-ws-beg)) 1883 (goto-char simple-ws-beg))
1883 1884
1885 (with-silent-modifications
1884 (while 1886 (while
1885 (progn 1887 (progn
1886 (while 1888 (while
@@ -2066,7 +2068,7 @@ comment at the start of cc-engine.el for more info."
2066 last-put-in-sws-pos) 2068 last-put-in-sws-pos)
2067 (c-remove-is-and-in-sws last-put-in-sws-pos 2069 (c-remove-is-and-in-sws last-put-in-sws-pos
2068 (1+ last-put-in-sws-pos))))) 2070 (1+ last-put-in-sws-pos)))))
2069 ))) 2071 ))))
2070 2072
2071 2073
2072;; Other whitespace tools 2074;; Other whitespace tools