From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: charles@aurox.ch (Charles A. Roelli) Newsgroups: gmane.emacs.bugs Subject: bug#27230: eldoc doc Date: Wed, 20 Sep 2017 20:12:38 +0200 Message-ID: References: <282e174a-e9c0-6bec-32f5-ed9d772e5e1d@yandex.ru> <83efu8ta6n.fsf@gnu.org> <4107369a-5d50-7e46-2e81-57c4ef5c7965@yandex.ru> <1f39b877-4cbf-96d8-a318-7edf95f10406@yandex.ru> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1505931196 7340 195.159.176.226 (20 Sep 2017 18:13:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 20 Sep 2017 18:13:16 +0000 (UTC) Cc: dgutov@yandex.ru, pok@netfonds.no, 27230@debbugs.gnu.org To: charles@aurox.ch (Charles A. Roelli) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Sep 20 20:13:10 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dujUg-0001RN-Mz for geb-bug-gnu-emacs@m.gmane.org; Wed, 20 Sep 2017 20:13:07 +0200 Original-Received: from localhost ([::1]:50078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dujUn-0001mS-VF for geb-bug-gnu-emacs@m.gmane.org; Wed, 20 Sep 2017 14:13:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dujUh-0001mG-Ii for bug-gnu-emacs@gnu.org; Wed, 20 Sep 2017 14:13:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dujUe-0007b3-Bz for bug-gnu-emacs@gnu.org; Wed, 20 Sep 2017 14:13:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:41795) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dujUe-0007am-34 for bug-gnu-emacs@gnu.org; Wed, 20 Sep 2017 14:13:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dujUc-0000Bh-01 for bug-gnu-emacs@gnu.org; Wed, 20 Sep 2017 14:13:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: charles@aurox.ch (Charles A. Roelli) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 20 Sep 2017 18:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27230 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 27230-submit@debbugs.gnu.org id=B27230.1505931178710 (code B ref 27230); Wed, 20 Sep 2017 18:13:01 +0000 Original-Received: (at 27230) by debbugs.gnu.org; 20 Sep 2017 18:12:58 +0000 Original-Received: from localhost ([127.0.0.1]:50476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dujUX-0000BO-Rv for submit@debbugs.gnu.org; Wed, 20 Sep 2017 14:12:58 -0400 Original-Received: from sinyavsky.aurox.ch ([37.35.109.145]:36104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dujUV-0000B8-Fy for 27230@debbugs.gnu.org; Wed, 20 Sep 2017 14:12:56 -0400 Original-Received: from sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) by sinyavsky.aurox.ch (Postfix) with ESMTP id 313492254A for <27230@debbugs.gnu.org>; Wed, 20 Sep 2017 18:06:32 +0000 (UTC) Authentication-Results: sinyavsky.aurox.ch (amavisd-new); dkim=pass (1024-bit key) reason="pass (just generated, assumed good)" header.d=aurox.ch DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aurox.ch; h= content-type:content-type:mime-version:references:subject :subject:in-reply-to:to:from:from:message-id:date:date; s=dkim; t=1505930790; x=1506794791; bh=+Ln2yX0ju+GE5hb52n3/2LZuW3TXovKD 1PFVjmNHtzY=; b=lNL5iFIjkH/dqkMJ0xpqUKr5wkTj+oiJAPjwkJXudvENm5TG dlGf/xNDq1mtQmkyD4HLeAO/EXfFBdHf5Akf1kPR3oBmYDlHHhTNZuMdL1foTk3k Mfm/qpbfp7MdPJpUEJAnbCNKUE4KdfCIR4eMXYDvmZ5xGCLu8vlw1wH6Ojs= X-Virus-Scanned: Debian amavisd-new at test.virtualizor.com Original-Received: from sinyavsky.aurox.ch ([127.0.0.1]) by sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id GP_m02n2pNgA for <27230@debbugs.gnu.org>; Wed, 20 Sep 2017 18:06:30 +0000 (UTC) Original-Received: from gray (125.85.192.178.dynamic.wline.res.cust.swisscom.ch [178.192.85.125]) by sinyavsky.aurox.ch (Postfix) with ESMTPSA id 2BCB52252C; Wed, 20 Sep 2017 18:06:28 +0000 (UTC) In-reply-to: (charles@aurox.ch) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:137184 Archived-At: --=-=-= Content-Type: text/plain Sorry, I had forgotten to update the docstring. Updated patch attached. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Keep-old-calling-convention-of-eldoc-message.patch >From 576fced66c8960a91a1fcfd51efc700413a810b4 Mon Sep 17 00:00:00 2001 From: "Charles A. Roelli" Date: Tue, 19 Sep 2017 22:00:54 +0200 Subject: [PATCH] Keep old calling convention of 'eldoc-message' * lisp/emacs-lisp/eldoc.el (eldoc-message): Keep its old calling convention, as it's used by other packages. See the discussion in Bug#27230, and the previous change 7ef0b5f6 ("Simplify eldoc-message") of 2017-08-21. --- lisp/emacs-lisp/eldoc.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index cba9a00..1440fb1 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -276,12 +276,16 @@ eldoc-minibuffer-message (force-mode-line-update))) (apply 'message format-string args))) -(defun eldoc-message (&optional string) - "Display STRING as an ElDoc message if it's non-nil. +(defun eldoc-message (&optional format-string &rest args) + "Display FORMAT-STRING as an ElDoc message if it's non-nil. + +If ARGS are given, FORMAT-STRING and ARGS are first passed to +`format-message'. Also store it in `eldoc-last-message' and return that value." (let ((omessage eldoc-last-message)) - (setq eldoc-last-message string) + (setq eldoc-last-message + (if args (apply #'format-message format-string args) format-string)) ;; In emacs 19.29 and later, and XEmacs 19.13 and later, all messages ;; are recorded in a log. Do not put eldoc messages in that log since ;; they are Legion. -- 2.9.4 --=-=-=--