Mercurial > hg > xemacs-beta
view lisp/msw-glyphs.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 | 70921960b980 |
children | 308d34e9f07d |
line wrap: on
line source
;;; msw-glyphs.el --- Support for glyphs in ms windows ;; Copyright (C) 1994, 1997 Free Software Foundation, Inc. ;; Copyright (C) 2002 Ben Wing. ;; Author: Kirill M. Katsnelson <kkm@kis.ru> ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; Initialization code for MS Windows glyphs. ;; This file is dumped with XEmacs (when MS Windows display support is ;; compiled in). Make sure this is the first of msw-*.el files ;; dumped. ;;; Code: (defun msgdi-device-p (&optional device) "Return non-nil if DEVICE is a GDI device, that is 'mswindows or 'msprinter. MS GDI devices are mutuially WYSIWIG-compatible, so that many common glyph, color and font properties apply to them equally. This function is also a predicate for 'msgdi device tag, matching this device class." (memq (device-type device) '(mswindows msprinter))) (progn (define-specifier-tag 'msgdi (function msgdi-device-p)) (set-console-type-image-conversion-list 'mswindows `(("\\.bmp\\'" [bmp :file nil] 2) ("\\`BM" [bmp :data nil] 2) ,@(if (featurep 'xpm) '(("\\.xpm\\'" [xpm :file nil] 2))) ("\\.xbm\\'" [xbm :file nil] 2) ,@(if (featurep 'xpm) '(("\\`/\\* XPM \\*/" [xpm :data nil] 2))) ,@(if (featurep 'gif) '(("\\.gif\\'" [gif :file nil] 2) ("\\`GIF8[79]" [gif :data nil] 2))) ,@(if (featurep 'jpeg) '(("\\.jpe?g\\'" [jpeg :file nil] 2))) ;; all of the JFIF-format JPEG's that I've seen begin with ;; the following. I have no idea if this is standard. ,@(if (featurep 'jpeg) '(("\\`\377\330\377\340\000\020JFIF" [jpeg :data nil] 2))) ,@(if (featurep 'png) '(("\\.png\\'" [png :file nil] 2))) ,@(if (featurep 'png) '(("\\`\211PNG" [png :data nil] 2))) ,@(if (featurep 'tiff) '(("\\.tif?f\\'" [tiff :file nil] 2))) ("\\`X-Face:" [string :data "[xface]"]) ("\\`/\\* XPM \\*/" [string :data "[xpm]"]) ("" [string :data nil] 2) ;; this last one is here for pointers and icons and such -- ;; strings are not allowed so they will be ignored. ("" [nothing]))) (set-console-type-image-conversion-list 'msprinter (console-type-image-conversion-list 'mswindows)) (set-face-font 'border-glyph "WingDings:Regular:11::Symbol" 'global 'msgdi) (set-glyph-image continuation-glyph "\xC3" 'global 'msgdi) (set-glyph-image truncation-glyph "\xF0" 'global 'msgdi) (set-glyph-image hscroll-glyph "\xEF" 'global 'msgdi) (set-glyph-contrib-p continuation-glyph nil) (set-glyph-contrib-p truncation-glyph nil) (set-glyph-contrib-p hscroll-glyph nil) (set-glyph-image octal-escape-glyph "\\") (set-glyph-image control-arrow-glyph "^") (set-glyph-image invisible-text-glyph " ...") (cond ((featurep 'xpm) (set-glyph-image frame-icon-glyph (concat "../etc/" "xemacs-icon3.xpm") 'global 'mswindows) (set-glyph-image xemacs-logo (concat "../etc/" (if emacs-beta-version "xemacs-beta.xpm" "xemacs.xpm")) 'global 'msgdi)) (t (set-glyph-image xemacs-logo "XEmacs <insert spiffy graphic logo here>" 'global 'msgdi))) ) ;;; msw-glyphs.el ends here