diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-31 19:38:16 +0100 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-31 19:38:16 +0100 |
| commit | f486841f693606fff8f40a47f9d1a5afcf0a343d (patch) | |
| tree | 94c1441d0778e0efb1865856115455bcfd360116 /lisp | |
| parent | c8c599548191c0d9f903e20d010b076dcd74170a (diff) | |
| download | emacs-f486841f693606fff8f40a47f9d1a5afcf0a343d.tar.gz emacs-f486841f693606fff8f40a47f9d1a5afcf0a343d.tar.bz2 emacs-f486841f693606fff8f40a47f9d1a5afcf0a343d.zip | |
More merge fixes.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/cedet/ChangeLog | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f5ab5f3f312..018e7da2a83 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -30,7 +30,7 @@ 2010-10-31 Aaron S. Hawley <aaron.s.hawley@gmail.com> - * add-log.el (find-change-log): Use derived-mode-p rather than + * vc/add-log.el (find-change-log): Use derived-mode-p rather than major-mode (bug#7284). 2010-10-31 Glenn Morris <rgm@gnu.org> diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 3ab14039828..6daabfecc89 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -6,12 +6,6 @@ (semantic-symref-rb-toggle-expand-tag): Replace inappropriate uses of toggle-read-only. -2010-10-31 Juanma Barranquero <lekktu@gmail.com> - - * semantic/symref/list.el (semantic-symref-list-rename-open-hits): - Fix typo in message. - (semantic-symref-list-map-open-hits): Fix typo in docstring. - 2010-09-30 Chong Yidong <cyd@stupidchicken.com> * semantic/bovine/el.el: |