Packets: Fix access problems for g++ < 4.1

[senf.git] / project.el

diff --git a/project.el b/project.el
index 2ec9007..7f83abe 100644 (file)
--- a/project.el
+++ b/project.el
@@ -2,11 +2,12 @@
 
  (defconst senf-c-style
   '((c-basic-offset              . 4)
-    (c-cleanup-list             . (empty-defun-braces 
-                                   defun-close-semi 
-                                   list-close-comma 
-                                   scope-operator 
-                                   compact-empty-funcall))
+    (c-backslash-column          . 98)
+    (c-cleanup-list              . (empty-defun-braces 
+                                   defun-close-semi 
+                                   list-close-comma 
+                                   scope-operator 
+                                   compact-empty-funcall))
     (c-hanging-braces-alist      . ((namespace-open after)
                                     (namespace-close before after)
                                     (brace-list-open)
@@ -27,10 +28,12 @@
 (c-add-style "senf" senf-c-style)
 
 (set (make-local-variable 'ccide-file-vars)
-     '(( fill-column  . 100    )
+     '(( fill-column  . 100 )
+       ( comment-column . 40 )
        ( c-file-style . "senf" )
        ( indent-tabs-mode . nil )
-       ( ispell-local-dictionary . "american" )))
+       ( ispell-local-dictionary . "american" )
+       ( compile-command . "scons -u test") ))
 
 (set (make-local-variable 'ccide-default-copyright)
      (concat "//\n"
@@ -49,6 +52,6 @@
              "// Free Software Foundation, Inc.,\n"
              "// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n"))
 
-(let ((local-conf (expand-file-name "project-local.el" ccide-project-root)))
-  (if (file-readable-p local-conf)
+(let ((local-conf (ccide-project-search-upwards "project-local.el")))
+  (if local-conf
       (load-file local-conf)))