From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Jan 2025 09:03:07 +0000 (+0200)
Subject: ; Fix warnings in a tty-only build on MS-Windows
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7dbddc5356edf0bff6b2158ae90cf90d404ddef2;p=emacs.git

; Fix warnings in a tty-only build on MS-Windows

* lisp/org/org.el (dnd-open-local-file):
* lisp/dired.el (tool-bar--image-expression):
* lisp/term/android-win.el (x-handle-args): Declare.
* lisp/w32-fns.el (w32-system-shells):
(w32-allow-system-shell):
* lisp/net/shr.el (image-scaling-factor):
* lisp/net/eww.el (image-scaling-factor):
* lisp/image.el (image-scaling-factor): Defvar.
(image-recompute-map-p): Move to before the first use.
Reported by Angelo Graziosi <angelo.g0@libero.it>.

(cherry picked from commit 7eb8596ff5f1964f91664a6b7cac3199a5af5ba7)
---

diff --git a/lisp/dired.el b/lisp/dired.el
index 0385e98287f..beab1b9cd20 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -5260,6 +5260,7 @@ Interactively with prefix argument, read FILE-NAME."
 (declare-function Man-getpage-in-background "man" (topic))
 (defvar Man-support-remote-systems) ; from man.el
 (defvar manual-program) ; from man.el
+(declare-function tool-bar--image-expression "tool-bar" (icon))
 
 (defun dired-do-man ()
   "In Dired, run `man' on this file."
diff --git a/lisp/image.el b/lisp/image.el
index ddd2424d641..e0c73cb5760 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -158,6 +158,11 @@ or \"ffmpeg\") is installed."
   :type 'boolean
   :version "27.1")
 
+(defcustom image-recompute-map-p t
+  "Recompute image map when scaling, rotating, or flipping an image."
+  :type 'boolean
+  :version "30.1")
+
 (define-error 'unknown-image-type "Unknown image type")
 
 (defvar-keymap image-slice-map
@@ -608,6 +613,7 @@ properties specific to certain image types."
   (declare (gv-setter image--set-property))
   (plist-get (cdr image) property))
 
+(defvar image-scaling-factor)
 (defun image-compute-scaling-factor (&optional scaling)
   "Compute the scaling factor based on SCALING.
 If a number, use that.  If it's `auto', compute the factor.
@@ -1416,11 +1422,6 @@ is recomputed to fit the newly transformed image."
 
 ;;; Map transformation
 
-(defcustom image-recompute-map-p t
-  "Recompute image map when scaling, rotating, or flipping an image."
-  :type 'boolean
-  :version "30.1")
-
 (defsubst image--compute-rotation (image)
   "Return the current rotation of IMAGE, or 0 if no rotation.
 Also return nil if rotation is not a multiples of 90 degrees (0, 90,
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index c00ef8ea093..dabc5eee987 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1395,6 +1395,7 @@ within text input fields."
 (declare-function imagep "image.c")
 (defvar text-scale-mode)
 (defvar text-scale-mode-amount)
+(defvar image-scaling-factor)
 (defun eww--rescale-images ()
   (let ((scaling (if text-scale-mode
                      (+ 1 (* text-scale-mode-amount 0.1))
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 4c396f50cf4..a732e25a560 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1276,6 +1276,7 @@ not, `imagemagick' is preferred if it's present."
       nil
     'imagemagick))
 
+(defvar image-scaling-factor)
 (defun shr-rescale-image (data content-type width height
                                &optional max-width max-height)
   "Rescale DATA, if too big, to fit the current buffer.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 1ab1bc84ca2..b3899922f2b 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -20916,6 +20916,8 @@ URLS is a list of file URL."
 
 (put 'org--dnd-multi-local-file-handler 'dnd-multiple-handler t)
 
+(declare-function dnd-open-local-file "dnd" (uri action))
+
 (defun org--dnd-local-file-handler (url action &optional separator)
   "Handle file URL as per ACTION.
 SEPARATOR is the string to insert after each link.  It may be nil
diff --git a/lisp/term/android-win.el b/lisp/term/android-win.el
index 77b81be1255..a7d74413a24 100644
--- a/lisp/term/android-win.el
+++ b/lisp/term/android-win.el
@@ -42,6 +42,7 @@
 (add-to-list 'display-format-alist '(".*" . android))
 
 (declare-function android-get-connection "androidfns.c")
+(declare-function x-handle-args "common-win" (args))
 
 ;; Window system initialization.  This is extremely simple because all
 ;; initialization is done in android_term_init.
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index d7958d3762b..5a4c5f52ab4 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -49,6 +49,8 @@
       (and (fboundp 'w32-using-nt) (w32-using-nt) "cmd.exe")
       "command.com"))
 
+(defvar w32-system-shells)       ;; defined in w32-vars.el
+(defvar w32-allow-system-shell)  ;; defined in w32-vars.el
 (defun w32-system-shell-p (shell-name)
   (and shell-name
        (member (downcase (file-name-nondirectory shell-name))