From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Edward O'Connor Newsgroups: gmane.emacs.devel Subject: removal of erc-viper.el Date: Sun, 29 Jan 2006 12:24:24 -0800 Organization: Church of Emacs Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: sea.gmane.org 1138566291 22957 80.91.229.2 (29 Jan 2006 20:24:51 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 29 Jan 2006 20:24:51 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 29 21:24:49 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1F3J6O-0002IR-BI for ged-emacs-devel@m.gmane.org; Sun, 29 Jan 2006 21:24:48 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1F3J9J-0003PP-K0 for ged-emacs-devel@m.gmane.org; Sun, 29 Jan 2006 15:27:49 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1F3J97-0003PK-CK for emacs-devel@gnu.org; Sun, 29 Jan 2006 15:27:37 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1F3J93-0003P4-MZ for emacs-devel@gnu.org; Sun, 29 Jan 2006 15:27:37 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1F3J93-0003P1-II for emacs-devel@gnu.org; Sun, 29 Jan 2006 15:27:33 -0500 Original-Received: from [80.91.229.2] (helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1F3J7E-0001WN-Lc for emacs-devel@gnu.org; Sun, 29 Jan 2006 15:25:41 -0500 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1F3J62-0002Es-K4 for emacs-devel@gnu.org; Sun, 29 Jan 2006 21:24:26 +0100 Original-Received: from ip68-101-164-233.sd.sd.cox.net ([68.101.164.233]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 29 Jan 2006 21:24:26 +0100 Original-Received: from hober0 by ip68-101-164-233.sd.sd.cox.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 29 Jan 2006 21:24:26 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-To: emacs-devel@gnu.org Original-Lines: 130 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: ip68-101-164-233.sd.sd.cox.net Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAHlBMVEX47PoBAAegiLwiH1N IQYI0M4iMeKYBAAYGBBGqm9JF4g0mAAACYElEQVR4nGWTsY/aMBTGLXoLo8WQjNVrFJXxzviUbig JEcy5SNft5LhRGT3RNecUuRuiCMn/bZ+dhHDqJ2SZ7+f3nt/DEMOcqv9E9AdQTsD7fPw6hRIz+iw xxuhbMBn3SUtRofk95CTa9D49UIWiRvt4TnTiNmUbHIIDykUxdwm8lTvQUmergwoCpXR/qwojXqk 7jTEK1xANXhKOgD8eRmHggrt2CNKKtfcAU3EHkCbB5OJn4Ws40Prco6jhAyiDoSyeTrAb1gNe+dI eKNVlpvXNE5+pT6HUIjEi24a8B6XvjSrd0rCon5vCDwX7eA2wvV9bqrPWdCAFZBtfA0tQRWmRsE6 uZCMA6qYHbRDg6I5RlxVSFNCISG56QB3oIBNSRKL+JuLMg9LZlGqIUhCFlH9m8FN74GxFQwEFxKm crWYQJQ680v43TSEGEDArAWLJPVAObN8BHDghhrwcI1RYH2GSLMfiKnzWd6DGx4DvwNc41mIC0QQ WqzgXH0HV+kvVoohvIB5AaHRSyCZHyzawtOd4SBUyXR9lxOb2RB7Sz4T0AB8zY/smvWzRIrN0OQL GcsbW8zf7dY1gfsIlZm66JUsdOK3ljjjNCbnoHuxq9jQnb+TkAa6XY0XyJmf7C1uRwfbk4b0m1tr 8+zljb+ROD0+xA9f4umHP9+CTAAesjfGPWNyBvzCAc5ax/I40CFJPvkQrC/vRP+NsiC58LpGKfWH 7Ppy/JMY8ObK0AJfTRUDTz5eQxHS2VxPlG1697N0ee4qSbjeQ64bjc94Nhex1b+2N5Hn1MoJJwlp pf1Rr7/8DXitGHanPc2gAAAAASUVORK5CYII= X-Attribution: Ted User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (darwin) Cancel-Lock: sha1:tLw8Z1Shnk5tsD6icmehkNC5LHY= X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:49706 Archived-At: --=-=-= 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 hober0@gmail.com Ense petit placidam sub libertate quietem. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=erc-viper-integration.diff Content-Description: viper/erc integration ? 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 + + * 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 * 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 + + * erc-viper.el: Remove. Now that ERC is included in Emacs, these + work-arounds live in Viper itself. + 2006-01-28 Michael Olson * erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --=-=-=--