Mercurial > hg > xemacs-beta
comparison lisp/toolbar.el @ 239:41f2f0e326e9 r20-5b18
Import from CVS: tag r20-5b18
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:15:48 +0200 |
parents | d44af0c54775 |
children | c5d627a313b1 |
comparison
equal
deleted
inserted
replaced
238:b5f2e56b938d | 239:41f2f0e326e9 |
---|---|
66 (file-name-as-directory | 66 (file-name-as-directory |
67 (locate-data-directory "toolbar"))))) | 67 (locate-data-directory "toolbar"))))) |
68 | 68 |
69 (defun init-toolbar-from-resources (locale) | 69 (defun init-toolbar-from-resources (locale) |
70 (if (and (featurep 'x) | 70 (if (and (featurep 'x) |
71 (not (featurep 'infodock)) | |
71 (or (eq locale 'global) | 72 (or (eq locale 'global) |
72 (eq 'x (device-or-frame-type locale)))) | 73 (eq 'x (device-or-frame-type locale)))) |
73 (x-init-toolbar-from-resources locale))) | 74 (x-init-toolbar-from-resources locale))) |
74 | 75 |
75 | 76 |