@@ -302,8 +302,8 @@ not found, return nil."
302
302
(cdr ess-developer-local-package))
303
303
(pack-name
304
304
(ess-developer--find-package-path pack-name))
305
- (t
306
- ( ess-developer--check-current-dir -package-path)))))
305
+ ((ess-developer--check-current-dir-package-path))
306
+ (( ess-developer--get-process -package-path)))))
307
307
308
308
(defun ess-developer--find-package-path (pack-name )
309
309
(let ((bl (buffer-list ))
@@ -407,11 +407,17 @@ If ALL is non-nil, deactivate in all open R buffers."
407
407
(equal pack package )))
408
408
(ess-developer -1 )))))
409
409
410
+ (defun ess-developer--get-process-package-path ()
411
+ (with-ess-process-buffer t
412
+ (when (boundp 'ess-developer-local-package )
413
+ (cdr ess-developer-local-package))))
414
+
410
415
(defun ess-developer-send-process (command &optional msg )
411
416
(ess-force-buffer-current)
412
417
(let* ((path (or (cdr ess-developer-local-package)
413
418
(ess-developer--get-package-path)))
414
- (name (file-name-nondirectory (directory-file-name path))))
419
+ (name (when path
420
+ (file-name-nondirectory (directory-file-name path)))))
415
421
; ; Ask package directory only when not obvious
416
422
(unless (or ess-developer-local-package path)
417
423
(setq path (read-directory-name " Package: " path nil t nil )))
@@ -425,9 +431,8 @@ If ALL is non-nil, deactivate in all open R buffers."
425
431
(ess-eval-linewise (format command path))))
426
432
427
433
(defun ess-developer--init-process-local-vars (name path )
428
- (let ((pbuffer (process-buffer (ess-get-process ess-current-process-name))))
429
- (with-current-buffer pbuffer
430
- (setq-local ess-developer-local-package (cons name path)))))
434
+ (with-ess-process-buffer nil
435
+ (setq-local ess-developer-local-package (cons name path))))
431
436
432
437
(defun ess-developer-load-package ()
433
438
" Interface to load_all() function from devtools package.
0 commit comments