Merge pull request #1186 from emacs-ess/ask-for-dir-after-ess-inf

[Fix #1185] Move ask-for directory code after ess-r-mode startup

Author: vspinu

lisp/ess-custom.el

@@ -314,24 +314,24 @@ buffer.")
 (defvaralias 'ess-directory-function 'ess-startup-directory-function)
 (defcustom ess-startup-directory-function nil
   "Function to return the directory that ESS is run from.
-If nil or if the function returns nil then you get `ess-startup-directory'."
-  :group 'ess
-  :type '(choice (const nil) function))
-
-(defcustom ess-setup-directory-function nil
-  "Function to setup the directory that ESS is run from.
-This function can be called to set environment variables or to create
-a workspace."
+Value of `ess-startup-directory' has precedence over this function."
   :group 'ess
   :type '(choice (const nil) function))
 
 (defvaralias 'ess-directory 'ess-startup-directory)
 (defcustom ess-startup-directory nil
-  "The directory ESS is run from.  It must end in a slash.
-Provided as a default if `ess-ask-for-ess-directory' is non-nil.
-A nil value means use the current buffer's default directory."
+  "The directory ESS is run from (string or a symbol).
+Provided a default (especially useful if
+`ess-ask-for-ess-directory' is non-nil). A nil value means use
+the value returned by `ess-startup-directory-function'. If nil,
+use current project directory, otherwise use to the
+`default-directory'.
+
+When this variable is a symbol, use its value. Set this variable
+to `'default-directory' in order to always start in the current
+directory."
   :group 'ess
-  :type '(choice (const nil) directory))
+  :type '(choice (const nil) directory symbol))
 
 
 (defcustom ess-history-directory nil

lisp/ess-inf.el

@@ -169,17 +169,16 @@ This may be useful for debugging."
                              dialect)
                          dialect))
          (inf-buf (inferior-ess--get-proc-buffer-create temp-dialect))
-         (proc-name (buffer-local-value 'ess-local-process-name inf-buf))
-         (cur-dir (inferior-ess--maybe-prompt-startup-directory proc-name temp-dialect))
-         (default-directory cur-dir))
+         (proc-name (buffer-local-value 'ess-local-process-name inf-buf)))
     (with-current-buffer inf-buf
       ;; TODO: Get rid of this, we should rely on modes to set the
       ;; variables they need.
       (ess-setq-vars-local customize-alist)
       (inferior-ess--set-major-mode ess-dialect)
       ;; Set local variables after changing mode because they might
       ;; not be permanent
-      (setq default-directory cur-dir)
+      (setq default-directory
+            (inferior-ess--maybe-prompt-startup-directory proc-name temp-dialect))
       (setq inferior-ess--local-data (cons inferior-ess-program start-args))
       ;; Read the history file
       (when ess-history-file
@@ -204,7 +203,7 @@ This may be useful for debugging."
         (unless (and proc (eq (process-status proc) 'run))
           (error "Process %s failed to start" proc-name))
         (when ess-setwd-command
-          (ess-set-working-directory cur-dir))
+          (ess-set-working-directory default-directory))
         (setq-local font-lock-fontify-region-function #'inferior-ess-fontify-region)
         (setq-local ess-sl-modtime-alist nil)
         (run-hooks 'ess-post-run-hook)
@@ -623,11 +622,14 @@ process-less buffer because it was created with
 ;;*;; Requester functions called at startup
 (defun inferior-ess--get-startup-directory ()
   "Return a startup directory."
-  (let ((dir (or (and ess-directory-function
-                      (funcall ess-directory-function))
+  (let ((dir (or (when (boundp 'ess-startup-directory)
+                   (if (symbolp ess-startup-directory)
+                       (symbol-value ess-startup-directory)
+                     ess-startup-directory))
+                 (and ess-startup-directory-function
+                      (funcall ess-startup-directory-function))
                  (when-let ((proj (project-current)))
                    (ess--project-root proj))
-                 ess-startup-directory
                  default-directory)))
     (directory-file-name dir)))
 
@@ -2430,7 +2432,7 @@ START-ARGS gets passed to the dialect-specific
       ;; Make sure we don't ask for directory again
       ;; Use current working directory as default
       (let ((project-find-functions nil)
-            (ess-directory-function nil)
+            (ess-startup-directory-function nil)
             (ess-startup-directory (ess-get-process-variable 'default-directory))
             (ess-ask-for-ess-directory nil))
         (ess-quit 'no-save)

lisp/ess-r-mode.el

@@ -558,8 +558,10 @@ will be prompted to enter arguments interactively."
     "\n(R): ess-dialect=%s, buf=%s, start-arg=%s\n current-prefix-arg=%s\n"
     ess-dialect (current-buffer) start-args current-prefix-arg))
   (unless (or (file-remote-p default-directory)
-              (and ess-startup-directory
-                   (file-remote-p ess-startup-directory))
+              (when ess-startup-directory
+                (file-remote-p (if (symbolp ess-startup-directory)
+                                   (symbol-value ess-startup-directory)
+                                 ess-startup-directory)))
               ;; TODO: Once we drop Emacs 26 support, can probably
               ;; just use the REMOTE argument of `executable-find'.
               (executable-find inferior-ess-r-program))
@@ -588,9 +590,6 @@ will be prompted to enter arguments interactively."
                   inferior-R-args " "   ; add space just in case
                   start-args))
          (debug (string-match-p " -d \\| --debugger=" r-start-args))
-         (project-find-functions (if (memq 'ess-r-project project-find-functions)
-                                     project-find-functions
-                                   (cons 'ess-r-project project-find-functions)))
          use-dialog-box)
     (when (or ess-microsoft-p
               (eq system-type 'cygwin))

lisp/ess-r-package.el

@@ -527,7 +527,7 @@ Set this variable to nil to disable the mode line entirely."
                   (set (make-local-variable var)
                        (eval (cdr (assq var ess-r-customize-alist)))))
                 vars))
-        (add-hook 'project-find-functions #'ess-r-project)
+        (add-hook 'project-find-functions #'ess-r-project nil 'local)
         (run-hooks 'ess-r-package-enter-hook))
     (remove-hook 'project-find-functions #'ess-r-project)
     (run-hooks 'ess-r-package-exit-hook)))

lisp/ess-sp6-d.el

@@ -76,8 +76,7 @@
      (inferior-ess-help-command        . "help(\"%s\", pager=\"slynx -dump\", window=FALSE)\n")
      (inferior-ess-search-list-command . "searchPaths()\n")
 
-     (ess-directory-function           . S+-directory-function)
-     (ess-setup-directory-function     . S+-setup-directory-function)
+     (ess-startup-directory-function   . S+-directory-function)
      (ess-STERM                        . "iESS"))
    S+common-cust-alist)