Mercurial > hg > xemacs-beta

comparison src/glyphs-x.c @ 940:79fb6b9e9f76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-07-31 10:23:28 by adrian] [S] [PATCH] xemacs-21.5: Fix for xbm crash -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2002-07-29 Sean MacLennan <seanm@seanm.ca> * glyphs-x.c (x_locate_pixmap_file): Test path not to be 0, before using it.
author adrian
date Wed, 31 Jul 2002 10:23:39 +0000
parents 44e6e64b1cf2
children 184461bc8de4
comparison
equal deleted inserted replaced
939:025200a2163c 940:79fb6b9e9f76
586 } 586 }
587 587
588 #ifdef USE_XBMLANGPATH 588 #ifdef USE_XBMLANGPATH
589 { 589 {
590 Ibyte *path = egetenv ("XBMLANGPATH"); 590 Ibyte *path = egetenv ("XBMLANGPATH");
591 Extbyte *pathext; 591 if (path)
592 SubstitutionRec subs[1];
593 subs[0].match = 'B';
594 LISP_STRING_TO_EXTERNAL (name, subs[0].substitution, Qfile_name);
595 C_STRING_TO_EXTERNAL (path, pathext, Qfile_name);
596 /* #### Motif uses a big hairy default if $XBMLANGPATH isn't set.
597 We don't. If you want it used, set it. */
598 if (pathext &&
599 (pathext = XtResolvePathname (display, "bitmaps", 0, 0, pathext,
600 subs, XtNumber (subs), 0)))
601 { 592 {
602 name = build_ext_string (pathext, Qfile_name); 593 Extbyte *pathext;
603 XtFree (pathext); 594 SubstitutionRec subs[1];
604 return (name); 595 subs[0].match = 'B';
596 LISP_STRING_TO_EXTERNAL (name, subs[0].substitution, Qfile_name);
597 C_STRING_TO_EXTERNAL (path, pathext, Qfile_name);
598 /* #### Motif uses a big hairy default if $XBMLANGPATH isn't set.
599 We don't. If you want it used, set it. */
600 if (pathext &&
601 (pathext = XtResolvePathname (display, "bitmaps", 0, 0, pathext,
602 subs, XtNumber (subs), 0)))
603 {
604 name = build_ext_string (pathext, Qfile_name);
605 XtFree (pathext);
606 return (name);
607 }
605 } 608 }
606 } 609 }
607 #endif 610 #endif
608 611
609 if (NILP (Vx_bitmap_file_path)) 612 if (NILP (Vx_bitmap_file_path))