                (end-of-line))
       (goto-char pos))
     (if (not (= start-pos (point)))
-        (go-backward-irrelevant))
+        (go--backward-irrelevant))
     (not (= start-pos (point)))))
 
 (defun go-previous-line-has-dangling-op-p ()
   (save-excursion
     (beginning-of-line)
-    (go-backward-irrelevant)
+    (go--backward-irrelevant)
     (looking-back go-dangling-operators-regexp)))
 
 (defun go-indentation-at-point (point)

      ;; When there's no more hunks, diff-hunk-next signals an error, ignore it
      (error nil))))

(defun gofmt-process-errors (filename errbuf)
  ;; Convert the gofmt stderr to something understood by the compilation mode.
  (with-current-buffer errbuf
    (goto-char (point-min))

  (interactive)
  (when (eq major-mode 'go-mode) (gofmt)))

(defun godoc--read-query ()
  "Read a godoc query from the minibuffer."
  ;; Compute the default query as the symbol under the cursor.
  ;; TODO: This does the wrong thing for e.g. multipart.NewReader (it only grabs
