various cleanups while tracking down an issue

fancy-settings/source/i18n.js

@@ -43,12 +43,12 @@ this.i18n = {
         "en": "Edit with Emacs is an extension that allows you to edit textareas and other editable text elements\
         of a web-page with your favourite editor. For this to work you need to be running an \"edit server\"\
         on your local machine. This is because extensions in Chrome(ium) cannot directly start new programs. For Emacs users \
-        it is recommended you use the use supplied native <a href=\"/servers/edit-server.el\">edit-server.el</a>.\
-	Alternativley you can track the latest version through the <a href=\"http://melpa.milkbox.net/\">MELPA</a>\
+        it is recommended you use the supplied native <a href=\"/servers/edit-server.el\">edit-server.el</a>.\
+	Alternativeley you can track the latest version through the <a href=\"http://melpa.milkbox.net/\">MELPA</a>\
 	package archive.\
         </p>\
 	<p>\
-        Save the file to somewhere visible to your your Emacs <code>load-path</code> (~/.emacs.d/lisp is popular) and add the following\
+        Save the file to somewhere visible to your Emacs <code>load-path</code> (~/.emacs.d/lisp is popular) and add the following\
         to your <code>.emacs</code>:\
         </p>\
 	<pre>\

javascript/context_menu.js

@@ -1,21 +1,24 @@
 /* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 (function(){
 
-    var edit_msg = {};
+    var edit_msg = null;
 
     function menuClicked(info, tab) {
         if (edit_msg) {
             var tab_port = chrome.tabs.connect(tab.id);
             edit_msg.pageUrl = info.pageUrl;
+            console.debug("menuClicked with edit_msg:", edit_msg);
             handleContentMessages(edit_msg, tab_port);
+            edit_msg = null;
+        } else {
+            console.error("menuClicked called while edit_msg is null");
         }
     }
 
-
-	var menu_enabled = false;
+	var menu_is_installed = false;
 
 	function enableContextMenu() {
-		if (!menu_enabled) {
+		if (!menu_is_installed) {
 			chrome.contextMenus.removeAll();
 			chrome.contextMenus.create({
 				title: "Edit with Emacs",
@@ -24,13 +27,13 @@
 					menuClicked(info, tab);
 				}
 			});
-			menu_enabled = true;
+			menu_is_installed = true;
 		}
 	}
 
 	function disableContextMenu() {
 		chrome.contextMenus.removeAll();
-		menu_enabled = false;
+		menu_is_installed = false;
 	}
 
 	// Initialize the context menu based on stored options.

javascript/textareas.js

@@ -263,6 +263,7 @@ function sendTextArea(text_tracker) {
     edit_msg.msg = "edit";
     edit_msg.text = text_tracker.getContent();
 	edit_msg.id = text_tracker.edit_id;
+    console.debug("sendTextArea: sending message:", edit_msg);
 	port.postMessage(edit_msg);
 }
 
@@ -429,17 +430,21 @@ browser_runtime.onConnect.addListener(function(iport) {
     iport.onMessage.addListener(localMessageHandler);
 });
 
+console.debug("About to fetch our configuration from the background process");
+
 /*
   To start the whole process off we first need to fetch our configuration
   from the background process.
 */
 port.postMessage({msg: "config"});
 
+console.debug("About to install contextmenu event listener on document");
 
 // Inform the background process whenever the user opens
 // the context menu on an editable element.
 document.addEventListener("contextmenu", (function(event) {
     var elem = event.srcElement;
+    console.debug("contextmenu event called on elem: ", elem);
     if (elem && elem.getAttribute("edit_id")) {
         var edit_msg = getEmptyMessage();
         edit_msg.msg = "edit";
@@ -452,3 +457,5 @@ document.addEventListener("contextmenu", (function(event) {
         browser_sendMessage(request);
     }
 }));
+
+console.debug("Edit with Emacs has finished initializing");

javascript/xmlcomms.js

@@ -101,7 +101,8 @@ chrome.commands.onCommand.addListener(function(command) {
 // Package up the text to be edited and send it to the edit server
 function handleContentMessages(msg, tab_port)
 {
-    console.log("handleContentMessages called:"+JSON.stringify(msg));
+    console.debug("handleContentMessages called:", msg);
+    console.assert(msg.text);
     var cmd = msg.msg;
     var id = msg.id;
     var text = msg.text;

servers/edit-server.el

@@ -392,6 +392,7 @@ non-nil, then STRING is also echoed to the message line."
   ;; data in the buffer and process it in different phases, which
   ;; requires us to keep track of the processing state.
   (with-current-buffer (process-buffer proc)
+    (edit-server-log proc "Got HTTP request string of length `%s'" (length string))
     (insert string)
     (setq edit-server-received
 	  (+ edit-server-received (string-bytes string)))
@@ -415,6 +416,7 @@ non-nil, then STRING is also echoed to the message line."
       (save-excursion
 	(goto-char (point-min))
 	(when (re-search-forward "^Content-Length:\\s-+\\([0-9]+\\)" nil t)
+	  (edit-server-log proc "Found Content-Length: %s" (match-string 1))
 	  (setq edit-server-content-length
 		(string-to-number (match-string 1)))))
       ;; look for "x-url" header
@@ -434,6 +436,7 @@ non-nil, then STRING is also echoed to the message line."
 	(when (re-search-forward "\\(\r?\n\\)\\{2\\}" nil t)
 	  ;; HTTP headers are pure ASCII (1 char = 1 byte), so we can subtract
 	  ;; the buffer position from the count of received bytes
+	  (edit-server-log proc "Found body offset at: %s" (match-end 0))
 	  (setq edit-server-received
 		(- edit-server-received (- (match-end 0) (point-min))))
 	  ;; discard headers - keep only HTTP content in buffer
@@ -540,7 +543,8 @@ and save the network process for the final call back"
     (when existing-buffer
       (kill-ring-save (point-min) (point-max)))
 
-    (edit-server-log proc "copying new data into buffer")
+    (edit-server-log proc "copying new data into buffer, length: %s"
+                     (- (point-max) (point-min)))
     (copy-to-buffer buffer (point-min) (point-max))
 
     (with-current-buffer buffer