removal of erc-viper.el

[Edward O'Connor]

Hi,

In January of last year I installed into ERC erc-viper.el, which
exists solely to work around the fact that Viper doesn't know anything
about ERC, and needs to in order for the two modes to interact together
nicely.

Now that ERC has been installed into Emacs, the hacks in erc-viper.el
can be integrated into Viper itself, thus removing the need for
erc-viper.el entirely.

Attached is a patch that does precisely that (except for the actual
removal of erc-viper.el, which should be done by whomever applies this
patch). I've tested these changes locally, and all appears well.

I don't have papers on file for Emacs, but I believe this patch can be
applied anyway: the changes to Viper (excepting ChangeLog entries) add
up to only 5 lines, and while the changes to ERC total to more than 10
lines, I have papers on file for ERC. Nevertheless, I'm quite willing to
sign papers for Emacs, should it be necessary.


Thanks,
Ted

-- 
Edward O'Connor
address@hidden

Ense petit placidam sub libertate quietem.

? mac/Emacs.app/Contents/Resources/Emacs.rsrc
Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.9037
diff -u -c -r1.9037 ChangeLog
*** lisp/ChangeLog      29 Jan 2006 02:49:03 -0000      1.9037
--- lisp/ChangeLog      29 Jan 2006 19:56:32 -0000
***************
*** 1,3 ****
--- 1,12 ----
+ 2006-01-29  Edward O'Connor  <address@hidden>
+ 
+       * emulation/viper.el (viper-major-mode-modifier-list): Add
+       insert-state and vi-state entries for erc-mode.
+       (viper-go-away, viper-set-hooks): Add and remove
+       viper-comint-mode-hook from erc-mode-hook as appropriate.
+ 
+       * emulation/viper.el (viper-insert-state-mode-list): Add erc-mode.
+ 
  2006-01-29  Juanma Barranquero  <address@hidden>
  
        * bs.el (bs--format-aux): Implement `middle' alignment as
Index: lisp/emulation/viper.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper.el,v
retrieving revision 1.89
diff -u -c -r1.89 viper.el
*** lisp/emulation/viper.el     25 Nov 2005 07:18:07 -0000      1.89
--- lisp/emulation/viper.el     29 Jan 2006 19:56:33 -0000
***************
*** 458,463 ****
--- 458,464 ----
    '(internal-ange-ftp-mode
      comint-mode
      inferior-emacs-lisp-mode
+     erc-mode
      eshell-mode
      shell-mode)
    "*A list of major modes that should come up in Vi Insert state."
***************
*** 494,499 ****
--- 495,502 ----
      (gnus-summary-mode emacs-state viper-gnus-modifier-map)
      (Info-mode emacs-state viper-slash-and-colon-map)
      (Buffer-menu-mode emacs-state viper-slash-and-colon-map)
+     (erc-mode insert-state viper-comint-mode-modifier-map)
+     (erc-mode vi-state viper-comint-mode-modifier-map)
      )
    "List specifying how to modify the various major modes to enable some 
Viperisms.
  The list has the structure: ((mode viper-state keymap) (mode viper-state
***************
*** 768,773 ****
--- 771,777 ----
    ;; remove all hooks set by viper
    (mapatoms 'viper-remove-hooks)
    (remove-hook 'comint-mode-hook 'viper-comint-mode-hook)
+   (remove-hook 'erc-mode-hook 'viper-comint-mode-hook)
    (remove-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel)
    (remove-hook 'change-major-mode-hook 'viper-major-mode-change-sentinel)
    (remove-hook 'post-command-hook 'viper-minibuffer-post-command-hook)
***************
*** 913,918 ****
--- 917,923 ----
  
    ;; Emacs shell, ange-ftp, and comint-based modes
    (add-hook 'comint-mode-hook 'viper-comint-mode-hook) ; comint
+   (add-hook 'erc-mode-hook 'viper-comint-mode-hook) ; ERC
  
    (add-hook 'eshell-mode-hook
            (lambda () (setq viper-auto-indent nil)))
Index: lisp/erc/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/erc/ChangeLog,v
retrieving revision 1.1
diff -u -c -r1.1 ChangeLog
*** lisp/erc/ChangeLog  29 Jan 2006 13:08:57 -0000      1.1
--- lisp/erc/ChangeLog  29 Jan 2006 19:56:34 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2006-01-29  Edward O'Connor  <address@hidden>
+ 
+       * erc-viper.el: Remove. Now that ERC is included in Emacs, these
+       work-arounds live in Viper itself.
+       
  2006-01-28  Michael Olson  <address@hidden>
  
        * erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs