From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: jpw@shootybangbang.com (John Paul Wallington)
Newsgroups: gmane.emacs.devel
Subject: bad checkdoc/eldoc interaction
Date: Thu, 02 Jan 2003 23:52:02 +0000
Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org
Message-ID: <E18UF86-0003UJ-00@bundalo.shootybangbang.com>
NNTP-Posting-Host: main.gmane.org
X-Trace: main.gmane.org 1041551053 28584 80.91.224.249 (2 Jan 2003 23:44:13 GMT)
X-Complaints-To: usenet@main.gmane.org
NNTP-Posting-Date: Thu, 2 Jan 2003 23:44:13 +0000 (UTC)
Return-path: <emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org>
Original-Received: from quimby.gnus.org ([80.91.224.244])
	by main.gmane.org with esmtp (Exim 3.35 #1 (Debian))
	id 18UF0W-0007Qk-00
	for <emacs-devel@main.gmane.org>; Fri, 03 Jan 2003 00:44:12 +0100
Original-Received: from monty-python.gnu.org ([199.232.76.173])
	by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian))
	id 18UF2s-0001E0-00
	for <emacs-devel@quimby.gnus.org>; Fri, 03 Jan 2003 00:46:38 +0100
Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.10.13)
	id 18UF0V-0001Fg-08
	for emacs-devel@quimby.gnus.org; Thu, 02 Jan 2003 18:44:11 -0500
Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13)
	id 18UF0B-0001C2-00
	for emacs-devel@gnu.org; Thu, 02 Jan 2003 18:43:51 -0500
Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13)
	id 18UF08-0001Am-00
	for emacs-devel@gnu.org; Thu, 02 Jan 2003 18:43:50 -0500
Original-Received: from host217-42-184-226.range217-42.btcentralplus.com
	([217.42.184.226] helo=bundalo.shootybangbang.com)
	by monty-python.gnu.org with esmtp (Exim 4.10.13)	id 18UF08-00016N-00
	for emacs-devel@gnu.org; Thu, 02 Jan 2003 18:43:48 -0500
Original-Received: from jpw by bundalo.shootybangbang.com with local (Exim 3.36 #1
	(Debian))	id 18UF86-0003UJ-00
	for <emacs-devel@gnu.org>; Thu, 02 Jan 2003 23:52:02 +0000
Original-To: emacs-devel@gnu.org
X-Attribution: jpw
X-Face: R(_z-<e!Z,qjN8xeu/^:Szs}15R'D_9}g7Qlm0x+2sF<`w9o]-oT>rF:grdKO.*u`n);
	p.i
	$Eiz=h^CO5eDYv"4:K@#\HN09*Ykx}}B{kF/KH}%f_o^Wp<kb`,1KLtZp"^C{-{e~S=IP0_"8B6K+C
	kbKw='FSzftzu
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1b5
Precedence: list
List-Id: Emacs development discussions. <emacs-devel.gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Post: <mailto:emacs-devel@gnu.org>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
List-Archive: <http://mail.gnu.org/pipermail/emacs-devel>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org
Xref: main.gmane.org gmane.emacs.devel:10421
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:10421

Presently, if you do

emacs -q --no-site-file
(require 'checkdoc)
M-x eldoc-mode

then eldoc will print "nil: Checkdoc Minor Mode Menu" when it has
nothing to say.

One fix is for `eldoc-get-var-docstring' to only return the
documentation if sym is non-nil (see below).  Before making the change
I would like to check that it isn't hiding a greater problem, so
please holler if it shouldn't be installed.


diff -u -b -r1.21 eldoc.el
--- eldoc.el	19 Nov 2002 23:32:54 -0000	1.21
+++ eldoc.el	2 Jan 2003 23:41:03 -0000
@@ -327,6 +327,7 @@
 ;; Return a string containing a brief (one-line) documentation string for
 ;; the variable.
 (defun eldoc-get-var-docstring (sym)
+  (when sym
   (cond ((and (eq sym (aref eldoc-last-data 0))
               (eq 'variable (aref eldoc-last-data 2)))
          (aref eldoc-last-data 1))
@@ -336,7 +337,7 @@
                   (setq doc (eldoc-docstring-format-sym-doc
                              sym (eldoc-docstring-first-line doc)))
                   (eldoc-last-data-store sym doc 'variable)))
-           doc))))
+	     doc)))))
 
 (defun eldoc-last-data-store (symbol doc type)
   (aset eldoc-last-data 0 symbol)

-- 
John Paul Wallington