Merge branch 'bug-125'

Conflicts:

	Source/BSSourceView.m

diff --cc Source/BSSourceView.m
index e5d2552f9b06856e3b993b91e680862366900f0f,554794cc0254eb86c57bc0f642c6be4d7dbfb164..70ced9af95b8c7b43329b2a9fce146b8cd7c33fa
--- 1/Source/BSSourceView.m
--- 2/Source/BSSourceView.m
+++ b/Source/BSSourceView.m
@@@ -41,26 -53,9 +53,27 @@@
   */
  - (void)setFile:(NSString *)f
  {
-       file = f;
+       [file release];
+       file = [f retain];
 -      [textView setString:[NSString stringWithContentsOfFile:f]];
 +
 +      @try
 +      {
 +              // Attempt to use the PHP CLI to highlight the source file as HTML
 +              NSPipe* pipe = [NSPipe pipe];
 +              NSTask* task = [NSTask new];
 +              [task setLaunchPath:@"/usr/bin/php"]; // This is the path to the default Leopard PHP executable
 +              [task setArguments:[NSArray arrayWithObjects:@"-s", f, nil]];
 +              [task setStandardOutput:pipe];
 +              [task launch];
 +              NSData* data               = [[pipe fileHandleForReading] readDataToEndOfFile];
 +              NSAttributedString* source = [[NSAttributedString alloc] initWithHTML:data documentAttributes:NULL];
 +              [[textView textStorage] setAttributedString:source];
 +      }
-       @catch(NSException* exception)
++      @catch (NSException* exception)
 +      {
 +              // If the PHP executable is not available then the NSTask will throw an exception
 +              [textView setString:[NSString stringWithContentsOfFile:f]];
 +      }
  }
  
  /**

diff --cc Source/BreakpointWindowController.m
Simple merge