From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.bugs Subject: bug#18048: 24.3.92; [patch] eldoc improvements Date: Sat, 19 Jul 2014 10:11:13 +0200 Message-ID: <8738dx6a0g.fsf@gmail.com> References: <87egxjxkxh.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1405757732 5673 80.91.229.3 (19 Jul 2014 08:15:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 19 Jul 2014 08:15:32 +0000 (UTC) Cc: 18048@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jul 19 10:15:24 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 1X8Png-0007HN-AJ for geb-bug-gnu-emacs@m.gmane.org; Sat, 19 Jul 2014 10:15:24 +0200 Original-Received: from localhost ([::1]:53484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X8Pnf-0002JS-Re for geb-bug-gnu-emacs@m.gmane.org; Sat, 19 Jul 2014 04:15:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X8PnV-0002IX-Ca for bug-gnu-emacs@gnu.org; Sat, 19 Jul 2014 04:15:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X8PnL-0007FJ-Ao for bug-gnu-emacs@gnu.org; Sat, 19 Jul 2014 04:15:13 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X8PnL-0007Ej-7I for bug-gnu-emacs@gnu.org; Sat, 19 Jul 2014 04:15:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1X8PnJ-0008Dn-Tm for bug-gnu-emacs@gnu.org; Sat, 19 Jul 2014 04:15:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Thierry Volpiatto Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 19 Jul 2014 08:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18048 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 18048-submit@debbugs.gnu.org id=B18048.140575765831533 (code B ref 18048); Sat, 19 Jul 2014 08:15:01 +0000 Original-Received: (at 18048) by debbugs.gnu.org; 19 Jul 2014 08:14:18 +0000 Original-Received: from localhost ([127.0.0.1]:58934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X8Pmb-0008CW-RU for submit@debbugs.gnu.org; Sat, 19 Jul 2014 04:14:18 -0400 Original-Received: from mail-wi0-f173.google.com ([209.85.212.173]:38246) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X8PmZ-0008CH-UY for 18048@debbugs.gnu.org; Sat, 19 Jul 2014 04:14:17 -0400 Original-Received: by mail-wi0-f173.google.com with SMTP id f8so1883844wiw.6 for <18048@debbugs.gnu.org>; Sat, 19 Jul 2014 01:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:from:to:cc:subject:date:in-reply-to:message-id :mime-version:content-type; bh=AZcevAt6HA6Ms5WEQTqbCcYudeioKqLTPJwlPUdSlsQ=; b=VS0g1bVLI5pzgZ5imxMbkYcb0fQ6V5s8liqUBSSjz3tvjjIe05RBEQ2ruYQTT5xu30 VRF1u4oLp8phEhOwJnJhoBGQ1m7r0SvXlIgpXNeu0VAUNLVhrX02TQAgVp+Ebgu6Ac5a cbpbo4Xz/3o4tGMyq5P05xz416C4HDETtb/vm9TtH2KBvOaiq3mcGc8TjPlL0XKiSr+N q3nKzyQN8Hn9i63zv/ZHIKLRTzxSvlrlOv9OUyHJavHOjVUs0WyIKcASrL9K6hHDWd2g jFowzOr+Au8aM6VaTDpueG2L6TWAAdm7qoHR0PxBGKg596OyqeBYGBx00wOkkH96qVT2 vT1w== X-Received: by 10.180.13.208 with SMTP id j16mr14465648wic.15.1405757649969; Sat, 19 Jul 2014 01:14:09 -0700 (PDT) Original-Received: from dell-14z (lbe83-2-78-243-104-167.fbx.proxad.net. [78.243.104.167]) by mx.google.com with ESMTPSA id da9sm15876936wib.5.2014.07.19.01.14.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 19 Jul 2014 01:14:09 -0700 (PDT) In-reply-to: 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:91656 Archived-At: Also the words &key and &allow-other-keys are upcased. diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index c64ec52..85c40b6 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -551,12 +551,15 @@ ARGLIST is either a string, or a list of strings or symbols." (defun eldoc-function-argstring-format (argstring) "Apply `eldoc-argument-case' to each word in ARGSTRING. -The words \"&rest\", \"&optional\" are returned unchanged." - (mapconcat (lambda (s) - (if (string-match-p "\\`(?&\\(?:optional\\|rest\\))?\\'" s) - s - (funcall eldoc-argument-case s))) - (split-string argstring) " ")) +The words \"&rest\", \"&optional\", \"&key\" and \"&allow-other-keys\" +are returned unchanged." + (mapconcat + (lambda (s) + (if (string-match-p + "\\`(?&\\(?:optional\\|rest\\|key\\|allow-other-keys\\))?\\'" s) + s + (funcall eldoc-argument-case s))) + (split-string argstring) " ")) -- Thierry Get my Gnupg key: gpg --keyserver pgp.mit.edu --recv-keys 59F29997