diff options
| author | Glenn Morris | 2011-05-04 23:35:41 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-05-04 23:35:41 -0700 |
| commit | cf5bee67f95175049e30ffd9952dfff12394c18b (patch) | |
| tree | c3edbef8765046faac2cbc9420f12c41469161e9 | |
| parent | 0bff894fc150a90943bff8061bd34827937f952c (diff) | |
| download | emacs-cf5bee67f95175049e30ffd9952dfff12394c18b.tar.gz emacs-cf5bee67f95175049e30ffd9952dfff12394c18b.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/network-stream.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/gud.el | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5d40325c952..7e13237ccf6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2011-05-05 Glenn Morris <rgm@gnu.org> | 1 | 2011-05-05 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * net/network-stream.el (gnutls-negotiate): | ||
| 4 | * simple.el (tabulated-list-print): Fix declarations. | ||
| 5 | |||
| 6 | * progmodes/gud.el (syntax-symbol, syntax-point): | ||
| 7 | Remove unnecessary and incorrect declarations. | ||
| 8 | |||
| 3 | * emacs-lisp/check-declare.el (check-declare-scan): | 9 | * emacs-lisp/check-declare.el (check-declare-scan): |
| 4 | Handle byte-compile-initial-macro-environment in bytecomp.el | 10 | Handle byte-compile-initial-macro-environment in bytecomp.el |
| 5 | 11 | ||
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 @@ | |||
| 45 | (require 'tls) | 45 | (require 'tls) |
| 46 | (require 'starttls) | 46 | (require 'starttls) |
| 47 | 47 | ||
| 48 | (declare-function gnutls-negotiate "gnutls" (&rest spec)) | 48 | (declare-function gnutls-negotiate "gnutls" t t) ; defun* |
| 49 | 49 | ||
| 50 | ;;;###autoload | 50 | ;;;###autoload |
| 51 | (defun open-network-stream (name buffer host service &rest parameters) | 51 | (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: | |||
| 3042 | 3042 | ||
| 3043 | (declare-function c-langelem-sym "cc-defs" (langelem)) | 3043 | (declare-function c-langelem-sym "cc-defs" (langelem)) |
| 3044 | (declare-function c-langelem-pos "cc-defs" (langelem)) | 3044 | (declare-function c-langelem-pos "cc-defs" (langelem)) |
| 3045 | (declare-function syntax-symbol "gud" (x)) | ||
| 3046 | (declare-function syntax-point "gud" (x)) | ||
| 3047 | 3045 | ||
| 3048 | (defun gud-find-class (f _line) | 3046 | (defun gud-find-class (f _line) |
| 3049 | "Find fully qualified class in file F at line LINE. | 3047 | "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." | |||
| 2707 | (defvar tabulated-list-entries) | 2707 | (defvar tabulated-list-entries) |
| 2708 | (defvar tabulated-list-sort-key) | 2708 | (defvar tabulated-list-sort-key) |
| 2709 | (declare-function tabulated-list-init-header "tabulated-list" ()) | 2709 | (declare-function tabulated-list-init-header "tabulated-list" ()) |
| 2710 | (declare-function tabulated-list-print "tabulated-list" ()) | 2710 | (declare-function tabulated-list-print "tabulated-list" |
| 2711 | (&optional remember-pos)) | ||
| 2711 | 2712 | ||
| 2712 | (defvar process-menu-query-only nil) | 2713 | (defvar process-menu-query-only nil) |
| 2713 | 2714 | ||