~ubuntu-branches/ubuntu/wily/ess/wily-proposed

« back to all changes in this revision

Viewing changes to lisp/ess-trns.el

  • Committer: Package Import Robot
  • Author(s): Dirk Eddelbuettel
  • Date: 2013-09-27 18:41:32 UTC
  • mto: This revision was merged to the branch mainline in revision 37.
  • Revision ID: package-import@ubuntu.com-20130927184132-dxa7ufsry9hjd9dc
Tags: upstream-13.09
ImportĀ upstreamĀ versionĀ 13.09

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
 
53
53
(autoload 'ess-load-file                "ess-inf" "[autoload]" t)
54
54
(autoload 'ess-request-a-process        "ess-inf" "(autoload)" nil)
55
 
(autoload 'get-ess-buffer               "ess-inf" "(autoload)" nil)
 
55
(autoload 'ess-get-process-buffer               "ess-inf" "(autoload)" nil)
56
56
(autoload 'ess-switch-to-ESS            "ess-inf" "(autoload)" nil)
57
57
(autoload 'ess-switch-to-end-of-ESS     "ess-inf" "(autoload)" nil)
58
58
(autoload 'ess-eval-linewise            "ess-inf" "(autoload)" nil)
218
218
  (interactive)
219
219
  (let* ((proc (or ess-local-process-name
220
220
                   (ess-request-a-process "Evaluate into which process? " t)))
221
 
         (ess-buf (get-ess-buffer proc)))
 
221
         (ess-buf (ess-get-process-buffer proc)))
222
222
    (setq ess-local-process-name proc)
223
223
    (if (get-buffer-window ess-buf) nil
224
224
      (display-buffer ess-buf t))
234
234
  ;; replacement code begins
235
235
  (let* ((proc (or ess-local-process-name
236
236
                   (ess-request-a-process "Evaluate into which process? " t)))
237
 
         (ess-buf (get-ess-buffer proc)))
 
237
         (ess-buf (ess-get-process-buffer proc)))
238
238
    (setq ess-local-process-name proc)
239
239
    (if (get-buffer-window ess-buf) nil
240
240
      (display-buffer ess-buf t))