From 122e9f8f29a92b6038b65a3b4f6ef31ad96e2cd5 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Wed, 16 Jul 2008 23:24:46 +0000 Subject: [PATCH] various small cleanups detailed in changelogs --- ChangeLog | 6 ++++++ configure.in | 16 ++++++++-------- lib-src/ChangeLog | 5 +++++ lib-src/Makefile.in | 9 ++++----- lisp/ChangeLog | 5 +++++ lisp/startup.el | 10 ++++------ nextstep/ChangeLog | 4 ++++ .../Emacs.base/Contents/Resources/Credits.html | 2 +- nextstep/FOR-RELEASE | 3 ++- src/ChangeLog | 9 +++++++++ src/Makefile.in | 12 ++++++------ src/frame.c | 2 +- src/keyboard.c | 15 --------------- src/syntax.c | 1 - 14 files changed, 55 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dce58cba9..bf8bfe8350 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-16 Adrian Robert + + * configure.in: Change GNUSTEP to NS_IMPL_GNUSTEP, COCOA to + NS_IMPL_COCOA. + * configure: Regenerate. + 2008-07-16 Glenn Morris * configure.in (with_kerberos, with_kerberos5, with_hesiod): diff --git a/configure.in b/configure.in index e6db75750f..94ffd228fc 100644 --- a/configure.in +++ b/configure.in @@ -1221,17 +1221,17 @@ if test "${with_carbon}" != no; then fi HAVE_NS=no -COCOA=no -GNUSTEP=no +NS_IMPL_COCOA=no +NS_IMPL_GNUSTEP=no tmp_CPPFLAGS="$CPPFLAGS" tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c" if test "${with_ns}" != no; then if test "${opsys}" = darwin; then - COCOA=yes + NS_IMPL_COCOA=yes 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_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" @@ -2062,13 +2062,13 @@ if test "${HAVE_NS}" = "yes"; then * ) ns_appdir=${ns_appdir_x} ;; esac 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.]) fi 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.]) 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.]) fi # 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 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 -# else /* COCOA */ +# else /* NS_IMPL_COCOA */ # define C_SWITCH_X_SYSTEM # define GNU_OBJC_CFLAGS -# endif /* COCOA */ +# endif /* NS_IMPL_COCOA */ #endif /* HAVE_NS */ diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 71f5809077..05bfc1934e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2008-07-16 Adrian Robert + + * Makefile.in: Change GNUSTEP to NS_IMPL_GNUSTEP, COCOA to + NS_IMPL_COCOA. + 2008-07-16 Dan Nicolaescu * ntlib.h (fcloseall, fgetchar, flushall, fputchar, putw): Remove, diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 9b537ecfbe..482103ddeb 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -144,7 +144,7 @@ MOVE_FLAGS= #define NOT_C_CODE #include "../src/config.h" -#if defined(COCOA) +#if defined(NS_IMPL_COCOA) /* Build these programs as universal binaries. */ CFLAGS := $(CFLAGS) -universal /* 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. */ .c.o: ${CC} -c ${CPP_CFLAGS} $< -#ifdef HAVE_NS + .m.o: -#ifdef GNUSTEP +#ifdef NS_IMPL_GNUSTEP $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString $< #else $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< #endif -#endif 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 \ -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" -#if defined(COCOA) +#if defined(NS_IMPL_COCOA) mac-fix-env: ${srcdir}/mac-fix-env.m $(CC) -o mac-fix-env ${srcdir}/mac-fix-env.m -prebind -framework Foundation #endif diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 513235108e..3a975feb1f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-07-16 Adrian Robert + + * 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 * progmodes/gdb-ui.el (gdb-create-define-alist): Don't create a diff --git a/lisp/startup.el b/lisp/startup.el index 33ad8a586c..c426c6c249 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -2087,12 +2087,10 @@ A fancy display is used on graphic displays, normal otherwise." (if (string-match "^--" (car tem)) (push (list (car tem)) longopts))) - ;; Add the long NS options to longopts. - (setq tem command-line-ns-option-alist) - (while tem - (if (string-match "^--" (car (car tem))) - (setq longopts (cons (list (car (car tem))) longopts))) - (setq tem (cdr tem))) + ;; Add the long NS options to longopts. + (dolist (tem command-line-ns-option-alist) + (if (string-match "^--" (car tem)) + (push (list (car tem)) longopts))) ;; Loop, processing options. (while command-line-args-left diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index f0d9c3a5da..6909f6a29f 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,7 @@ +2008-07-15 Adrian Robert + * Cocoa/Contents/Resources/Credits.html: Change URL from sf.net to + GNU.org. + 2008-07-15 Adrian Robert * FOR-RELEASE: Remove historical info. diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html b/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html index 8e7cdc676e..c053cfadc3 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html @@ -1,4 +1,4 @@ -http://emacs-app.sf.net +http://www.gnu.org/software/emacs diff --git a/nextstep/FOR-RELEASE b/nextstep/FOR-RELEASE index df02afc0d8..39be79946b 100644 --- a/nextstep/FOR-RELEASE +++ b/nextstep/FOR-RELEASE @@ -1,9 +1,10 @@ -*- outline -*- * BUGS -** Fix char_quoted's workaround. * 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. ** free_frame_resources, face colors diff --git a/src/ChangeLog b/src/ChangeLog index 6351e0168f..a47586e08c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2008-07-16 Adrian Robert + + * 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 * nsterm.m (lisp_to_mod): Use parse_solitary_modifier instead. diff --git a/src/Makefile.in b/src/Makefile.in index 8f2c2f8805..a715b83be2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -113,7 +113,7 @@ SHELL=/bin/sh #endif /* Under GNUstep, putting libc on the link line causes problems. */ -#ifdef GNUSTEP +#ifdef NS_IMPL_GNUSTEP #define LIB_STANDARD #endif @@ -234,7 +234,7 @@ STARTFILES = START_FILES #endif /* not ORDINARY_LINK */ -#ifdef GNUSTEP +#ifdef NS_IMPL_GNUSTEP /* Pull in stuff from GNUstep-make. */ FOUNDATION_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 \ fontset.o fringe.o image.o emacsapp = $(PWD)/../nextstep/build/Emacs.app/ -#ifdef GNUSTEP +#ifdef NS_IMPL_GNUSTEP emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base emacsbindir = $(emacsapp) #else emacsappsrc = ${srcdir}/../nextstep/Cocoa/Emacs.base emacsbindir = $(emacsapp)/Contents/MacOS/ -#endif /* GNUSTEP */ +#endif /* NS_IMPL_GNUSTEP */ #endif /* HAVE_NS */ #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} 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} #else $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ @@ -1355,7 +1355,7 @@ mostlyclean: rm -f buildobj.lst clean: mostlyclean rm -f emacs-*.*.*${EXEEXT} emacs${EXEEXT} -#ifdef GNUSTEP +#ifdef NS_IMPL_GNUSTEP rm -f *.d #endif /* bootstrap-clean is used to clean up just before a bootstrap. diff --git a/src/frame.c b/src/frame.c index d297501343..88cabc2ac8 100644 --- a/src/frame.c +++ b/src/frame.c @@ -206,7 +206,7 @@ DEFUN ("framep", Fframep, Sframep, 1, 1, 0, Value is t for a termcap frame (a character-only terminal), `x' for an Emacs frame that is really an X window, `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, `pc' for a direct-write MS-DOS frame. See also `frame-live-p'. */) diff --git a/src/keyboard.c b/src/keyboard.c index 219b42c245..716d1101aa 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -7308,10 +7308,6 @@ tty_read_avail_input (struct terminal *terminal, void handle_async_input () { -#ifdef BSD4_1 - extern int select_alarmed; -#endif - interrupt_input_pending = 0; while (1) @@ -7323,10 +7319,6 @@ handle_async_input () 0 means there was no keyboard input available. */ if (nread <= 0) 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); #endif /* USG */ -#ifdef BSD4_1 - sigisheld (SIGIO); -#endif - #ifdef SYNC_INPUT interrupt_input_pending = 1; #else @@ -7362,9 +7350,6 @@ input_available_signal (signo) handle_async_input (); #endif -#ifdef BSD4_1 - sigfree (); -#endif errno = old_errno; } #endif /* SIGIO */ diff --git a/src/syntax.c b/src/syntax.c index 0c547c724c..541411b4d2 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1,4 +1,3 @@ -#include /* GNU Emacs routines to deal with syntax tables; also word and list parsing. Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -- 2.20.1