(goto-address-url-face): Change default value from `bold' to `link'.

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

diff --git a/lisp/version.el b/lisp/version.el
index 07c033f..a35c4ae 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,7 +1,8 @@
 ;;; 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, 2008 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -25,7 +26,7 @@
 
 ;;; Code:
 
-(defconst emacs-copyright "Copyright (C) 2008 Free Software Foundation, Inc."
+(defconst emacs-copyright "Copyright (C) 2009 Free Software Foundation, Inc."
   "Short copyright string for this version of Emacs.")
 
 (defconst emacs-version "23.0.60" "\
@@ -65,8 +66,8 @@ to the system configuration; look at `system-configuration' instead."
                       ((featurep 'gtk)
                        (concat ", GTK+ Version " gtk-version-string))
                       ((featurep 'x-toolkit) ", X toolkit")
-                      ((boundp 'mac-carbon-version-string)
-                       (concat ", Carbon Version " mac-carbon-version-string))
+                      ((featurep 'ns)
+                       (format ", NS %s" ns-version-string))
                       (t ""))
                 (if (and (boundp 'x-toolkit-scroll-bars)
                          (memq x-toolkit-scroll-bars '(xaw xaw3d)))
@@ -85,7 +86,7 @@ to the system configuration; look at `system-configuration' instead."
 (defalias 'version 'emacs-version)
 
 ;; We put version info into the executable in the form that `ident' uses.
-(or (memq system-type '(vax-vms windows-nt))
+(or (eq system-type 'windows-nt)
     (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
                      " $\n")))