diff -ur ratpoison/acconfig.h ratpoison-noemacs/acconfig.h --- ratpoison/acconfig.h Fri Feb 16 04:53:22 2001 +++ ratpoison-noemacs/acconfig.h Sun Feb 25 19:22:46 2001 @@ -1,9 +1,3 @@ /* When defined, ratpoison will print debugging information */ #undef DEBUG -/* X terminal emulator to user */ -#undef TERM_PROG - -/* name of emacs program */ -#undef EMACS_PROG - diff -ur ratpoison/configure.in ratpoison-noemacs/configure.in --- ratpoison/configure.in Thu Feb 22 05:14:15 2001 +++ ratpoison-noemacs/configure.in Sun Feb 25 19:22:28 2001 @@ -38,30 +38,10 @@ AC_MSG_RESULT(no) fi],[AC_MSG_RESULT(no)]) -AC_ARG_WITH(xterm, [ --with-xterm=PROG set the x terminal emulator used by ratpoison ], -term_prog=$withval, term_prog="xterm") -AC_DEFINE_UNQUOTED(TERM_PROG,"$term_prog") - -AC_ARG_WITH(emacs, [ --with-emacs=PROG set the Emacs used by ratpoison ], -emacs_prog=$withval, emacs_prog="emacs") -AC_DEFINE_UNQUOTED(EMACS_PROG,"$emacs_prog") - dnl Checks for programs. CFLAGS="$CFLAGS -Wall -g" AC_CHECK_TOOL(CC, gcc) AC_PROG_CC - -dnl check for an x terminal emulator -AC_CHECK_PROG(TERM_PROG,$term_prog,yes,no) -if test x$TERM_PROG = xno; then - AC_MSG_ERROR([*** Can't find x terminal emulator \`$term_prog']) -fi - -dnl check for an Emacs (we dont really want to do this, c'mon) -AC_CHECK_PROG(EMACS_PROG,$emacs_prog,yes,no) -if test x$EMACS_PROG = xno; then - AC_MSG_WARN([*** Can't find Emacs \`$emacs_prog']) -fi dnl Check for the X libs AC_PATH_X diff -ur ratpoison/debian/rules ratpoison-noemacs/debian/rules --- ratpoison/debian/rules Thu Feb 15 20:26:03 2001 +++ ratpoison-noemacs/debian/rules Sun Feb 25 19:23:49 2001 @@ -32,7 +32,6 @@ --prefix=/usr \ --infodir=/usr/share/info \ --mandir=/usr/share/man \ - --with-xterm=x-terminal-emulator \ --disable-debug --build=$(DEB_BUILD_GNU_TYPE) \ --host=$(DEB_HOST_GNU_TYPE) diff -ur ratpoison/src/actions.c ratpoison-noemacs/src/actions.c --- ratpoison/src/actions.c Sat Feb 24 22:46:48 2001 +++ ratpoison-noemacs/src/actions.c Sun Feb 25 19:28:37 2001 @@ -107,13 +107,7 @@ add_keybinding (XK_Return, C, "next"); add_keybinding (XK_a, 0, "clock"); add_keybinding (XK_a, C, "clock"); - add_keybinding (XK_c, 0, "exec " TERM_PROG); - add_keybinding (XK_c, C, "exec " TERM_PROG); add_keybinding (XK_colon, 0, "colon"); - add_keybinding (XK_e, 0, "exec " EMACS_PROG); - add_keybinding (XK_e, C, "exec " EMACS_PROG); - add_keybinding (XK_exclam, 0, "exec"); - add_keybinding (XK_exclam, C, "colon exec " TERM_PROG " -e "); add_keybinding (XK_k, 0, "delete"); add_keybinding (XK_k, C, "delete"); add_keybinding (XK_m, 0, "maximize"); diff -ur ratpoison/src/main.c ratpoison-noemacs/src/main.c --- ratpoison/src/main.c Sun Feb 25 01:47:51 2001 +++ ratpoison-noemacs/src/main.c Sun Feb 25 19:36:41 2001 @@ -211,8 +211,9 @@ { PRINT_DEBUG ("rcfile line: %s\n", line); - /* do it */ - command (line); + /* do it - unless it's a comment */ + if(line[0] != '#') + command (line); *line = '\0'; }