2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1e1f7615cb..241087e608e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-22  Masatake YAMATO  <jet@gyve.org>
+
+        * add-log.el (add-log-current-defun): Use `forward-sexp'
+        instead of `forward-word' to pick c++::symbol.
+        Reported by Herbert Euler <herberteuler@hotmail.com>.
+
 2006-09-22  Kenichi Handa  <handa@m17n.org>
 
         * bindings.el: Fix setting self-insert-command for multibyte
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 393a696d3f1..d60f920244a 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -914,7 +914,7 @@ Has a preference of looking backwards."
                                ;; Include certain keywords if they
                                ;; precede the name.
                                (setq middle (point))
-                               (forward-word -1)
+                               (forward-sexp -1)
                                ;; Is this C++ method?
                                (when (and (< 2 middle)
                                           (string= (buffer-substring (- middle 2)