diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:25:18 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:25:18 +0000 |
| commit | d6e01aa592f7326dffeafa6e97180a1cc39fe7ea (patch) | |
| tree | 5a22b785cfee1d77d6452607450a12ca82eeecd3 /lisp/version.el | |
| parent | 14bcc1e098410087a837313e2fc822319ff2e8ca (diff) | |
| parent | 4975e69596a64247e8995d1ff9084b98a9a5ed0d (diff) | |
| download | emacs-d6e01aa592f7326dffeafa6e97180a1cc39fe7ea.tar.gz | |
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-479
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-480
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-481
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-482
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-483
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-484
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-485
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-153
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-154
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-155
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-585
Diffstat (limited to 'lisp/version.el')
| -rw-r--r-- | lisp/version.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/version.el b/lisp/version.el index 5b9fccfefb3..e6ed5fb5e7e 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -27,7 +27,7 @@ ;;; Code: -(defconst emacs-version "22.0.51" "\ +(defconst emacs-version "22.0.91" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version @@ -64,6 +64,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)) (t "")) (if (and (boundp 'x-toolkit-scroll-bars) (memq x-toolkit-scroll-bars '(xaw xaw3d))) |