Mercurial > hg > xemacs-beta
annotate lisp/cus-file.el @ 4686:cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
lisp/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-form-code-walker):
Be careful about discarding multiple values when optimising
#'prog1 calls.
(byte-optimize-or):
Preserve any trailing nil, as this is a supported way to
explicitly discard multiple values.
(byte-optimize-cond-1):
Discard multiple values with a singleton followed by no more
clauses.
* bytecomp.el (progn):
(prog1):
(prog2):
Be careful about discarding multiple values in the byte-hunk
handler of these three forms.
* bytecomp.el (byte-compile-prog1, byte-compile-prog2):
Don't call #'values explicitly, use `(or ,(pop form) nil) instead,
since that compiles to bytecode, not a funcall.
* bytecomp.el (byte-compile-values):
With one non-const argument, byte-compile to `(or ,(second form)
nil), not an explicit #'values call.
* bytecomp.el (byte-compile-insert-header):
Be nicer in the error message to emacs versions that don't
understand our bytecode.
src/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* eval.c (For, Fand):
Don't declare val as REGISTER in these functions, for some reason
it breaks the non-DEBUG union build. These functions are only
called from interpreted code, the performance implication doesn't
matter. Thank you Robert Delius Royar!
* eval.c (Fmultiple_value_list_internal):
Error on too many arguments.
tests/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el (Assert-rounding):
Remove an overly-verbose failure message here.
Correct a couple of tests which were buggy in themselves. Add
three new tests, checking the behaviour of #'or and #'and when
passed zero arguments, and a Known-Bug-Expect-Failure call
involving letf and values. (The bug predates the C-level
multiple-value implementation.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 06 Sep 2009 19:36:02 +0100 |
parents | abe6d1db359e |
children | 308d34e9f07d |
rev | line source |
---|---|
442 | 1 ;;; cus-file.el --- Manage location of the customize init file |
2 | |
3 ;; Copyright (C) 2000 by Free Software Foundation, Inc. | |
4 | |
5 ;; Author: Mike Sperber <mike@xemacs.org> | |
6 ;; Keywords: internal | |
7 | |
8 ;; This file is part of XEmacs. | |
9 | |
10 ;; XEmacs is free software; you can redistribute it and/or modify it | |
11 ;; under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; XEmacs is distributed in the hope that it will be useful, but | |
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
18 ;; General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
23 ;; 02111-1307, USA. | |
24 | |
25 ;;; Synched up with: Not in FSF | |
26 | |
27 ;;; Commentary: | |
28 | |
29 ;; This file manages the location of the custom init file without | |
30 ;; loading all of the custom code itself. | |
31 | |
32 | |
33 ;;; Code: | |
34 (provide 'cus-file) | |
35 | |
36 ;;;###autoload | |
37 (defconst custom-file-base "custom.el" | |
38 "Base of file name for storing customization information.") | |
39 | |
40 ;;;###autoload | |
41 (defvar custom-file nil | |
42 "File used for storing customization information. | |
43 If you change this from the default you need to | |
44 explicitly load that file for the settings to take effect.") | |
45 | |
46 ;;;###autoload | |
47 (defun make-custom-file-name (init-file &optional force-new) | |
48 "Construct the default custom file name from the init file name. | |
49 If FORCE-NEW is non-nil, force post-migration location." | |
50 (let ((init-file (or init-file user-init-file))) | |
51 (if (or force-new | |
52 (not init-file) | |
53 (string= (file-name-directory init-file) | |
54 (expand-file-name | |
55 (file-name-as-directory user-init-directory)))) | |
56 (expand-file-name custom-file-base user-init-directory) | |
57 init-file))) | |
58 | |
59 ;;; cus-file.el ends here |