Mercurial > emacs
comparison lisp/ChangeLog @ 65658:5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 23 Sep 2005 18:15:20 +0000 |
parents | 1dcb69996086 |
children | a36daa69a131 |
comparison
equal
deleted
inserted
replaced
65657:c6e45e9a83bf | 65658:5bde6d4759d6 |
---|---|
1 2005-09-23 Stefan Monnier <monnier@iro.umontreal.ca> | |
2 | |
3 * smerge-mode.el (smerge-remove-props): Cause re-highlighting of the | |
4 whole conflict. | |
5 | |
1 2005-09-23 Carsten Dominik <dominik@science.uva.nl> | 6 2005-09-23 Carsten Dominik <dominik@science.uva.nl> |
2 | 7 |
3 * textmodes/org.el (org-mode-map, orgtbl-mode-map): Move | 8 * textmodes/org.el (org-mode-map, orgtbl-mode-map): |
4 keybindings with `C-c C-h' prefix to `C-c C-x' prefix. Make use | 9 Move keybindings with `C-c C-h' prefix to `C-c C-x' prefix. Make use |
5 of `remap' feature when available. Additional key bindings for | 10 of `remap' feature when available. Additional key bindings for |
6 better tty support. | 11 better tty support. |
7 (org-mode-restart, org-force-self-insert): New commands. | 12 (org-mode-restart, org-force-self-insert): New commands. |
8 (org-time-stamp-inactive): New command. | 13 (org-time-stamp-inactive): New command. |
9 (org-remap): New function. | 14 (org-remap): New function. |
10 (org-table-auto-blank-field, org-level-color-stars-only): New | 15 (org-table-auto-blank-field, org-level-color-stars-only): New options. |
11 options. | 16 (org-enable-fixed-width-editor): Move to `org-structure' |
12 (org-enable-fixed-width-editor): Moved to `org-structure' | |
13 customization group. | 17 customization group. |
14 (org-self-insert-command, orgtbl-self-insert-command): Modified to | 18 (org-self-insert-command, orgtbl-self-insert-command): Modify to |
15 blank field after field motion commands. | 19 blank field after field motion commands. |
16 | 20 |
17 2005-09-23 Kenichi Handa <handa@m17n.org> | 21 2005-09-23 Kenichi Handa <handa@m17n.org> |
18 | 22 |
19 * international/mule-cmds.el (set-language-environment): Don't | 23 * international/mule-cmds.el (set-language-environment): |
20 check utf-translate-cjk-lang-env is nil or not on deciding if we | 24 Don't check utf-translate-cjk-lang-env is nil or not on deciding if we |
21 have to call utf-translate-cjk-load-tables. | 25 have to call utf-translate-cjk-load-tables. |
22 | 26 |
23 2005-09-22 Stefan Monnier <monnier@iro.umontreal.ca> | 27 2005-09-22 Stefan Monnier <monnier@iro.umontreal.ca> |
24 | 28 |
25 * mouse.el (mouse-move-drag-overlay): Fix last change. | 29 * mouse.el (mouse-move-drag-overlay): Fix last change. |