diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-09-23 18:15:20 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-09-23 18:15:20 +0000 |
| commit | 91773964a584a74b2879cd344f6094aad4afd6e8 (patch) | |
| tree | 23752239017779f5e75db8d9f6736b6cd67fa824 /lisp | |
| parent | 3480d92bb007bebdb644afbe667a02c00edbb334 (diff) | |
| download | emacs-91773964a584a74b2879cd344f6094aad4afd6e8.tar.gz | |
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 20 | ||||
| -rw-r--r-- | lisp/smerge-mode.el | 12 |
2 files changed, 23 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 630e5128365..a545e3e400a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,23 +1,27 @@ +2005-09-23 Stefan Monnier <monnier@iro.umontreal.ca> + + * smerge-mode.el (smerge-remove-props): Cause re-highlighting of the + whole conflict. + 2005-09-23 Carsten Dominik <dominik@science.uva.nl> - * textmodes/org.el (org-mode-map, orgtbl-mode-map): Move - keybindings with `C-c C-h' prefix to `C-c C-x' prefix. Make use + * textmodes/org.el (org-mode-map, orgtbl-mode-map): + Move keybindings with `C-c C-h' prefix to `C-c C-x' prefix. Make use of `remap' feature when available. Additional key bindings for better tty support. (org-mode-restart, org-force-self-insert): New commands. (org-time-stamp-inactive): New command. (org-remap): New function. - (org-table-auto-blank-field, org-level-color-stars-only): New - options. - (org-enable-fixed-width-editor): Moved to `org-structure' + (org-table-auto-blank-field, org-level-color-stars-only): New options. + (org-enable-fixed-width-editor): Move to `org-structure' customization group. - (org-self-insert-command, orgtbl-self-insert-command): Modified to + (org-self-insert-command, orgtbl-self-insert-command): Modify to blank field after field motion commands. 2005-09-23 Kenichi Handa <handa@m17n.org> - * international/mule-cmds.el (set-language-environment): Don't - check utf-translate-cjk-lang-env is nil or not on deciding if we + * international/mule-cmds.el (set-language-environment): + Don't check utf-translate-cjk-lang-env is nil or not on deciding if we have to call utf-translate-cjk-load-tables. 2005-09-22 Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 31c7c4f2f12..e777f3f8211 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -335,7 +335,17 @@ according to `smerge-match-conflict'.") (defun smerge-remove-props (beg end) (remove-overlays beg end 'smerge 'refine) - (remove-overlays beg end 'smerge 'conflict)) + (remove-overlays beg end 'smerge 'conflict) + ;; Now that we use overlays rather than text-properties, this function + ;; does not cause refontification any more. It can be seen very clearly + ;; in buffers where jit-lock-contextually is not t, in which case deleting + ;; the "<<<<<<< foobar" leading line leaves the rest of the conflict + ;; highlighted as if it were still a valid conflict. Note that in many + ;; important cases (such as the previous example) we're actually called + ;; 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) + (remove-text-properties beg end '(fontified nil))) (defun smerge-popup-context-menu (event) "Pop up the Smerge mode context menu under mouse." |