From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kelvin White Newsgroups: gmane.emacs.devel Subject: [PATCH] ERC bugfixes and improvements Date: Wed, 06 Aug 2014 14:01:02 -0400 Message-ID: <87oavxh50h.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 1407348080 32303 80.91.229.3 (6 Aug 2014 18:01:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 6 Aug 2014 18:01:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 06 20:01:13 2014 Return-path: Envelope-to: ged-emacs-devel@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 1XF5WQ-0003qY-E9 for ged-emacs-devel@m.gmane.org; Wed, 06 Aug 2014 20:01:10 +0200 Original-Received: from localhost ([::1]:40369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF5WP-0003qP-Vg for ged-emacs-devel@m.gmane.org; Wed, 06 Aug 2014 14:01:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF5WM-0003qH-B2 for emacs-devel@gnu.org; Wed, 06 Aug 2014 14:01:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF5WJ-00071f-SC for emacs-devel@gnu.org; Wed, 06 Aug 2014 14:01:06 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37247) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF5WJ-00071b-Pz for emacs-devel@gnu.org; Wed, 06 Aug 2014 14:01:03 -0400 Original-Received: from [2600:3c02::f03c:91ff:fe73:3fa6] (port=43839 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 1XF5WJ-0002Cw-C3 for emacs-devel@gnu.org; Wed, 06 Aug 2014 14:01:03 -0400 User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) 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-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:173456 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))))))