From: Juanma Barranquero Date: Sun, 31 Oct 2010 18:38:16 +0000 (+0100) Subject: More merge fixes. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~422^2~38 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f486841f693606fff8f40a47f9d1a5afcf0a343d;p=emacs.git More merge fixes. --- 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 - * 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 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 - - * 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 * semantic/bovine/el.el: