From: Glenn Morris <rgm@gnu.org>
Date: Thu, 5 May 2011 06:35:41 +0000 (-0700)
Subject: Declaration fixes.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~104
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf5bee67f95175049e30ffd9952dfff12394c18b;p=emacs.git

Declaration fixes.

* lisp/net/network-stream.el (gnutls-negotiate): Fix declaration.

* lisp/simple.el (tabulated-list-print): Fix declaration.

* lisp/progmodes/gud.el (syntax-symbol, syntax-point):
Remove unnecessary and incorrect declarations.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d40325c952..7e13237ccf6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2011-05-05  Glenn Morris  <rgm@gnu.org>
 
+	* net/network-stream.el (gnutls-negotiate):
+	* simple.el (tabulated-list-print): Fix declarations.
+
+	* progmodes/gud.el (syntax-symbol, syntax-point):
+	Remove unnecessary and incorrect declarations.
+
 	* emacs-lisp/check-declare.el (check-declare-scan):
 	Handle byte-compile-initial-macro-environment in bytecomp.el
 
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index f3cfd7d058f..61e4630906d 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -45,7 +45,7 @@
 (require 'tls)
 (require 'starttls)
 
-(declare-function gnutls-negotiate "gnutls" (&rest spec))
+(declare-function gnutls-negotiate "gnutls" t t) ; defun*
 
 ;;;###autoload
 (defun open-network-stream (name buffer host service &rest parameters)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 74bdc980e8b..f45273026b4 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3042,8 +3042,6 @@ Link exprs of the form:
 
 (declare-function c-langelem-sym "cc-defs" (langelem))
 (declare-function c-langelem-pos "cc-defs" (langelem))
-(declare-function syntax-symbol  "gud"     (x))
-(declare-function syntax-point   "gud"     (x))
 
 (defun gud-find-class (f _line)
   "Find fully qualified class in file F at line LINE.
diff --git a/lisp/simple.el b/lisp/simple.el
index 9fd221819c5..dba0453ad07 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2707,7 +2707,8 @@ support pty association, if PROGRAM is nil."
 (defvar tabulated-list-entries)
 (defvar tabulated-list-sort-key)
 (declare-function tabulated-list-init-header  "tabulated-list" ())
-(declare-function tabulated-list-print "tabulated-list" ())
+(declare-function tabulated-list-print "tabulated-list"
+                  (&optional remember-pos))
 
 (defvar process-menu-query-only nil)