From bcca5576ab31a55b6d3ef3e5cec7c6243d427ecf Mon Sep 17 00:00:00 2001 From: rsparapa Date: Thu, 20 Dec 2007 16:43:52 +0000 Subject: [PATCH] not sure how long ago i made some of these changes... the sleep and SAS options stuff is late summer/early fall, i think and the ODS and SAS Bayesian Procedure stuff is from October git-svn-id: https://svn.r-project.org/ESS/trunk@3832 0bbaf3bd-34e0-0310-bf65-c717079852d4 --- lisp/ess-emcs.el | 6 ++++++ lisp/essa-sas.el | 16 ++++++++-------- lisp/essl-sas.el | 9 +++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lisp/ess-emcs.el b/lisp/ess-emcs.el index db61fa68..873be24c 100644 --- a/lisp/ess-emcs.el +++ b/lisp/ess-emcs.el @@ -252,6 +252,12 @@ and replace a sub-expression, e.g. (not (fboundp 'w32-short-file-name))) (fset 'w32-short-file-name 'win32-short-file-name)) +(defun ess-sleep () + "Put emacs to sleep for `ess-sleep-for' seconds (floats work). +Sometimes its necessary to wait for a shell prompt." + (if (featurep 'xemacs) (sleep-for ess-sleep-for) + (sleep-for 0 (truncate (* ess-sleep-for 1000))))) + (provide 'ess-emcs) ; Local variables section diff --git a/lisp/essa-sas.el b/lisp/essa-sas.el index b2642add..7ad90474 100644 --- a/lisp/essa-sas.el +++ b/lisp/essa-sas.el @@ -48,7 +48,7 @@ or `ess-sas-data-view-insight'." (defcustom ess-sas-data-view-submit-options (if ess-microsoft-p "-noenhancededitor -nosysin -log NUL:" - "-nodms -nosysin -log /dev/null") + "-nodms -nosysin -log /dev/null -terminal") "*The command-line options necessary for your OS with respect to `ess-sas-data-view-fsview' and `ess-sas-data-view-insight'." :group 'ess-sas @@ -155,7 +155,7 @@ Virtual PC emulator on your Mac; buffer-local." (make-variable-buffer-local 'ess-sas-submit-command) -(defcustom ess-sas-submit-command-options " " +(defcustom ess-sas-submit-command-options "-rsasuser" "*Options to pass to SAS in batch; buffer-local." :group 'ess-sas :type 'string) @@ -196,9 +196,9 @@ should set this variable to 'sh regardless of their local shell :type 'string) (defcustom ess-sas-submit-post-command - (if (equal ess-sas-submit-method 'sh) "-rsasuser &" - (if ess-microsoft-p "-rsasuser -icon")) - "*Command-line statement to post-modify SAS invocation, e.g. -rsasuser" + (if (equal ess-sas-submit-method 'sh) "&" + (if ess-microsoft-p "-icon")) + "*Command-line statement to post-modify SAS invocation" :group 'ess-sas :type 'string) @@ -468,6 +468,7 @@ current buffer if nil." (insert (concat ess-sas-submit-pre-command " " ess-sas-submit-command " -initstmt \"" ess-sas-data-view-libname ess-sas-data-view-fsview-command ess-sas-data ";" ess-tmp-sas-data-view-fsview-statement "; run;\" " + ess-sas-submit-command-options " " ess-sas-data-view-submit-options " " ess-sas-submit-post-command)) (comint-send-input) ))))) @@ -1023,15 +1024,14 @@ i.e. let arg1 be your local equivalent of (insert ess-sas-submit-pre-command " " arg1 " " (file-name-sans-extension (file-name-nondirectory ess-sas-file-path)) " " arg2 " " ess-sas-submit-post-command)) - (sleep-for ess-sleep-for) + (ess-sleep) (comint-send-input)) (defun ess-sas-submit-windows (arg1 arg2) "Windows using MS-DOS prompt in the *shell* buffer. Multiple processing is supported on this platform. On most Windows installations, SAS will not be found in your -PATH. You can set `ess-sas-submit-command' to -\"sas -icon -rsasuser\" and alter your PATH to include SAS, i.e. +PATH so you should alter your PATH to include SAS, i.e. SET PATH=%PATH%;C:\\Program Files\\SAS diff --git a/lisp/essl-sas.el b/lisp/essl-sas.el index 1ed2ed09..d70fedc0 100644 --- a/lisp/essl-sas.el +++ b/lisp/essl-sas.el @@ -396,6 +396,7 @@ number." "proc[ \t]+" ;;SAS/Base, SAS/Graph, SAS/FSP and common add-ons "\\(append" + "\\|b\\(genmod\\|lifereg\\|phreg\\)" "\\|c\\(a\\(lendar\\|talog\\)\\|port\\|o\\(mpare\\|ntents\\|py\\|rr\\)\\)" "\\|d\\(atasets\\|bcstab\\|isplay\\)\\|ex\\(plode\\|port\\)" "\\|f\\(orm\\(at\\|s\\)\\|req\\|s\\(browse\\|edit\\|l\\(etter\\|ist\\)\\|view\\)\\)" @@ -405,7 +406,7 @@ number." "\\|[cg]?import\\|i\\(ml\\|nsight\\)\\|means\\|options\\|p\\(menu\\|rintto\\)" "\\|r\\(ank\\|e\\(gistry\\|port\\)\\)" "\\|s\\(ort\\|ql\\|tandard\\|ummary\\)" - "\\|t\\(abulate\\|imeplot\\|ran\\(spose\\|tab\\)\\)\\|univariate" + "\\|t\\(abulate\\|emplate\\|imeplot\\|ran\\(spose\\|tab\\)\\)\\|univariate" ;;SAS/Stat and SAS/ETS "\\|a\\(ceclus\\|nova\\|rima\\|utoreg\\)\\|boxplot" "\\|c\\(a\\(lis\\|n\\(corr\\|disc\\)\\|tmod\\)\\|itibase\\|luster\\|o\\(mputab\\|rresp\\)\\)" @@ -445,17 +446,17 @@ number." ;; SAS statements (cons (concat "\\(^[0-9]*\\|):\\|[;,]\\|then\\|else\\)[ \t]*" - "\\(a\\(bort\\|rray\\|ttrib\\)\\|by" + "\\(a\\(bort\\|rray\\|ttrib\\)\\|b\\(ayes\\|y\\)" "\\|c\\(hange\\|lass\\|ontrast\\)" "\\|d\\(elete\\|isplay\\|m\\|o\\([ \t]+\\(data\\|over\\)\\)?\\|rop\\)" "\\|e\\(rror\\|stimate\\|xc\\(hange\\|lude\\)\\)" "\\|f\\(ile\\(name\\)?\\|o\\(otnote\\(10?\\|[2-9]\\)?\\|rmat\\)\\|req\\)" "\\|go\\([ \t]*to\\|ptions\\)" - "\\|[hv]bar\\(3d\\)?" + "\\|hazardratio\\|[hv]bar\\(3d\\)?" "\\|i\\(d\\|f\\|n\\(dex\\|f\\(ile\\|ormat\\)\\|put\\|value\\)\\)" "\\|keep\\|l\\(abel\\|ength\\|i\\(bname\\|nk\\|st\\)\\|smeans\\)" "\\|m\\(anova\\|e\\(ans\\|rge\\)\\|issing\\|od\\(el\\|ify\\)\\)\\|note" - "\\|o\\(ptions\\|therwise\\|utput\\)\\|p\\(arms\\|lot2?\\|ut\\)" + "\\|o\\(ds\\|ptions\\|therwise\\|utput\\)\\|p\\(arms\\|lot2?\\|ut\\)" "\\|r\\(andom\\|e\\(name\\|peated\\|tain\\)\\)" "\\|s\\(ave\\|e\\(lect\\|t\\)\\|kip\\|trata\\|umby\\)" "\\|t\\(ables?\\|i\\(me\\|tle\\(10?\\|[2-9]\\)?\\)\\)\\|update" -- 2.11.4.GIT