2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>

	* ediff-hooks.el: Put back the autoloads (for compatibility with XEmacs).

	* ediff-init.el: Use defalias instead of fset.

	* ediff-util.el: Use defalias instead of fset.

	* viper-util.el (viper-chars-in-region): simplification.

	* viper.el (viper-emacs-state-mode-list): added modes.

2 files changed, 13 insertions, 6 deletions

diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index bb748fcadfc..2bbdb828ff6 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -264,13 +264,16 @@
     (goto-char cur-pos)
     result))
 
-;; Emacs counts each multibyte character as several positions in the buffer, so
-;; we use Emacs' chars-in-region.  XEmacs is counting each char as just one pos,
-;; so we can simply subtract. 
+;; Emacs used to count each multibyte character as several positions in the buffer,
+;; so we had to use Emacs' chars-in-region to count characters. Since 20.3,
+;; Emacs counts multibyte characters as 1 position.  XEmacs has always been
+;; counting each char as just one pos. So, now we can simply subtract beg from
+;; end to determine the number of characters in a region.
 (defun viper-chars-in-region (beg end &optional preserve-sign)
-  (let ((count (abs (if (fboundp 'chars-in-region)
-                        (chars-in-region beg end)
-                      (- end beg)))))
+  ;;(let ((count (abs (if (fboundp 'chars-in-region)
+  ;;                    (chars-in-region beg end)
+  ;;                  (- end beg)))))
+  (let ((count (abs (- end beg))))
     (if (and (< end beg) preserve-sign)
         (- count)
       count)))
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 27bcf021e80..50b5d82dff0 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -422,6 +422,10 @@ widget."
     efs-mode
     tar-mode
 
+    browse-kill-ring-mode
+    recentf-mode
+    occur-mode
+
     mh-folder-mode
     mail-mode
     gnus-group-mode