(x_set_menu_bar_lines, x_set_tool_bar_lines): Remove

[bpt/emacs.git] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 7d4c764..5f136a5 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,17 +1,17 @@
 ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
 
 ;; 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 3, 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
@@ -19,15 +19,13 @@
 ;; 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:
 
 ;;; Code:
 
-(defconst emacs-copyright "Copyright (C) 2007 Free Software Foundation, Inc."
+(defconst emacs-copyright "Copyright (C) 2008 Free Software Foundation, Inc."
   "Short copyright string for this version of Emacs.")
 
 (defconst emacs-version "23.0.60" "\
@@ -67,6 +65,8 @@ to the system configuration; look at `system-configuration' instead."
                       ((featurep 'gtk)
                        (concat ", GTK+ Version " gtk-version-string))
                       ((featurep 'x-toolkit) ", X toolkit")
+                      ((featurep 'ns-windowing)
+                       (format ", *Step %s" ns-version-string))
                       ((boundp 'mac-carbon-version-string)
                        (concat ", Carbon Version " mac-carbon-version-string))
                       (t ""))