erl-service.diff

diff --git a/elisp/erl-service.el b/elisp/erl-service.el
index fa23aed1..73dcc58e 100644
--- a/elisp/erl-service.el
+++ b/elisp/erl-service.el
@@ -25,11 +25,9 @@ (defvar erl-nodename-history nil
   "The historical list of node names that have been selected.")
 
 (defun erl-target-node ()
-  "Return the name of the default target node for commands.
-Force node selection if no such node has been choosen yet, or when
-invoked with a prefix argument."
-  (or (and (not current-prefix-arg) erl-nodename-cache)
-      (erl-choose-nodename)))
+  "Get the name of the default target node for commands.
+Use \\[erl-choose-nodename] to set or change default node name."
+  (or erl-nodename-cache (erl-choose-nodename)))
 
 (defun erl-set-cookie ()
   "Prompt the user for the cookie."
@@ -780,7 +778,7 @@ (defun erl-find-source (module &optional function arity)
   (if (equal module (erlang-get-module))
       (when function
         (erl-search-definition function arity))
-    (let ((node (or erl-nodename-cache (erl-target-node))))
+    (let ((node (erl-target-node)))
       (erl-spawn
         (erl-send-rpc node 'distel 'find_source (list (intern module)))
         (erl-receive (function arity)
@@ -824,7 +822,7 @@ (defun erl-do-find-doc (what how &optional module function ari)
               (erl-parse-mfa (read-string "Function reference: ") "-")
             (erl-mfa-at-point))
           (error "No call at point."))
-    (let ((node (or erl-nodename-cache (erl-target-node)))
+    (let ((node (erl-target-node))
           (arity (or ari -1))
           (module (if (equal mod "-") fun mod))
           (function (if (equal mod "-") nil fun)))
@@ -1275,7 +1273,7 @@ (defun erl-goto-caller ()
   (interactive)
   (let ((line (get-text-property (line-beginning-position) 'line))
         (module (get-text-property (line-beginning-position) 'module))
-        (node (or erl-nodename-cache (erl-target-node))))
+        (node (erl-target-node)))
     (erl-spawn
       (erl-send-rpc node 'distel 'find_source (list (intern module)))
       (erl-receive (line)