Merge branch 'master' of github.com:emacs-ess/ESS

Author: rsparapa

VERSION

@@ -1 +1 @@
-14.11
+15.03

etc/ESSR/R/completion.R

@@ -61,3 +61,46 @@
     c(get('token', envir=utils:::.CompletionEnv),
       utils:::.retrieveCompletions())
 }
+
+.ess_arg_help <- function(arg, func){
+    olderr <- getOption('error')
+    options(error=NULL)
+    on.exit(options(error=olderr))
+    fguess <-
+        if(is.null(func)) get('fguess', envir=utils:::.CompletionEnv)
+        else func
+    findArgHelp <- function(fun, arg){
+        file <- help(fun, try.all.packages=FALSE)[[1]]
+        hlp <- utils:::.getHelpFile(file)
+        id <- grep('arguments', tools:::RdTags(hlp), fixed=TRUE)
+        if(length(id)){
+            arg_section <- hlp[[id[[1L]]]]
+            items <- grep('item', tools:::RdTags(arg_section), fixed=TRUE)
+            ## cat('items:', items, fill=TRUE)
+            if(length(items)){
+                arg_section <- arg_section[items]
+                args <- unlist(lapply(arg_section,
+                                      function(el) paste(unlist(el[[1]][[1]], TRUE, FALSE), collapse='')))
+                fits <- grep(arg, args, fixed=TRUE)
+                ## cat('args', args, 'fits', fill=TRUE)
+                if(length(fits))
+                    paste(unlist(arg_section[[fits[1L]]][[2]], TRUE, FALSE), collapse='')
+            }
+        }
+    }
+    funcs <- c(fguess, tryCatch(methods(fguess),
+                                warning=function(w) {NULL},
+                                error=function(e) {NULL}))
+    if(length(funcs) > 1 && length(pos <- grep('default', funcs))){
+        funcs <- c(funcs[[pos[[1L]]]], funcs[-pos[[1L]]])
+    }
+    i <- 1L; found <- FALSE
+    out <- 'No help found'
+    while(i <= length(funcs) && is.null(out <-
+        tryCatch(findArgHelp(funcs[[i]], arg),
+                 warning=function(w) {NULL},
+                 error=function(e) {NULL})
+                                        ))
+        i <- i + 1L
+    cat('\n\n', as.character(out), '\n')
+};

etc/ESSR/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

etc/R-ESS-bugs.R

@@ -489,22 +489,37 @@ parse_roc <- function(lines, match = "^\\s*+\' ?") {
 {
     a <- ggplot(data = overtime.by.month,
                 aes(x="", y=Percent, fill = Overtime)) +
-                    geom_bar(width = 1) +
-                        xlab('') +
-                            ylab(sub.txt) +
-                                labs(title = title.txt) +
-                                    facet_wrap(~Year.Month)
+        geom_bar(width = 1) +
+            xlab('') +
+                ylab(sub.txt) +
+                    labs(title = title.txt) +
+                        facet_wrap(~Year.Month)
 }
 
 a <- ggplot(data = overtime.by.month,
             aes(x="", y=Percent, fill = Overtime)) +
-                geom_bar(width = 1) +
-                    xlab('') +
-                        ylab(sub.txt) +
-                            labs(title = title.txt) +
-                                facet_wrap(~Year.Month)
-###                             ^-- face_wrap must be here
+    geom_bar(width = 1) +
+        xlab('') +
+            ylab(sub.txt) +
+                labs(title = title.txt) +
+                    facet_wrap(~Year.Month)
+###                 ^-- face_wrap must be here
 
+### --- 20b ---
+
+mean(rnorm(100, mean = runif(1, 1, 10)), na.rm =TRUE) +
+  2
+##^--- 2 is here
+
+mean(rnorm(100, mean = runif(1, 1, 10)),
+     na.rm =TRUE) +
+  2
+##^--- 2 is here
+
+mean(rnorm(100,
+           mean = runif(1, 1, 10)), na.rm=TRUE) +
+  2
+##^--- 2 is here
 
 ### --- 21 ---
 
@@ -659,3 +674,28 @@ x <- c(1, 3.075819, 1.515999, 2.156169, 1.480742, 1.765485, 1.460206, 1.603707,
                    cM <- qchisq(0.95, p)
                    function(d) as.numeric(d < cM)
                })
+
+### --- 28 ---
+## Indentation of end-line comments (to column 40 = 'indent-column')
+## {this is part of "real" code in Rmpfr/R/hjk.R}:
+hjk <- function(x,n) { # <--- C-M-q  "on {" -- does *no longer* indent the "# .."
+    ##-- Setting steps and stepsize -----
+    nsteps <- floor(log2(1/tol))	# number of steps
+    steps  <- 2^c(-(0:(nsteps-1))) # decreasing step size
+    dir <- diag(1, n, n) # orthogonal directions
+
+    x <- par    # start point
+    fx <- f(x)    # smallest value so far
+    fcount <- 1     # counts number of function calls
+
+    if (info) cat(sprintf("step  nofc %-12s | %20s\n",
+                          "fmin", "xpar"))
+
+    ##-- Start the main loop ------------
+    ns <- 0
+    while (ns < nsteps && fcount < maxfeval && abs(fx) < target) {
+        ns <- ns + 1
+        hjs    <- .hjsearch(x, f, steps[ns], dir, fcount, maxfeval, target)
+    }
+    hjs
+}

lisp/Makefile

@@ -48,12 +48,12 @@ ELC = $(CORE) ess-comp.elc ess-custom.elc \
 	ess-omg-l.elc ess-omg-d.elc \
 	ess-bugs-l.elc ess-bugs-d.elc ess-jags-d.elc \
 	ess-noweb.elc ess-noweb-mode.elc ess-noweb-font-lock-mode.elc \
-	ess-eldoc.elc ess-roxy.elc ess-rutils.elc \
+	ess-eldoc.elc ess-roxy.elc ess-rutils.elc ess-r-completion.elc \
 	ess-s-l.elc ess-s3-d.elc ess-s4-d.elc \
 	ess-sp3-d.elc ess-sp4-d.elc ess-sp5-d.elc ess-sp6-d.elc \
 	ess-rdired.elc ess-r-args.elc ess-r-d.elc ess-rd.elc \
 	ess-developer.elc ess-tracebug.elc ess-julia.elc\
-	ess-sp6w-d.elc msdos.elc 
+	ess-sp6w-d.elc msdos.elc
 ##      ^^^^^^^^^^^^^^^^^^^^^^^ Windows only (but be platform-oblivious)
 
 ESSR_VER =`cat ../etc/ESSR-VERSION`
@@ -85,7 +85,7 @@ uninstall:
 		cd $(SITELISP) && $(UNINSTALL) ess-site.el ; \
 	fi;
 clean:
-	rm -f $(ELC) 
+	rm -f $(ELC)
 
 distclean: clean
 # and potentially more
@@ -96,7 +96,7 @@ distclean: clean
 ### Replace Version numbers (as in ../doc/Makefile !):
 ## "../VERSION" if that changes, *definitely* need to update ess-custom.el
 ess-custom.el: ../VERSION
-	perl -pi -e 's/".*"/"$(ESSVERSION)"/ if /ess-version/' $@
+	EV=$(ESSVERSION); perl -pi -e "s/\".*\"/\"$$EV\"/ if /ess-version/" $@
 
 # ess-r-d.el: ../etc/ESSR-VERSION
 # 	sed -i -e '/let.*ESSR-version/s/"[-.0-9]*"/"$(ESSR_VER)"/' $@

lisp/ess-custom.el

@@ -1,8 +1,8 @@
 ;;; ess-custom.el --- Customize variables for ESS
 
-;; Copyright (C) 1997--2010, 2014 A.J. Rossini, Richard M. Heiberger, Martin
+;; Copyright (C) 1997--2010 A.J. Rossini, Richard M. Heiberger, Martin
 ;;      Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
-;; Copyright (C) 2011--2012 A.J. Rossini, Richard M. Heiberger, Martin Maechler,
+;; Copyright (C) 2011--2015 A.J. Rossini, Richard M. Heiberger, Martin Maechler,
 ;;      Kurt Hornik, Rodney Sparapani, Stephen Eglen and Vitalie Spinu.
 
 ;; Author: A.J. Rossini <[email protected]>
@@ -132,7 +132,7 @@
   :prefix "ess-")
 ;; Variables (not user-changeable)
 
-(defvar ess-version "14.11" ;; updated by 'make'
+(defvar ess-version "15.03" ;; updated by 'make'
   "Version of ESS currently loaded.")
 
 (defvar ess-revision nil ;; set
@@ -451,8 +451,7 @@ default), doc strings are truncated to fit into minibufer. This
 allows the use of different abbreviation styles with the
 truncation."
   :group 'ess
-  :type '(choice (const nil) (const mild) (const normal) (const strong) (const aggressive) (const t))
-  )
+  :type '(choice (const nil) (const mild) (const normal) (const strong) (const aggressive) (const t)))
 
 
 (defcustom ess-use-auto-complete t
@@ -465,15 +464,22 @@ If non-nil add `ac-source-R' and `ac-source-filename' to the
 ESS defines three AC sources `ac-source-R',`ac-source-R-objects'
 and `ac-source-R-args'. See auto-complete package
 documentation (http://cx4a.org/software/auto-complete/) for how
-to install your custom sources.
-"
+to install your custom sources."
   :group 'ess-extras
   :type '(choice (const t) (const script-only) (const nil)))
 
-(defcustom ess-ac-R-argument-suffix " = "
-  "Suffix appended by `ac-source-R' and `ac-source-R-args' to candidates."
-  :group 'R
-  :type 'string)
+(defcustom ess-use-company t
+  "If t, activate company support in ess-mode and inferior-ess-mode buffers.
+If non-nil add `company-R-args' and `company-R-objects' to the
+`company-backends'. If 'script-only activate in ess-mode buffers
+only."
+  :group 'ess-extras
+  :type '(choice (const t) (const script-only) (const nil)))
+
+(defcustom ess-company-arg-prefix-length t
+  "Minimum prefix for ess company function argument completion."
+  :group 'ess-extras
+  :type 'number)
 
 (defcustom ess-use-tracebug t
   "If t, load ess-tracebug when R process starts."
@@ -493,15 +499,17 @@ might want to set this to nil.
 (defvar ess-ac-sources nil
   "Dialect specific, ESS specific list of ac-sources")
 
+(defvar ess-company-backends nil
+  "Dialect specific, ESS specific list of `company-backends'")
+
 (defvar ess--completing-hist nil
   "Variable to store completion history.
 Used by `ess-completion-read' command.")
 
 (defvar ess-smart-operators ()
   "List of smart operators to be used in ESS and IESS modes.
 Not to be set by users. It is redefined by mode specific
-settings, such as `ess-R-smart-operators'.
-")
+settings, such as `ess-R-smart-operators'.")
 (make-variable-buffer-local 'ess-smart-operators)
 
 (defvar ess-R-smart-operators nil
@@ -510,15 +518,13 @@ If t, use all. If an axplicit list of operators, use only those
 operators.
 
 In current verion of ESS, it controls the behavior of
-ess-smart-comma only, but will be enriched in the near future.
-")
+ess-smart-comma only, but will be enriched in the near future.")
 
 (defvar ess-no-skip-regexp "[ \t\n]*\\'"
   "If `ess-next-code-line' sees this line, it doesn't jump over.
 
 Used to avoid annoying jumping by ess-eval.*-and-step to end of
-buffer or end chunks etc.
- ")
+buffer or end chunks etc.")
 
 (defcustom ess-S-assign " <- "
   "String used for left assignment in all S dialects.
@@ -2032,9 +2038,7 @@ from `inferior-ess-primary-prompt' and `inferior-ess-secondary-prompt'.")
 (make-obsolete-variable 'ess-search-list nil "ESS[12.09]")
 
 (defvar ess-sl-modtime-alist nil
-  "Alist of modification times for all ess directories accessed this
-session.")
-
+  "Alist of modification times for all ess directories accessed this session.")
 (make-variable-buffer-local 'ess-sl-modtime-alist)
 
 (defvar ess-sp-change nil
@@ -2223,12 +2227,10 @@ system described in `ess-font-lock-keywords'.")
   (cons "=" 'font-lock-constant-face)
   "=")
 
-
 (defvar ess-fl-keyword:operators
   (cons "[-=+></%]+" 'font-lock-constant-face)
   "Operators.")
 
-
 ;;; fl-keywords S
 (defvar ess-S-fl-keyword:modifiers
   (cons (concat "\\<" (regexp-opt ess-S-modifyiers 'enc-paren) "\\>")
@@ -2275,7 +2277,6 @@ default or not."
   :type 'alist)
 
 
-
 ;;; fl-keywords R
 (defvar ess-R-fl-keyword:modifiers
   (cons (concat "\\<" (regexp-opt ess-R-modifyiers 'enc-paren) "\\>")
@@ -2307,8 +2308,11 @@ default or not."
 
 (defvar ess-R-fl-keyword:F&T
   (cons "\\b[FT]\\b" 'font-lock-type-face)
-  "Highlith T and F in addition to TRUE and FALSE in R.")
+  "Highlight T and F in addition to TRUE and FALSE in R.")
 
+(defvar ess-R-fl-keyword:%op%
+  (cons "%[^ \t]*%" 'ess-%op%-face)
+  "Highlight %op% operators.")
 
 (defcustom ess-R-font-lock-keywords
   '((ess-R-fl-keyword:modifiers  . t)
@@ -2321,7 +2325,8 @@ default or not."
     (ess-fl-keyword:operators)
     (ess-fl-keyword:delimiters)
     (ess-fl-keyword:=)
-    (ess-R-fl-keyword:F&T))
+    (ess-R-fl-keyword:F&T)
+    (ess-R-fl-keyword:%op%))
   "An alist of available font-lock keywords for the R mode.
 The key of each cons cell is a name of the keyword. The value
 should be t or nil to indicate if the keyword is active or not."
@@ -2481,21 +2486,23 @@ the variable `ess-help-own-frame' is non-nil."
 (defvar ess-numbers-face 'ess-numbers-face
   "Face name to use for highlighting numbers.")
 
-(if (featurep 'xemacs)
-    ;; just to make xemacs not to choke on ESS
-    (setq ess-function-call-face font-lock-builtin-face
-          ess-numbers-face font-lock-type-face)
+(defvar ess-%op%-face 'ess-%op%-face
+  "Face name to use for highlighting %op% operators.")
 
-  (defface ess-function-call-face
-    '((default (:slant normal :inherit font-lock-function-name-face)))
-    "Font Lock face used to highlight function calls in ess buffers."
-    :group 'ess)
+(defface ess-function-call-face
+  '((default (:slant normal :inherit font-lock-function-name-face)))
+  "Font Lock face used to highlight function calls in ess buffers."
+  :group 'ess)
 
-  (defface ess-numbers-face
-    '((default (:slant normal :inherit font-lock-type-face)))
-    "Font Lock face used to highlight numbers in ess-mode buffers."
-    :group 'ess)
-  )
+(defface ess-numbers-face
+  '((default (:slant normal :inherit font-lock-type-face)))
+  "Font Lock face used to highlight numbers in ess-mode buffers."
+  :group 'ess)
+
+(defface ess-%op%-face
+  '((default (:slant normal :inherit font-lock-keyword-face)))
+  "Font Lock face used to highlight %op% operators in ess-mode buffers."
+  :group 'ess)
 
 
 (defcustom ess-help-kill-bogus-buffers t