# HG changeset patch # User Katsumi Yamaoka # Date 1273185775 0 # Node ID e14a0bf9fbd0288bf70b7ecfb1e5e2a7a8e65f2c # Parent 3ecfdde2a36c12d9567516fb48ea6055c37835a6# Parent de8de918fbab0e2e24cf1bc876cba54df7a9f96c Merge from mainline. diff -r 3ecfdde2a36c -r e14a0bf9fbd0 ChangeLog --- a/ChangeLog Thu May 06 06:11:19 2010 +0000 +++ b/ChangeLog Thu May 06 22:42:55 2010 +0000 @@ -1,3 +1,10 @@ +2010-05-06 Glenn Morris + + * configure.in (AC_PROG_LN_S): Remove test, nothing uses @LN_S@. + + * Makefile.in (CPP, C_SWITCH_SYSTEM, ALLOCA, LN_S, C_SWITCH_X_SITE) + (LD_SWITCH_X_SITE): Remove unused variables. + 2010-05-04 Glenn Morris * configure.in (LD_SWITCH_X_SITE_AUX): Use AC_SUBST only, not AC_DEFINE diff -r 3ecfdde2a36c -r e14a0bf9fbd0 Makefile.in --- a/Makefile.in Thu May 06 06:11:19 2010 +0000 +++ b/Makefile.in Thu May 06 22:42:55 2010 +0000 @@ -69,15 +69,9 @@ # ==================== Things `configure' Might Edit ==================== CC=@CC@ -CPP=@CPP@ -C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ -ALLOCA=@ALLOCA@ -LN_S=@LN_S@ CFLAGS=@CFLAGS@ LDFLAGS=@LDFLAGS@ CPPFLAGS=@CPPFLAGS@ -C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ -LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@ EXEEXT=@EXEEXT@ MAKEINFO=@MAKEINFO@ diff -r 3ecfdde2a36c -r e14a0bf9fbd0 configure --- a/configure Thu May 06 06:11:19 2010 +0000 +++ b/configure Thu May 06 22:42:55 2010 +0000 @@ -694,7 +694,6 @@ CPP GREP EGREP -LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -5026,17 +5025,6 @@ #### Some other nice autoconf tests. -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6021,7 +6009,7 @@ ## Some programs in src produce warnings saying certain subprograms ## are too complex and need a MAXMEM value greater than 2000 for ## additional optimization. --nils@exp-math.uni-essen.de -test "$opsys" = "aix4.2" && test "x$GCC" = "xyes" && \ +test "$opsys" = "aix4.2" && test "x$GCC" != "xyes" && \ C_SWITCH_SYSTEM="-ma -qmaxmem=4000" ## gnu-linux might need -D_BSD_SOURCE on old libc5 systems. ## It is redundant in glibc2, since we define _GNU_SOURCE. diff -r 3ecfdde2a36c -r e14a0bf9fbd0 configure.in --- a/configure.in Thu May 06 06:11:19 2010 +0000 +++ b/configure.in Thu May 06 22:42:55 2010 +0000 @@ -755,7 +755,6 @@ #### Some other nice autoconf tests. dnl checks for programs -AC_PROG_LN_S AC_PROG_CPP AC_PROG_INSTALL if test "x$RANLIB" = x; then diff -r 3ecfdde2a36c -r e14a0bf9fbd0 lib-src/ChangeLog --- a/lib-src/ChangeLog Thu May 06 06:11:19 2010 +0000 +++ b/lib-src/ChangeLog Thu May 06 22:42:55 2010 +0000 @@ -1,3 +1,12 @@ +2010-05-06 Glenn Morris + + * Makefile.in: Minimize blessmail-related cpp usage. + (BLESSMAIL_TARGET): New variable. + (MOVEMAIL_NEEDS_BLESSING): Remove, replace by above variable. + (blessmail): Always define this rule. + (need-blessmail): New rule, split out from maybe-blessmail. + (maybe-blessmail): Use BLESSMAIL_TARGET. + 2010-05-04 Glenn Morris * Makefile.in: Use @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@ rather than diff -r 3ecfdde2a36c -r e14a0bf9fbd0 lib-src/Makefile.in --- a/lib-src/Makefile.in Thu May 06 06:11:19 2010 +0000 +++ b/lib-src/Makefile.in Thu May 06 22:42:55 2010 +0000 @@ -1,7 +1,6 @@ # Makefile for lib-src subdirectory in GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -132,6 +131,9 @@ # If neither flag is set, blessmail is used. MOVE_FLAGS= +## May be reset below by cpp. +BLESSMAIL_TARGET= + ## -lkrb if HAVE_LIBKRB or -lkrb4 if HAVE_LIBKRB4 KRB4LIB=@KRB4LIB@ ## -ldes if HAVE_LIBDES or -ldes425 if HAVE_LIBDES425 @@ -170,22 +172,14 @@ #ifndef LIBS_SYSTEM #define LIBS_SYSTEM #endif +LOADLIBES=LIBS_SYSTEM -#undef MOVEMAIL_NEEDS_BLESSING #ifndef MAIL_USE_FLOCK #ifndef MAIL_USE_LOCKF -#define MOVEMAIL_NEEDS_BLESSING +BLESSMAIL_TARGET = need-blessmail #endif #endif -#ifdef MOVEMAIL_NEEDS_BLESSING -#define BLESSMAIL blessmail -#else -#define BLESSMAIL -#endif - -LOADLIBES=LIBS_SYSTEM - .SUFFIXES: .m @@ -218,14 +212,14 @@ vcdiff: $(srcdir)/vcdiff -cp -p $(srcdir)/vcdiff vcdiff -#ifdef MOVEMAIL_NEEDS_BLESSING +/* Only used if we need blessmail, but no harm in always defining. + This makes the actual blessmail executable. */ blessmail: $(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el chmod +x blessmail -#endif -maybe-blessmail: BLESSMAIL -#ifdef MOVEMAIL_NEEDS_BLESSING +/* This checks if we need to run blessmail. */ +need-blessmail: blessmail /* Don\'t charge ahead and do it! Let the installer decide. ./blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT} */ @if [ `wc -l + + * net/tramp.el (top, with-progress-reporter): Use + `symbol-function' inside `funcall'. + + * net/tramp-compat.el (tramp-compat-file-attributes) + (tramp-compat-delete-file, tramp-compat-delete-directory): Handle + only `wrong-number-of-arguments' error. + + * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Fix typo. + (tramp-gvfs-handle-file-selinux-context): Use `symbol-function' + inside `funcall'. + 2010-05-06 Stefan Monnier * minibuffer.el (completion--sreverse, completion--common-suffix): diff -r 3ecfdde2a36c -r e14a0bf9fbd0 lisp/net/tramp-compat.el --- a/lisp/net/tramp-compat.el Thu May 06 06:11:19 2010 +0000 +++ b/lisp/net/tramp-compat.el Thu May 06 22:42:55 2010 +0000 @@ -262,7 +262,7 @@ (tramp-file-name-handler 'file-attributes filename id-format)) (t (condition-case nil (funcall (symbol-function 'file-attributes) filename id-format) - (error (file-attributes filename)))))) + (wrong-number-of-arguments (file-attributes filename)))))) ;; PRESERVE-UID-GID has been introduced with Emacs 23. It does not ;; hurt to ignore it for other (X)Emacs versions. @@ -320,13 +320,20 @@ ;; FORCE has been introduced with Emacs 24.1. (defun tramp-compat-delete-file (filename &optional force) "Like `delete-file' for Tramp files (compat function)." - (condition-case nil - (funcall (symbol-function 'delete-file) filename force) - ;; This Emacs version does not support the FORCE flag. Setting - ;; `delete-by-moving-to-trash' shall give us the same effect. - (error - (let ((delete-by-moving-to-trash (null force))) - (delete-file filename))))) + (if (null force) + (delete-file filename) + (condition-case nil + (funcall (symbol-function 'delete-file) filename force) + ;; This Emacs version does not support the FORCE flag. Setting + ;; `delete-by-moving-to-trash' shall give us the same effect. + (wrong-number-of-arguments + (let ((delete-by-moving-to-trash + (cond + ((null force) t) + ((boundp 'delete-by-moving-to-trash) + (symbol-value 'delete-by-moving-to-trash)) + (t nil)))) + (delete-file filename)))))) ;; RECURSIVE has been introduced with Emacs 23.2. (defun tramp-compat-delete-directory (directory &optional recursive) @@ -337,7 +344,7 @@ (funcall (symbol-function 'delete-directory) directory recursive) ;; This Emacs version does not support the RECURSIVE flag. We ;; use the implementation from Emacs 23.2. - (error + (wrong-number-of-arguments (setq directory (directory-file-name (expand-file-name directory))) (if (not (file-symlink-p directory)) (mapc (lambda (file) diff -r 3ecfdde2a36c -r e14a0bf9fbd0 lisp/net/tramp-gvfs.el --- a/lisp/net/tramp-gvfs.el Thu May 06 06:11:19 2010 +0000 +++ b/lisp/net/tramp-gvfs.el Thu May 06 22:42:55 2010 +0000 @@ -525,7 +525,7 @@ newname) ok-if-already-exists keep-date preserve-uid-gid))) (when preserve-selinux-context - (setq args (append args (list preserve-uid-gid)))) + (setq args (append args (list preserve-selinux-context)))) (apply 'copy-file args))) (defun tramp-gvfs-handle-delete-directory (directory &optional recursive) @@ -629,7 +629,8 @@ (defun tramp-gvfs-handle-file-selinux-context (filename) "Like `file-selinux-context' for Tramp files." - (funcall 'file-selinux-context (tramp-gvfs-fuse-file-name filename))) + (funcall (symbol-function 'file-selinux-context) + (tramp-gvfs-fuse-file-name filename))) (defun tramp-gvfs-handle-file-writable-p (filename) "Like `file-writable-p' for Tramp files." diff -r 3ecfdde2a36c -r e14a0bf9fbd0 lisp/net/tramp.el --- a/lisp/net/tramp.el Thu May 06 06:11:19 2010 +0000 +++ b/lisp/net/tramp.el Thu May 06 22:42:55 2010 +0000 @@ -145,7 +145,8 @@ ;; this would load dbus.el. (when (and (featurep 'dbusbind) (condition-case nil - (funcall 'dbus-get-unique-name :session) + (funcall (symbol-function 'dbus-get-unique-name) + :session) (error nil)) (tramp-compat-process-running-p "gvfs-fuse-daemon")) 'tramp-gvfs) @@ -2273,7 +2274,7 @@ ;; introduced in Emacs 24.1. (when (<= ,level tramp-verbose) (condition-case nil - (setq pr (funcall 'make-progress-reporter ,message) + (setq pr (funcall (symbol-function 'make-progress-reporter) ,message) tm (run-at-time 3 0.1 'progress-reporter-update pr)) (error nil))) (unwind-protect diff -r 3ecfdde2a36c -r e14a0bf9fbd0 lwlib/ChangeLog --- a/lwlib/ChangeLog Thu May 06 06:11:19 2010 +0000 +++ b/lwlib/ChangeLog Thu May 06 22:42:55 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-06 Glenn Morris + + * Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables. + 2010-05-04 Glenn Morris * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): diff -r 3ecfdde2a36c -r e14a0bf9fbd0 lwlib/Makefile.in --- a/lwlib/Makefile.in Thu May 06 06:11:19 2010 +0000 +++ b/lwlib/Makefile.in Thu May 06 22:42:55 2010 +0000 @@ -32,27 +32,21 @@ CC=@CC@ CFLAGS=@CFLAGS@ -CPP=@CPP@ CPPFLAGS=@CPPFLAGS@ -LN_S=@LN_S@ RANLIB=@RANLIB@ # See below--@X_TOOLKIT_TYPE@ is used below. USE_X_TOOLKIT=@X_TOOLKIT_TYPE@ - TOP = . - - AR = ar cq +AR = ar cq +RM = rm -f - LN = ln -s - RM = rm -f - - LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o - MOTIF_OBJS = lwlib-Xm.o +LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o +MOTIF_OBJS = lwlib-Xm.o TOOLKIT_DEFINES = - TOOLKIT_OBJS = $(@X_TOOLKIT_TYPE@_OBJS) +TOOLKIT_OBJS = $(@X_TOOLKIT_TYPE@_OBJS) - OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o +OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o # ../src is needed to find config.h. ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ diff -r 3ecfdde2a36c -r e14a0bf9fbd0 msdos/ChangeLog --- a/msdos/ChangeLog Thu May 06 06:11:19 2010 +0000 +++ b/msdos/ChangeLog Thu May 06 22:42:55 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-06 Glenn Morris + + * sed1v2.inp, sed5x.inp: Remove LN_S, unused. + 2010-04-01 Eli Zaretskii Remove support for DJGPP v1.x. diff -r 3ecfdde2a36c -r e14a0bf9fbd0 msdos/sed1v2.inp --- a/msdos/sed1v2.inp Thu May 06 06:11:19 2010 +0000 +++ b/msdos/sed1v2.inp Thu May 06 22:42:55 2010 +0000 @@ -2,8 +2,8 @@ # Configuration script for src/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -50,7 +50,6 @@ /^OTHER_FILES *=/s/@OTHER_FILES@// /^EXEEXT *=/s/@EXEEXT@/.exe/ /^version *=/s/@[^@\n]*@// -/^LN_S *=/s/@[^@\n]*@/ln -s/ /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// diff -r 3ecfdde2a36c -r e14a0bf9fbd0 msdos/sed5x.inp --- a/msdos/sed5x.inp Thu May 06 06:11:19 2010 +0000 +++ b/msdos/sed5x.inp Thu May 06 22:42:55 2010 +0000 @@ -2,8 +2,8 @@ # Configuration script for oldxmenu/makefile for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +# 2009, 2010 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -22,7 +22,6 @@ /^CC *=/s/@[^@\n]*@/gcc/ /^CPP *=/s/@[^@\n]*@/gcc -e/ /^CFLAGS *=/s/@[^@\n]*@/-O2 -g/ -/^LN_S *=/s/@[^@\n]*@/ln -s/ s/|| true// # arch-tag: 612a79be-2a02-4cb0-8dec-779aac0a2f4f diff -r 3ecfdde2a36c -r e14a0bf9fbd0 oldXMenu/ChangeLog --- a/oldXMenu/ChangeLog Thu May 06 06:11:19 2010 +0000 +++ b/oldXMenu/ChangeLog Thu May 06 22:42:55 2010 +0000 @@ -1,3 +1,11 @@ +2010-05-06 Glenn Morris + + * Makefile.in (RANLIB): Let configure set it. + (libXMenu11.a): configure sets RANLIB = : on systems without it. + + * Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE) + (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables. + 2010-05-04 Glenn Morris * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Use diff -r 3ecfdde2a36c -r e14a0bf9fbd0 oldXMenu/Makefile.in --- a/oldXMenu/Makefile.in Thu May 06 06:11:19 2010 +0000 +++ b/oldXMenu/Makefile.in Thu May 06 22:42:55 2010 +0000 @@ -15,8 +15,8 @@ ## without express or implied warranty. -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -## Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +## 2010 Free Software Foundation, Inc. ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ ## To the best of our knowledge, this code was originally based on the ## X11 oldXMenu Makefile, which was automatically generated from the -## X11 oldXMenu Imakefile. There was no explicit copyright information +## X11 oldXMenu Imakefile. There was no explicit copyright information ## in the Imakefile, therefore we have added the same MIT license as ## used by the rest of the oldXMenu code. @@ -53,24 +53,11 @@ EXTRA=insque.o CC=@CC@ CFLAGS=@CFLAGS@ -CPP=@CPP@ -LN_S=@LN_S@ - AS = as - LD = ld - TAGS = etags - RM = rm -f - MV = mv - RANLIB = ranlib +TAGS = etags +RM = rm -f +RANLIB = @RANLIB@ # Solaris 2.1 ar doesn't accept the 'l' option. - AR = ar cq - LS = ls - LINTOPTS = -axz - LINTLIBFLAG = -C - MAKE = make - STD_DEFINES = - CDEBUGFLAGS = -O - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \ - tags TAGS make.log +AR = ar cq OBJS = Activate.o \ AddPane.o \ @@ -110,11 +97,7 @@ libXMenu11.a: $(OBJS) $(EXTRA) $(RM) $@ $(AR) $@ $(OBJS) $(EXTRA) - @echo Do not be alarmed if the following ranlib command - @echo fails due to the absence of a ranlib program on your system. - -$(RANLIB) $@ || true -#If running ranlib fails, probably there is none. -#That's ok. So don't stop the build. + $(RANLIB) $@ Activate.o: Activate.c XMenuInt.h XMenu.h X10.h AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h diff -r 3ecfdde2a36c -r e14a0bf9fbd0 src/ChangeLog --- a/src/ChangeLog Thu May 06 06:11:19 2010 +0000 +++ b/src/ChangeLog Thu May 06 22:42:55 2010 +0000 @@ -1,3 +1,24 @@ +2010-05-06 Dan Nicolaescu + + Remove NEED_BSDTTY and NEED_UNISTD_H. + * s/hpux10-20.h (NEED_BSDTTY): Remove. + * s/aix4-2.h (NEED_UNISTD_H): Remove. + * systty.h: Simplify conditionals for including , + and . + + * emacs.c (main): Remove NO_DIR_LIBRARY conditional, unused. + + * Makefile.in (STARTFILES): Conditionally define to make the usage clear. + * s/gnu.h (START_FILES): Remove empty definition. + +2010-05-06 Jan Djärv + + * xterm.c (x_draw_image_relief): Move declaration of extra to beginning. + +2010-05-06 Glenn Morris + + * Makefile.in (CPP, LN_S): Remove unused variables. + 2010-05-05 Stefan Monnier * syntax.c (Fchar_syntax): Check the arg is a character (bug#6080). diff -r 3ecfdde2a36c -r e14a0bf9fbd0 src/Makefile.in --- a/src/Makefile.in Thu May 06 06:11:19 2010 +0000 +++ b/src/Makefile.in Thu May 06 22:42:55 2010 +0000 @@ -37,11 +37,9 @@ abs_builddir = @abs_builddir@ VPATH = $(srcdir) CC = @CC@ -CPP = @CPP@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ -LN_S = @LN_S@ EXEEXT = @EXEEXT@ version = @version@ # Substitute an assignment for the MAKE variable, because @@ -214,8 +212,11 @@ #define LD_SWITCH_X_SITE #endif +#ifdef START_FILES STARTFILES = START_FILES - +#else +STARTFILES = +#endif #ifdef NS_IMPL_GNUSTEP /* Pull in stuff from GNUstep-make. */ @@ -239,6 +240,7 @@ /* C_SWITCH_X_SITE must come before C_SWITCH_X_SYSTEM since it may have -I options that should override those two. */ +/* MYCPPFLAGS only referenced in etc/DEBUG. */ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} ${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} @C_SWITCH_X_SITE@ @C_SWITCH_X_SYSTEM@ ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS} ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ @@ -730,6 +732,7 @@ buildobj.h: Makefile echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h +/* FIXME LOCALCPP not defined or mentioned anywhere. */ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} #ifdef NS_IMPL_GNUSTEP $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ diff -r 3ecfdde2a36c -r e14a0bf9fbd0 src/emacs.c --- a/src/emacs.c Thu May 06 06:11:19 2010 +0000 +++ b/src/emacs.c Thu May 06 22:42:55 2010 +0000 @@ -1582,9 +1582,7 @@ syms_of_ccl (); syms_of_character (); syms_of_cmds (); -#ifndef NO_DIR_LIBRARY syms_of_dired (); -#endif /* not NO_DIR_LIBRARY */ syms_of_display (); syms_of_doc (); syms_of_editfns (); diff -r 3ecfdde2a36c -r e14a0bf9fbd0 src/s/aix4-2.h --- a/src/s/aix4-2.h Thu May 06 06:11:19 2010 +0000 +++ b/src/s/aix4-2.h Thu May 06 22:42:55 2010 +0000 @@ -109,9 +109,6 @@ It may not have been needed in certain earlier versions. */ #define HAVE_TCATTR -/* Include unistd.h, even though we don't define POSIX. */ -#define NEED_UNISTD_H - /* AIX doesn't define this. */ #define unix 1 diff -r 3ecfdde2a36c -r e14a0bf9fbd0 src/s/gnu.h --- a/src/s/gnu.h Thu May 06 06:11:19 2010 +0000 +++ b/src/s/gnu.h Thu May 06 22:42:55 2010 +0000 @@ -44,8 +44,6 @@ #define ORDINARY_LINK #define DATA_START ({ extern int data_start; (char *) &data_start; }) -#define START_FILES - /* Some losing code fails to include this and then assumes that because it is braindead that O_RDONLY==0. */ #ifndef NOT_C_CODE diff -r 3ecfdde2a36c -r e14a0bf9fbd0 src/s/hpux10-20.h --- a/src/s/hpux10-20.h Thu May 06 06:11:19 2010 +0000 +++ b/src/s/hpux10-20.h Thu May 06 22:42:55 2010 +0000 @@ -91,9 +91,6 @@ #define UNEXEC unexhp9k800.o -/* Include the file bsdtty.h, since this machine has job control. */ -#define NEED_BSDTTY - /* This is how to get the device name of the tty end of a pty. */ #define PTY_TTY_NAME_SPRINTF \ sprintf (pty_name, "/dev/pty/tty%c%x", c, i); diff -r 3ecfdde2a36c -r e14a0bf9fbd0 src/systty.h --- a/src/systty.h Thu May 06 06:11:19 2010 +0000 +++ b/src/systty.h Thu May 06 22:42:55 2010 +0000 @@ -51,11 +51,8 @@ #include #endif -#ifdef NEED_BSDTTY +#ifdef HPUX #include -#endif - -#if defined (HPUX) && defined (HAVE_PTYS) #include #endif @@ -63,7 +60,7 @@ #include #endif /* AIX */ -#if (defined (POSIX) || defined (NEED_UNISTD_H)) && defined (HAVE_UNISTD_H) +#ifdef HAVE_UNISTD_H #include #endif diff -r 3ecfdde2a36c -r e14a0bf9fbd0 src/xterm.c --- a/src/xterm.c Thu May 06 06:11:19 2010 +0000 +++ b/src/xterm.c Thu May 06 22:42:55 2010 +0000 @@ -2291,7 +2291,7 @@ x_draw_image_relief (s) struct glyph_string *s; { - int x0, y0, x1, y1, thick, raised_p; + int x0, y0, x1, y1, thick, raised_p, extra; XRectangle r; int x = s->x; int y = s->ybase - image_ascent (s->img, s->face, &s->slice); @@ -2322,7 +2322,7 @@ raised_p = s->img->relief > 0; } - int extra = s->face->id == TOOL_BAR_FACE_ID + extra = s->face->id == TOOL_BAR_FACE_ID ? XINT (Vtool_bar_button_margin) : 0; x0 = x - thick - extra;