Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
755e0210
Commit
755e0210
authored
Sep 08, 2009
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(smerge-remove-props, smerge-refine):
Use with-silent-modifications (bug#4342).
parent
83a5aac5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
lisp/ChangeLog
lisp/ChangeLog
+3
-0
lisp/smerge-mode.el
lisp/smerge-mode.el
+6
-6
No files found.
lisp/ChangeLog
View file @
755e0210
2009-09-08 Stefan Monnier <monnier@iro.umontreal.ca>
* smerge-mode.el (smerge-remove-props, smerge-refine):
Use with-silent-modifications (bug#4342).
* subr.el (with-silent-modifications): New macro.
2009-09-07 Juanma Barranquero <lekktu@gmail.com>
...
...
lisp/smerge-mode.el
View file @
755e0210
...
...
@@ -367,9 +367,8 @@ according to `smerge-match-conflict'.")
;; during font-locking so inhibit-modification-hooks is non-nil, so we
;; can't just modify the buffer and expect font-lock to be triggered as in:
;; (put-text-property beg end 'smerge-force-highlighting nil)
(
let
((
modified
(
buffer-modified-p
)))
(
remove-text-properties
beg
end
'
(
fontified
nil
))
(
restore-buffer-modified-p
modified
)))
(
with-silent-modifications
(
remove-text-properties
beg
end
'
(
fontified
nil
))))
(
defun
smerge-popup-context-menu
(
event
)
"Pop up the Smerge mode context menu under mouse."
...
...
@@ -1015,9 +1014,10 @@ repeating the command will highlight other 2 parts."
(
n2
(
if
(
eq
part
3
)
2
3
)))
(
smerge-ensure-match
n1
)
(
smerge-ensure-match
n2
)
(
put-text-property
(
match-beginning
0
)
(
1+
(
match-beginning
0
))
'smerge-refine-part
(
cons
(
buffer-chars-modified-tick
)
part
))
(
with-silent-modifications
(
put-text-property
(
match-beginning
0
)
(
1+
(
match-beginning
0
))
'smerge-refine-part
(
cons
(
buffer-chars-modified-tick
)
part
)))
(
smerge-refine-subst
(
match-beginning
n1
)
(
match-end
n1
)
(
match-beginning
n2
)
(
match-end
n2
)
'
((
smerge
.
refine
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment