Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.8578
diff -u -r1.8578 ChangeLog
--- lisp/ChangeLog	14 Nov 2005 21:04:26 -0000	1.8578
+++ lisp/ChangeLog	14 Nov 2005 21:58:06 -0000
@@ -1,3 +1,8 @@
+2005-11-14  Edward O'Connor  <hober0@gmail.com>  (tiny change)
+
+	* emulation/viper.el (viper-emacs-state-mode-list): Ensure that
+	`rcirc-mode' buffers come up in Emacs state.
+
 2005-11-14  Romain Francoise  <romain@orebokech.com>
 
 	* dired-x.el: If `vm-visit-folder' doesn't exist, define it as a
Index: lisp/emulation/viper.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper.el,v
retrieving revision 1.87
diff -u -r1.87 viper.el
--- lisp/emulation/viper.el	23 Oct 2005 12:47:10 -0000	1.87
+++ lisp/emulation/viper.el	14 Nov 2005 21:58:07 -0000
@@ -440,6 +440,8 @@
     Buffer-menu-mode
     compilation-mode
 
+    rcirc-mode
+
     view-mode
     vm-mode
     vm-summary-mode)