X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7d5989e14aacad4aa0775339dab645db80ab7144..ebff94f066752734a6154db49f2aadded68f2c08:/etc/emacs.bash

diff --git a/etc/emacs.bash b/etc/emacs.bash
index 2589c784a8..831fb7e1d7 100644
--- a/etc/emacs.bash
+++ b/etc/emacs.bash
@@ -1,16 +1,16 @@
 ### emacs.bash --- contact/resume an existing Emacs, or start a new one
 
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ##   Free Software Foundation, Inc.
 
 ## Author: Noah Friedman
 
 ## This file is part of GNU Emacs.
 
-## GNU Emacs is free software; you can redistribute it and/or modify
+## GNU Emacs 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)
-## any later version.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 
 ## GNU Emacs is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs; see the file COPYING.  If not, write to the
-## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-## Boston, MA 02110-1301, USA.
+## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ### Commentary:
 
@@ -55,7 +53,7 @@ function edit ()
 
     case "${windowsys}" in
       x ) (emacs "$@" &) ;;
-      sun ) (emacstool "$@" &) ;;
+      sun ) echo "unsupported window system"; return 1 ;;
     esac
  else
     if jobs %emacs 2> /dev/null ; then