Mercurial > hg > xemacs-beta
view lisp/x-scrollbar.el @ 5574:d4f334808463
Support inlining labels, bytecomp.el.
lisp/ChangeLog addition:
2011-10-02 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
Add #'declare to this, so it doesn't need to rely on
#'cl-compiling file to determine when we're byte-compiling.
Update #'labels to support declaring labels inline, as Common Lisp
requires.
* bytecomp.el (byte-compile-function-form):
Don't error if FUNCTION is quoting a non-lambda, non-symbol, just
return it.
* cl-extra.el (cl-macroexpand-all):
If a label name has been quoted, expand to the label placeholder
quoted with 'function. This allows the byte compiler to
distinguish between uses of the placeholder as data and uses in
contexts where it should be inlined.
* cl-macs.el:
* cl-macs.el (cl-do-proclaim):
When proclaming something as inline, if it is bound as a label,
don't modify the symbol's plist; instead, treat the first element
of its placeholder constant vector as a place to store compile
information.
* cl-macs.el (declare):
Leave processing declarations while compiling to the
implementation of #'declare in
byte-compile-initial-macro-environment.
tests/ChangeLog addition:
2011-10-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (+):
Test #'labels and inlining.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 02 Oct 2011 15:32:16 +0100 |
| parents | 308d34e9f07d |
| children |
line wrap: on
line source
;;; x-scrollbar.el --- scrollbar resourcing and such. ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Author: Ben Wing <ben@xemacs.org> ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. ;;; Synched up with: Not synched. ;;; Commentary: ;; This file is dumped with XEmacs (when X and menubar support is compiled in). ;;; Code: (globally-declare-fboundp '(x-init-specifier-from-resources x-get-resource)) (defun x-init-scrollbar-from-resources (locale) (x-init-specifier-from-resources (specifier-fallback scrollbar-width) 'natnum locale '("scrollBarWidth" . "ScrollBarWidth") ;; The name strings are wrong, but the scrollbar name is ;; non-deterministic so it is a poor way to set a resource ;; for the scrollbar anyhow. (cond ((featurep 'athena-scrollbars) '("scrollbar.thickness" . "ScrollBar.Thickness")) ((featurep 'lucid-scrollbars) '("scrollbar.width" . "XlwScrollBar.Width")) ((featurep 'motif-scrollbars) '("scrollbar.width" . "XmScrollBar.Width")))) ;; Athena scrollbars accept either 'thickness' or 'width'. ;; If any of the previous resources succeeded, the following ;; call does nothing; so there's no harm in doing it all the ;; time. (if (featurep 'athena-scrollbars) (x-init-specifier-from-resources (specifier-fallback scrollbar-width) 'natnum locale '("scrollbar.width" . "ScrollBar.Width"))) ;; lather, rinse, repeat. (x-init-specifier-from-resources (specifier-fallback scrollbar-height) 'natnum locale '("scrollBarHeight" . "ScrollBarHeight") ;; The name strings are wrong, but the scrollbar name is ;; non-deterministic so it is a poor way to set a resource ;; for the scrollbar anyhow. (cond ((featurep 'athena-scrollbars) '("scrollbar.thickness" . "ScrollBar.Thickness")) ((featurep 'lucid-scrollbars) '("scrollbar.height" . "XlwScrollBar.Height")) ((featurep 'motif-scrollbars) '("scrollbar.height" . "XmScrollBar.Height")))) ;; Athena scrollbars accept either 'thickness' or 'height'. ;; If any of the previous resources succeeded, the following ;; call does nothing; so there's no harm in doing it all the ;; time. (if (featurep 'athena-scrollbars) (x-init-specifier-from-resources (specifier-fallback scrollbar-height) 'natnum locale '("scrollbar.height" . "ScrollBar.Height"))) ;; Now do ScrollBarPlacement.scrollBarPlacement (let ((case-fold-search t) (resval (x-get-resource "ScrollBarPlacement" "scrollBarPlacement" 'string locale nil 'warn))) (cond ((null resval)) ((string-match "^top[_-]left$" resval) (set-specifier scrollbar-on-top-p t locale) (set-specifier scrollbar-on-left-p t locale)) ((string-match "^top[_-]right$" resval) (set-specifier scrollbar-on-top-p t locale) (set-specifier scrollbar-on-left-p nil locale)) ((string-match "^bottom[_-]left$" resval) (set-specifier scrollbar-on-top-p nil locale) (set-specifier scrollbar-on-left-p t locale)) ((string-match "^bottom[_-]right$" resval) (set-specifier scrollbar-on-top-p nil locale) (set-specifier scrollbar-on-left-p nil locale)) (t (display-warning 'resource (format "Illegal value '%s' for scrollBarPlacement resource" resval))))) ) ;;; x-scrollbar.el ends here
