From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#17755: 24.3; ERC user mode support Date: Wed, 18 Jun 2014 14:32:09 -0400 Message-ID: References: <87wqcnag57.fsf@localhost.i-did-not-set--mail-host-address--so-tickle-me> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1403126786 13017 80.91.229.3 (18 Jun 2014 21:26:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 18 Jun 2014 21:26:26 +0000 (UTC) Cc: Lawrence Mitchell , Michael Olson , 17755@debbugs.gnu.org, Mario Lang , Diane Murray , Alex Schroeder , Julien Danjou , Francis Litterio , Jorgen Schaefer To: Kelvin White Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 18 23:26:18 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 1WxNN3-0003WY-Lr for geb-bug-gnu-emacs@m.gmane.org; Wed, 18 Jun 2014 23:26:17 +0200 Original-Received: from localhost ([::1]:60796 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxNN2-0002co-WA for geb-bug-gnu-emacs@m.gmane.org; Wed, 18 Jun 2014 17:26:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxKfV-0007zY-2Q for bug-gnu-emacs@gnu.org; Wed, 18 Jun 2014 14:33:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxKfP-0005kX-0X for bug-gnu-emacs@gnu.org; Wed, 18 Jun 2014 14:33:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxKfO-0005kT-TW for bug-gnu-emacs@gnu.org; Wed, 18 Jun 2014 14:33:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WxKfO-0002I9-Aj for bug-gnu-emacs@gnu.org; Wed, 18 Jun 2014 14:33:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 18 Jun 2014 18:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17755 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 17755-submit@debbugs.gnu.org id=B17755.14031163448756 (code B ref 17755); Wed, 18 Jun 2014 18:33:02 +0000 Original-Received: (at 17755) by debbugs.gnu.org; 18 Jun 2014 18:32:24 +0000 Original-Received: from localhost ([127.0.0.1]:52084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WxKeh-0002H6-LV for submit@debbugs.gnu.org; Wed, 18 Jun 2014 14:32:23 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:34399) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WxKee-0002Gs-VW for 17755@debbugs.gnu.org; Wed, 18 Jun 2014 14:32:17 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUGAIDvNVNLd+D9/2dsb2JhbABZgwaDSsA9gRcXdIImAQEEViMQCzQSFA0LDSQTh2UDEcpdDYcvF4xeghwHhDgElmGOWINggWqDTCGBLCQ X-IPAS-Result: ArUGAIDvNVNLd+D9/2dsb2JhbABZgwaDSsA9gRcXdIImAQEEViMQCzQSFA0LDSQTh2UDEcpdDYcvF4xeghwHhDgElmGOWINggWqDTCGBLCQ X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="67742115" Original-Received: from 75-119-224-253.dsl.teksavvy.com (HELO ceviche.home) ([75.119.224.253]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 18 Jun 2014 14:32:10 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id F0C216608C; Wed, 18 Jun 2014 14:32:09 -0400 (EDT) In-Reply-To: (Kelvin White's message of "Wed, 18 Jun 2014 10:40:21 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) 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-Mailman-Approved-At: Wed, 18 Jun 2014 17:26:14 -0400 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:90523 Archived-At: >> > + (defsubst erc-channel-user-owner-p (nick) >> > + "Return t if NICK is an owner of the current channel." >> Usually we say "non-nil" rather than "t", unless the callers need to >> rely on the return value being t rather than some other non-nil value. > Indeed, the callers do rely on the value being t in this case. rather than > just non-nil Hmm? I see only one call to erc-channel-user-owner-p and the result is passed to `cond' so any non-nil value will work as well (which is the way it should be for functions named `-p'). > + 2014-06-11 Kelvin White > + > + * erc-backend.el: Handle user modes in relevent server responses > + * erc.el: Better user mode support. > + (erc-channel-user): Add members for new modes. > + (erc-channel-member-halfop-p, erc-channel-user-admin-p, erc-channel-user-owner-p): Use new struct members. > + (erc-format-nick, erc-format-@nick): Display user modes as nick prefix. > + (erc-nick-prefix-face, erc-my-nick-prefix-face): Add new faces to separate colors if desired. > + (erc-get-user-mode-prefix): Return symbol for mode prefix. > + (erc-update-channel-member, erc-update-current-channel-member, erc-channel-receive-names): Update channel users. > + (erc-nick-at-point): Return correct user info. > + Please try a bit harder to stay within 80 columns. M-q is your friend. > ! ;; Hacker: l3thal@smashthestack.org > ! ;; Created: 2004-05-07 > ! ;; Hacked: 2014-06-08 If you want to add your name, add it to the "Author:" part (one per line, see in erc.el for an example). And don't add entries like timestamps of when it was last changed. This just causes spurious conflicts when merging branches. This info is readily available via "bzr log". I tolerate things like "Created" (tho find it a waste of perfectly good bits and screen real estate) because, by nature these should never change and hence don't cause such spurious conflicts. > ! ;;; hacked > (define-erc-response-handler (JOIN) > ! "HACKED: Handle join messages." What does this "hacked" mean here? Looks like left-over annotations you used temporarily to keep track of what you changed. Anyway, the patch looks OK to me. As soon as your copyright paperwork comes through I can give you write access and you can install it. Stefan