<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -39,19 +39,16 @@
 (require 'shell)
 
 (defcustom beholder-command &quot;beholder&quot;
-  &quot;Command name to use to execute beholder.&quot;
   :group 'beholder
   :type '(string))
 
 (defun beholder ()
-  &quot;Fire up an instance of beholder in its own buffer with shell bindings and compile-mode highlighting and linking.&quot;
   (interactive)
   (let ((buffer (shell &quot;*beholder*&quot;)))
     (define-key shell-mode-map &quot;\C-c\C-a&quot; 'beholder-switch)
     (comint-send-string buffer (concat beholder-command &quot;\n&quot;))))
 
 (defun beholder-switch ()
-  &quot;Switch back and forth between beholder and the previous buffer&quot;
   (interactive)
   (if (equal &quot;*beholder*&quot; (buffer-name))
       (switch-to-buffer (other-buffer))</diff>
      <filename>editor_integration/emacs/beholder.el</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>beholder.el</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>7e62e618e6bf6841d93dd82247b1eb0369c852c3</id>
    </parent>
  </parents>
  <author>
    <name>Chad Humphries</name>
    <email>chad@spicycode.com</email>
  </author>
  <url>http://github.com/spicycode/beholder/commit/6e88d78f778070fac8ffc4ad384b9855d9b8b306</url>
  <id>6e88d78f778070fac8ffc4ad384b9855d9b8b306</id>
  <committed-date>2009-01-11T13:23:27-08:00</committed-date>
  <authored-date>2009-01-11T13:23:27-08:00</authored-date>
  <message>Minor merge conflict fix</message>
  <tree>70504d386dd85619fbd8477d8e03ebfc3bf82e80</tree>
  <committer>
    <name>Chad Humphries</name>
    <email>chad@spicycode.com</email>
  </committer>
</commit>
