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#19338: [PATCH 1/3] eldoc: use default eldoc function if local one gives no results Date: Wed, 10 Dec 2014 15:05:26 -0500 Message-ID: References: <1418232280-16915-1-git-send-email-mpn@google.com> <1418233785-18020-1-git-send-email-mpn@google.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418241990 10630 80.91.229.3 (10 Dec 2014 20:06:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 10 Dec 2014 20:06:30 +0000 (UTC) Cc: 19338@debbugs.gnu.org To: Michal Nazarewicz Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 10 21:06:23 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 1XynWf-0003fE-8j for geb-bug-gnu-emacs@m.gmane.org; Wed, 10 Dec 2014 21:06:21 +0100 Original-Received: from localhost ([::1]:47721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XynWe-0001oP-A3 for geb-bug-gnu-emacs@m.gmane.org; Wed, 10 Dec 2014 15:06:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XynWT-0001oA-QW for bug-gnu-emacs@gnu.org; Wed, 10 Dec 2014 15:06:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XynWM-0004Z1-A9 for bug-gnu-emacs@gnu.org; Wed, 10 Dec 2014 15:06:09 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XynWM-0004Yt-76 for bug-gnu-emacs@gnu.org; Wed, 10 Dec 2014 15:06:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XynWL-0006Zs-Qu for bug-gnu-emacs@gnu.org; Wed, 10 Dec 2014 15:06:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 10 Dec 2014 20:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19338 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 19338-submit@debbugs.gnu.org id=B19338.141824193125237 (code B ref 19338); Wed, 10 Dec 2014 20:06:01 +0000 Original-Received: (at 19338) by debbugs.gnu.org; 10 Dec 2014 20:05:31 +0000 Original-Received: from localhost ([127.0.0.1]:41993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XynVq-0006Yz-Sa for submit@debbugs.gnu.org; Wed, 10 Dec 2014 15:05:31 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:34177) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XynVo-0006Yn-Qk for 19338@debbugs.gnu.org; Wed, 10 Dec 2014 15:05:29 -0500 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id sBAK5Qej019730; Wed, 10 Dec 2014 15:05:27 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 90ECA6610C; Wed, 10 Dec 2014 15:05:26 -0500 (EST) In-Reply-To: <1418233785-18020-1-git-send-email-mpn@google.com> (Michal Nazarewicz's message of "Wed, 10 Dec 2014 18:49:43 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5151=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5151> : inlines <1621> : streams <1354810> : uri <1838052> 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:97163 Archived-At: > - (eldoc-message (funcall eldoc-documentation-function))))) > + (eldoc-message > + (or (funcall eldoc-documentation-function) > + ;; If local documentation function did not return anything, try > + ;; global one. > + (when (local-variable-p 'eldoc-documentation-function) > + (let ((func (default-value 'eldoc-documentation-function))) > + (when func (funcall func))))))))) We don't need that: if the major-mode wants that to happen, it can do that with an appropriate call to add-function, which will take care of delegating to the global value if/when applicable. This works very much like the add-hook's `local' argument. Stefan