>>> merge git branch into trunk

Squashed commit of the following:

commit 3cdae48c7e3f3fe1b46673a01b9dd1c2619a9818
Author: Vitalie Spinu <spinuvit@gmail.com>
Date:   Mon Apr 23 13:07:25 2012 +0200

    manually apply changes which filed during haxney merges

commit 0b0c12097c65f479cc08568a0b5eb742712aaf16
Merge: eb7beec c93848d
Author: Vitalie Spinu <spinuvit@gmail.com>
Date:   Mon Apr 23 12:50:44 2012 +0200

    Merge remote-tracking branch 'haxney/whitespace-cleanup'

    Conflicts:
    	lisp/ess-developer.el

commit eb7beec4191b27d22423df569c4f8cfa320dfc80
Merge: 85a286c 8dc3d6d
Author: Vitalie Spinu <spinuvit@gmail.com>
Date:   Mon Apr 23 12:47:13 2012 +0200

    Merge remote-tracking branch 'haxney/eol-consistency'

    Conflicts:
    	lisp/ess-tracebug.el

commit 85a286cacc6407d05b494d5ec9306d98a92a2c15
Merge: 14849a9 6352290
Author: Vitalie Spinu <spinuvit@gmail.com>
Date:   Mon Apr 23 12:43:22 2012 +0200

    Merge remote-tracking branch 'haxney/clean-docs'

    Conflicts:
    	lisp/ess-developer.el
    	lisp/ess-install.el
    	lisp/ess-tracebug.el

commit 14849a903639102f0f880bcce3d63198476eb964
Merge: 50312c1 708101b
Author: Vitalie Spinu <spinuvit@gmail.com>
Date:   Mon Apr 23 03:28:33 2012 -0700

    Merge pull request #9 from haxney/fix-gpl-description

    Remove incorrect description of the GPL

commit 708101bef3e5c1f20f53736a9e93799eddaf4f0c
Author: Daniel Hackney <dan@haxney.org>
Date:   Mon Apr 23 00:28:53 2012 -0400

    Remove incorrect description of the GPL

    A couple files had the following in their header:

        In short: you may use this code any way you like, as long as you
        don't charge money for it, remove this notice, or hold anyone liable
        for its results.

    This is not an accurate description of the GPL, and should therefore not appear
    in the headers.

commit c93848d930783f0c38fec1ff07af40fb623799d1
Author: Daniel Hackney <dan@haxney.org>
Date:   Sun Apr 22 23:03:42 2012 -0400

    Clean up all whitespace according to settings from ".dir-locals.el"

    Uses `whitespace-cleanup' to set a consistent style for whitespace throughout
    the project. This can be applied with:

        (defun recursive-files (dir func)
          (loop with before-save-hook
                for (file is-dir)
                  in (directory-files-and-attributes dir t ".*\.el$")
                if is-dir
                  do (recursive-files file form)
                else
                  do (with-current-buffer (find-file-noselect file)
                       (apply func)
                       (basic-save-buffer)
                       (kill-buffer))))

        (recursive-files 'whitespace-cleanup)

    Again, this can be run from "emacs -Q" after "(require 'cl)"

commit 3c9c0857d67bda1e9161e37ed426e97a8c61223c
Author: Daniel Hackney <dan@haxney.org>
Date:   Sun Apr 22 22:51:54 2012 -0400

    Directory-local variables for whitespace cleanup.

    Use the `whitespace' library for the cleaning.

commit 8dc3d6db1d40956ab96c33b18a80a95a047b46b3
Author: Daniel Hackney <dan@haxney.org>
Date:   Sun Apr 22 22:40:28 2012 -0400

    Convert files to `utf-8-unix' coding system.

    The default coding system to use going forward, `utf-8-unix', is set as a
    directory-local variable in ".dir-locals.el".

    To force all elisp files to use the `utf-8-unix' coding system, the following
    code will recursively walk through all elisp files in the specified directory
    set the encoding system, and save the file.

        (require 'cl)

        (defun recursive-files (dir func)
          (loop with before-save-hook
                for (file is-dir)
                  in (directory-files-and-attributes dir t ".*\.el$")
                if is-dir
                  do (recursive-files file form)
                else
                  do (with-current-buffer (find-file-noselect file)
                       (apply func)
                       (basic-save-buffer)
                       (kill-buffer))))

    This can be invoked as follows:

        (recursive-files "/path/to/ess" '(lambda () (set-buffer-file-coding-system 'utf-8-unix)))

    To ensure no other variables from the user environment impact the process, this
    code can be run in "emacs -Q", which doesn't load any startup files (outside of
    the emacs core).

    This function could perhaps be split out, named better, and put in its own file.

commit 6352290fe13ce9048abaa0e401679a67bbcafe43
Author: Daniel Hackney <dan@haxney.org>
Date:   Tue Apr 17 21:01:36 2012 -0400

    Reformat all headers to be consistent.

    Summary of changes made:

    * Correct first- and last-line format. Preferred is three semicolons, file name,
      either three dashes and the description (first line) or the string "ends
      here" (last line).

    * Changed header comment lines to match conventions. "Author" and "Maintainer"
      headers are singular, even when there are multiple authors or maintainers.

    * Use the correct number of semicolons for each header section. Regular comments
      should have two semicolons; section headers, such as "Commentary" or "Code"
      should have three.

    * Fixed "Keywords" header comments. There is a standard-ish set of keywords used
      in Emacs, available through `finder-by-keyword'; this commit uses those
      conventions. Also, keywords are now separated by comma then space and do not
      have a trailing period.

    * Trailing newline at end of file. A few files lacked this, which makes
      subsequent diffs which modify the last line unnecessarily noisy.

    * Moved "Code" section marker before any and all code in a file.

git-svn-id: https://svn.r-project.org/ESS/trunk@4809 0bbaf3bd-34e0-0310-bf65-c717079852d4
summary of Daniel Hackney's changes.

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