/[emacs]/emacs/lisp/smerge-mode.el
ViewVC logotype

Diff of /emacs/lisp/smerge-mode.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.44 by rms, Fri Sep 9 01:16:05 2005 UTC revision 1.45 by monnier, Fri Sep 23 18:15:20 2005 UTC
# Line 335  according to `smerge-match-conflict'.") Line 335  according to `smerge-match-conflict'.")
335    
336  (defun smerge-remove-props (beg end)  (defun smerge-remove-props (beg end)
337    (remove-overlays beg end 'smerge 'refine)    (remove-overlays beg end 'smerge 'refine)
338    (remove-overlays beg end 'smerge 'conflict))    (remove-overlays beg end 'smerge 'conflict)
339      ;; Now that we use overlays rather than text-properties, this function
340      ;; does not cause refontification any more.  It can be seen very clearly
341      ;; in buffers where jit-lock-contextually is not t, in which case deleting
342      ;; the "<<<<<<< foobar" leading line leaves the rest of the conflict
343      ;; highlighted as if it were still a valid conflict.  Note that in many
344      ;; important cases (such as the previous example) we're actually called
345      ;; during font-locking so inhibit-modification-hooks is non-nil, so we
346      ;; can't just modify the buffer and expect font-lock to be triggered as in:
347      ;; (put-text-property beg end 'smerge-force-highlighting nil)
348      (remove-text-properties beg end '(fontified nil)))
349    
350  (defun smerge-popup-context-menu (event)  (defun smerge-popup-context-menu (event)
351    "Pop up the Smerge mode context menu under mouse."    "Pop up the Smerge mode context menu under mouse."

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.45

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26