>>>> merged git branch into trunk

commit ef3fb7557c52a968e7bf8a026681b90c9a3d19f2
Author: Vitalie Spinu <spinuvit@gmail.com>
Date:   Mon Apr 2 09:35:10 2012 +0000

    renamed local var "funname" into .ess_funname to avoid poluting .R_GlobalEnv

    git-svn-id: https://svn.r-project.org/ESS/trunk@4748 0bbaf3bd-34e0-0310-bf65-c717079852d4

commit 31972ba5dc62e13b10c5f2b5c4f39d70026aedf8
Author: Sam Steingold <sds@gnu.org>
Date:   Mon Apr 2 16:22:50 2012 -0400

    * lisp/ess-help.el (ess-help-mode-map): Older XEmacs misses
    `special-mode-map', check for that.
    * lisp/ess-tracebug.el (ess-watch-mode-map): Likewise.

commit e960b877ffc27cf230e123ae26a7dbf27eac1a9f
Author: Sam Steingold <sds@gnu.org>
Date:   Mon Apr 2 14:45:57 2012 -0400

    * ess-inf.el (ess-mode-minibuffer-map): All supported emacsen have `set-keymap-parent'.

commit 11b42141dc28f2b15cd273e4636641faddde6150
Author: Sam Steingold <sds@gnu.org>
Date:   Mon Apr 2 11:36:21 2012 -0400

    * ess-mode.el (ess-mode-map): All supported emacsen have `set-keymap-parent'.

commit 78af6cb18409c7929418729b2c963221d48bfca1
Author: Sam Steingold <sds@gnu.org>
Date:   Mon Apr 2 11:29:16 2012 -0400

    * lisp/ess-tracebug.el (ess-bp-kill): Bug fix: `called-interactively-p'
    requires an argument; fix it as recommended in the doc for
    `called-interactively-p' by avoiding it altogether; this also
    takes care of compatibility.

commit 7ca012b90fbce65ec522099ab6c767843b279f02
Author: Sam Steingold <sds@gnu.org>
Date:   Mon Apr 2 11:25:23 2012 -0400

    * lisp/ess-help.el (ess-help-mode-map): All supported emacsen have
    `set-keymap-parent'.
    * lisp/ess-inf.el (inferior-ess-mode-map): Likewise.
    * lisp/ess-tracebug.el (ess-watch-mode-map): Likewise.
    * lisp/ess-trns.el (ess-transcript-mode-map): Likewise.

commit 05f020fdf3c778c599584022d1199771b27a1159
Author: Sam Steingold <sds@gnu.org>
Date:   Mon Apr 2 11:15:00 2012 -0400

    * lisp/ess-inf.el (update-ess-process-name-list, ess-cleanup):
    Use `dolist' instead of `mapc'+`lambda' for clarity and speed.
    * lisp/ess-help.el (ess-help-mode, ess-describe-sec-map)
    (ess-get-help-files-list, ess-get-help-aliases-list): Likewise.

commit 7d6df13db9248f0bf891275d2a6675bf3cd1a65c
Author: Sam Steingold <sds@gnu.org>
Date:   Mon Apr 2 11:09:57 2012 -0400

    * lisp/ess-custom.el, ess-custom.el, lisp/ess-mous.el, lisp/ess-mouse.el:
    * lisp/ess-r-args.el, lisp/ess-r-d.el, lisp/ess-rd.el, lisp/ess-s-l.el, lisp/ess-s4-d.el:
    * lisp/ess-site.el, lisp/ess-sp5-d.el, lisp/ess-sp6-d.el, lisp/ess-swv.el:
    * lisp/ess-tracebug.el, lisp/ess-utils.el, lisp/ess.el, lisp/make-regexp.el, lisp/mouseme.el:
    * lisp/noweb-mode.el: Do not quote lambda forms, this is never needed.

commit 4ff37fd8aa2eb22dfa2d47355ad0cde753a58c58
Author: Sam Steingold <sds@gnu.org>
Date:   Mon Apr 2 10:58:36 2012 -0400

    * lisp/ess-site.el: Rise up to the challenge: use `locate-file'
    instead of horrible adhockery to check if info can find ess.info.

commit 196602f61ff167af81ce339d5229b27dcad832ae
Author: Sam Steingold <sds@gnu.org>
Date:   Mon Apr 2 10:50:35 2012 -0400

    ignore elc and VERSION

commit 65126ca05ac2b73d821e72c5b69e995fff896c13
Author: Vitalie Spinu <spinuvit@gmail.com>
Date:   Sat Mar 31 08:14:26 2012 +0000

    Corrected `' typos (patch by Sam Steingold)

    git-svn-id: https://svn.r-project.org/ESS/trunk@4747 0bbaf3bd-34e0-0310-bf65-c717079852d4

commit 2eefb13f44fd78dc36c0f1990d9f992d7414cd26
Author: Vitalie Spinu <spinuvit@gmail.com>
Date:   Fri Mar 30 18:08:26 2012 +0000

    improved docs

    git-svn-id: https://svn.r-project.org/ESS/trunk@4746 0bbaf3bd-34e0-0310-bf65-c717079852d4

    etc

git-svn-id: https://svn.r-project.org/ESS/trunk@4749 0bbaf3bd-34e0-0310-bf65-c717079852d4