diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | doc/Makefile.am | 1 | ||||
| -rw-r--r-- | doc/ratpoison.texi | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/actions.c | 2 |
8 files changed, 22 insertions, 20 deletions
@@ -1,5 +1,12 @@ 2001-03-02 shawn <sabetts@diggin.lamenet.tmp> + * Makefile.am (SUBDIRS): removed man/ + + * configure.in (AC_OUTPUT): removed man/Makefile + removed references to emacs. + + * doc/Makefile.am (man_MANS): ratpoison.1 moved to doc/ + * doc/ratpoison.texi: minor updates. * man/ratpoison.1: added changes from texinfo docs. diff --git a/Makefile.am b/Makefile.am index 3b39e52..aa4adc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ## -## $Id: Makefile.am,v 1.6 2001/02/26 01:47:38 sabetts Exp $ +## $Id: Makefile.am,v 1.7 2001/03/02 09:40:59 sabetts Exp $ PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -27,7 +27,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 \ config.guess config.h.in config.sub configure \ install-sh missing mkinstalldirs stamp-h.in -SUBDIRS = src doc man +SUBDIRS = src doc docdir = $(datadir)/doc/$(PACKAGE) doc_DATA = AUTHORS COPYING ChangeLog NEWS README @@ -1,6 +1,11 @@ ratpoison NEWS --- history of user-visible changes. -*- outline -*- * Changes Since 0.0.5 +** C-t e removed + +Since you can custo your own keystrokes, there's not much sense +cluttering things with a binding to launch emacs. + ** XErrorEvents don't bring down ratpoison A friendly message pops up displaying the error message. This does diff --git a/configure.in b/configure.in index 7e43134..1c0d6be 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl $Id: configure.in,v 1.14 2001/02/26 01:47:38 sabetts Exp $ +dnl $Id: configure.in,v 1.15 2001/03/02 09:40:59 sabetts Exp $ AC_INIT(src/main.c) AM_INIT_AUTOMAKE(ratpoison, 0.0.6-cvs) @@ -42,10 +42,6 @@ AC_ARG_WITH(xterm, [ --with-xterm=PROG set the x terminal emulator used b 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) @@ -57,12 +53,6 @@ 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 AC_PATH_XTRA @@ -87,4 +77,4 @@ dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for library functions. AC_TYPE_SIGNAL -AC_OUTPUT(Makefile doc/Makefile src/Makefile man/Makefile) +AC_OUTPUT(Makefile doc/Makefile src/Makefile) diff --git a/doc/Makefile.am b/doc/Makefile.am index 96a2f8b..fb58769 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1 +1,2 @@ +man_MANS = ratpoison.1 info_TEXINFOS = ratpoison.texi diff --git a/doc/ratpoison.texi b/doc/ratpoison.texi index 203d885..9499484 100644 --- a/doc/ratpoison.texi +++ b/doc/ratpoison.texi @@ -198,10 +198,6 @@ Open a new X terminal. @item C-t C-: This allows you to execute a single ratpoison command. -@item C-t e -@item C-t C-e -Run Emacs (you know you want to). - @item C-t ! Run a shell command. diff --git a/src/ChangeLog b/src/ChangeLog index 21151e8..42f8834 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-03-02 shawn <sabetts@diggin.lamenet.tmp> + + * actions.c (initialize_default_keybindings): removed emacs + binding. + 2001-03-01 Ryan Yeske <rcyeske@cut.hotdog.tmp> * ratpoison.h (xmalloc, xrealloc, fatal): Prototype. diff --git a/src/actions.c b/src/actions.c index 32c8059..f01a836 100644 --- a/src/actions.c +++ b/src/actions.c @@ -113,8 +113,6 @@ initialize_default_keybindings (void) 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"); |