Commit 91773964 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(smerge-remove-props): Cause re-highlighting of the whole conflict.

parent 3480d92b
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> 2005-09-23 Carsten Dominik <dominik@science.uva.nl>
   
* textmodes/org.el (org-mode-map, orgtbl-mode-map): Move * textmodes/org.el (org-mode-map, orgtbl-mode-map):
keybindings with `C-c C-h' prefix to `C-c C-x' prefix. Make use 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 of `remap' feature when available. Additional key bindings for
better tty support. better tty support.
(org-mode-restart, org-force-self-insert): New commands. (org-mode-restart, org-force-self-insert): New commands.
(org-time-stamp-inactive): New command. (org-time-stamp-inactive): New command.
(org-remap): New function. (org-remap): New function.
(org-table-auto-blank-field, org-level-color-stars-only): New (org-table-auto-blank-field, org-level-color-stars-only): New options.
options. (org-enable-fixed-width-editor): Move to `org-structure'
(org-enable-fixed-width-editor): Moved to `org-structure'
customization group. 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. blank field after field motion commands.
   
2005-09-23 Kenichi Handa <handa@m17n.org> 2005-09-23 Kenichi Handa <handa@m17n.org>
   
* international/mule-cmds.el (set-language-environment): Don't * international/mule-cmds.el (set-language-environment):
check utf-translate-cjk-lang-env is nil or not on deciding if we Don't check utf-translate-cjk-lang-env is nil or not on deciding if we
have to call utf-translate-cjk-load-tables. have to call utf-translate-cjk-load-tables.
   
2005-09-22 Stefan Monnier <monnier@iro.umontreal.ca> 2005-09-22 Stefan Monnier <monnier@iro.umontreal.ca>
......
...@@ -335,7 +335,17 @@ according to `smerge-match-conflict'.") ...@@ -335,7 +335,17 @@ according to `smerge-match-conflict'.")
(defun smerge-remove-props (beg end) (defun smerge-remove-props (beg end)
(remove-overlays beg end 'smerge 'refine) (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) (defun smerge-popup-context-menu (event)
"Pop up the Smerge mode context menu under mouse." "Pop up the Smerge mode context menu under mouse."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment