Commits

rsparapa  committed a63bad6

Updates for latest version of ESS: upstream 5.2.3, downstream 1.11
Mostly removal of RCS variables since we moved to a subversion
repository and decided that they weren't worth migrating. Also,
a few bug fixes and new features.

  • Participants
  • Parent commits a4be0cd

Comments (0)

Files changed (47)

File lisp/ess-comp.el

 ;;; ess-comp.el --- setting for compiling, only.
 
 ;; Copyright (C) 1997--2004 A. J. Rossini
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@stat.sc.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: A.J. Rossini <rossini@stat.sc.edu>
 ;; Created: 25 July 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS

File lisp/ess-cust.el

 ;;; ess-cust.el --- Customize variables for ESS
-;; Copyright (C) 1997--2004 A.J. Rossini, Martin Maechler,
-;; Kurt Hornik, Richard M. Heiberger, Rodney Sparapani,
-;; and Stephen Eglen. 
 
-;; Author: A.J. Rossini <rossini@u.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
+
+;; Original Author: A.J. Rossini <rossini@u.washington.edu>
 ;; Created: 05 June 2000
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; Keywords: editing and process modes.
 
 
 ;; Variables (not user-changeable)
 
-(defvar ess-version "5.2.2"
+(defvar ess-version "5.2.3"
   "Version of ESS currently loaded.")
 
 (defvar no-doc
   :group 'ess-proc
   :type 'alist)
 
+(defcustom inferior-ess-same-window t
+  "*Non-nil indicates new inferior ESS process appears in current window.
+Otherwise, the new inferior ESS buffer is shown in another window in the
+current frame.  This variable is ignored if `inferior-ess-own-frame' is
+non-nil."
+  :group 'ess-proc
+  :type 'boolean)
 
 (defcustom inferior-R-program-name
   (if ess-microsoft-p "Rterm"  "R")
   :group 'ess-R
   :type 'string)
 
+(defcustom inferior-R-args ""
+  "*String of arguments used when starting R.
+These arguments are currently not passed to other versions of R that have
+been created using the variable `ess-r-versions'."
+  :group 'ess-R
+  :type 'string)
 
 (defcustom ess-r-versions '( "R-1" "R-2")
   "*List of partial strings for versions of R to access within ESS.
     "c:/progra~1/Insightful/splus62net/server"
     "c:/progra~1/Insightful/splus61netclient"
     "c:/progra~1/Insightful/splus61net/server"
-    "c:/progra~1/Insightful/splus6se")
+    "c:/progra~1/Insightful/splus6se"
+    "c:/progra~1/Insightful/splus61se"
+    "c:/progra~1/Insightful/splus62se")
   "*List of possible values of the environment variable SHOME for recent
 releases of S-Plus.  These are the default locations for several
 current and recent releases of S-Plus.  If any of these pathnames
     :group 'ess-S
     :type 'string))
 
+(defcustom inferior-Splus-args ""
+  "*String of arguments used when starting S.
+These arguments are currently passed only to S+6."
+  :group 'ess-S
+  :type 'string)
+
 (defcustom inferior-S+6-print-command "S_PRINT_COMMAND=gnuclientw.exe"
   "*Destination of print icon in S+6 for Windows Commands window."
   :group 'ess-S
 ;;- 	    ))
 
 
-(defcustom inferior-ess-start-args ""
-  "*String of arguments passed to the ESS process.
-Useful for R and SAS.  This is generic."
-  :group 'ess-proc
-  :type 'string)
+(defvar inferior-ess-start-args ""
+  "String of arguments passed to the ESS process.
+If you wish to pass arguments to a process, see e.g. `inferior-R-args'.")
 
 (defcustom inferior-ess-start-file nil
   "*File dumped into process, if non-nil."

File lisp/ess-debug.el

 ;;; ess-debug.el --- debugging start up for ESS
 
 ;; Copyright (C) 1997--2001 A.J. Rossini
+;; Copyright (C) 2001--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@biostat.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: A.J. Rossini <rossini@biostat.washington.edu>
 ;; Created: November 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/ess-dump.el

 ;;; ess-dump.el --- Getting objects into text files for editing
 
-;; Copyright (C) 2000--2001 A.J. Rossini <rossini@u.washington.edu>
-;;			Kurt Hornik <hornik@ci.tuwien.ac.at>
-;;			Martin Maechler <maechler@stat.math.ethz.ch>
-;;                      Richard M. Heiberger <rmh@fisher.stat.temple.edu>
-;;
-;; Author:  A.J. Rossini <rossini@u.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Copyright (C) 2000--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
+
+;; Original Author:  A.J. Rossini <rossini@u.washington.edu>
 ;; Created: 3 Sept 2000
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS
 

File lisp/ess-emcs.el

 ;;; ess-emcs.el --- simple determination of Emacs/XEmacs and version #.
 
-;; Copyright (C) 2000--2003 A.J. Rossini <rossini@u.washington.edu>,
-;; R.M. Heiberger <rmh@surfer.sbm.temple.edu>,
-;; Martin Maechler <maechler@stat.math.ethz.ch>,
-;; Kurt Hornik <hornik@ci.tuwien.ac.at>, and
-;; Rodney Sparapani <rsparapa@mcw.edu>.
+;; Copyright (C) 2000--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author:  A.J. Rossini <rossini@biostat.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
+;; Original Author: A.J. Rossini <rossini@biostat.washington.edu>
 ;; Created: 07 June 2000
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS

File lisp/ess-font-lock.el

 ;;; ess-font-lock.el -- font-lock color options
 
-;; Copyright (C) 1997--2001 Rodney Sparapani <rsparapa@mcw.edu>,
-;; A.J. Rossini <rossini@u.washington.edu>,  Martin Maechler
-;; <maechler@stat.math.ethz.ch>, Kurt Hornik < >, 
-;; Richard M. Heiberger <rmh@temple.edu>.
+;; Copyright (C) 2000--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Richard M. Heiberger <rmh@temple.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: Richard M. Heiberger <rmh@temple.edu>
 ;; Created: 06 Feb 2000
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
 
 ;; Keywords: ESS, font-lock
 

File lisp/ess-help.el

 
 ;; Copyright (C) 1989-1994 Bates, Kademan, Ritter and Smith
 ;; Copyright (C) 1997, A.J. Rossini <rossini@stat.sc.edu>
-;; Copyright (C) 1998--2001	A.J. Rossini <rossini@u.washington.edu>,
-;; Martin Maechler <maechler@stat.math.ethz.ch>, Kurt Hornik < >,
-;; and Richard M. Heiberger <rmh@temple.edu>.
+;; Copyright (C) 1998--2001 A.J. Rossini, Martin Maechler, Kurt Hornik and
+;;	Richard M. Heiberger <rmh@temple.edu>.
+;; Copyright (C) 2001--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: David Smith <dsmith@stats.adelaide.edu.au>
-;; Maintainers: A.J. Rossini <rossini@u.washington.edu>,
-;;              Martin Maechler <maechler@stat.math.ethz.ch>
+;; Original Author: David Smith <dsmith@stats.adelaide.edu.au>
 ;; Created: 7 Jan 1994
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS
 

File lisp/ess-inf.el

 ;;; ess-inf.el --- Support for running S as an inferior Emacs process
 
 ;; Copyright (C) 1989-1994 Bates, Kademan, Ritter and Smith
-;; Copyright (C) 1997-2001 A.J. Rossini <rossini@u.washington.edu>,
+;; Copyright (C) 1997-1999 A.J. Rossini <rossini@u.washington.edu>,
 ;; Martin Maechler <maechler@stat.math.ethz.ch>.
+;; Copyright (C) 2000--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: David Smith <dsmith@stats.adelaide.edu.au>
-;;         (now: dsmith@insightful.com)
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: David Smith <dsmith@stats.adelaide.edu.au>
 ;; Created: 7 Jan 1994
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS
 
 	;; Get search list when needed
 	(setq ess-sp-change t)
 	(run-hooks 'ess-post-run-hook))
-      (pop-to-buffer (process-buffer (get-process proc-name))))))
+      (if inferior-ess-same-window
+	  (switch-to-buffer (process-buffer (get-process proc-name)))
+	(pop-to-buffer (process-buffer (get-process proc-name)))))))
+
 
 (defun ess-process-sentinel (proc message)
   "Sentinel for use with ESS processes.
   (let ((the-dir
 	 (expand-file-name
 	  (file-name-as-directory
+	   (if (fboundp 'read-directory-name)
+	       ;; use XEmacs' read-directory-name if exists.
+	       (read-directory-name prompt
+				    (file-name-as-directory default)
+				    (file-name-as-directory default) t nil)
 	   (read-file-name prompt
 			   (file-name-as-directory default)
-			   (file-name-as-directory default) t nil)))))
+			     (file-name-as-directory default) t nil))))))
     (if (file-directory-p the-dir) nil
       (error "%s is not a valid directory" the-dir))
     the-dir))
 ;;>
 ;;> As promised, here is a quick hack:
 ;;  ___hack much improved by MM___ , both help(.) and ?... now work
-;;
-;; rmh: catch page() just like we catch help()
+;; FIXME: Note that  '??' nicely works in *R*, but
+;;        'type ? topic' doesn't use ess-help {but display in *R*}
 (defconst inferior-R-1-input-help (format "help *(%s)" ess-help-arg-regexp))
 (defconst inferior-R-2-input-help (format "^ *\\? *%s" ess-help-arg-regexp))
-(defconst inferior-R-page         (format "page *(%s)" ess-help-arg-regexp))
+(defconst inferior-R-page         (format "^ *page *(%s)" ess-help-arg-regexp))
 
 (defun inferior-R-input-sender (proc string)
   ;; REALLY only for debugging: this S_L_O_W_S D_O_W_N   [here AND below]

File lisp/ess-iw32.el

 ;;; essd-iw32.el --- ESS customization for ddeclients under Windows 9x/NT
-;; Copyright (C) 1998--1999,  Richard M. Heiberger <rmh@fisher.stat.temple.edu>
 
-;; Author: Richard M. Heiberger  <rmh@fisher.stat.temple.edu>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
+;; Copyright (C) 1998--1999 Richard M. Heiberger <rmh@fisher.stat.temple.edu>
+;; Copyright (C) 2000--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
+
+;; Original Author: Richard M. Heiberger  <rmh@fisher.stat.temple.edu>
 ;; Created: 9 Dec 1998
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS
 

File lisp/ess-latex.el

 ;; ess-latex.el - Interface ESS and LaTeX.
+
 ;; Copyright (C) 1999 by A.J. Rossini <rossini@biostat.washington.edu>
 ;; based on noweb-mode by: Thorsten.Ohl @ Physik.TH-Darmstadt.de
 ;;     with a little help from Norman Ramsey <norman@bellcore.com>
 ;;                         and Mark Lunt <mark.lunt@mrc-bsu.cam.ac.uk>
-;;                         and A.J. Rossini <rossini@biostat.washington.edu>
+
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
+;; This file is part of ESS.
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; 
 ;; See bottom of this file for information on language-dependent
 ;; highlighting, and recent changes.
-;;
 
-;; BASED ON: (from Mark Lunt).
-;; ESS CVS: --Id: noweb-mode.el,v 1.1 1999/04/21 18:03:51 rossini Exp --
 
 
-
 ;;; Variables
 
 (defconst ess-latex-minor-mode-RCS-Id
-  "$Id$")
+  "Imported to ESS Subversion repository and RCS ids not maintained.")
 
 (defconst ess-latex-minor-mode-RCS-Name
-  "$Name$")
+  " ")
 
 (defvar ess-latex-minor-mode-prefix "\M-n"
   "*Prefix key to use for noweb mode commands.

File lisp/ess-menu.el

 ;;; ess-menu.el --- Menu and Speedbar support for statistical
 ;;; programming and analysis
 
-;; Copyright 2000--2004 (C) A.J. Rossini, Richard M. Heiberger,
-;; Kurt Hornik, Martin Maechler, Rodney Sparapani, and Stephen Eglen.
+;; Copyright (C) 2000--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author:  A.J. Rossini <rossini@u.washington.edu>
-;; Maintainer(s): A.J. Rossini <rossini@u.washington.edu>, Stephen Eglen <stephen@anc.ed.ac.uk> 
+;; Original Author: A.J. Rossini
 ;; Created: September 4, 2000
-;; Version: $Id$
+;; Maintainer: ESS Core Team <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: statistical support
+
 ;; Summary: general functions for ESS
 
 ;; This file is part of ESS
 
 
 ;;; Speedbar stuff.
 
-(defun S-speedbar-buttons (buffer)
-  "attempted hack."
-
-  (speedbar-with-writable)
-  ;;(speedbar-make-tag-line)
-  ;;(speedbar-insert-button)
-  )
-
-(fset 'R-speedbar-buttons 'S-speedbar-buttons)
-
-(defun S-speedbar-menu-items  ( )
-  "Need to write.")
-
 (defun ess-S-initialize-speedbar ()
   "Extend to all extensions; see initialization, and edit."
   (speedbar-add-supported-extension ".R")
   (speedbar-add-supported-extension ".s")
   (speedbar-add-supported-extension ".q"))
 
-(if (featurep 'speedbar)
+;(if (featurep 'speedbar)
+;    (progn
+;      (message "enabling speedbar support")
+;      (require 'speedbar)
+;      (ess-S-initialize-speedbar)))
+
+(eval-when-compile
+  (condition-case nil
     (progn
-      (message "enabling speedbar support")
       (require 'speedbar)
+        (when (featurep 'speedbar)
+          (message "enabling speedbar support")
+
+	    (defun S-speedbar-buttons (buffer)
+		"attempted hack."
+
+		;;(speedbar-make-tag-line)
+		;;(speedbar-insert-button)
+		(speedbar-with-writable))
+
+	    (fset 'R-speedbar-buttons 'S-speedbar-buttons)
+
+	    (defun S-speedbar-menu-items  ( )
+		"Need to write.")
+
       (ess-S-initialize-speedbar)))
+    (error nil)))
 
 
 ; Run load hook and provide package
 

File lisp/ess-mode.el

 ;;; ess-mode.el --- Support for editing ESS source code
 
 ;; Copyright (C) 1989-1994 Doug Bates, Ed Kademan, Frank Ritter, David Smith.
-;; Copyright (C) 1997-1999 Richard M. Heiberger <rmh@fisher.stat.temple.edu>
-;;			Kurt Hornik <hornik@ci.tuwien.ac.at>
-;;			Martin Maechler <maechler@stat.math.ethz.ch>
-;;			A.J. (Tony) Rossini <rossini@u.washington.edu>
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: David Smith <dsmith@stats.adelaide.edu.au>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: David Smith <dsmith@stats.adelaide.edu.au>
 ;; Created: 7 Jan 1994
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS
 
     ;; be replaced with the other versions of R and Sqpe that can be run.
     ;; See `ess-r-versions-create' and ess-site.el
     ("Other"
-     ["No other R or Sqpe versions" R nil])
+     ["No other R or Sqpe versions" nil nil])
     ["About" 
      (ess-goto-info "Starting up") t]
      ;; :help "Read about starting a new ESS process" :active t]

File lisp/ess-mous.el

 ;;; ess-mous.el --- Support for mouse- or cursor-sensitive actions
 
 ;; Copyright (C) 2001 Richard M. Heiberger <rmh@sbm.temple.edu>
+;; Copyright (C) 2002--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Richard M. Heiberger <rmh@sbm.temple.edu>
-;; Maintainer: Richard M. Heiberger <rmh@sbm.temple.edu>
+;; Original Author: Richard M. Heiberger <rmh@sbm.temple.edu>
 ;; Created: 25 Mar 2001
-;; Modified: $Date$
-;; Version: $Revision:
-;; RCS: $Id: ess-mous.el
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS
 

File lisp/ess-noweb.el

 ;;; ess-noweb.el : support for Literate Data Analysis
 
-;; Copyright (C) 1999--2004, Mark Lunt and A.J. Rossini
+;; Copyright (C) 1999 Mark Lunt
+;; Copyright (C) 1999--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Authors: Mark Lunt <mark.lunt@mrc-bsu.cam.ac.uk>
+;; Original Authors: Mark Lunt <mark.lunt@mrc-bsu.cam.ac.uk>
 ;;          A.J. Rossini <rossini@u.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
 ;; Created: April 18, 1999
-;; Version: $Revision$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: statistical support
 ;; Summary: Noweb support for ESS
-;; CVS: $Id$
+
 
 ;; This file is part of ESS
 

File lisp/ess-rdired.el

 ;;; ess-rdired.el --- prototype object browser for R, looks like dired mode.
-;; Author: Stephen Eglen <stephen@anc.ed.ac.uk>
-;; Maintainer: Stephen Eglen <stephen@anc.ed.ac.uk>
+
+;; Copyright (C) 2002--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
+
+;; Original Author: Stephen Eglen <stephen@anc.ed.ac.uk>
 ;; Created: Thu 24 Oct 2002
-;; $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
+;; This file is part of ESS
 
 ;; This file is not part of GNU Emacs.
 

File lisp/ess-site.el

 ;;; ess-site.el --- user customization of ess-mode
 
 ;; Copyright (C) 1993 David M. Smith
-;; Copyright (C) 1997--2004 A.J. Rossini, R.M. Heiberger, Martin
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
 ;; Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: David Smith <D.M.Smith@lancaster.ac.uk>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>, 
-;;             Martin Maechler <maechler@stat.math.ethz.ch>
+;; Original Author: David Smith <D.M.Smith@lancaster.ac.uk>
 ;; Created: 12 Nov 1993
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS
 The ESS etc directory stores various auxillary files that are useful
 for ESS, such as icons.")
 
-(defvar ess-etc-directory-list '("/../etc" "/../etc/ess" "/../../etc/ess")
+(defvar ess-etc-directory-list
+  '("../etc/" "../etc/ess/" "../../etc/ess/" "./etc/")
   "*List of directories, relative to `ess-lisp-directory', to search for etc.")
 
 (while (and (listp ess-etc-directory-list) (consp ess-etc-directory-list))
     (setq ess-etc-directory 
-	(expand-file-name (concat ess-lisp-directory 
+	(expand-file-name (concat ess-lisp-directory "/"
 	    (car ess-etc-directory-list))))
     (if (file-directory-p ess-etc-directory) 
 	(setq ess-etc-directory-list nil)
 	(setq ess-etc-directory nil)
 	(setq ess-etc-directory-list (cdr ess-etc-directory-list))
-	(if (null ess-etc-directory-list) (progn
-	    (beep 0) (beep 0) (message (concat
+    (when (null ess-etc-directory-list)
+      (beep 0) (beep 0)
+      (message (concat
 	    "ERROR:ess-site.el:ess-etc-directory\n"
 	    "Relative to ess-lisp-directory\n"
 	    "At least one of ../etc, ../etc/ess, ../../etc/ess must exist!"))
-	    (sit-for 4)))))
+      (sit-for 4))))
 
 (defvar ess-info-directory nil
   "*Location of the ESS info/ directory.

File lisp/ess-toolbar.el

 ;;; ess-toolbar.el --- Support for a toolbar in ESS.
-;;; Thu 06 May 2004
-;;; Stephen Eglen
-;;; GPL.
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
+
+;; Original Author: Stephen Eglen
+;; Created: 06 May 2004
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
+;; This file is part of ESS
+
+;; GPL --> see beginning of ./ess-site.el
 
 ;;; Commentary:
 
 Icons should be found in ESS/etc/icons/ directory.
 If `ess-icon-directory' is invalid, please report a bug.")
 
-(if (not (file-exists-p ess-icon-directory))
-    (message "Check that you have set `ess-icon-directory'."))
+(unless (file-directory-p ess-icon-directory)
+    (ess-write-to-dribble-buffer
+	"`ess-icon-directory' does not exist; using `ess-etc-directory'.\n")
+    (setq ess-icon-directory ess-etc-directory))
 
 (defvar ess-toolbar nil
   "Toolbar items to be added to ESS editing buffers.")

File lisp/ess-trns.el

 ;;; ess-trns.el --- Support for manipulating S transcript files
 
-;; Copyright (C) 1989-1994 Bates, Kademan, Ritter and Smith
-;; Copyright (C) 1997-2000 Richard M. Heiberger <rmh@fisher.stat.temple.edu>
-;;				Kurt Hornik <hornik@ci.tuwien.ac.at>
-;;				Martin Maechler <maechler@stat.math.ethz.ch>
-;;				A.J. (Tony) Rossini <rossini@stat.sc.edu>
+;; Copyright (C) 1989--1994 Bates, Kademan, Ritter and Smith
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: David Smith <dsmith@stats.adelaide.edu.au>
-;; Maintainer: A.J. Rossini <rossini@stat.sc.edu>
-;; Created: 7 Jan 1994
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Original Author: David Smith <dsmith@stats.adelaide.edu.au>
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS
 

File lisp/ess-utils.el

 ;;; ess-utils.el --- General Emacs utility functions used by ESS
 
-;; Copyright (C) 1998--2004 D. Bates, K. Hornik, R.M. Heiberger,
-;; M. Maechler, R.A. Sparapani and A.J. Rossini.
+;; Copyright (C) 1998--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Martin Maechler <maechler@stat.math.ethz.ch>
-;; Maintainer: Martin Maechler <maechler@stat.math.ethz.ch>
+;; Original Author: Martin Maechler <maechler@stat.math.ethz.ch>
 ;; Created: 9 Sept 1998
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS (Emacs Speaks Statistics).
 
 	    (ess-flatten-list-1 (cdr list))))
    (t (list list))))
 
+(defun ess-delete-blank-lines ()
+  "Convert 2 or more lines of white space into one."
+    (interactive)
+    (save-excursion
+	(goto-char (point-min))
+	(save-match-data
+	    (while (search-forward-regexp "^[ \t]*\n[ \t]*\n" nil t)
+              ;;(goto-char (match-beginning 0))
+		    (delete-blank-lines)))))
+
+(defun ess-ebcdic-to-ascii-search-and-replace () 
+    "*Search and replace EBCDIC text with ASCII equivalents."
+    (interactive)
+    (while (search-forward-regexp "[^\f\t\n -~][^\f\t\n -?A-JQ-Yb-jp-y]*[^\f\t\n -~]?" nil t)
+	(call-process-region (match-beginning 0) (match-end 0) "/bin/dd" t (list t nil) t "conv=ascii")))
+
 (provide 'ess-utils)
 ;;; ess.el --- Emacs Speaks Statistics: statistical programming within Emacs
 
 ;; Copyright (C) 1989--1996 Bates, Kademan, Ritter and Smith
-;; Copyright (C) 1997--2004 A.J. Rossini, Martin Maechler,
-;; Kurt Hornik, Richard M. Heiberger, Rodney Sparapani,
-;; and Stephen Eglen. 
-;; Author: Doug Bates, Ed Kademan, Frank Ritter, David Smith
-;; Maintainer(s): A.J. Rossini <rossini@biostat.washington.edu>
-;;                Martin Maechler  <maechler@stat.math.ethz.ch>
-;;                Kurt Hornik <hornik@ci.tuwien.ac.at>
-;;                Richard M. Heiberger <rmh@fisher.stat.temple.edu>
-;;                Rodney Sparapani <rsparapa@mcw.edu>
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
+
+;; Original Authors: Doug Bates, Ed Kademan, Frank Ritter, David Smith
 ;; Created: October 14, 1991
-;; Version: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: statistical support
 ;; Summary: general functions for ESS
 

File lisp/essa-r.el

 ;;; essa-r.el -- Possible local customizations for R with ESS.
 
-;; Copyright (C) 1997--2004 A.J. Rossini, Martin Maechler,
-;; Kurt Hornik, Richard M. Heiberger, Rodney Sparapani, and Stephen Eglen.
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@u.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: A.J. Rossini <rossini@u.washington.edu>
 ;; Created: 17 November 1999
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; Keywords: editing and process modes.
 

File lisp/essa-sas.el

 ;;; essa-sas.el -- clean-room implementation of many SAS-mode features
 
-;; Copyright (C) 1997-2004 Rodney A. Sparapani, A.J. Rossini, 
-;; Martin Maechler, Kurt Hornik, and Richard M. Heiberger.
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Rodney A. Sparapani <rsparapa@mcw.edu>
-;; Maintainer: Rodney A. Sparapani <rsparapa@mcw.edu>, 
-;;             A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: Rodney A. Sparapani <rsparapa@mcw.edu>
+;; Maintainer: ESS-core@stat.math.ethz.ch
 ;; Created: 17 November 1999
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-
 ;; Keywords: SAS 
 
 ;; This file is part of ESS
 ;;; Section 2:  Function Definitions
 ;;; Section 3:  Key Definitions
 
-
 ;;; Section 1:  Variable Definitions
 
 (defvar ess-sas-file-path "."
   (kill-buffer nil)  
 )
 
+(eval-when-compile
+  (condition-case nil
+      (progn
+        (require 'rtf-support)
+        (when (featurep 'rtf-support)
+
 (defun ess-sas-rtf-portrait ()
 "Creates an MS RTF portrait file from the current buffer."
     (interactive)
     (ess-sas-file-path)
     
-    (if (fboundp 'rtf-export) (let 
+    (let
 	((ess-temp-rtf-file (replace-in-string ess-sas-file-path "[.][^.]*$" ".rtf")))
 	    ;(expand-file-name (buffer-name)) "[.][^.]*$" ".rtf")))
 	(rtf-export ess-temp-rtf-file)
 	    
         (while (replace-regexp "\\\\fs[0-9]+" "\\\\fs18" ) nil)
 	    
-        (save-buffer))))
+        (save-buffer)))
 
 (defun ess-sas-rtf-us-landscape ()
 "Creates an MS RTF US landscape file from the current buffer."
 "{\\pgdsc0\\pgdscuse195\\lndscpsxn\\pgwsxn16837\\pghsxn11905\\marglsxn1800\\margrsxn1800\\margtsxn1440\\margbsxn1440\\pgdscnxt0 Default;}}\n"
 "\\landscape\\paperh11905\\paperw16837\\margl1800\\margr1800\\margt1440\\margb1440\\sectd\\sbknone\\lndscpsxn\\pgwsxn16837\\pghsxn11905\\marglsxn1800\\margrsxn1800\\margtsxn1440\\margbsxn1440\\ftnbj\\ftnstart1\\ftnrstcont\\ftnnar\\aenddoc\\aftnrstcont\\aftnstart1\\aftnnrlc\n"))
     (save-buffer))
+))
+    (error nil)))
 
 (defun ess-sas-submit ()
   "Save the .sas file and submit to shell using a function that
 (defun ess-sas-global-pc-keys ()
   "PC-like SAS key definitions"
   (interactive)
+  (when (featurep 'rtf-support)
   (global-set-key [(control f1)] 'ess-sas-rtf-portrait)
-  (global-set-key [(control f2)] 'ess-sas-rtf-us-landscape)
+    (global-set-key [(control f2)] 'ess-sas-rtf-us-landscape))
   (global-set-key (quote [f2]) 'ess-revert-wisely)
   (global-set-key (quote [f3]) 'ess-sas-goto-shell)
   (global-set-key (quote [f4]) 'ess-sas-goto-file-1)
   (global-set-key (quote [f10]) 'ess-sas-toggle-sas-log-mode)
   (global-set-key [(control f10)] 'ess-sas-kill-buffers)
   (global-set-key (quote [f11]) 'ess-sas-goto-file-2)
+  (global-set-key [(control f11)] 'ess-ebcdic-to-ascii-search-and-replace)
   (global-set-key (quote [f12]) 'ess-sas-graph-view)
   (if (and ess-sas-edit-keys-toggle
 	   (equal emacs-major-version 19) (equal emacs-minor-version 28))
 (defun ess-sas-global-unix-keys ()
   "Unix/Mainframe-like SAS key definitions"
   (interactive)
+  (when (featurep 'rtf-support)
   (global-set-key [(control f1)] 'ess-sas-rtf-portrait)
-  (global-set-key [(control f2)] 'ess-sas-rtf-us-landscape)
+    (global-set-key [(control f2)] 'ess-sas-rtf-us-landscape))
   (global-set-key (quote [f2]) 'ess-revert-wisely)
   (global-set-key (quote [f3]) 'ess-sas-submit)
   (global-set-key [(control f3)] 'ess-sas-submit-region)
   (global-set-key (quote [f10]) 'ess-sas-toggle-sas-log-mode)
   (global-set-key [(control f10)] 'ess-sas-kill-buffers)
   (global-set-key (quote [f11]) 'ess-sas-goto-file-2)
+  (global-set-key [(control f11)] 'ess-ebcdic-to-ascii-search-and-replace)
   (global-set-key (quote [f12]) 'ess-sas-graph-view)
 	(if (and ess-sas-edit-keys-toggle
 	    (equal emacs-major-version 19) (equal emacs-minor-version 28))
 (defun ess-sas-local-pc-keys ()
   "PC-like SAS key definitions."
   (interactive)
+  (when (featurep 'rtf-support)
   (define-key sas-mode-local-map [(control f1)] 'ess-sas-rtf-portrait)
-  (define-key sas-mode-local-map [(control f2)] 'ess-sas-rtf-us-landscape)
+    (define-key sas-mode-local-map [(control f2)] 'ess-sas-rtf-us-landscape))
   (define-key sas-mode-local-map (quote [f2]) 'ess-revert-wisely)
   (define-key sas-mode-local-map (quote [f3]) 'ess-sas-goto-shell)
   (define-key sas-mode-local-map (quote [f4]) 'ess-sas-goto-file-1)
   (define-key sas-mode-local-map (quote [f10]) 'ess-sas-toggle-sas-log-mode)
   (define-key sas-mode-local-map [(control f10)] 'ess-sas-kill-buffers)
   (define-key sas-mode-local-map (quote [f11]) 'ess-sas-goto-file-2)
+  (define-key sas-mode-local-map [(control f11)] 'ess-ebcdic-to-ascii-search-and-replace)
   (define-key sas-mode-local-map (quote [f12]) 'ess-sas-graph-view)
   ;(define-key sas-mode-local-map "\C-c\C-p" 'ess-sas-file-path) 
   (setq ess-sas-global-pc-keys nil)
 (defun ess-sas-local-unix-keys ()
   "Unix/Mainframe-like SAS key definitions"
   (interactive)
+  (when (featurep 'rtf-support)
   (define-key sas-mode-local-map [(control f1)] 'ess-sas-rtf-portrait)
-  (define-key sas-mode-local-map [(control f2)] 'ess-sas-rtf-us-landscape)
+    (define-key sas-mode-local-map [(control f2)] 'ess-sas-rtf-us-landscape))
   (define-key sas-mode-local-map (quote [f2]) 'ess-revert-wisely)
   (define-key sas-mode-local-map (quote [f3]) 'ess-sas-submit)
   (define-key sas-mode-local-map [(control f3)] 'ess-sas-submit-region)
   (define-key sas-mode-local-map (quote [f10]) 'ess-sas-toggle-sas-log-mode)
   (define-key sas-mode-local-map [(control f10)] 'ess-sas-kill-buffers)
   (define-key sas-mode-local-map (quote [f11]) 'ess-sas-goto-file-2)
+  (define-key sas-mode-local-map [(control f11)] 'ess-ebcdic-to-ascii-search-and-replace)
   (define-key sas-mode-local-map (quote [f12]) 'ess-sas-graph-view)
   ;(define-key sas-mode-local-map "\C-c\C-p" 'ess-sas-file-path) 
   (setq ess-sas-global-pc-keys nil)

File lisp/essd-arc.el

 ;;; essd-vst.el --- ARC customization
 
 ;; Copyright (C) 2000 A. J. Rossini
+;; Copyright (C) 2001--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@stat.sc.edu>
-;; Maintainer: A.J. Rossini <rossini@stat.sc.edu>
+;; Original Author: A.J. Rossini <rossini@stat.sc.edu>
 ;; Created: 30 Jun 2000
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS

File lisp/essd-els.el

 ;;; essd-els.el --- S-PLUS 3.x at another location customization
+
 ;; Copyright (C) 1998 Richard M. Heiberger
+;; Copyright (C) 1999--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Richard M. Heiberger <rmh@fisher.stat.temple.edu>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
+;; Original Author: Richard M. Heiberger <rmh@fisher.stat.temple.edu>
 ;; Created: December 1998
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/essd-omg.el

 ;;; essd-omg.el --- Omega customization
 
 ;; Copyright (C) 1999 A. J. Rossini
+;; Copyright (C) 2000--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@biostat.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
+;; Original Author: A.J. Rossini <rossini@biostat.washington.edu>
 ;; Created: 15 August 1999
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/essd-r.el

 ;;; essd-r.el --- R customization
 
-;; Copyright (C) 1997--2004 A. J. Rossini, Richard M. Heiberger, Kurt
-;; Hornik, Martin Maechler, Rodney Sparapani, and Stephen Eglen.
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@u.washington.edu>
-;; Maintainers: A.J. Rossini <rossini@u.washington.edu>
-;;              M. Maechler <maechler@stat.math.ethz.ch>,
-;;              Stephen Eglen < >
+;; Original Author: A.J. Rossini
 ;; Created: 12 Jun 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.
 (defun R (&optional start-args)
   "Call 'R', the GNU 'S clone' from Robert & Ross (Auckland, NZ).
 Optional prefix (C-u) allows to set command line arguments, such as
---vsize.  This should be OS agnostic."
+--vsize.  This should be OS agnostic.
+If you have certain command line arguments that should always be passed
+to R, put them in the variable `inferior-R-args'."
   (interactive "P")
   (setq ess-customize-alist R-customize-alist)
   (ess-write-to-dribble-buffer   ;; for debugging only
 	    "--no-readline "))
 	 (r-start-args
 	  (concat r-always-arg
+		  inferior-R-args
 		  (if start-args
 		      (read-string
 		       (concat "Starting Args [other than `"

File lisp/essd-s3.el

 ;;; essd-s3.el ---  S 3 (AT&T version) customization
 
 ;; Copyright (C) 1997 A. J. Rossini
+;; Copyright (C) 1998--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@stat.sc.edu>
-;; Maintainer: A.J. Rossini <rossini@stat.sc.edu>
+;; Original Author: A.J. Rossini <rossini@stat.sc.edu>
 ;; Created: 12 Jun 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/essd-s4.el

 ;;; essd-s4.el --- S4 customization
 
-;; Copyright (C) 1997--2004 A.J. Rossini
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@stat.sc.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: A.J. Rossini <rossini@stat.sc.edu>
 ;; Created: 12 Jun 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/essd-sas.el

 ;;; essd-sas.el --- SAS customization
 
 ;; Copyright (C) 1997--2001 Richard M. Heiberger and A. J. Rossini
+;; Copyright (C) 2002--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Richard M. Heiberger <rmh@astro.ocis.temple.edu>
-;; Maintainer: A.J. Rossini <rossini@stat.sc.edu>
+;; Original Author: Richard M. Heiberger <rmh@astro.ocis.temple.edu>
 ;; Created: 20 Aug 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/essd-sp3.el

 ;;; essd-sp3.el --- S-PLUS 3.x customization
 
-;; Copyright (C) 1997--2004 A. J. Rossini
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@stat.sc.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: A.J. Rossini <rossini@u.washington.edu>
 ;; Created: 12 Jun 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/essd-sp4.el

 ;;; essd-sp4.el --- S-PLUS 4.x customization
-;;; Richard M. Heiberger, December 1998
 
-;; Copyright (C) 1998--2004 Richard M. Heiberger <rmh@fisher.stat.temple.edu>
+;; Copyright (C) 1998--2002 Richard M. Heiberger <rmh@fisher.stat.temple.edu>
+;; Copyright (C) 2003--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Richard M. Heiberger <rmh@fisher.stat.temple.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: Richard M. Heiberger <rmh@fisher.stat.temple.edu>
 ;; Created: December 1998
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/essd-sp5.el

 ;;; essd-sp5.el --- S-plus 5  customization
 
-;; Copyright (C) 1998--2004 A.J. Rossini
+;; Copyright (C) 1998 A.J. Rossini
+;; Copyright (C) 1999--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@biostat.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: A.J. Rossini <rossini@biostat.washington.edu>
 ;; Created: 9 Nov 1998
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/essd-sp6.el

 ;;; essd-sp6.el --- S-Plus 6  customization
 
-;; Copyright (C) 2001--2004 A.J. Rossini <rossini@u.washington.edu>
+;; Copyright (C) 2001--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: A.J. Rossini <rossini@u.washington.edu>
+;; Created: 2001/02/06
 ;; Maintainer: ESS Core Team <ESS-core@stat.math.ethz.ch>
-;; Created: 2001/02/06
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.
     (ess-save-lastvalue-command
      . "assign(\".ess.lvsave\",.Last.value,frame=0)\n")
     (inferior-ess-program          . inferior-S+6-program-name)
+    (inferior-ess-start-args       . inferior-Splus-args)
     (inferior-ess-objects-command  . "objects(where = %d)\n")
     (inferior-ess-objects-pattern  . ".*") ; for new s4 stuff
     (inferior-ess-help-command     . "help(\"%s\",pager=\"slynx -dump\",window=F)\n")

File lisp/essd-sta.el

 ;;; essd-sta.el --- Stata customization
 
 ;; Copyright (C) 1997--1999 A. J. Rossini, Thomas Lumley
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@biostat.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
+;; Original Author: A.J. Rossini <rossini@biostat.washington.edu>
 ;; Created: 9 Sep 1998
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS

File lisp/essd-vst.el

 ;;; essd-vst.el --- ViSta customization
 
 ;; Copyright (C) 1997 A. J. Rossini
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@stat.sc.edu>
-;; Maintainer: A.J. Rossini <rossini@stat.sc.edu>
+;; Original Author: A.J. Rossini <rossini@u.washington.edu>
 ;; Created: 26 Aug 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS

File lisp/essd-xls.el

 ;;; essd-xls.el --- XLispStat customization for ESS.
 
 ;; Copyright (C) 1997 A. J. Rossini
+;; Copyright (C) 1998--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@stat.sc.edu>
-;; Maintainer: A.J. Rossini <rossini@stat.sc.edu>
+;; Original Author: A.J. Rossini <rossini@stat.sc.edu>
 ;; Created: 12 Jun 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: Statistics
 
 ;; This file is part of ESS

File lisp/essddr.el

 ;; essddr.el --- Support for editing R documentation (Rd) source
 
-;;; Copyright (C) 1998--2002 KH <Kurt.Hornik@ci.tuwien.ac.at>, AJR, MM
-;;;
+;; Copyright (C) 1997--2002  A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: KH <Kurt.Hornik@ci.tuwien.ac.at>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
+;; Original Author: KH <Kurt.Hornik@ci.tuwien.ac.at>
 ;; Created: 25 July 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS (Emacs Speaks Statistics).
 
 ;; obtain it by writing to the Free Software Foundation, Inc., 675 Mass
 ;; Ave, Cambridge, MA 02139, USA.
 
-;;; ESS RCS: $Id$
-
 ;;; Code:
 
 ;; To stave off byte compiler errors
   "Current version of essddr.el.")
 
 (defvar essddr-maintainer-address
-  "Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at>"
+  "Kurt Hornik <Kurt.Hornik@R-project.org>"
   "Current maintainer of essddr.el.")
 
 ;; Special support for XEmacs (curtesy of auctex):

File lisp/essdsp6w.el

 ;;; essdsp6w.el --- S-PLUS 6.x  for Windows customization
-;;; copied and edited from essd-sp4.el
-;;; Richard M. Heiberger, April 2001
+
+;;; copied and edited from essd-sp4.el - Richard M. Heiberger, April 2001
 
 ;; Copyright (C) 2001 Richard M. Heiberger <rmh@sbm.temple.edu>
+;; Copyright (C) 2002--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Richard M. Heiberger <rmh@sbm.temple.edu>
-;; Maintainer: Richard M. Heiberger <rmh@sbm.temple.edu>
+;; Original Author: Richard M. Heiberger <rmh@sbm.temple.edu>
 ;; Created: April 2001
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS.

File lisp/essl-bug.el

 ;;; essl-bug.el -- ESS BUGS customization
 
 ;; Copyright (C) 2001 Rodney Sparapani
-;; Copyright (C) 2002-2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002--2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Rodney Sparapani <rsparapa@mcw.edu>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
+;; Original Author: Rodney Sparapani <rsparapa@mcw.edu>
 ;; Created: 27 February 2001
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$/ini
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; Keywords: BUGS, bugs, BACKBUGS, backbugs.
 

File lisp/essl-lsp.el

 ;;; essl-lsp.el --- Support for editing Lisp source code
 
 ;; Copyright (C) 1997 A.J. Rossini.
+;; Copyright (C) 1998--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@stat.sc.edu>
-;; Maintainer: A.J. Rossini <rossini@stat.sc.edu>
+;; Original Author: A.J. Rossini <rossini@stat.sc.edu>
 ;; Created: 1 Sept 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS.
 

File lisp/essl-omg.el

 ;;; essl-omg.el --- Support for editing Omega source code
 
 ;; Copyright (C) 1999--2001 A.J. Rossini.
+;; Copyright (C) 2002--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@u.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@u.washington.edu>
+;; Original Author: A.J. Rossini <rossini@u.washington.edu>
 ;; Created: 15 Aug 1999
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS (Emacs Speaks Statistics).
 

File lisp/essl-s.el

 ;;; essl-s.el --- Support for editing S source code
 
-;; Copyright (C) 1989-2001 D. Bates, Kademan, Ritter, D.M. Smith, K. Hornik,
+;; Copyright (C) 1989-1997 D. Bates, Kademan, Ritter, D.M. Smith, K. Hornik,
 ;; R.M. Heiberger, M. Maechler, and A.J. Rossini.
+;; Copyright (C) 1998-2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: A.J. Rossini <rossini@biostat.washington.edu>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
+;; Original Author: A.J. Rossini <rossini@biostat.washington.edu>
 ;; Created: 26 Aug 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
 
 ;; This file is part of ESS (Emacs Speaks Statistics).
 

File lisp/essl-sas.el

 ;;; essl-sas.el --- SAS customization
 
-;; Copyright (C) 1997--2004 Richard M. Heiberger, A. J. Rossini, 
-;;  M. Maechler, Rodney Sparapani
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Authors: Richard M. Heiberger <rmh@astro.ocis.temple.edu>,
+;; Original Authors: Richard M. Heiberger <rmh@astro.ocis.temple.edu>,
 ;;          A.J. Rossini <rossini@u.washington.edu>,
 ;;          Rodney Sparapani <rsparap@mcw.edu>
-;; Maintainer: Richard M. Heiberger <rmh@astro.ocis.temple.edu>,
-;;             Rodney Sparapani <rsparap@mcw.edu>
 ;; Created: 20 Aug 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS (Emacs Speaks Statistics).

File lisp/essl-sta.el

 ;;; essl-sta.el --- Stata customization
 
 ;; Copyright (C) 1999--2000, Thomas Lumley, A. J. Rossini, Brendan Halpin.
+;; Copyright (C) 1997--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Thomas Lumley <thomas@biostat.washington.edu>,
+;; Original Authors: Thomas Lumley <thomas@biostat.washington.edu>,
 ;;         Brendan Halpin <brendan@essex.ac.uk>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
 ;; Created: 2 Nov 1997
-;; Modified: $Date$
-;; Version: $Revision$
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: start up, configuration.
 
 ;; This file is part of ESS (Emacs Speaks Statistics).

File lisp/msdos.el

 ;;; msdos.el --- Run an MS-DOS shell in an NTemacs buffer with bash as the shell
-;;; Richard M. Heiberger, February 1999
 
 ;; Copyright (C) 1999 Richard M. Heiberger <rmh@fisher.stat.temple.edu>
+;; Copyright (C) 2000--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
-;; Author: Richard M. Heiberger <rmh@fisher.stat.temple.edu>
-;; Maintainer: A.J. Rossini <rossini@biostat.washington.edu>
+;; Original Author: Richard M. Heiberger <rmh@fisher.stat.temple.edu>
 ;; Created: February 1999
-;; Modified: $Date$ 
-;; Version: $Revision$ 
-;; RCS: $Id$
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; Keywords: processes
 
 ;; This file is part of ESS.

File lisp/noweb-font-lock-mode.el

 ;; noweb-font-lock-mode.el - edit noweb files with GNU Emacs
+
 ;; Copyright (C) 1999 by  Adnan Yaqub (AYaqub@orga.com)
 ;;                    and Mark Lunt (mark.lunt@mrc-bsu.cam.ac.uk
 ;; Copyright (C) 2002 by A.J. Rossini <rossini@u.washington.edu>
-;; 
+;; Copyright (C) 2003--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
+
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)

File lisp/noweb-mode.el

 ;; noweb-mode.el - edit noweb files with GNU Emacs
+
 ;; Copyright (C) 1995 by Thorsten.Ohl @ Physik.TH-Darmstadt.de
 ;;     with a little help from Norman Ramsey <norman@bellcore.com>
 ;;                         and Mark Lunt <mark.lunt@mrc-bsu.cam.ac.uk>
 ;;                         and A.J. Rossini <rossini@biostat.washington.edu>
+;; Copyright (C) 1999--2004 A.J. Rossini, Rich M. Heiberger, Martin
+;;	Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
 
 ;; ESS-related Changes for ESS added by Mark Lunt and A.J. Rossini,
 ;; starting March, 1999.
 
-;;
+;; Maintainers: ESS-core <ESS-core@stat.math.ethz.ch>
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; BASED ON: (from Mark Lunt).
 ;; -- Id: noweb-mode.el,v 1.11 1999/03/21 20:14:41 root Exp --
 
-;; ESS CVS: $Id$
-
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; THIS IS UNRELEASED CODE: IT IS MISSING FUNCTIONALITY AND IT NEEDS CLEANUP ;;
 ;;; Variables
 
 (defconst noweb-mode-RCS-Id
-  "$Id$")
+  "Imported to ESS Subversion repository and RCS ids not maintained.")
 
 (defconst noweb-mode-RCS-Name
-  "$Name$")
+  " ")
 
 (defvar noweb-mode-prefix "\M-n"
   "*Prefix key to use for noweb mode commands.