March 2011 - XEmacs-Patches - XEmacs Mailing List Archives

[PATCH] updated patch to device-color-cells 13 years, 9 months

Jeff Sparkes

This patch corrects the calculation of available color cells on X, msw and gtk devices. The value is limited to 24 bits of color, which is a realistic limit and fits into an XEmacs int. -- Jeff Sparkes jsparkes(a)gmail.com _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[COMMIT] Remove use of auto keyword. It is default and will be illegal in C++0X. 13 years, 9 months

The XEmacs Package Smoketest

APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Mats Lidell <matsl(a)xemacs.org> # Date 1300835315 -3600 # Node ID d363790fd936879ef0414abd81afd7ea7f25f3ee # Parent 4f39e57a82b4458b9c51499cd6d2aab78d7c3584 Remove use of auto keyword. It is default and will be illegal in C++0X. 2011-03-20 Mats Lidell <matsl(a)xemacs.org> * alloca.c (find_stack_direction): * alloca.c (xemacs_c_alloca): Remove use of auto keyword. It is default and will be illegal in C++0X. diff -r 4f39e57a82b4 -r d363790fd936 src/ChangeLog --- a/src/ChangeLog Thu Mar 17 16:20:09 2011 +0100 +++ b/src/ChangeLog Wed Mar 23 00:08:35 2011 +0100 ＠＠ -1,3 +1,10 ＠＠ +2011-03-20 Mats Lidell <matsl(a)xemacs.org> + + * alloca.c (find_stack_direction): + * alloca.c (xemacs_c_alloca): + Remove use of auto keyword. It is default and will be illegal in + C++0X. + 2011-03-17 Didier Verna <didier(a)xemacs.org> * data.c (init_errors_once_early): Define Qextent_read_only error. diff -r 4f39e57a82b4 -r d363790fd936 src/alloca.c --- a/src/alloca.c Thu Mar 17 16:20:09 2011 +0100 +++ b/src/alloca.c Wed Mar 23 00:08:35 2011 +0100 ＠＠ -78,7 +78,7 ＠＠ find_stack_direction (void) { static char *addr = NULL; /* Address of first `dummy', once known. */ - auto char dummy; /* To get stack address. */ + char dummy; /* To get stack address. */ if (addr == NULL) { /* Initial entry. */ ＠＠ -131,7 +131,7 ＠＠ pointer xemacs_c_alloca (unsigned int size) { - auto char probe; /* Probes stack depth: */ + char probe; /* Probes stack depth: */ register char *depth = ADDRESS_FUNCTION (probe); #if STACK_DIRECTION == 0 Yours -- %% Mats _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[COMMIT] #'cl-non-fixnum-number-p: return t for integers > #x3fffffff and < -#x40000000 13 years, 9 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1300709965 0 # Node ID a32a108ae8156a56b45e541414ec06f80bd65efb # Parent 4f0a1f4cc1117446ab7cd1252fcda433a3fd68d5 #'cl-non-fixnum-number-p: return t for integers > #x3fffffff and < -#x40000000 2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> * cl-macs.el (cl-non-fixnum-number-p): This should return t under 64-bit builds for fixnums that would be bignums on a 32-bit machine; make it so. diff -r 4f0a1f4cc111 -r a32a108ae815 lisp/ChangeLog --- a/lisp/ChangeLog Sat Mar 19 22:13:14 2011 +0900 +++ b/lisp/ChangeLog Mon Mar 21 12:19:25 2011 +0000 ＠＠ -1,3 +1,9 ＠＠ +2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> + + * cl-macs.el (cl-non-fixnum-number-p): + This should return t under 64-bit builds for fixnums that would + be bignums on a 32-bit machine; make it so. + 2011-03-19 Stephen J. Turnbull <stephen(a)xemacs.org> * faces.el (face-spec-set-match-display): diff -r 4f0a1f4cc111 -r a32a108ae815 lisp/cl-macs.el --- a/lisp/cl-macs.el Sat Mar 19 22:13:14 2011 +0900 +++ b/lisp/cl-macs.el Mon Mar 21 12:19:25 2011 +0000 ＠＠ -3230,14 +3230,26 ＠＠ argns argvs))) (if lets (list 'let lets body) body)))) +;; When a 64-bit build is byte-compiling code, some of its native fixnums +;; will not be represented as fixnums if the byte-compiled code is read by +;; the Lisp reader in a 32-bit build. So in that case we need to check the +;; range of fixnums as well as their types. XEmacs doesn't support machines +;; with word size less than 32, so it's OK to have that as the minimum. +(macrolet + ((most-negative-fixnum-on-32-bit-machines () (lognot (1- (lsh 1 30)))) + (most-positive-fixnum-on-32-bit-machines () (lsh 1 30))) + (defun cl-non-fixnum-number-p (object) + "Return t if OBJECT is a number not guaranteed to be immediate." + (and (numberp object) + (or (not (fixnump object)) + (not (<= (most-negative-fixnum-on-32-bit-machines) + object + (most-positive-fixnum-on-32-bit-machines))))))) ;;; Compile-time optimizations for some functions defined in this package. ;;; Note that cl.el arranges to force cl-macs to be loaded at compile-time, ;;; mainly to make sure these macros will be present. -(defun cl-non-fixnum-number-p (object) - (and (numberp object) (not (fixnump object)))) - (define-compiler-macro eql (&whole form a b) (cond ((eq (cl-const-expr-p a) t) (let ((val (cl-const-expr-val a))) -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[COMMIT] Add compiler macros for #'revappend, #'nreconc. 13 years, 9 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1300710427 0 # Node ID 919c77c567bb82e43065c057122af0ff97ed6907 # Parent a32a108ae8156a56b45e541414ec06f80bd65efb Add compiler macros for #'revappend, #'nreconc. 2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> * cl-macs.el (revappend, nreconc): Add compiler macros for these two functions. (They used to be inline, but that involves needless binding of the arguments.) diff -r a32a108ae815 -r 919c77c567bb lisp/ChangeLog --- a/lisp/ChangeLog Mon Mar 21 12:19:25 2011 +0000 +++ b/lisp/ChangeLog Mon Mar 21 12:27:07 2011 +0000 ＠＠ -1,3 +1,9 ＠＠ +2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> + + * cl-macs.el (revappend, nreconc): + Add compiler macros for these two functions. (They used to be + inline, but that involves needless binding of the arguments.) + 2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> * cl-macs.el (cl-non-fixnum-number-p): diff -r a32a108ae815 -r 919c77c567bb lisp/cl-macs.el --- a/lisp/cl-macs.el Mon Mar 21 12:19:25 2011 +0000 +++ b/lisp/cl-macs.el Mon Mar 21 12:27:07 2011 +0000 ＠＠ -3710,6 +3710,12 ＠＠ (define-compiler-macro pairlis (a b &optional c) `(nconc (mapcar* #'cons ,a ,b) ,c)) +(define-compiler-macro revappend (&whole form &rest args) + (if (eql 3 (length form)) `(nconc (reverse ,(pop args)) ,(pop args)) form)) + +(define-compiler-macro nreconc (&whole form &rest args) + (if (eql 3 (length form)) `(nconc (nreverse ,(pop args)) ,(pop args)) form)) + (define-compiler-macro complement (&whole form fn) (if (or (eq (car-safe fn) 'function) (eq (car-safe fn) 'quote)) (cond -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit: Add compiler macros for #'revappend, #'nreconc. 13 years, 9 months

Aidan Kehoe

changeset: 5380:919c77c567bb tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net> date: Mon Mar 21 12:27:07 2011 +0000 files: lisp/ChangeLog lisp/cl-macs.el description: Add compiler macros for #'revappend, #'nreconc. 2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> * cl-macs.el (revappend, nreconc): Add compiler macros for these two functions. (They used to be inline, but that involves needless binding of the arguments.) diff -r a32a108ae815 -r 919c77c567bb lisp/ChangeLog --- a/lisp/ChangeLog Mon Mar 21 12:19:25 2011 +0000 +++ b/lisp/ChangeLog Mon Mar 21 12:27:07 2011 +0000 ＠＠ -1,3 +1,9 ＠＠ +2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> + + * cl-macs.el (revappend, nreconc): + Add compiler macros for these two functions. (They used to be + inline, but that involves needless binding of the arguments.) + 2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> * cl-macs.el (cl-non-fixnum-number-p): diff -r a32a108ae815 -r 919c77c567bb lisp/cl-macs.el --- a/lisp/cl-macs.el Mon Mar 21 12:19:25 2011 +0000 +++ b/lisp/cl-macs.el Mon Mar 21 12:27:07 2011 +0000 ＠＠ -3710,6 +3710,12 ＠＠ (define-compiler-macro pairlis (a b &optional c) `(nconc (mapcar* #'cons ,a ,b) ,c)) +(define-compiler-macro revappend (&whole form &rest args) + (if (eql 3 (length form)) `(nconc (reverse ,(pop args)) ,(pop args)) form)) + +(define-compiler-macro nreconc (&whole form &rest args) + (if (eql 3 (length form)) `(nconc (nreverse ,(pop args)) ,(pop args)) form)) + (define-compiler-macro complement (&whole form fn) (if (or (eq (car-safe fn) 'function) (eq (car-safe fn) 'quote)) (cond _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit: #'cl-non-fixnum-number-p: return t for integers > #x3fffffff and < -#x40000000 13 years, 9 months

Aidan Kehoe

changeset: 5379:a32a108ae815 tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net> date: Mon Mar 21 12:19:25 2011 +0000 files: lisp/ChangeLog lisp/cl-macs.el description: #'cl-non-fixnum-number-p: return t for integers > #x3fffffff and < -#x40000000 2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> * cl-macs.el (cl-non-fixnum-number-p): This should return t under 64-bit builds for fixnums that would be bignums on a 32-bit machine; make it so. diff -r 4f0a1f4cc111 -r a32a108ae815 lisp/ChangeLog --- a/lisp/ChangeLog Sat Mar 19 22:13:14 2011 +0900 +++ b/lisp/ChangeLog Mon Mar 21 12:19:25 2011 +0000 ＠＠ -1,3 +1,9 ＠＠ +2011-03-21 Aidan Kehoe <kehoea(a)parhasard.net> + + * cl-macs.el (cl-non-fixnum-number-p): + This should return t under 64-bit builds for fixnums that would + be bignums on a 32-bit machine; make it so. + 2011-03-19 Stephen J. Turnbull <stephen(a)xemacs.org> * faces.el (face-spec-set-match-display): diff -r 4f0a1f4cc111 -r a32a108ae815 lisp/cl-macs.el --- a/lisp/cl-macs.el Sat Mar 19 22:13:14 2011 +0900 +++ b/lisp/cl-macs.el Mon Mar 21 12:19:25 2011 +0000 ＠＠ -3230,13 +3230,25 ＠＠ argns argvs))) (if lets (list 'let lets body) body)))) +;; When a 64-bit build is byte-compiling code, some of its native fixnums +;; will not be represented as fixnums if the byte-compiled code is read by +;; the Lisp reader in a 32-bit build. So in that case we need to check the +;; range of fixnums as well as their types. XEmacs doesn't support machines +;; with word size less than 32, so it's OK to have that as the minimum. +(macrolet + ((most-negative-fixnum-on-32-bit-machines () (lognot (1- (lsh 1 30)))) + (most-positive-fixnum-on-32-bit-machines () (lsh 1 30))) + (defun cl-non-fixnum-number-p (object) + "Return t if OBJECT is a number not guaranteed to be immediate." + (and (numberp object) + (or (not (fixnump object)) + (not (<= (most-negative-fixnum-on-32-bit-machines) + object + (most-positive-fixnum-on-32-bit-machines))))))) ;;; Compile-time optimizations for some functions defined in this package. ;;; Note that cl.el arranges to force cl-macs to be loaded at compile-time, ;;; mainly to make sure these macros will be present. - -(defun cl-non-fixnum-number-p (object) - (and (numberp object) (not (fixnump object)))) (define-compiler-macro eql (&whole form a b) (cond ((eq (cl-const-expr-p a) t) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit: Improve support for min-colors req in `defface'. 13 years, 9 months

Stephen J. Turnbull

changeset: 5378:4f0a1f4cc111 tag: tip user: Stephen J. Turnbull <stephen(a)xemacs.org> date: Sat Mar 19 22:13:14 2011 +0900 files: lisp/ChangeLog lisp/faces.el man/ChangeLog man/lispref/customize.texi man/lispref/faces.texi description: Improve support for min-colors req in `defface'. lisp/faces.el (face-spec-set-match-display): Protect against `display-color-cells' returning nil. Delete unreferenced let-binding of `min-colors'. man/lispref/customize.texi (Face Definitions): New node. (Customization): Add entry to menu. (Variable Definitions): Add cross-ref for `defface'. (Customization Types): Fixup Previous link. man/lispref/faces.texi (Faces): Clarify that built-in properties of faces are computed at runtime. diff -r eac2e6bd5b2c -r 4f0a1f4cc111 lisp/ChangeLog --- a/lisp/ChangeLog Thu Mar 17 21:50:34 2011 +0000 +++ b/lisp/ChangeLog Sat Mar 19 22:13:14 2011 +0900 ＠＠ -1,3 +1,9 ＠＠ +2011-03-19 Stephen J. Turnbull <stephen(a)xemacs.org> + + * faces.el (face-spec-set-match-display): + Protect against `display-color-cells' returning nil. + Delete unreferenced let-binding of `min-colors'. + 2011-03-17 Aidan Kehoe <kehoea(a)parhasard.net> * bytecomp.el (byte-compile-catch): diff -r eac2e6bd5b2c -r 4f0a1f4cc111 lisp/faces.el --- a/lisp/faces.el Thu Mar 17 21:50:34 2011 +0000 +++ b/lisp/faces.el Sat Mar 19 22:13:14 2011 +0900 ＠＠ -1702,7 +1702,6 ＠＠ (type (plist-get props 'type)) (class (plist-get props 'class)) (background (plist-get props 'background)) - (min-colors (plist-get props 'min-colors)) (match t) (entries display) entry req options) ＠＠ -1715,7 +1714,9 ＠＠ (type (memq type options)) (class (memq class options)) (background (memq background options)) - (min-colors (>= (display-color-cells frame) + ;; `display-color-cells' can return nil (eg, TTYs). + ;; If so, assume monochrome. + (min-colors (>= (or (display-color-cells frame) 2) (car options))) (t (warn "Unknown req `%S' with options `%S'" req options) diff -r eac2e6bd5b2c -r 4f0a1f4cc111 man/ChangeLog --- a/man/ChangeLog Thu Mar 17 21:50:34 2011 +0000 +++ b/man/ChangeLog Sat Mar 19 22:13:14 2011 +0900 ＠＠ -1,3 +1,13 ＠＠ +2011-03-19 Stephen J. Turnbull <stephen(a)xemacs.org> + + * lispref/customize.texi (Face Definitions): New node. + (Customization): Add entry to menu. + (Variable Definitions): Add cross-ref for `defface'. + (Customization Types): Fixup Previous link. + + * lispref/faces.texi (Faces): + Clarify that built-in properties of faces are computed at runtime. + 2011-03-15 Aidan Kehoe <kehoea(a)parhasard.net> * lispref/objects.texi (Character Type): diff -r eac2e6bd5b2c -r 4f0a1f4cc111 man/lispref/customize.texi --- a/man/lispref/customize.texi Thu Mar 17 21:50:34 2011 +0000 +++ b/man/lispref/customize.texi Sat Mar 19 22:13:14 2011 +0900 ＠＠ -15,6 +15,7 ＠＠ * Common Keywords:: * Group Definitions:: * Variable Definitions:: +* Face Definitions:: * Customization Types:: * Enabling Behavior:: ＠end menu ＠＠ -163,6 +164,7 ＠＠＠section Defining Customization Variables Use ＠code{defcustom} to declare user-editable variables. +For face declarations, use ＠code{defface} instead. ＠xref{Face Definitions}. ＠tindex defcustom ＠defmac defcustom option default doc [keyword value]... ＠＠ -288,7 +290,67 ＠＠ customization buffer. The ＠code{saved-value} property is actually a list whose car is an expression which evaluates to the value. -＠node Customization Types, Enabling Behavior, Variable Definitions, Customization +＠node Face Definitions, Customization Types, Variable Definitions, Customization +＠section Face Definitions + +Use ＠code{defface} to declare a new face. Conventions used in +specifying properties are similar to those for general customizable +variables. ＠xref{Variable Definitions}. + +＠defun defface face spec doc &rest args + +Declare ＠var{face} as a customizable face that defaults to ＠var{spec}. +＠var{face} does not need to be quoted. + +Third argument ＠var{doc} is the face documentation. + +If ＠var{face} has been set with `custom-set-face', set the face attributes +as specified by that function, otherwise set the face attributes +according to ＠var{spec}. + +The remaining arguments ＠var{args} are a property list, which has the +form + + ＠var{keyword} ＠var{value}... + +The following ＠var{keyword}s are defined: + +＠table ＠code +＠item:group +＠var{value} is a customization group. Add ＠var{face} to that group. +＠end table + +＠var{spec} is an alist of the form ((＠var{display} ＠var{atts})...). + +＠var{atts} is a list of face attributes and their values. The possible +attributes are defined in the variable `custom-face-attributes'. + +The ＠var{atts} of the first entry in ＠var{spec} where the +＠var{display} matches the frame take effect in that frame. +＠var{display} can either be the symbol t, which will match all frames, +or an alist of the form \((＠var{req} ＠var{item}...)...) + +For ＠var{display} to match a frame, the ＠var{req} property of the +frame must match one of the ＠var{item}. The following ＠var{req} are +defined: + +＠table ＠code +＠item ＠code{type} (the value of ＠code{window-system}) + Should be one of ＠code{x}, ＠code{mswindows}, or ＠code{tty}. + +＠code{class} (the frame's color support) + Should be one of ＠code{color}, ＠code{grayscale}, or ＠code{mono}. + +＠code{min-colors} (the minimum number of colors the frame supports) + Should be in integer which is compared to ＠code{display-color-cells} + +＠code{background} (what color is used for the background text) + Should be one of ＠code{light} or ＠code{dark}. +＠end table +＠end defun + + +＠node Customization Types, Enabling Behavior, Face Definitions, Customization ＠section Customization Types When you define a user option with ＠code{defcustom}, you must specify diff -r eac2e6bd5b2c -r 4f0a1f4cc111 man/lispref/faces.texi --- a/man/lispref/faces.texi Thu Mar 17 21:50:34 2011 +0000 +++ b/man/lispref/faces.texi Sat Mar 19 22:13:14 2011 +0900 ＠＠ -26,10 +26,13 ＠＠ Each built-in property of a face is controlled using a specifier, which allows it to have separate values in particular buffers, frames, -windows, and devices and to further vary according to device type -(X or TTY), device class (color, mono, or grayscale) and number of -displayable colors (min-colors). -＠xref{Specifiers}, for more information. +windows, and devices. These properties are computed when the face is +instantiated, allowing them to vary according to properties of the +display device, such as type (X or TTY), visual class (color, mono, or +grayscale), and number of colors displayable on the device. +＠xref{Specifiers}, for more information on specifiers. +＠xref{Face Definitions}, for defining faces whose properties vary +according to their runtime environments. The face named ＠code{default} is used for ordinary text. The face named ＠code{modeline} is used for displaying the modeline. The face named _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[AC21.5] Improve support for req min-colors in defface 13 years, 9 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Note: Reply-To set to xemacs-beta. Jeff Sparkes' commit changeset: 5373:b6e59ea11533 user: Jeff Sparkes <jsparkes(a)gmail.com> date: Thu Mar 17 14:35:02 2011 -0400 summary: Add min-colors specifier to defface, and document it. breaks initialization on TTYs (eg, xemacs -nw) because `display-color-cells' currently returns nil on TTYs (cf issue757 on the tracker), and code in faces.el expects that to return an integer. This doesn't quite break the build, but it isn't debuggable via -debug-init and AFAICS there is no workaround, so I'm going to go ahead and commit. The workaround I've employed is to assume that a display that returns nil is monochrome, and thus display-color-cells is 2. I've made the change in faces.el rather than in display-color-cells. Please advise me on whether the change should be made in display-color-cells instead. I'm of two minds; if there is no information on visual depth, returning nil allows higher-level code to make its own assumptions for that case. On the other hand, the API is simpler if it always returns an integer, and user code can always override (although that's kind of unclean). This change also adds a new node to customize.texi documenting `defface' and clarifies some documentation in the Faces node of faces.texi. The new code builds without errors and XEmacs starts correctly, on Gentoo Linux. 2011-03-19 Stephen J. Turnbull <stephen(a)xemacs.org> * faces.el (face-spec-set-match-display): Protect against `display-color-cells' returning nil. Delete unreferenced let-binding of `min-colors'. 2011-03-19 Stephen J. Turnbull <stephen(a)xemacs.org> * lispref/customize.texi (Face Definitions): New node. (Customization): Add entry to menu. (Variable Definitions): Add cross-ref for `defface'. (Customization Types): Fixup Previous link. * lispref/faces.texi (Faces): Clarify that built-in properties of faces are computed at runtime. diff -r eac2e6bd5b2c lisp/ChangeLog --- a/lisp/ChangeLog Thu Mar 17 21:50:34 2011 +0000 +++ b/lisp/ChangeLog Sat Mar 19 21:55:48 2011 +0900 ＠＠ -1,3 +1,9 ＠＠ +2011-03-19 Stephen J. Turnbull <stephen(a)xemacs.org> + + * faces.el (face-spec-set-match-display): + Protect against `display-color-cells' returning nil. + Delete unreferenced let-binding of `min-colors'. + 2011-03-17 Aidan Kehoe <kehoea(a)parhasard.net> * bytecomp.el (byte-compile-catch): diff -r eac2e6bd5b2c lisp/faces.el --- a/lisp/faces.el Thu Mar 17 21:50:34 2011 +0000 +++ b/lisp/faces.el Sat Mar 19 21:55:48 2011 +0900 ＠＠ -1702,7 +1702,6 ＠＠ (type (plist-get props 'type)) (class (plist-get props 'class)) (background (plist-get props 'background)) - (min-colors (plist-get props 'min-colors)) (match t) (entries display) entry req options) ＠＠ -1715,7 +1714,9 ＠＠ (type (memq type options)) (class (memq class options)) (background (memq background options)) - (min-colors (>= (display-color-cells frame) + ;; `display-color-cells' can return nil (eg, TTYs). + ;; If so, assume monochrome. + (min-colors (>= (or (display-color-cells frame) 2) (car options))) (t (warn "Unknown req `%S' with options `%S'" req options) diff -r eac2e6bd5b2c man/ChangeLog --- a/man/ChangeLog Thu Mar 17 21:50:34 2011 +0000 +++ b/man/ChangeLog Sat Mar 19 21:55:48 2011 +0900 ＠＠ -1,3 +1,13 ＠＠ +2011-03-19 Stephen J. Turnbull <stephen(a)xemacs.org> + + * lispref/customize.texi (Face Definitions): New node. + (Customization): Add entry to menu. + (Variable Definitions): Add cross-ref for `defface'. + (Customization Types): Fixup Previous link. + + * lispref/faces.texi (Faces): + Clarify that built-in properties of faces are computed at runtime. + 2011-03-15 Aidan Kehoe <kehoea(a)parhasard.net> * lispref/objects.texi (Character Type): diff -r eac2e6bd5b2c man/lispref/customize.texi --- a/man/lispref/customize.texi Thu Mar 17 21:50:34 2011 +0000 +++ b/man/lispref/customize.texi Sat Mar 19 21:55:48 2011 +0900 ＠＠ -15,6 +15,7 ＠＠ * Common Keywords:: * Group Definitions:: * Variable Definitions:: +* Face Definitions:: * Customization Types:: * Enabling Behavior:: ＠end menu ＠＠ -163,6 +164,7 ＠＠＠section Defining Customization Variables Use ＠code{defcustom} to declare user-editable variables. +For face declarations, use ＠code{defface} instead. ＠xref{Face Definitions}. ＠tindex defcustom ＠defmac defcustom option default doc [keyword value]... ＠＠ -288,7 +290,67 ＠＠ customization buffer. The ＠code{saved-value} property is actually a list whose car is an expression which evaluates to the value. -＠node Customization Types, Enabling Behavior, Variable Definitions, Customization +＠node Face Definitions, Customization Types, Variable Definitions, Customization +＠section Face Definitions + +Use ＠code{defface} to declare a new face. Conventions used in +specifying properties are similar to those for general customizable +variables. ＠xref{Variable Definitions}. + +＠defun defface face spec doc &rest args + +Declare ＠var{face} as a customizable face that defaults to ＠var{spec}. +＠var{face} does not need to be quoted. + +Third argument ＠var{doc} is the face documentation. + +If ＠var{face} has been set with `custom-set-face', set the face attributes +as specified by that function, otherwise set the face attributes +according to ＠var{spec}. + +The remaining arguments ＠var{args} are a property list, which has the +form + + ＠var{keyword} ＠var{value}... + +The following ＠var{keyword}s are defined: + +＠table ＠code +＠item:group +＠var{value} is a customization group. Add ＠var{face} to that group. +＠end table + +＠var{spec} is an alist of the form ((＠var{display} ＠var{atts})...). + +＠var{atts} is a list of face attributes and their values. The possible +attributes are defined in the variable `custom-face-attributes'. + +The ＠var{atts} of the first entry in ＠var{spec} where the +＠var{display} matches the frame take effect in that frame. +＠var{display} can either be the symbol t, which will match all frames, +or an alist of the form \((＠var{req} ＠var{item}...)...) + +For ＠var{display} to match a frame, the ＠var{req} property of the +frame must match one of the ＠var{item}. The following ＠var{req} are +defined: + +＠table ＠code +＠item ＠code{type} (the value of ＠code{window-system}) + Should be one of ＠code{x}, ＠code{mswindows}, or ＠code{tty}. + +＠code{class} (the frame's color support) + Should be one of ＠code{color}, ＠code{grayscale}, or ＠code{mono}. + +＠code{min-colors} (the minimum number of colors the frame supports) + Should be in integer which is compared to ＠code{display-color-cells} + +＠code{background} (what color is used for the background text) + Should be one of ＠code{light} or ＠code{dark}. +＠end table +＠end defun + + +＠node Customization Types, Enabling Behavior, Face Definitions, Customization ＠section Customization Types When you define a user option with ＠code{defcustom}, you must specify diff -r eac2e6bd5b2c man/lispref/faces.texi --- a/man/lispref/faces.texi Thu Mar 17 21:50:34 2011 +0000 +++ b/man/lispref/faces.texi Sat Mar 19 21:55:48 2011 +0900 ＠＠ -26,10 +26,13 ＠＠ Each built-in property of a face is controlled using a specifier, which allows it to have separate values in particular buffers, frames, -windows, and devices and to further vary according to device type -(X or TTY), device class (color, mono, or grayscale) and number of -displayable colors (min-colors). -＠xref{Specifiers}, for more information. +windows, and devices. These properties are computed when the face is +instantiated, allowing them to vary according to properties of the +display device, such as type (X or TTY), visual class (color, mono, or +grayscale), and number of colors displayable on the device. +＠xref{Specifiers}, for more information on specifiers. +＠xref{Face Definitions}, for defining faces whose properties vary +according to their runtime environments. The face named ＠code{default} is used for ordinary text. The face named ＠code{modeline} is used for displaying the modeline. The face named _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

Re: [COMMIT] Be better about searching for chars typed via XIM and x-compose.el, isearch 13 years, 9 months

Aidan Kehoe

Ar an t-ochtú lá déag de mí Márta, scríobh Mats Lidell: > >>>>> Aidan Kehoe <kehoea(a)parhasard.net> writes: > > Aidan> [...] This can be avoided with a nil value for > Aidan> try-alternate-layout-for-commands, and I now think that only > Aidan> language environments with non-Latin scripts should have a > Aidan> non-nil default for this variable. > > But then those who need try-alternate-layout-for-commands will have > problems with isearch in dired and gnus, right? They will, but they do at the moment, too. The pre-command-hook approach that isearch does is inherently fragile, but I don’t really see a better alternative without a lot of work. Maybe Julian Bradfield’s Quail work could be leveraged for this. > I guess I'm still confused. You should be able to isearch for any > character in any buffer! What am I missing? You’re not missing anything, as far as I can see. -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[COMMIT] Correct some minor problems in my last change. 13 years, 9 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1300398634 0 # Node ID eac2e6bd5b2cd5226490ce691472729026bbb2b6 # Parent 4b529b940e2e8bcc623fed865ac1796132b99eaa Correct some minor problems in my last change. 2011-03-17 Aidan Kehoe <kehoea(a)parhasard.net> * bytecomp.el (byte-compile-catch): * bytecomp.el (byte-compile-throw): Correct some minor problems in my last change. Happy St. Patrick's day, everyone! diff -r 4b529b940e2e -r eac2e6bd5b2c lisp/ChangeLog --- a/lisp/ChangeLog Thu Mar 17 21:07:16 2011 +0000 +++ b/lisp/ChangeLog Thu Mar 17 21:50:34 2011 +0000 ＠＠ -1,3 +1,10 ＠＠ +2011-03-17 Aidan Kehoe <kehoea(a)parhasard.net> + + * bytecomp.el (byte-compile-catch): + * bytecomp.el (byte-compile-throw): + Correct some minor problems in my last change. Happy St. Patrick's + day, everyone! + 2011-03-17 Aidan Kehoe <kehoea(a)parhasard.net> * bytecomp.el (byte-compile-catch): diff -r 4b529b940e2e -r eac2e6bd5b2c lisp/bytecomp.el --- a/lisp/bytecomp.el Thu Mar 17 21:07:16 2011 +0000 +++ b/lisp/bytecomp.el Thu Mar 17 21:50:34 2011 +0000 ＠＠ -4209,7 +4209,7 ＠＠ byte-compile-active-blocks)) (body (byte-compile-top-level (cons 'progn (cddr form)) - (and elt for-effect)))) + (and (not elt) for-effect)))) (if (and elt (not (cdr elt))) ;; A lexical block without any contained return-from clauses: (byte-compile-form body) ＠＠ -4371,16 +4371,17 ＠＠ ;; corresponding block as having been referenced. (let* ((symbol (car-safe (cdr-safe (nth 1 form)))) (not-present '#:not-present) - (block (and symbol (symbolp symbol) - (get symbol 'cl-block-name not-present))) + (block (if (and symbol (symbolp symbol)) + (get symbol 'cl-block-name not-present) + not-present)) (assq (and (not (eq block not-present)) (assq block byte-compile-active-blocks)))) - (when assq - (setcdr assq t)) - (when (not (eq block not-present)) - ;; No corresponding enclosing block. - (byte-compile-warn "return-from: no enclosing block named `%s'" - block))) + (if assq + (setcdr assq t) + (if (not (eq block not-present)) + ;; No corresponding enclosing block. + (byte-compile-warn "return-from: no enclosing block named `%s'" + block)))) (mapc 'byte-compile-form (cdr form)) ;; Push the arguments (byte-compile-out (get (car form) 'byte-opcode) 0) (pushnew '(null (function-max-args 'throw)) byte-compile-checks-on-load -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches March 2011