[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget 5693f3d 2/5: merge master
|
From: |
Joakim Verona |
|
Subject: |
[Emacs-diffs] xwidget 5693f3d 2/5: merge master |
|
Date: |
Sun, 25 Jan 2015 20:20:09 +0000 |
branch: xwidget
commit 5693f3de69f9db99252b2f4eb1c7178fdec2a210
Merge: 5c1d2b0 d7995b1
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>
merge master
---
lib-src/ChangeLog | 8 +++++
lib-src/Makefile.in | 58 +++++++++++++++++++++++++---------------
lisp/emacs-lisp/eieio-core.el | 2 +-
lisp/emacs-lisp/eieio.el | 4 +-
src/ChangeLog | 9 ++++++
src/xfont.c | 8 +++---
src/xftfont.c | 22 ++++++++--------
src/xgselect.c | 4 +-
8 files changed, 73 insertions(+), 42 deletions(-)
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c2aedb0..6cf82e9 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-22 Paul Eggert <address@hidden>
+
+ Check exit statuses in lib-src/Makefile
+ * Makefile.in ($(DESTDIR)${archlibdir}, install, uninstall)
+ (mostlyclean, clean, distclean, extraclean):
+ Check exit statuses more carefully. Reindent to fit in 80 chars.
+ (bootstrap-clean maintainer-clean): Remove unnecessary 'true'.
+
2015-01-22 Ulrich Müller <address@hidden>
* Makefile.in ($(DESTDIR)${archlibdir}): Don't fail if the chown
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index a0bf5ba..1b329c2 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -254,31 +254,41 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
$(DESTDIR)${archlibdir}: all
@echo
@echo "Installing utilities run internally by Emacs."
- umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}"
- exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+ umask 022 && ${MKDIR_P} "$(DESTDIR)${archlibdir}"
+ exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd` && \
if [ "$$exp_archlibdir" != "`/bin/pwd`" ]; then \
for file in ${UTILITIES}; do \
- $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file
"$(DESTDIR)${archlibdir}/$$file" ; \
+ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file \
+ "$(DESTDIR)${archlibdir}/$$file" || exit; \
done ; \
fi
- umask 022; ${MKDIR_P} "$(DESTDIR)${gamedir}"; \
- touch "$(DESTDIR)${gamedir}/snake-scores"; \
- touch "$(DESTDIR)${gamedir}/tetris-scores"
+ umask 022 && ${MKDIR_P} "$(DESTDIR)${gamedir}" && \
+ touch "$(DESTDIR)${gamedir}/snake-scores" \
+ "$(DESTDIR)${gamedir}/tetris-scores"
ifneq ($(gameuser),)
- -if chown ${gameuser}
"$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && chmod u+s,go-r
"$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; then \
- chown ${gameuser} "$(DESTDIR)${gamedir}"; \
+ if chown ${gameuser} \
+ "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && \
+ chmod u+s,go-r \
+ "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; \
+ then \
+ chown ${gameuser} "$(DESTDIR)${gamedir}" && \
chmod u=rwx,g=rx,o=rx "$(DESTDIR)${gamedir}"; \
fi
else ifneq ($(gamegroup),)
- -if chgrp ${gamegroup}
"$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && chmod g+s,o-r
"$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; then \
- chgrp ${gamegroup} "$(DESTDIR)${gamedir}"; \
+ if chgrp ${gamegroup} \
+ "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && \
+ chmod g+s,o-r \
+ "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; \
+ then \
+ chgrp ${gamegroup} "$(DESTDIR)${gamedir}" && \
chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \
fi
endif
- exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+ exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd` && \
if [ "$$exp_archlibdir" != "`cd ${srcdir} && /bin/pwd`" ]; then \
for file in ${SCRIPTS}; do \
- $(INSTALL_SCRIPT) ${srcdir}/$$file
"$(DESTDIR)${archlibdir}/$$file"; \
+ $(INSTALL_SCRIPT) ${srcdir}/$$file \
+ "$(DESTDIR)${archlibdir}/$$file" || exit; \
done ; \
fi
@@ -288,34 +298,38 @@ endif
install: $(DESTDIR)${archlibdir}
@echo
@echo "Installing utilities for users to run."
- umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
+ umask 022 && ${MKDIR_P} "$(DESTDIR)${bindir}"
for file in ${INSTALLABLES} ; do \
- $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file}
"$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e
'$(TRANSFORM)'`${EXEEXT} ; \
+ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} \
+ "$(DESTDIR)${bindir}"/` \
+ echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)' \
+ `${EXEEXT} || exit; \
done
uninstall:
for file in ${INSTALLABLES}; do \
- rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//'
-e '$(TRANSFORM)'`${EXEEXT} ; \
+ rm -f "$(DESTDIR)${bindir}"/` \
+ echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)' \
+ `${EXEEXT}; \
done
if [ -d "$(DESTDIR)${archlibdir}" ]; then \
- (cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES} ${SCRIPTS}) \
+ cd "$(DESTDIR)${archlibdir}" && \
+ rm -f ${UTILITIES} ${SCRIPTS}; \
fi
mostlyclean:
- -rm -f core *.o *.res
+ rm -f core *.o *.res
clean: mostlyclean
- -rm -f ${EXE_FILES}
+ rm -f ${EXE_FILES}
distclean: clean
- -rm -f TAGS
- -rm -f Makefile blessmail
+ rm -f TAGS Makefile blessmail
bootstrap-clean maintainer-clean: distclean
- true
extraclean: maintainer-clean
- -rm -f *~ \#*
+ rm -f *~ \#*
## Test the contents of the directory.
check:
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
index 0297acc..261138b 100644
--- a/lisp/emacs-lisp/eieio-core.el
+++ b/lisp/emacs-lisp/eieio-core.el
@@ -1258,7 +1258,7 @@ method invocation orders of the involved classes."
(eieio--class-precedence-list tag))))
-;;;### (autoloads nil "eieio-compat" "eieio-compat.el"
"51667b1cd372f45acdae14f838cedcc6")
+;;;### (autoloads nil "eieio-compat" "eieio-compat.el"
"57805f02023795a01567781e70aaf9f9")
;;; Generated autoloads from eieio-compat.el
(autoload 'eieio--defalias "eieio-compat" "\
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 7672d7f..3dba8e0 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -931,7 +931,7 @@ variable PRINT-FUNCTION. Optional argument NOESCAPE is
passed to
;;; Start of automatically extracted autoloads.
-;;;### (autoloads nil "eieio-custom" "eieio-custom.el"
"6baa78cfc590cc0422e12b7eb55abf24")
+;;;### (autoloads nil "eieio-custom" "eieio-custom.el"
"2ec91e473fcad1ff20cd76edc4aab706")
;;; Generated autoloads from eieio-custom.el
(autoload 'customize-object "eieio-custom" "\
@@ -942,7 +942,7 @@ Optional argument GROUP is the sub-group of slots to
display.
;;;***
-;;;### (autoloads nil "eieio-opt" "eieio-opt.el"
"e922bf7ebc7dcb272480c4ba148da1ac")
+;;;### (autoloads nil "eieio-opt" "eieio-opt.el"
"d7b8682e15aebad7dbe6384dc5ed655f")
;;; Generated autoloads from eieio-opt.el
(autoload 'eieio-browse "eieio-opt" "\
diff --git a/src/ChangeLog b/src/ChangeLog
index 8f23dd3..a98c77f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
2015-01-22 Paul Eggert <address@hidden>
+ Use bool for boolean in xfont.c, xftfont.c, xgselect.c
+ * xfont.c (xfont_driver, xfont_chars_supported)
+ (xfont_text_extents):
+ * xftfont.c (xftfont_get_colors, xftfont_open)
+ (xftfont_prepare_face, xftfont_done_face)
+ (xftfont_cached_font_ok):
+ * xgselect.c (xg_select):
+ Use bool for boolean.
+
Don't downcase system diagnostics' first letters
* fileio.c (report_file_errno): Don't downcase, and simplify.
Fixes: bug#19642
diff --git a/src/xfont.c b/src/xfont.c
index 10cc321..55053b9 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -132,7 +132,7 @@ static int xfont_check (struct frame *, struct font *);
struct font_driver xfont_driver =
{
LISP_INITIALLY_ZERO, /* Qx */
- 0, /* case insensitive */
+ false, /* case insensitive */
xfont_get_cache,
xfont_list,
xfont_match,
@@ -269,7 +269,7 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct
*xfont,
}
return (i >= 0);
}
- return 0;
+ return false;
}
/* A hash table recoding which font supports which scripts. Each key
@@ -983,7 +983,7 @@ xfont_text_extents (struct font *font, unsigned int *code,
int i, width = 0;
bool first;
- for (i = 0, first = 1; i < nglyphs; i++)
+ for (i = 0, first = true; i < nglyphs; i++)
{
XChar2b char2b;
static XCharStruct *pcm;
@@ -1000,7 +1000,7 @@ xfont_text_extents (struct font *font, unsigned int *code,
metrics->rbearing = pcm->rbearing;
metrics->ascent = pcm->ascent;
metrics->descent = pcm->descent;
- first = 0;
+ first = false;
}
else
{
diff --git a/src/xftfont.c b/src/xftfont.c
index 054b38e..0e8b876 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -85,7 +85,7 @@ xftfont_get_colors (struct frame *f, struct face *face, GC gc,
else
{
XGCValues xgcv;
- bool fg_done = 0, bg_done = 0;
+ bool fg_done = false, bg_done = false;
block_input ();
XGetGCValues (FRAME_X_DISPLAY (f), gc,
@@ -93,15 +93,15 @@ xftfont_get_colors (struct frame *f, struct face *face, GC
gc,
if (xftface_info)
{
if (xgcv.foreground == face->foreground)
- *fg = xftface_info->xft_fg, fg_done = 1;
+ *fg = xftface_info->xft_fg, fg_done = true;
else if (xgcv.foreground == face->background)
- *fg = xftface_info->xft_bg, fg_done = 1;
+ *fg = xftface_info->xft_bg, fg_done = true;
if (! bg)
- bg_done = 1;
+ bg_done = true;
else if (xgcv.background == face->background)
- *bg = xftface_info->xft_bg, bg_done = 1;
+ *bg = xftface_info->xft_bg, bg_done = true;
else if (xgcv.background == face->foreground)
- *bg = xftface_info->xft_fg, bg_done = 1;
+ *bg = xftface_info->xft_fg, bg_done = true;
}
if (! (fg_done & bg_done))
@@ -434,7 +434,7 @@ xftfont_open (struct frame *f, Lisp_Object entity, int
pixel_size)
font->baseline_offset = 0;
font->relative_compose = 0;
font->default_ascent = 0;
- font->vertical_centering = 0;
+ font->vertical_centering = false;
#ifdef FT_BDF_H
if (! (ft_face->face_flags & FT_FACE_FLAG_SFNT))
{
@@ -487,7 +487,7 @@ xftfont_prepare_face (struct frame *f, struct face *face)
{
struct xftface_info *xftface_info;
-#if 0
+#if false
/* This doesn't work if face->ascii_face doesn't use an Xft font. */
if (face != face->ascii_face)
{
@@ -507,7 +507,7 @@ xftfont_done_face (struct frame *f, struct face *face)
{
struct xftface_info *xftface_info;
-#if 0
+#if false
/* This doesn't work if face->ascii_face doesn't use an Xft font. */
if (face != face->ascii_face
|| ! face->extra)
@@ -682,7 +682,7 @@ xftfont_cached_font_ok (struct frame *f, Lisp_Object
font_object,
Display *display = FRAME_X_DISPLAY (f);
FcPattern *pat = FcPatternCreate ();
FcBool b1, b2;
- bool ok = 0;
+ bool ok = false;
int i1, i2, r1, r2;
xftfont_add_rendering_parameters (pat, entity);
@@ -712,7 +712,7 @@ xftfont_cached_font_ok (struct frame *f, Lisp_Object
font_object,
r2 = FcPatternGetInteger (oldpat, FC_RGBA, 0, &i2);
if (r1 != r2 || i1 != i2) goto out;
- ok = 1;
+ ok = true;
out:
FcPatternDestroy (pat);
return ok;
diff --git a/src/xgselect.c b/src/xgselect.c
index bb2226e..0b62d3e 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -50,7 +50,7 @@ xg_select (int fds_lim, fd_set *rfds, fd_set *wfds, fd_set
*efds,
struct timespec const *tmop = timeout;
GMainContext *context;
- int have_wfds = wfds != NULL;
+ bool have_wfds = wfds != NULL;
GPollFD gfds_buf[128];
GPollFD *gfds = gfds_buf;
int gfds_size = ARRAYELTS (gfds_buf);
@@ -96,7 +96,7 @@ xg_select (int fds_lim, fd_set *rfds, fd_set *wfds, fd_set
*efds,
{
FD_SET (gfds[i].fd, &all_wfds);
if (gfds[i].fd > max_fds) max_fds = gfds[i].fd;
- have_wfds = 1;
+ have_wfds = true;
}
}