From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kelvin White Newsgroups: gmane.emacs.bugs Subject: bug#18213: [PATCH] ERC bugfixes and improvements Date: Wed, 06 Aug 2014 13:44:12 -0400 Message-ID: <87ppgdh5sj.wl%kwhite@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1407357618 22793 80.91.229.3 (6 Aug 2014 20:40:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 6 Aug 2014 20:40:18 +0000 (UTC) To: 18213@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Aug 06 22:40:13 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XF80H-0005yf-BK for geb-bug-gnu-emacs@m.gmane.org; Wed, 06 Aug 2014 22:40:09 +0200 Original-Received: from localhost ([::1]:40916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF80G-00058C-W6 for geb-bug-gnu-emacs@m.gmane.org; Wed, 06 Aug 2014 16:40:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF80D-00056o-Gj for bug-gnu-emacs@gnu.org; Wed, 06 Aug 2014 16:40:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF80C-0003Zi-Q3 for bug-gnu-emacs@gnu.org; Wed, 06 Aug 2014 16:40:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF80C-0003ZF-Nj for bug-gnu-emacs@gnu.org; Wed, 06 Aug 2014 16:40:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XF80B-00034m-Q7 for bug-gnu-emacs@gnu.org; Wed, 06 Aug 2014 16:40:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Kelvin White Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 06 Aug 2014 20:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 18213 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.140735757011770 (code B ref -1); Wed, 06 Aug 2014 20:40:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 6 Aug 2014 20:39:30 +0000 Original-Received: from localhost ([127.0.0.1]:60811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XF7zZ-00033h-C3 for submit@debbugs.gnu.org; Wed, 06 Aug 2014 16:39:28 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50216) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XF5HK-0006vU-5M for submit@debbugs.gnu.org; Wed, 06 Aug 2014 13:45:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF5HD-0001YI-L5 for submit@debbugs.gnu.org; Wed, 06 Aug 2014 13:45:28 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:51885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF5HD-0001YB-Ft for submit@debbugs.gnu.org; Wed, 06 Aug 2014 13:45:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF5HC-0000eZ-Gx for bug-gnu-emacs@gnu.org; Wed, 06 Aug 2014 13:45:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF5HA-0001Xi-A3 for bug-gnu-emacs@gnu.org; Wed, 06 Aug 2014 13:45:26 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF5H9-0001Xd-Q8 for bug-gnu-emacs@gnu.org; Wed, 06 Aug 2014 13:45:23 -0400 Original-Received: from [2600:3c02::f03c:91ff:fe73:3fa6] (port=43836 helo=localhost.gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XF5H9-0002ma-Er for bug-gnu-emacs@gnu.org; Wed, 06 Aug 2014 13:45:23 -0400 User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?Q?Goj=C5=8D?=) APEL/10.8 EasyPG/1.0.0 Emacs/24.3 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Mailman-Approved-At: Wed, 06 Aug 2014 16:39:23 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:92222 Archived-At: I plan to install the following patch in emacs trunk if there are no objections. This patch fixes a bug in loss of user mode prefix display, and adds feature to rename server buffers to network name if available. === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2014-07-08 19:45:24 +0000 +++ lisp/erc/erc.el 2014-08-06 17:36:30 +0000 @@ -4783,10 +4783,10 @@ (setq name (substring item 1)) (setf (pcase (aref item 0) ((pred (eq voice-ch)) voice) - ((pred (eq hop-ch)) hop) + ((pred (eq hop-ch)) halfop) ((pred (eq op-ch)) op) - ((pred (eq adm-ch)) adm) - ((pred (eq own-ch)) own)) + ((pred (eq adm-ch)) admin) + ((pred (eq own-ch)) owner)) 'on))) (when updatep (puthash (erc-downcase name) t @@ -6233,7 +6233,10 @@ (cond ((erc-default-target) (concat (erc-string-no-properties (erc-default-target)) "@" network-name)) - (network-name network-name) + ((and network-name + (not (string-equal network-name (buffer-name)))) + (rename-buffer network-name) + network-name) (t (buffer-name (current-buffer))))))