diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-09-04 03:48:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-09-04 03:48:17 +0000 |
| commit | fbf349734468d48b421c3d03074bb66dfcf3115b (patch) | |
| tree | 0a7d1ee844b6c591a5a499d23e35931945106e5a /lisp/version.el | |
| parent | f0caabd962b662cccbea472995d86af718cc8d0b (diff) | |
| parent | 4b5fa40e1f1ba3cafde672863a0331311d1c2695 (diff) | |
| download | emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.tar.gz emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.tar.bz2 emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.zip | |
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
Patches applied:
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
Add CVS metadata files.
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
Update from CVS.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
Diffstat (limited to 'lisp/version.el')
| -rw-r--r-- | lisp/version.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/version.el b/lisp/version.el index d52e1e944c8..b34a4c7cdef 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -1,7 +1,7 @@ ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- -;;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001 -;;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -47,7 +47,7 @@ Time at which Emacs was dumped out.") (defconst emacs-build-system (system-name)) -(defun emacs-version (&optional here) "\ +(defun emacs-version (&optional here) "\ Return string describing the version of Emacs that is running. If optional argument HERE is non-nil, insert string at point. Don't use this function in programs to choose actions according @@ -84,7 +84,7 @@ to the system configuration; look at `system-configuration' instead." ;; We put version info into the executable in the form that `ident' uses. (or (memq system-type '(vax-vms windows-nt)) - (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ? (emacs-version)) + (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version)) " $\n"))) ;;Local variables: |