From: Michael Kifer <kifer@cs.stonybrook.edu>
Date: Tue, 15 Nov 2005 18:44:30 +0000 (+0000)
Subject: 2005-11-15  Michael Kifer  <kifer@cs.stonybrook.edu>
X-Git-Tag: emacs-pretest-22.0.90~5884
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=54b171c787f722dec1fb965fd46b6fc0c70c168a;p=emacs.git

2005-11-15  Michael Kifer  <kifer@cs.stonybrook.edu>

	* viper-utils (viper-non-word-characters-reformed-vi): quote `-' in
	string.

	* viper.el (viper-emacs-state-mode-list): Ensure that
	rcirc-mode buffers come up in Emacs state.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 185bfdacab6..99ec4d32b9a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-15  Michael Kifer  <kifer@cs.stonybrook.edu>
+	
+	* viper-utils (viper-non-word-characters-reformed-vi): quote `-' in
+	string.
+	
+	* viper.el (viper-emacs-state-mode-list): Ensure that
+	rcirc-mode buffers come up in Emacs state.
+
 2005-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* term.el (term-termcap-format): Fix typos.
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index d0b9b34e4d6..def90669885 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1242,8 +1242,12 @@ the `Local variables' section of a file."
 
 ;; Characters that should not be considered as part of the word, in reformed-vi
 ;; syntax mode.
+;; Note: \\ (quoted \) must appear before `-' because this string is listified
+;; into characters at some point and then put back to string. The result is
+;; used in skip-chars-forward, which treats - specially. Here we achieve the
+;; effect of quoting - and preventing it from being special.
 (defconst viper-non-word-characters-reformed-vi
-  "!@#$%^&*()-+=|\\~`{}[];:'\",<.>/?")
+  "!@#$%^&*()\\-+=|\\~`{}[];:'\",<.>/?")
 ;; These are characters that are not to be considered as parts of a word in
 ;; Viper.
 ;; Set each time state changes and at loading time
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 71b9347b8b0..7bcaf8be399 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -440,6 +440,8 @@ widget."
     Buffer-menu-mode
     compilation-mode
 
+    rcirc-mode
+
     view-mode
     vm-mode
     vm-summary-mode)