Mercurial > hg > xemacs-beta
annotate lisp/version.el @ 5632:bd80d9103fc8
Integrate CL code better into core, remove obsolete compatibility code.
lisp/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
Call #'cl-compile-time-init explicitly here, don't rely on
bytecomp-load-hook for what is core functionality.
* cl-extra.el:
* cl-extra.el (require):
* cl-extra.el (make-random-state):
* cl-extra.el (random-state-p):
* cl-extra.el (make-hashtable): Removed.
* cl-extra.el (make-weak-hashtable): Removed.
* cl-extra.el (make-key-weak-hashtable): Removed.
* cl-extra.el (make-value-weak-hashtable): Removed.
* cl-extra.el ('hashtablep): Removed.
* cl-extra.el ('hashtable-fullness): Removed.
* cl-extra.el ('hashtable-test-function): Removed.
* cl-extra.el ('hashtable-type): Removed.
* cl-extra.el ('hashtable-size): Removed.
* cl-extra.el ('copy-hashtable): Removed.
* cl-extra.el (cl-builtin-gethash): Removed.
* cl-extra.el (cl-builtin-remhash): Removed.
* cl-extra.el (cl-builtin-clrhash): Removed.
* cl-extra.el (cl-builtin-maphash): Removed.
* cl-extra.el ('cl-gethash): Removed.
* cl-extra.el ('cl-puthash): Removed.
* cl-extra.el ('cl-remhash): Removed.
* cl-extra.el ('cl-clrhash): Removed.
* cl-extra.el ('cl-maphash): Removed.
* cl-extra.el ('cl-make-hash-table): Removed.
* cl-extra.el ('cl-hash-table-p): Removed.
* cl-extra.el ('cl-hash-table-count): Removed.
* cl-extra.el (cl-prettyexpand):
* cl-extra.el (names):
Remove compatibility aliases from this file.
In #'cl-prettyexpand, if FULL is nil, don't expand return-from
either, for symmetry with not expanding block.
Drop cl-extra-load-hook, it's useless when cl-extra is dumped
(since third-party code can't use it, and dumped code shouldn't
use it.)
* cl-macs.el:
* cl-macs.el (cl-pop2):
* cl-macs.el (defun*):
* cl-macs.el (cl-parse-loop-clause):
Remove some no-longer-needed compatibility kludges.
* cl.el:
* cl.el ('cl-map-extents): Removed.
* cl.el (cl-random-time):
* cl.el (list*): New, moved back from subr.el, given a shorter
implementation.
* cl.el ('cl-member): Removed.
* cl.el ('cl-floor): Removed.
* cl.el ('cl-ceiling): Removed.
* cl.el ('cl-truncate): Removed.
* cl.el ('cl-round): Removed.
* cl.el ('cl-mod): Removed.
Remove some compatibility aliases; these may conflict with
package usage, in which case the packages need to be updated, the
new names are available in 21.4, and that's the most recent
version we support.
* cl.el (cl-hacked-flag): Removed.
* cl.el (cl-hack-byte-compiler): Removed.
* subr.el:
* subr.el (list*): Moved back to cl.el.
* update-elc-2.el (batch-update-elc-2):
* update-elc.el (do-autoload-commands):
Add an autoload for cl-compile-time-init in these two files, they
run on bare temacs, auto-autoload isn't available to them, and now
bytecomp calls cl-compile-time-init explicitly.
* cl-compat.el: Removed. This file was long obsolete.
man/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Top):
* cl.texi (Usage):
* cl.texi (Organization):
* cl.texi (Efficiency Concerns):
* cl.texi (Common Lisp Compatibility):
Remove documentation of cl-compat, now it's deleted.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 30 Dec 2011 16:05:31 +0000 |
| parents | 91b3aa59f49b |
| children | bbe4146603db |
| rev | line source |
|---|---|
| 428 | 1 ;; version.el --- Record version number of Emacs. |
| 2 | |
| 3 ;; Copyright (C) 1985, 1991-1994, 1997 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Maintainer: XEmacs Development Team | |
| 6 ;; Keywords: internal, dumped | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
|
5404
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5228
diff
changeset
|
10 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5228
diff
changeset
|
11 ;; under the terms of the GNU General Public License as published by the |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5228
diff
changeset
|
12 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5228
diff
changeset
|
13 ;; option) any later version. |
| 428 | 14 |
|
5404
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5228
diff
changeset
|
15 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5228
diff
changeset
|
16 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5228
diff
changeset
|
17 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5228
diff
changeset
|
18 ;; for more details. |
| 428 | 19 |
| 20 ;; You should have received a copy of the GNU General Public License | |
|
5404
91b3aa59f49b
Convert lisp/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5228
diff
changeset
|
21 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 22 |
| 23 ;;; Synched up with: FSF 19.34. | |
| 24 | |
| 25 ;;; Commentary: | |
| 26 | |
| 27 ;; This file is dumped with XEmacs. | |
| 28 | |
| 29 ;;; Code: | |
| 30 | |
| 31 (defconst xemacs-betaname | |
| 32 (and emacs-beta-version (format "(beta%d)" emacs-beta-version)) | |
| 33 "Non-nil when this is a test (beta) version of XEmacs. | |
|
4519
41c84a94258b
Improve beta-version-name docstring.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4246
diff
changeset
|
34 Warning, this variable did not exist in XEmacs versions prior to 20.3. |
|
4523
6a3006b37260
Fix docstring typo (and commit only this fix).
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4522
diff
changeset
|
35 Its value is derived from `emacs-beta-version'. It is mutually exclusive |
|
4519
41c84a94258b
Improve beta-version-name docstring.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4246
diff
changeset
|
36 with `emacs-patch-level'.") |
| 428 | 37 |
| 38 (defconst emacs-version | |
| 975 | 39 (format "%d.%d %s%s%s%s%s" |
| 444 | 40 emacs-major-version |
| 41 emacs-minor-version | |
| 42 (if emacs-patch-level | |
| 43 (format "(patch %d)" emacs-patch-level) | |
| 44 "") | |
| 45 (if xemacs-betaname | |
| 46 (concat " " xemacs-betaname) | |
| 47 "") | |
| 48 (if xemacs-codename | |
| 49 (concat " \"" xemacs-codename "\"") | |
| 50 "") | |
| 975 | 51 (if xemacs-extra-name |
| 52 (concat " " xemacs-extra-name) | |
| 53 "") | |
| 444 | 54 " XEmacs Lucid") |
| 428 | 55 "Version numbers of this version of XEmacs.") |
| 56 | |
| 57 ;; Moved to C code as of XEmacs 20.3 | |
| 58 ;(defconst emacs-major-version | |
| 59 ; (progn (or (string-match "^[0-9]+" emacs-version) | |
| 60 ; (error "emacs-version unparsable")) | |
| 61 ; (string-to-int (match-string 0 emacs-version))) | |
| 62 ; "Major version number of this version of Emacs, as an integer. | |
| 63 ;Warning, this variable did not exist in Emacs versions earlier than: | |
| 64 ; FSF Emacs: 19.23 | |
| 65 ; XEmacs: 19.10") | |
| 66 | |
| 67 ;; Moved to C code as of XEmacs 20.3 | |
| 68 ;(defconst emacs-minor-version | |
| 69 ; (progn (or (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version) | |
| 70 ; (error "emacs-version unparsable")) | |
| 71 ; (string-to-int (match-string 1 emacs-version))) | |
| 72 ; "Minor version number of this version of Emacs, as an integer. | |
| 73 ;Warning, this variable did not exist in Emacs versions earlier than: | |
| 74 ; FSF Emacs: 19.23 | |
| 75 ; XEmacs: 19.10") | |
| 76 | |
| 77 (defconst emacs-build-time (current-time-string) | |
| 78 "Time at which Emacs was dumped out.") | |
| 79 | |
| 80 (defconst emacs-build-system (system-name)) | |
| 81 | |
| 82 (defun emacs-version (&optional arg) | |
| 83 "Return string describing the version of Emacs that is running. | |
| 84 When called interactively with a prefix argument, insert string at point. | |
| 85 Don't use this function in programs to choose actions according | |
| 86 to the system configuration; look at `system-configuration' instead." | |
| 87 (interactive "p") | |
| 88 (save-match-data | |
| 89 (let ((version-string | |
| 90 (format | |
| 91 "XEmacs %s %s(%s%s) of %s %s on %s" | |
| 92 (substring emacs-version 0 (string-match " XEmacs" emacs-version)) | |
|
5228
5efbd1253905
Remove all support for InfoDock.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5004
diff
changeset
|
93 "[Lucid] " |
| 428 | 94 system-configuration |
| 95 (cond ((or (and (fboundp 'featurep) | |
| 96 (featurep 'mule)) | |
| 97 (memq 'mule features)) ", Mule") | |
| 98 (t "")) | |
| 99 (substring emacs-build-time 0 | |
| 100 (string-match " *[0-9]*:" emacs-build-time)) | |
| 101 (substring emacs-build-time | |
| 102 (string-match "[0-9]*$" emacs-build-time)) | |
| 103 emacs-build-system))) | |
| 104 (cond | |
| 105 ((null arg) version-string) | |
| 106 ((eq arg 1) (message "%s" version-string)) | |
| 107 (t (insert version-string)))))) | |
| 108 | |
| 109 ;; from emacs-vers.el | |
| 110 (defun emacs-version>= (major &optional minor patch) | |
| 111 "Return true if the Emacs version is >= to the given MAJOR, MINOR, | |
| 112 and PATCH numbers. | |
| 113 The MAJOR version number argument is required, but the other arguments | |
| 114 argument are optional. Only the Non-nil arguments are used in the test." | |
| 115 (let ((emacs-patch (or emacs-patch-level emacs-beta-version -1))) | |
| 116 (cond ((> emacs-major-version major)) | |
| 117 ((< emacs-major-version major) nil) | |
| 118 ((null minor)) | |
| 119 ((> emacs-minor-version minor)) | |
| 120 ((< emacs-minor-version minor) nil) | |
| 121 ((null patch)) | |
| 122 ((>= emacs-patch patch))))) | |
| 123 | |
| 124 ;;; We hope that this alias is easier for people to find. | |
| 125 (define-function 'version 'emacs-version) | |
| 126 | |
| 4246 | 127 (defvar Installation-file-coding-system |
| 128 (eval-when-compile `,(coding-system-name (find-coding-system 'native))) | |
| 129 "The coding system used to create the `Installation' file. | |
| 130 | |
| 131 The `Installation' file is created by configure, and the | |
| 132 `Installation-string' variable reflects its contents. | |
| 133 | |
| 134 This is initialized to reflect the native coding system at the time | |
| 135 version.el was byte-compiled; ideally it would reflect the native coding | |
| 136 system of the environment when XEmacs was dumped, but the locale | |
| 137 initialization code isn't called at dump time, and the appropriate value | |
| 138 at byte-compile time should be close enough. Note that this means that the | |
| 139 value of `Installation-string' during dump time thus reflects loading the | |
| 140 file using the `binary' coding system. ") | |
| 428 | 141 |
| 4246 | 142 (defvar Installation-string |
| 143 ;; Initialize Installation-string. We do it before loading | |
| 144 ;; anything so that dumped code can make use of its value. | |
| 145 (save-current-buffer | |
| 146 (set-buffer (get-buffer-create (generate-new-buffer-name | |
| 147 " *temp*"))) | |
| 148 (insert-file-contents-internal | |
| 149 (expand-file-name "Installation" build-directory) | |
| 150 ;; Relies on our working out the system coding system | |
| 151 ;; correctly at startup. | |
| 152 nil nil nil nil | |
| 153 ;; Installation-file-coding-system is actually respected in | |
| 154 ;; mule/general-late.el, after all the dumped coding systems have been | |
| 155 ;; loaded. | |
| 156 'binary) | |
| 157 (prog1 (buffer-substring) | |
| 158 (kill-buffer (current-buffer)))) | |
| 159 "Description of XEmacs installation. | |
| 428 | 160 |
| 4246 | 161 This reflects the values that the configure script worked out at build time, |
| 162 including things like the C code features included at compile time and the | |
| 163 installation prefix. Normally used when submitting a bug report; | |
| 164 occasionally used, in a way the XEmacs developers don't endorse, to work out | |
| 165 version information. ") | |
| 166 | |
|
5004
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4523
diff
changeset
|
167 ;;; version.el ends here |