diff options
| author | Glenn Morris <[email protected]> | 2010-10-31 23:13:43 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2010-10-31 23:13:43 -0700 |
| commit | c8ccffb13ced19628f6b9b46e497b4d5ed2febff (patch) | |
| tree | ee46625430ea78adc60ae2dd711d51e82ea22447 /lisp/gnus | |
| parent | f4ff702e2816f5756964ea6e81687f2aa8cc4a38 (diff) | |
Fix some declarations.
* lisp/gnus/nnimap.el (gnutls-negotiate):
* lisp/gnus/nntp.el (netrc-parse): Fix declarations.
* lisp/faces.el (xw-defined-colors, x-setup-function-keys):
* lisp/mouse-sel.el (x-select-text):
* lisp/term/w32console.el (x-setup-function-keys): Update declarations.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/nnimap.el | 3 | ||||
| -rw-r--r-- | lisp/gnus/nntp.el | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 1e42c4dc12..e171a71cad 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2010-11-01 Glenn Morris <[email protected]> + + * nnimap.el (gnutls-negotiate): + * nntp.el (netrc-parse): Fix declarations. + 2010-11-01 Katsumi Yamaoka <[email protected]> * gnus-util.el (gnus-string-match-p): New function, that is an alias to diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 4d0d4b840f..ea8a0fc95e 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -299,7 +299,8 @@ textual parts.") (* 5 60))) (nnimap-send-command "NOOP"))))))) -(declare-function gnutls-negotiate "subr" (fn file &optional arglist fileonly)) +(declare-function gnutls-negotiate "gnutls" + (proc type &optional priority-string trustfiles keyfiles)) (defun nnimap-open-connection (buffer) (unless nnimap-keepalive-timer diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 946025a0af..46cc0d281a 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1,8 +1,8 @@ ;;; nntp.el --- nntp access for Gnus -;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, -;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996, +;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <[email protected]> ;; Keywords: news @@ -1172,7 +1172,7 @@ It will make innd servers spawn an nnrpd process to allow actual article reading." (nntp-send-command "^.*\n" "MODE READER")) -(declare-function netrc-parse "netrc" (file)) +(declare-function netrc-parse "netrc" (&optional file)) (declare-function netrc-machine "netrc" (list machine &optional port defaultport)) (declare-function netrc-get "netrc" (alist type)) |