[Emacs-diffs] Changes to emacs/lisp/add-log.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       07/01/27 19:53:25

Index: add-log.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/add-log.el,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- add-log.el  22 Jan 2007 00:09:22 -0000      1.183
+++ add-log.el  27 Jan 2007 19:53:25 -0000      1.184
@@ -828,6 +828,10 @@
                     ;; here is the position after the final }.
                     (backward-sexp 1)
                     (forward-sexp 1)
+                     ;; Skip the semicolon ``;'' for
+                    ;; enum/union/struct/class definition.
+                    (if (= (char-after (point)) ?\;)
+                        (forward-char 1))
                     (setq previous-defun-end (point)))
 
                   (save-excursion
@@ -921,19 +925,9 @@
                                 ;; Include certain keywords if they
                                 ;; precede the name.
                                 (setq middle (point))
-                                ;; Single (forward-sexp -1) invocation is
-                                ;; not enough for C++ member function defined 
-                                ;; as part of nested class and/or namespace 
-                                ;; like:
-                                ;;
-                                ;;   void 
-                                ;;   foo::bar::baz::bazz ()
-                                ;;   { ...
-                                ;; 
-                                ;; Here we have to move the point to 
-                                ;; the beginning of foo, not bazz.
-                                (while (not (looking-back "\\(^\\|[ \t]\\)"))
-                                  (forward-sexp -1))
+                                ;; We tried calling `forward-sexp' in a loop
+                                ;; but it causes inconsistency for C names.
+                                (forward-sexp -1)
                                 ;; Is this C++ method?
                                 (when (and (< 2 middle)
                                            (string= (buffer-substring (- 
middle 2)