[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Stefan Monnier]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.8226 emacs/lisp/ChangeLog:1.8227
*** emacs/lisp/ChangeLog:1.8226 Fri Sep 23 15:45:23 2005
--- emacs/lisp/ChangeLog        Fri Sep 23 18:15:20 2005
***************
*** 1,23 ****
  2005-09-23  Carsten Dominik  <address@hidden>
  
!       * 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'
        customization group.
!       (org-self-insert-command, orgtbl-self-insert-command): Modified to
        blank field after field motion commands.
  
  2005-09-23  Kenichi Handa  <address@hidden>
  
!       * 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  <address@hidden>
--- 1,27 ----
+ 2005-09-23  Stefan Monnier  <address@hidden>
+ 
+       * smerge-mode.el (smerge-remove-props): Cause re-highlighting of the
+       whole conflict.
+ 
  2005-09-23  Carsten Dominik  <address@hidden>
  
!       * 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): Move to `org-structure'
        customization group.
!       (org-self-insert-command, orgtbl-self-insert-command): Modify to
        blank field after field motion commands.
  
  2005-09-23  Kenichi Handa  <address@hidden>
  
!       * 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  <address@hidden>