From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.bugs Subject: bug#18551: regression: erc-format-nick is now essentially an alias to eww-format-@nick Date: Wed, 24 Sep 2014 21:33:57 +0000 Message-ID: <87ppekn1oa.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1411594880 32260 80.91.229.3 (24 Sep 2014 21:41:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 24 Sep 2014 21:41:20 +0000 (UTC) Cc: kelvin white To: 18551@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Sep 24 23:41:14 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 1XWuJD-0004py-M6 for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Sep 2014 23:41:11 +0200 Original-Received: from localhost ([::1]:35011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWuJD-00005a-C5 for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Sep 2014 17:41:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWuJ5-0008Q4-VX for bug-gnu-emacs@gnu.org; Wed, 24 Sep 2014 17:41:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWuJ1-0003lQ-Ok for bug-gnu-emacs@gnu.org; Wed, 24 Sep 2014 17:41:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:59530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWuIv-0003jw-OW; Wed, 24 Sep 2014 17:40:53 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XWuDI-0004zN-8i; Wed, 24 Sep 2014 17:35:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ivan Shmakov Original-Sender: "Debbugs-submit" Resent-CC: kwhite@gnu.org, bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Sep 2014 21:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 18551 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: submit@debbugs.gnu.org X-Debbugs-Original-Xcc: kelvin white Original-Received: via spool by submit@debbugs.gnu.org id=B.141159444919079 (code B ref -1); Wed, 24 Sep 2014 21:35:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Sep 2014 21:34:09 +0000 Original-Received: from localhost ([127.0.0.1]:51090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XWuCO-0004xd-52 for submit@debbugs.gnu.org; Wed, 24 Sep 2014 17:34:08 -0400 Original-Received: from fely.am-1.org ([78.47.74.50]:34104) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XWuCL-0004xV-Sb for submit@debbugs.gnu.org; Wed, 24 Sep 2014 17:34:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Type:MIME-Version:Message-ID:Date:Sender:Subject:To:From; bh=ArV9XKOjsCokkR+v7nYHVG6Dxawa1/47Ii7Ojvdh9Lc=; b=WGDZ1pwIGWKjCY+Svk27S/ZIOFur4PxkEsoUy+6NhMSqfRBo2Av15RPOfnyss9K8m6NREVd6BLAdAyDGCvdgGUlYwR/WM0CLQRz9WrzAD3dPTb2WWZDrN+OeCeeUBDcjcz85PO43OiGjPDFYIe3TVoaasJCd2VXEqUdjpw5IqHg=; Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XWuCK-0007PH-MI for submit@debbugs.gnu.org; Wed, 24 Sep 2014 21:34:05 +0000 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XWuCD-0004PD-Nt for submit@debbugs.gnu.org; Thu, 25 Sep 2014 04:33:57 +0700 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (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-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:93703 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Package: emacs X-Debbugs-Cc: Kelvin White The following change (present as of 0ee10aff098b) was introduced into lisp/erc/erc.el back this June: commit b45734ee82eecb91010eb3055c8c8bafb73a3ade Author: Kelvin White AuthorDate: Thu Jun 19 12:56:18 2014 -0400 ERC: Better user mode support --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el =E2=80=A6 @@ -4190,7 +4223,24 @@ (defun erc-format-nick (&optional user _channel-data) "Return the nickname of USER. See also `erc-format-nick-function'." - (when user (erc-server-user-nickname user))) + (let ((nick (erc-server-user-nickname user))) + (concat (erc-propertize + (erc-get-user-mode-prefix nick) + 'face 'erc-nick-prefix-face) nick))) =E2=80=A6 This added the =E2=80=9Cuser mode=E2=80=9D sign =E2=80=93 previously kind = of specific to erc-format-@nick =E2=80=93 into the string returned by erc-format-nick. Thus, the only code difference left between the two is the (presumably accidental) lack of the (when user =E2=80=A6) in the former: 4227 (defun erc-format-nick (&optional user _channel-data) =E2=80=A6 4230 (let ((nick (erc-server-user-nickname user))) 4231 (concat (erc-propertize 4232 (erc-get-user-mode-prefix nick) 4233 'face 'erc-nick-prefix-face) 4234 nick))) 4250 (defun erc-format-@nick (&optional user channel-data) =E2=80=A6 4256 (when user 4257 (let ((nick (erc-server-user-nickname user))) 4258 (concat (erc-propertize 4259 (erc-get-user-mode-prefix nick) 4260 'face 'erc-nick-prefix-face) 4261 nick)))) I believe that this change was unintended, is not helpful in any way (if the intent was to get rid of the former, it should=E2=80=99ve been aliased over, not redefined, shouldn=E2=80=99t it?), and should thus be reverted. --=20 FSF associate member #7257 http://boycottsystemd.org/ =E2=80=A6 3013 B6A0= 230E 334A --=-=-= Content-Type: text/diff Content-Disposition: inline --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -4227,11 +4227,7 @@ (defun erc-format-nick (&optional user _channel-data) "Return the nickname of USER. See also `erc-format-nick-function'." - (let ((nick (erc-server-user-nickname user))) - (concat (erc-propertize - (erc-get-user-mode-prefix nick) - 'face 'erc-nick-prefix-face) - nick))) + (when user (erc-server-user-nickname user))) (defun erc-get-user-mode-prefix (user) (when user --=-=-=--