@@ -125,23 +125,20 @@ If `ess-plain-first-buffername', then initial process is number-free."
125125 (= n 1 ))) ; if not both first and plain-first add number
126126 (concat " :" (number-to-string n)))))
127127
128- (defun inferior-ess (&optional ess- start-args customize-alist no-wait )
128+ (defun inferior-ess (&optional start-args customize-alist no-wait )
129129 " Start inferior ESS process.
130-
131130Without a prefix argument, starts a new ESS process, or switches
132- to the ESS process associated with the current buffer. With
133- ESS- START-ARGS (perhaps specified via \\ [universal-argument]),
134- starts the process with those args. The current buffer is used
135- if it is an `inferior-ess-mode' or `ess-transcript-mode' buffer.
131+ to the ESS process associated with the current buffer. With
132+ START-ARGS (perhaps specified via \\ [universal-argument]), starts
133+ the process with those args. The current buffer is used if it is
134+ an `inferior-ess-mode' or `ess-transcript-mode' buffer.
136135
137136If `ess-ask-about-transfile' is non-nil, you will be asked for a
138137transcript file to use. If there is no transcript file, the
139138buffer name will be like *R* or *R2*, determined by
140139`ess-gen-proc-buffer-name-function' .
141140
142141Takes the program name from the variable `inferior-ess-program' .
143- Arguments to `inferior-ess-program' can be given with
144- `inferior-ess-start-args' .
145142
146143See Info node `(ess)Customizing startup' and
147144`display-buffer-alist' to control where and how the buffer is
@@ -180,33 +177,31 @@ This may be useful for debugging."
180177 ; ; TODO: Get rid of this, we should rely on modes to set the
181178 ; ; variables they need.
182179 (ess-setq-vars-local ess-customize-alist)
183- (let ((inf-args (or ess-start-args
184- inferior-ess-start-args)))
185- (inferior-ess--set-major-mode ess-dialect)
186- ; ; Show the buffer
187- ; ; TODO: Remove inferior-ess-own-frame after ESS 19.04, then just have:
188- ; ; (pop-to-buffer inf-buf)
189- (pop-to-buffer inf-buf (with-no-warnings
190- (when inferior-ess-own-frame
191- '(display-buffer-pop-up-frame ))))
192- (let ((proc (inferior-ess--start-process inf-buf proc-name inf-args)))
193- (ess-make-buffer-current)
194- (goto-char (point-max ))
195- (unless no-wait
196- (ess-write-to-dribble-buffer " (inferior-ess: waiting for process to start (before hook)\n " )
197- (ess-wait-for-process proc nil 0.01 t ))
198- (unless (and proc (eq (process-status proc) 'run ))
199- (error " Process %s failed to start " proc-name))
200- (when ess-setwd-command
201- (ess-set-working-directory cur-dir))
202- (setq-local font-lock-fontify-region-function #'inferior-ess-fontify-region )
203- (setq-local ess-sl-modtime-alist nil )
204- (run-hooks 'ess-post-run-hook )
205- ; ; User initialization can take some time ...
206- (unless no-wait
207- (ess-write-to-dribble-buffer " (inferior-ess 3): waiting for process after hook" )
208- (ess-wait-for-process proc)))
209- inf-buf)))))
180+ (inferior-ess--set-major-mode ess-dialect)
181+ ; ; Show the buffer
182+ ; ; TODO: Remove inferior-ess-own-frame after ESS 19.04, then just have:
183+ ; ; (pop-to-buffer inf-buf)
184+ (pop-to-buffer inf-buf (with-no-warnings
185+ (when inferior-ess-own-frame
186+ '(display-buffer-pop-up-frame ))))
187+ (let ((proc (inferior-ess--start-process inf-buf proc-name start-args)))
188+ (ess-make-buffer-current)
189+ (goto-char (point-max ))
190+ (unless no-wait
191+ (ess-write-to-dribble-buffer " (inferior-ess: waiting for process to start (before hook)\n " )
192+ (ess-wait-for-process proc nil 0.01 t ))
193+ (unless (and proc (eq (process-status proc) 'run ))
194+ (error " Process %s failed to start " proc-name))
195+ (when ess-setwd-command
196+ (ess-set-working-directory cur-dir))
197+ (setq-local font-lock-fontify-region-function #'inferior-ess-fontify-region )
198+ (setq-local ess-sl-modtime-alist nil )
199+ (run-hooks 'ess-post-run-hook )
200+ ; ; User initialization can take some time ...
201+ (unless no-wait
202+ (ess-write-to-dribble-buffer " (inferior-ess 3): waiting for process after hook" )
203+ (ess-wait-for-process proc)))
204+ inf-buf))))
210205
211206(defun inferior-ess--get-proc-buffer-create (name )
212207 " Get a process buffer, creating a new one if needed.
0 commit comments