mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

various small cleanups detailed in changelogs

Browse source
This commit is contained in:
Adrian Robert 2008-07-16 23:24:46 +00:00
parent cf7238adf9
commit 122e9f8f29
14 changed files with 55 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-07-16 Adrian Robert <Adrian.B.Robert@gmail.com>
* configure.in: Change GNUSTEP to NS_IMPL_GNUSTEP, COCOA to
NS_IMPL_COCOA.
* configure: Regenerate.
2008-07-16 Glenn Morris <rgm@gnu.org> 2008-07-16 Glenn Morris <rgm@gnu.org>
* configure.in (with_kerberos, with_kerberos5, with_hesiod): * configure.in (with_kerberos, with_kerberos5, with_hesiod):

16
configure.in
View file

@ -1221,17 +1221,17 @@ if test "${with_carbon}" != no; then
fi fi
HAVE_NS=no HAVE_NS=no
COCOA=no NS_IMPL_COCOA=no
GNUSTEP=no NS_IMPL_GNUSTEP=no
tmp_CPPFLAGS="$CPPFLAGS" tmp_CPPFLAGS="$CPPFLAGS"
tmp_CFLAGS="$CFLAGS" tmp_CFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -x objective-c" CPPFLAGS="$CPPFLAGS -x objective-c"
CFLAGS="$CFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c"
if test "${with_ns}" != no; then if test "${with_ns}" != no; then
if test "${opsys}" = darwin; then if test "${opsys}" = darwin; then
COCOA=yes NS_IMPL_COCOA=yes
elif test -f /etc/GNUstep/GNUstep.conf; then elif test -f /etc/GNUstep/GNUstep.conf; then
GNUSTEP=yes NS_IMPL_GNUSTEP=yes
GNUSTEP_SYSTEM_HEADERS="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_HEADERS="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)"
GNUSTEP_SYSTEM_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)" GNUSTEP_SYSTEM_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)"
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
@ -2062,13 +2062,13 @@ if test "${HAVE_NS}" = "yes"; then
* ) ns_appdir=${ns_appdir_x} ;; * ) ns_appdir=${ns_appdir_x} ;;
esac esac
fi fi
if test "${COCOA}" = "yes"; then if test "${NS_IMPL_COCOA}" = "yes"; then
AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing under MacOS X.]) AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing under MacOS X.])
fi fi
if test "${EN_COCOA_EXPERIMENTAL_CTRL_G}" = "yes"; then if test "${EN_COCOA_EXPERIMENTAL_CTRL_G}" = "yes"; then
AC_DEFINE(COCOA_EXPERIMENTAL_CTRL_G, 1, [Define to 1 if you are trying experimental enhanced Ctrl-g support using NS windowing under MacOS X.]) AC_DEFINE(COCOA_EXPERIMENTAL_CTRL_G, 1, [Define to 1 if you are trying experimental enhanced Ctrl-g support using NS windowing under MacOS X.])
fi fi
if test "${GNUSTEP}" = "yes"; then if test "${NS_IMPL_GNUSTEP}" = "yes"; then
AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.])
fi fi
# We also have mouse menus. # We also have mouse menus.
@ -2637,10 +2637,10 @@ AH_BOTTOM([
# define LD_SWITCH_SITE -lgnustep-gui -lgnustep-base -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread # define LD_SWITCH_SITE -lgnustep-gui -lgnustep-base -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread
# define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE # define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE
# define OTHER_FILES ns-app # define OTHER_FILES ns-app
# else /* COCOA */ # else /* NS_IMPL_COCOA */
# define C_SWITCH_X_SYSTEM # define C_SWITCH_X_SYSTEM
# define GNU_OBJC_CFLAGS # define GNU_OBJC_CFLAGS
# endif /* COCOA */ # endif /* NS_IMPL_COCOA */
#endif /* HAVE_NS */ #endif /* HAVE_NS */

5
lib-src/ChangeLog
View file

@ -1,3 +1,8 @@
2008-07-16 Adrian Robert <Adrian.B.Robert@gmail.com>
* Makefile.in: Change GNUSTEP to NS_IMPL_GNUSTEP, COCOA to
NS_IMPL_COCOA.
2008-07-16 Dan Nicolaescu <dann@ics.uci.edu> 2008-07-16 Dan Nicolaescu <dann@ics.uci.edu>
* ntlib.h (fcloseall, fgetchar, flushall, fputchar, putw): Remove, * ntlib.h (fcloseall, fgetchar, flushall, fputchar, putw): Remove,

9
lib-src/Makefile.in
View file

@ -144,7 +144,7 @@ MOVE_FLAGS=
#define NOT_C_CODE #define NOT_C_CODE
#include "../src/config.h" #include "../src/config.h"
#if defined(COCOA) #if defined(NS_IMPL_COCOA)
/* Build these programs as universal binaries. */ /* Build these programs as universal binaries. */
CFLAGS := $(CFLAGS) -universal CFLAGS := $(CFLAGS) -universal
/* Add mac-fix-env for OS X systems running NS version. */ /* Add mac-fix-env for OS X systems running NS version. */
@ -278,14 +278,13 @@ BASE_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
Using an explicit command made it work. */ Using an explicit command made it work. */
.c.o: .c.o:
${CC} -c ${CPP_CFLAGS} $< ${CC} -c ${CPP_CFLAGS} $<
#ifdef HAVE_NS
.m.o: .m.o:
#ifdef GNUSTEP #ifdef NS_IMPL_GNUSTEP
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString $< $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString $<
#else #else
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
#endif #endif
#endif
all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
@ -483,7 +482,7 @@ update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H)
$(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \
-DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\""
#if defined(COCOA) #if defined(NS_IMPL_COCOA)
mac-fix-env: ${srcdir}/mac-fix-env.m mac-fix-env: ${srcdir}/mac-fix-env.m
$(CC) -o mac-fix-env ${srcdir}/mac-fix-env.m -prebind -framework Foundation $(CC) -o mac-fix-env ${srcdir}/mac-fix-env.m -prebind -framework Foundation
#endif #endif

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2008-07-16 Adrian Robert <Adrian.B.Robert@gmail.com>
* startup.el (command-line-1): Update processing of NS long options to
mimic recent changes to processing of X long options.
2008-07-16 Nick Roberts <nickrob@snap.net.nz> 2008-07-16 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-create-define-alist): Don't create a * progmodes/gdb-ui.el (gdb-create-define-alist): Don't create a

10
lisp/startup.el
View file

@ -2087,12 +2087,10 @@ A fancy display is used on graphic displays, normal otherwise."
(if (string-match "^--" (car tem)) (if (string-match "^--" (car tem))
(push (list (car tem)) longopts))) (push (list (car tem)) longopts)))
;; Add the long NS options to longopts. ;; Add the long NS options to longopts.
(setq tem command-line-ns-option-alist) (dolist (tem command-line-ns-option-alist)
(while tem (if (string-match "^--" (car tem))
(if (string-match "^--" (car (car tem))) (push (list (car tem)) longopts)))
(setq longopts (cons (list (car (car tem))) longopts)))
(setq tem (cdr tem)))
;; Loop, processing options. ;; Loop, processing options.
(while command-line-args-left (while command-line-args-left

4
nextstep/ChangeLog
View file

@ -1,3 +1,7 @@
2008-07-15 Adrian Robert <Adrian.B.Robert@gmail.com>
* Cocoa/Contents/Resources/Credits.html: Change URL from sf.net to
GNU.org.
2008-07-15 Adrian Robert <Adrian.B.Robert@gmail.com> 2008-07-15 Adrian Robert <Adrian.B.Robert@gmail.com>
* FOR-RELEASE: Remove historical info. * FOR-RELEASE: Remove historical info.

2
nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html
View file

@ -1,4 +1,4 @@
<font face="lucida grande" size="-1"><a href="http://emacs-app.sf.net">http://emacs-app.sf.net</a></font> <font face="lucida grande" size="-1"><a href="http://www.gnu.org/software/emacs">http://www.gnu.org/software/emacs</a></font>
<!-- arch-tag: cc455793-f594-45c6-822c-f4a7bb362c15 <!-- arch-tag: cc455793-f594-45c6-822c-f4a7bb362c15
(do not change this comment) --> (do not change this comment) -->

3
nextstep/FOR-RELEASE
View file

@ -1,9 +1,10 @@
-*- outline -*- -*- outline -*-
* BUGS * BUGS
** Fix char_quoted's workaround.
* NON-SPECIFIC * NON-SPECIFIC
** Find out why char_quoted() in syntax.c gets called with Fix char_quoted's workaround.
** Remove Feval calls relating to insert working text in isearch mode. ** Remove Feval calls relating to insert working text in isearch mode.
** free_frame_resources, face colors ** free_frame_resources, face colors

9
src/ChangeLog
View file

@ -1,3 +1,12 @@
2008-07-16 Adrian Robert <Adrian.B.Robert@gmail.com>
* syntax.c: Remove stdio.h include accidentally introduced in
Emacs.app commit.
* Makefile.in: Change GNUSTEP to NS_IMPL_GNUSTEP, COCOA to
NS_IMPL_COCOA.
* keyboard.c (handle_async_input, input_available_signal): Remove
BSD4_1 conditional code, introduced accidentally in Emacs.app commit.
2008-07-16 Stefan Monnier <monnier@iro.umontreal.ca> 2008-07-16 Stefan Monnier <monnier@iro.umontreal.ca>
* nsterm.m (lisp_to_mod): Use parse_solitary_modifier instead. * nsterm.m (lisp_to_mod): Use parse_solitary_modifier instead.

12
src/Makefile.in
View file

@ -113,7 +113,7 @@ SHELL=/bin/sh
#endif #endif
/* Under GNUstep, putting libc on the link line causes problems. */ /* Under GNUstep, putting libc on the link line causes problems. */
#ifdef GNUSTEP #ifdef NS_IMPL_GNUSTEP
#define LIB_STANDARD #define LIB_STANDARD
#endif #endif
@ -234,7 +234,7 @@ STARTFILES = START_FILES
#endif /* not ORDINARY_LINK */ #endif /* not ORDINARY_LINK */
#ifdef GNUSTEP #ifdef NS_IMPL_GNUSTEP
/* Pull in stuff from GNUstep-make. */ /* Pull in stuff from GNUstep-make. */
FOUNDATION_LIB=gnu FOUNDATION_LIB=gnu
GUI_LIB=gnu GUI_LIB=gnu
@ -535,13 +535,13 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/
NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
fontset.o fringe.o image.o fontset.o fringe.o image.o
emacsapp = $(PWD)/../nextstep/build/Emacs.app/ emacsapp = $(PWD)/../nextstep/build/Emacs.app/
#ifdef GNUSTEP #ifdef NS_IMPL_GNUSTEP
emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base
emacsbindir = $(emacsapp) emacsbindir = $(emacsapp)
#else #else
emacsappsrc = ${srcdir}/../nextstep/Cocoa/Emacs.base emacsappsrc = ${srcdir}/../nextstep/Cocoa/Emacs.base
emacsbindir = $(emacsapp)/Contents/MacOS/ emacsbindir = $(emacsapp)/Contents/MacOS/
#endif /* GNUSTEP */ #endif /* NS_IMPL_GNUSTEP */
#endif /* HAVE_NS */ #endif /* HAVE_NS */
#ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_WINDOW_SYSTEM
@ -969,7 +969,7 @@ ${libsrc}make-docfile${EXEEXT}:
temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT} temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
#ifdef GNUSTEP #ifdef NS_IMPL_GNUSTEP
$(CC) -rdynamic YMF_PASS_LDFLAGS (${TEMACS_LDFLAGS}) -o temacs ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES} $(CC) -rdynamic YMF_PASS_LDFLAGS (${TEMACS_LDFLAGS}) -o temacs ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES}
#else #else
$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
@ -1355,7 +1355,7 @@ mostlyclean:
rm -f buildobj.lst rm -f buildobj.lst
clean: mostlyclean clean: mostlyclean
rm -f emacs-*.*.*${EXEEXT} emacs${EXEEXT} rm -f emacs-*.*.*${EXEEXT} emacs${EXEEXT}
#ifdef GNUSTEP #ifdef NS_IMPL_GNUSTEP
rm -f *.d rm -f *.d
#endif #endif
/* bootstrap-clean is used to clean up just before a bootstrap. /* bootstrap-clean is used to clean up just before a bootstrap.

2
src/frame.c
View file

@ -206,7 +206,7 @@ DEFUN ("framep", Fframep, Sframep, 1, 1, 0,
Value is t for a termcap frame (a character-only terminal), Value is t for a termcap frame (a character-only terminal),
`x' for an Emacs frame that is really an X window, `x' for an Emacs frame that is really an X window,
`w32' for an Emacs frame that is a window on MS-Windows display, `w32' for an Emacs frame that is a window on MS-Windows display,
`mac' for an Emacs frame on a Macintosh 8/9 X-Carbon display, `mac' for an Emacs frame on a Macintosh Carbon display,
`ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, `ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display,
`pc' for a direct-write MS-DOS frame. `pc' for a direct-write MS-DOS frame.
See also `frame-live-p'. */) See also `frame-live-p'. */)

15
src/keyboard.c
View file

@ -7308,10 +7308,6 @@ tty_read_avail_input (struct terminal *terminal,
void void
handle_async_input () handle_async_input ()
{ {
#ifdef BSD4_1
extern int select_alarmed;
#endif
interrupt_input_pending = 0; interrupt_input_pending = 0;
while (1) while (1)
@ -7323,10 +7319,6 @@ handle_async_input ()
0 means there was no keyboard input available. */ 0 means there was no keyboard input available. */
if (nread <= 0) if (nread <= 0)
break; break;
#ifdef BSD4_1
select_alarmed = 1; /* Force the select emulator back to life */
#endif
} }
} }
@ -7345,10 +7337,6 @@ input_available_signal (signo)
signal (signo, input_available_signal); signal (signo, input_available_signal);
#endif /* USG */ #endif /* USG */
#ifdef BSD4_1
sigisheld (SIGIO);
#endif
#ifdef SYNC_INPUT #ifdef SYNC_INPUT
interrupt_input_pending = 1; interrupt_input_pending = 1;
#else #else
@ -7362,9 +7350,6 @@ input_available_signal (signo)
handle_async_input (); handle_async_input ();
#endif #endif
#ifdef BSD4_1
sigfree ();
#endif
errno = old_errno; errno = old_errno;
} }
#endif /* SIGIO */ #endif /* SIGIO */

1
src/syntax.c
View file

@ -1,4 +1,3 @@
#include <stdio.h>
/* GNU Emacs routines to deal with syntax tables; also word and list parsing. /* GNU Emacs routines to deal with syntax tables; also word and list parsing.
Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001, Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 2002, 2003, 2004, 2005, 2006, 2007, 2008