[nongnu] elpa/go-mode 6a92c3b 349/495: cmd/guru: clean ups to command-line interface

[ELPA Syncer]

branch: elpa/go-mode
commit 6a92c3b1b280a9e33afdd06cd6da1615c7e14df9
Author: Alan Donovan <alan@alandonovan.net>
Commit: Dominik Honnef <dominik@honnef.co>

    cmd/guru: clean ups to command-line interface
    
    -pos is now a positional argument; -scope is now a flag.
    Tidy up usage message.
    Update Vim and Emacs scripts and test
    Remove call to GOMAXPROCS.
    Use log.{SetPrefix,SetFlags} and Fatalf
    
    Change-Id: I3786ed83aecb17d622b29d2a538a374f813f0adc
    Reviewed-on: https://go-review.googlesource.com/19438
    Reviewed-by: Michael Matloob <matloob@golang.org>
---
 guru_import/cmd/guru/guru.el | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/guru_import/cmd/guru/guru.el b/guru_import/cmd/guru/guru.el
index e33c30c..d00f44c 100644
--- a/guru_import/cmd/guru/guru.el
+++ b/guru_import/cmd/guru/guru.el
@@ -2,20 +2,16 @@
 ;;; Integration of the Go 'guru' analysis tool into Emacs.
 ;;;
 ;;; To install the Go guru, run:
-;;; % export GOROOT=... GOPATH=...
-;;; % go get golang.org/x/tools/cmd/guru
-;;; % mv $GOPATH/bin/guru $GOROOT/bin/
+;;; $ go get golang.org/x/tools/cmd/guru
 ;;;
 ;;; Load this file into Emacs and set go-guru-scope to your
 ;;; configuration. Then, find a file of Go source code, enable
 ;;; go-guru-mode, select an expression of interest, and press `C-c C-o d'
 ;;; (for "describe") or run one of the other go-guru-xxx commands.
-;;;
-;;; TODO(adonovan): simplify installation and configuration by making
-;;; guru a subcommand of 'go tool'.
 
 (require 'compile)
 (require 'go-mode)
+(require 'simple)
 (require 'cl)
 
 (defgroup go-guru nil
@@ -99,14 +95,14 @@ file name with a small hyperlink.  Display the result."
        (string-equal "" go-guru-scope)
        (go-guru-set-scope))
   (let* ((filename (file-truename buffer-file-name))
-         (posflag (if (use-region-p)
-                      (format "-pos=%s:#%d,#%d"
-                              filename
-                              (1- (go--position-bytes (region-beginning)))
-                              (1- (go--position-bytes (region-end))))
-                    (format "-pos=%s:#%d"
-                            filename
-                            (1- (position-bytes (point))))))
+         (posn (if (use-region-p)
+                  (format "%s:#%d,#%d"
+                          filename
+                          (1- (go--position-bytes (region-beginning)))
+                          (1- (go--position-bytes (region-end))))
+                (format "%s:#%d"
+                        filename
+                        (1- (position-bytes (point))))))
          (env-vars (go-root-and-paths))
          (goroot-env (concat "GOROOT=" (car env-vars)))
          (gopath-env (concat "GOPATH=" (mapconcat #'identity (cdr env-vars) 
":"))))
@@ -114,8 +110,8 @@ file name with a small hyperlink.  Display the result."
       (setq buffer-read-only nil)
       (erase-buffer)
       (insert "Go Guru\n")
-      (let ((args (append (list go-guru-command nil t nil posflag mode)
-                          (split-string go-guru-scope " " t))))
+      (let ((args (list go-guru-command nil t nil
+                       "-scope" go-guru-scope mode posn)))
         ;; Log the command to *Messages*, for debugging.
         (message "Command: %s:" args)
         (message nil) ; clears/shrinks minibuffer