From e8ffb999b95ca059dc97343a2c3571eb493255b8 Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Wed, 21 Nov 2007 03:06:01 +0000
Subject: [PATCH] * frame.el (msdos-mouse-p): * generic-x.el (w32-shell-name):
 * files.el (msdos-long-file-names, w32-long-file-name)
 (msdos-long-file-names, dired-get-filename, dired-unmark)
 (dired-do-flagged-delete, dos-8+3-filename, vms-read-directory)
 (view-mode-disable): * term/mac-win.el (mac-code-convert-string,
 mac-coerce-ae-data) (mac-resume-apple-event, mac-font-panel-mode)
 (mac-atsu-font-face-attributes, mac-ae-set-reply-parameter)
 (mac-clear-font-name-table): * term/pc-win.el (msdos-remember-default-colors)
 (w16-set-clipboard-data, w16-get-clipboard-data): * term/w32-win.el
 (w32-send-sys-command, w32-select-font) (set-message-beep): * w32-fns.el
 (set-message-beep, w32-get-clipboard-data) (w32-get-locale-info,
 w32-get-valid-locale-ids) (w32-set-clipboard-data): * help-fns.el
 (ad-get-advice-info): * font-lock.el (fast-lock-after-fontify-buffer)
 (fast-lock-after-unfontify-buffer, fast-lock-mode)
 (lazy-lock-after-fontify-buffer) (lazy-lock-after-unfontify-buffer,
 lazy-lock-mode): * net/browse-url.el (w32-shell-execute): * dos-fns.el
 (int86, msdos-long-file-names): * dos-w32.el (default-printer-name): Declare
 as functions.

---
 lisp/ChangeLog              | 28 ++++++++++++++++++++++++++++
 lisp/dos-fns.el             |  3 +++
 lisp/dos-w32.el             |  2 ++
 lisp/emulation/viper-cmd.el |  4 ++--
 lisp/files.el               | 10 ++++++++++
 lisp/font-lock.el           |  7 +++++++
 lisp/frame.el               |  2 ++
 lisp/generic-x.el           |  2 ++
 lisp/help-fns.el            |  2 ++
 lisp/mail/emacsbug.el       |  4 ++--
 lisp/net/browse-url.el      |  1 +
 lisp/progmodes/python.el    |  2 +-
 lisp/term/mac-win.el        |  8 ++++++++
 lisp/term/pc-win.el         |  4 ++++
 lisp/term/w32-win.el        |  4 ++++
 lisp/url/url-file.el        |  2 +-
 lisp/w32-fns.el             |  6 ++++++
 17 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af14d6fa5ce..18de50ed4cc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,31 @@
+2007-11-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* frame.el (msdos-mouse-p):
+	* generic-x.el (w32-shell-name):
+	* files.el (msdos-long-file-names, w32-long-file-name)
+	(msdos-long-file-names, dired-get-filename, dired-unmark)
+	(dired-do-flagged-delete, dos-8+3-filename, vms-read-directory)
+	(view-mode-disable):
+	* term/mac-win.el (mac-code-convert-string, mac-coerce-ae-data)
+	(mac-resume-apple-event, mac-font-panel-mode)
+	(mac-atsu-font-face-attributes, mac-ae-set-reply-parameter)
+	(mac-clear-font-name-table):
+	* term/pc-win.el (msdos-remember-default-colors)
+	(w16-set-clipboard-data, w16-get-clipboard-data):
+	* term/w32-win.el (w32-send-sys-command, w32-select-font)
+	(set-message-beep):
+	* w32-fns.el (set-message-beep, w32-get-clipboard-data)
+	(w32-get-locale-info, w32-get-valid-locale-ids)
+	(w32-set-clipboard-data):
+	* help-fns.el (ad-get-advice-info):
+	* font-lock.el (fast-lock-after-fontify-buffer)
+	(fast-lock-after-unfontify-buffer, fast-lock-mode)
+	(lazy-lock-after-fontify-buffer)
+	(lazy-lock-after-unfontify-buffer, lazy-lock-mode):
+	* net/browse-url.el (w32-shell-execute):
+	* dos-fns.el (int86, msdos-long-file-names):
+	* dos-w32.el (default-printer-name): Declare as functions.
+
 2007-11-21  Juanma Barranquero  <lekktu@gmail.com>
 
 	* textmodes/paragraphs.el (forward-sentence): Doc fix.
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index c66cbc7933a..62b71640017 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -29,6 +29,9 @@
 
 ;;; Code:
 
+(declare-function int86) ;; Defined in C.
+(declare-function msdos-long-file-names) ;; Defined in C.
+
 ;; This overrides a trivial definition in files.el.
 (defun convert-standard-filename (filename)
   "Convert a standard file's name to something suitable for the current OS.
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index 28cab4ccbcb..4b307423fb5 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -370,6 +370,8 @@ filesystem mounted on drive Z:, FILESYSTEM could be \"Z:\"."
 
 (defvar printer-name)
 
+(declare-function default-printer-name) ;; Defined in C.
+
 (defun direct-print-region-function (start end
 					   &optional lpr-prog
 					   delete-text buf display
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index c90cecf8adc..2c07017e389 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -3097,8 +3097,8 @@ On reaching beginning of line, stop and signal error."
     (setq this-command 'next-line)
     (if com (viper-execute-com 'viper-next-line val com))))
 
-(declare-function widget-type "../widget" (widget))
-(declare-function widget-button-press "../widget" (pos &optional event))
+(declare-function widget-type "../wid-edit" (widget))
+(declare-function widget-button-press "../wid-edit" (pos &optional event))
 (declare-function viper-set-hooks "viper" ())
 
 (defun viper-next-line-at-bol (arg)
diff --git a/lisp/files.el b/lisp/files.el
index d8c78a320ec..7575948b9db 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -213,6 +213,16 @@ have fast storage with limited space, such as a RAM disk."
 ;; The system null device. (Should reference NULL_DEVICE from C.)
 (defvar null-device "/dev/null" "The system null device.")
 
+(declare-function msdos-long-file-names) ;; Defined in C.
+(declare-function w32-long-file-name) ;; Defined in C.
+(declare-function msdos-long-file-names) ;; Defined in C.
+(declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
+(declare-function dired-unmark "dired" (arg))
+(declare-function dired-do-flagged-delete "dired" (&optional nomessage))
+(declare-function dos-8+3-filename "dos-fns" (filename))
+(declare-function vms-read-directory "vms-patch" (dirname switches buffer))
+(declare-function view-mode-disable "view" ())
+
 (defvar file-name-invalid-regexp
   (cond ((and (eq system-type 'ms-dos) (not (msdos-long-file-names)))
 	 (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 16f9730b1d1..7e1fff79772 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -886,6 +886,13 @@ The value of this variable is used when Font Lock mode is turned on."
 (defvar lazy-lock-mode)
 (defvar jit-lock-mode)
 
+(declare-function fast-lock-after-fontify-buffer "obsolete/fast-lock")
+(declare-function fast-lock-after-unfontify-buffer "obsolete/fast-lock")
+(declare-function fast-lock-mode "obsolete/fast-lock")
+(declare-function lazy-lock-after-fontify-buffer "obsolete/lazy-lock")
+(declare-function lazy-lock-after-unfontify-buffer "obsolete/lazy-lock")
+(declare-function lazy-lock-mode "obsolete/lazy-lock")
+
 (defun font-lock-turn-on-thing-lock ()
   (let ((thing-mode (font-lock-value-in-major-mode font-lock-support-mode)))
     (cond ((eq thing-mode 'fast-lock-mode)
diff --git a/lisp/frame.el b/lisp/frame.el
index 1c11829475b..6e660b1b5e5 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1126,6 +1126,8 @@ bars (top, bottom, or nil)."
   "Return the terminal that is now selected."
   (frame-terminal (selected-frame)))
 
+(declare-function msdos-mouse-p) ;; Defined in C only for on platform.
+
 (defun display-mouse-p (&optional display)
   "Return non-nil if DISPLAY has a mouse available.
 DISPLAY can be a display name, a frame, or nil (meaning the selected
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index fbabf6e6996..7b65f07e2c1 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -524,6 +524,8 @@ like an INI file.  You can add this hook to `find-file-hook'."
 (defvar bat-generic-mode-keymap (make-sparse-keymap)
   "Keymap for `bat-generic-mode'.")
 
+(declare-function w32-shell-name "w32-fns" ())
+
 (defun bat-generic-mode-compile ()
   "Run the current BAT file in a compilation buffer."
   (interactive)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 2bfd4176567..0643b85672c 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -248,6 +248,8 @@ face (according to `face-differs-from-default-p')."
 	src-file
       file-name)))
 
+(declare-function ad-get-advice-info "emacs-lisp/advice" (function))
+
 ;;;###autoload
 (defun describe-function-1 (function)
   (let* ((advised (and (featurep 'advice) (ad-get-advice-info function)))
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index eb96ef07612..dab87e04497 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -229,8 +229,8 @@ Type SPC to scroll through this section and its subsections."))))
       (setq report-emacs-bug-orig-text (buffer-substring (point-min) (point))))
     (goto-char user-point)))
 
-(declare-function Info-menu "info" (menu-item &optional fork))
-(declare-function Info-goto-node "info" (nodename &optional fork))
+(declare-function Info-menu "../info" (menu-item &optional fork))
+(declare-function Info-goto-node "../info" (nodename &optional fork))
 
 (defun report-emacs-bug-info ()
   "Go to the Info node on reporting Emacs bugs."
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 523588ec7c2..977639eec55 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -825,6 +825,7 @@ to use."
 ;; --- Default MS-Windows browser ---
 
 (defvar dos-windows-version)
+(declare-function w32-shell-execute)    ;; Defined in C.
 
 (defun browse-url-default-windows-browser (url &optional new-window)
   (interactive (browse-url-interactive-arg "URL: "))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4039a4f4a43..04cc07a2eb4 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1656,7 +1656,7 @@ instance.  Assumes an inferior Python is running."
 
 ;;;; Info-look functionality.
 
-(declare-function info-lookup-maybe-add-help "info-look" (&rest arg))
+(declare-function info-lookup-maybe-add-help "../info-look" (&rest arg))
 
 (defun python-after-info-look ()
   "Set up info-look for Python.
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index c84614d2246..050bd04d59e 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -85,6 +85,14 @@
 (defvar mac-ts-active-input-overlay)
 (defvar x-invocation-args)
 
+(declare-function mac-code-convert-string)        ;; Defined in C.  
+(declare-function mac-coerce-ae-data)		  ;; Defined in C.
+(declare-function mac-resume-apple-event)	  ;; Defined in C.
+(declare-function mac-font-panel-mode)		  ;; Defined in C.
+(declare-function mac-atsu-font-face-attributes)  ;; Defined in C.
+(declare-function mac-ae-set-reply-parameter)	  ;; Defined in C.
+(declare-function mac-clear-font-name-table)      ;; Defined in C.
+
 (defvar x-command-line-resources nil)
 
 ;; Handler for switches of the form "-switch value" or "-switch".
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index ecbda7d9c1e..d9ed7385514 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -29,6 +29,10 @@
 
 (load "term/internal" nil t)
 
+(declare-function msdos-remember-default-colors) ;; Defined in C.
+(declare-function w16-set-clipboard-data)	 ;; Defined in C.
+(declare-function w16-get-clipboard-data)        ;; Defined in C. 
+
 ;;; This is copied from etc/rgb.txt, except that some values were changed
 ;;; a bit to make them consistent with DOS console colors, and the RGB
 ;;; values were scaled up to 16 bits, as `tty-define-color' requires.
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 7ea8f08a67e..90b88f359bc 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -88,6 +88,10 @@
 (defvar xlfd-regexp-registry-subnum)
 (defvar w32-color-map) ;; defined in w32fns.c
 
+(declare-function w32-send-sys-command) ;; Defined in C.
+(declare-function w32-select-font)	;; Defined in C.
+(declare-function set-message-beep)     ;; Defined in C.
+
 ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
 (if (fboundp 'new-fontset)
     (require 'fontset))
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index c39dcc030ac..9af3bbb42b4 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -90,7 +90,7 @@ to them."
 (declare-function ange-ftp-copy-file-internal "../net/ange-ftp"
 		  (filename newname ok-if-already-exists
 			    keep-date &optional msg cont nowait))
-(declare-function url-generate-unique-filename "url-utile" (&optional fmt))
+(declare-function url-generate-unique-filename "url-util" (&optional fmt))
 
 (defun url-file-build-filename (url)
   (if (not (vectorp url))
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index d9257475447..670c4e45db0 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -38,6 +38,12 @@
 
 (defvar explicit-shell-file-name)
 
+(declare-function set-message-beep)          ;; Defined in C.
+(declare-function w32-get-clipboard-data)    ;; Defined in C.
+(declare-function w32-get-locale-info)	     ;; Defined in C.
+(declare-function w32-get-valid-locale-ids)  ;; Defined in C.
+(declare-function w32-set-clipboard-data)    ;; Defined in C.
+
 ;; Map delete and backspace
 (define-key function-key-map [backspace] "\177")
 (define-key function-key-map [delete] "\C-d")
-- 
2.39.2