(add-log-current-defun): Support more C DEFUN forms.

2 files changed, 14 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acf70150ce2..e7374fbff1d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-21  Sam Steingold  <sds@gnu.org>
+
+        * add-log.el (add-log-current-defun): Support more C DEFUN forms.
+
 2005-03-21  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * progmodes/dcl-mode.el (dcl-font-lock-keywords):
diff --git a/lisp/add-log.el b/lisp/add-log.el
index ce98760222d..7706a697755 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -812,7 +812,7 @@ Has a preference of looking backwards."
                                  (looking-at "[ \t\n]"))
                        (forward-line -1))
                      ;; See if this is using the DEFUN macro used in Emacs,
-                     ;; or the DEFUN macro used by the C library.
+                     ;; or the DEFUN macro used by the C library:
                      (if (condition-case nil
                              (and (save-excursion
                                     (end-of-line)
@@ -824,16 +824,20 @@ Has a preference of looking backwards."
                                     (looking-at "DEFUN\\b"))
                                   (>= location tem))
                            (error nil))
+                         ;; DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, ...) ==> Ffile_name_directory
+                         ;; DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) ==> POSIX::STREAM-LOCK
                          (progn
                            (goto-char tem)
                            (down-list 1)
-                           (if (= (char-after (point)) ?\")
-                               (progn
-                                 (forward-sexp 1)
-                                 (skip-chars-forward " ,")))
+                           (when (= (char-after (point)) ?\")
+                             (forward-sexp 1)
+                             (search-forward ","))
+                           (skip-syntax-forward " ")
                            (buffer-substring-no-properties
                             (point)
-                            (progn (forward-sexp 1)
+                            (progn (search-forward ",")
+                                   (forward-char -1)
+                                   (skip-syntax-backward " ")
                                    (point))))
                        (if (looking-at "^[+-]")
                            (change-log-get-method-definition)