Emacs/cc-ide: Further emacs22 fixes

diff --git a/cc-ide/cc-engine-2.el b/cc-ide/cc-engine-2.el
index 46d7847..1247e55 100644 (file)
--- a/cc-ide/cc-engine-2.el
+++ b/cc-ide/cc-engine-2.el
@@ -315,13 +315,18 @@
   (while (and (not (c-at-toplevel-p))
              (c-save-uplist -1)))
   (c-move-to-start-of-defun)
-  (let ((point (point)) beg)
-    (c-beginning-of-statement-1)
-    (setq beg (point))
-    (c-end-of-statement)
-    (if (> (point) point)
-       (goto-char beg)
-      (goto-char point))
+  (let ((point (point))
+       (flag (c-beginning-of-statement-1))
+       beg)
+    (cond ((eq flag 'label)
+          (c-forward-label))
+         ((eq flag 'previous)
+          (goto-char point)))
+    ;(setq beg (point))
+    ;(c-end-of-statement)
+    ;(if (> (point) point)
+       ;(goto-char beg)
+      ;(goto-char point))
     (c-forward-syntactic-ws)))
 
 (defun c-forward-out-of-comment ()