[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-defs.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/08/11 21:38:04

Index: cc-defs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/cc-defs.el,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- cc-defs.el  27 Jun 2008 21:12:46 -0000      1.58
+++ cc-defs.el  11 Aug 2008 21:38:04 -0000      1.59
@@ -1440,13 +1440,14 @@
                         '1-bit)
                       list)))
 
-    ;; In Emacs >= 23, beginning-of-defun will passes its parameter to
-    ;; beginning-of-defun-function.  Assume end-of-defun does the same.
+    ;; In Emacs >= 23, beginning-of-defun-raw passes its argument to
+    ;; beginning-of-defun-function.  Assume end-of-defun does likewise.
     (let ((beginning-of-defun-function
           (lambda (&optional arg)
             (not (eq arg nil)))))
-      (if (beginning-of-defun 1)
-         (setq list (cons 'argumentative-bod-function list))))
+      (save-excursion
+       (if (beginning-of-defun-raw 1)
+           (setq list (cons 'argumentative-bod-function list)))))
 
     (let ((buf (generate-new-buffer " test"))
          parse-sexp-lookup-properties