Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
57ebc3fd
Commit
57ebc3fd
authored
Jun 24, 2009
by
Chong Yidong
Browse files
* emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671).
parent
aa4a9384
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
src/ChangeLog
src/ChangeLog
+4
-0
src/emacs-icon.h
src/emacs-icon.h
+4
-3
No files found.
src/ChangeLog
View file @
57ebc3fd
2009-06-24 Chong Yidong <cyd@stupidchicken.com>
* emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671).
2009-06-24 Kenichi Handa <handa@m17n.org>
* fontset.c (fontset_get_font_group): Return 0 if no font-group is
...
...
src/emacs-icon.h
View file @
57ebc3fd
...
...
@@ -20,8 +20,9 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
/* Note that the GTK port uses gdk to display the icon, so Emacs need
not have XPM support compiled in. */
#if (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK)
static
char
*
gnu_xpm_bits
[]
=
{
/* width height ncolors chars_per_pixel */
"32 32 255 2"
,
...
...
@@ -314,7 +315,7 @@ static char * gnu_xpm_bits[] = {
"OPOPOPOPOPOPOPOPILILBIILPKCBJAAHJFBPILILOBOBAIOPOPOPOPOPOPOPOPOP"
,
"OPOPOPOPOPOPOPOPOPOPILMIGECABCPKGHAIILOBOBOPOPOPOPOPOPOPOPOPOPOP"
,
"OPOPOPOPOPOPOPOPOPOPOPOPOPCAOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOP"
};
#endif
/* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */
#endif
/*
(
defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
) || defined (USE_GTK)
*/
#define gnu_xbm_width 50
#define gnu_xbm_height 50
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment