[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v |
Date: |
Sun, 21 Jan 2007 19:29:51 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Alan Mackenzie <acmacm> 07/01/21 19:29:51
Index: cc-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-cmds.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- cc-cmds.el 21 Jan 2007 03:20:45 -0000 1.51
+++ cc-cmds.el 21 Jan 2007 19:29:51 -0000 1.52
@@ -1383,8 +1383,7 @@
;;
;; This function might do hidden buffer changes.
(save-excursion
- (let* (pos
- kluge-start
+ (let* (kluge-start
decl-result brace-decl-p
(start (point))
(paren-state (c-parse-state))
@@ -1417,11 +1416,12 @@
(setq kluge-start (point))
(setq decl-result
(car (c-beginning-of-decl-1
+ ;; NOTE: If we're in a K&R region, this might be the start
+ ;; of a parameter declaration, not the actual function.
(and least-enclosing ; LIMIT for c-b-of-decl-1
(c-safe-position least-enclosing paren-state)))))
;; Has the declaration we've gone back to got braces?
- (setq pos (point)) ; the search limit for c-recognize-knr-p
(setq brace-decl-p
(save-excursion
(and (c-syntactic-re-search-forward "[;{]" nil t t)
@@ -1431,7 +1431,7 @@
;; ';' in a K&R argdecl. In
;; that case the declaration
;; should contain a block.
- (c-in-knr-argdecl pos))))))
+ (c-in-knr-argdecl))))))
(cond
((= (point) kluge-start) ; might be BOB or unbalanced parens.
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Alan Mackenzie, 2007/01/01
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Alan Mackenzie, 2007/01/02
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Alan Mackenzie, 2007/01/03
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Alan Mackenzie, 2007/01/20
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Glenn Morris, 2007/01/20
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v,
Alan Mackenzie <=