From: Glenn Morris Date: Mon, 1 Nov 2010 06:13:43 +0000 (-0700) Subject: Fix some declarations. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~422^2~6 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8ccffb13ced19628f6b9b46e497b4d5ed2febff;p=emacs.git 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. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0e35abc58d..102e84d4cfa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-11-01 Glenn Morris + * faces.el (xw-defined-colors, x-setup-function-keys): + * mouse-sel.el (x-select-text): + * term/w32console.el (x-setup-function-keys): Update declarations. + * progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Declare. * textmodes/ispell.el (comment-add): Declare. diff --git a/lisp/faces.el b/lisp/faces.el index 8b17e9ad59b..a8be29ff57d 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -30,7 +30,7 @@ (eval-when-compile (require 'cl)) -(declare-function xw-defined-colors "term/x-win" (&optional frame)) +(declare-function xw-defined-colors "term/common-win" (&optional frame)) (defvar help-xref-stack-item) @@ -1957,7 +1957,7 @@ Value is the new parameter list." (list (cons 'cursor-color fg))))))) (declare-function x-create-frame "xfns.c" (parms)) -(declare-function x-setup-function-keys "term/x-win" (frame)) +(declare-function x-setup-function-keys "term/common-win" (frame)) (defun x-create-frame-with-faces (&optional parameters) "Create and return a frame with frame parameters PARAMETERS. @@ -2570,5 +2570,4 @@ also the same size as FACE on FRAME, or fail." (provide 'faces) -;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6 ;;; faces.el ends here diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 1e42c4dc12e..e171a71cada 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2010-11-01 Glenn Morris + + * nnimap.el (gnutls-negotiate): + * nntp.el (netrc-parse): Fix declarations. + 2010-11-01 Katsumi Yamaoka * 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 4d0d4b840f4..ea8a0fc95e5 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 946025a0af2..46cc0d281a6 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 ;; 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)) diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el index f3875e24f07..b9f0011e96f 100644 --- a/lisp/mouse-sel.el +++ b/lisp/mouse-sel.el @@ -1,7 +1,7 @@ ;;; mouse-sel.el --- multi-click selection support for Emacs 19 -;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Mike Williams ;; Keywords: mouse @@ -299,7 +299,7 @@ where SELECTION-NAME = name of selection SELECTION-THING-SYMBOL = name of variable where the current selection type for this selection should be stored.") -(declare-function x-select-text "term/x-win" (text)) +(declare-function x-select-text "term/common-win" (text)) (defvar mouse-sel-set-selection-function (if (eq mouse-sel-default-bindings 'interprogram-cut-paste) @@ -314,7 +314,7 @@ Called with two arguments: SELECTION, the name of the selection concerned, and VALUE, the text to store. -This sets the selection, unless `mouse-sel-default-bindings' +This sets the selection, unless `mouse-sel-default-bindings' is `interprogram-cut-paste'.") (declare-function x-selection-value "term/x-win" ()) @@ -749,5 +749,4 @@ If `mouse-yank-at-point' is non-nil, insert at point instead." (provide 'mouse-sel) -;; arch-tag: 86e6c73f-deaa-48d3-a24e-c565fda1f7d7 ;;; mouse-sel.el ends here diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el index 5da8b84d3f4..0d3aa934b9b 100644 --- a/lisp/term/w32console.el +++ b/lisp/term/w32console.el @@ -45,7 +45,7 @@ ("white" 15 65535 65535 65535)) "A list of VGA console colors, their indices and 16-bit RGB values.") -(declare-function x-setup-function-keys "w32-fns" (frame)) +(declare-function x-setup-function-keys "term/common-win" (frame)) (defun terminal-init-w32console () "Terminal initialization function for w32 console." @@ -62,4 +62,4 @@ (tty-set-up-initial-frame-faces) (run-hooks 'terminal-init-w32-hook)) -;; arch-tag: 3195fd5e-ab86-4a46-b1dc-4f7a8c8deff3 +;;; w32console.el ends here