Mercurial > emacs

comparison src/xfaces.c @ 83533:02e39decdc84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-351 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-352 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-353 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-354 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-355 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-356 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-357 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-358 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-359 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-360 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-361 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-362 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-363 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-364 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-365 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-366 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-367 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-368 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-369 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-370 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-115 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-116 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-117 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-118 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-119 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-120 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-573
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 29 Jul 2006 09:59:12 +0000
parents b19aaf4ab0ee 760807463226
children 694bbb62a75d
comparison
equal deleted inserted replaced
83532:b19aaf4ab0ee 83533:02e39decdc84
487 struct font_name **, int, int)); 487 struct font_name **, int, int));
488 static int font_scalable_p P_ ((struct font_name *)); 488 static int font_scalable_p P_ ((struct font_name *));
489 static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, int)); 489 static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, int));
490 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); 490 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *));
491 static unsigned char *xstrlwr P_ ((unsigned char *)); 491 static unsigned char *xstrlwr P_ ((unsigned char *));
492 static void signal_error P_ ((char *, Lisp_Object));
493 static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int)); 492 static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int));
494 static void load_face_font P_ ((struct frame *, struct face *, int)); 493 static void load_face_font P_ ((struct frame *, struct face *, int));
495 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); 494 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *));
496 static void free_face_colors P_ ((struct frame *, struct face *)); 495 static void free_face_colors P_ ((struct frame *, struct face *));
497 static int face_color_gray_p P_ ((struct frame *, char *)); 496 static int face_color_gray_p P_ ((struct frame *, char *));
856 855
857 return s; 856 return s;
858 } 857 }
859 858
860 859
861 /* Signal `error' with message S, and additional argument ARG. */
862
863 static void
864 signal_error (s, arg)
865 char *s;
866 Lisp_Object arg;
867 {
868 Fsignal (Qerror, Fcons (build_string (s), Fcons (arg, Qnil)));
869 }
870
871
872 /* If FRAME is nil, return a pointer to the selected frame. 860 /* If FRAME is nil, return a pointer to the selected frame.
873 Otherwise, check that FRAME is a live frame, and return a pointer 861 Otherwise, check that FRAME is a live frame, and return a pointer
874 to it. NPARAM is the parameter number of FRAME, for 862 to it. NPARAM is the parameter number of FRAME, for
875 CHECK_LIVE_FRAME. This is here because it's a frequent pattern in 863 CHECK_LIVE_FRAME. This is here because it's a frequent pattern in
876 Lisp function definitions. */ 864 Lisp function definitions. */
3288 3276
3289 tortoise = Fget (tortoise, Qface_alias); 3277 tortoise = Fget (tortoise, Qface_alias);
3290 if (EQ (hare, tortoise)) 3278 if (EQ (hare, tortoise))
3291 { 3279 {
3292 if (signal_p) 3280 if (signal_p)
3293 Fsignal (Qcircular_list, Fcons (orig_face, Qnil)); 3281 xsignal1 (Qcircular_list, orig_face);
3294 return Qdefault; 3282 return Qdefault;
3295 } 3283 }
3296 } 3284 }
3297 3285
3298 return face_name; 3286 return face_name;