Address some compilation warnings.

* lisp/international/mule-cmds.el (w32-get-console-codepage)
(w32-get-console-output-codepage):
* lisp/progmodes/elisp-mode.el (xref-collect-references):
* lisp/version.el (cairo-version-string): Declare.

* lisp/erc/erc.el (erc-nickname-in-use): Fix typo.

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index a860951634e82ccb80d210171ef99d9d4170b596..88732cb7ea6ddbd5cab79d5caea3cf0a86f8e503 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4185,7 +4185,7 @@ See also `erc-display-error-notice'."
                                    ;; server's setting if we haven't
                                    ;; established a connection yet
                                    (- 9 (length erc-nick-uniquifier))))
-                               erc-nick-uniqifier)))
+                               erc-nick-uniquifier)))
       (erc-cmd-NICK newnick)
       (erc-display-error-notice
        nil

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 474806d204e753520a4442a71c8b41947ce55757..76436682225c990adb2d41e2c916f3ffed7a2228 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2519,6 +2519,9 @@ is returned.  Thus, for instance, if charset \"ISO8859-2\",
 ;; too, for setting things such as calendar holidays, ps-print paper
 ;; size, spelling dictionary.
 
+(declare-function w32-get-console-codepage "w32proc.c" ())
+(declare-function w32-get-console-output-codepage "w32proc.c" ())
+
 (defun locale-translate (locale)
   "Expand LOCALE according to `locale-translation-file-name', if possible.
 For example, translate \"swedish\" into \"sv_SE.ISO8859-1\"."

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 61709c326d65644ed9fa92ae86d9a4946a4e125e..e12d13316018e53a93dc4b9138d62fc538f0be7b 100644 (file)
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -582,6 +582,7 @@ It can be quoted, or be inside a quoted form."
 (declare-function xref-make-bogus-location "xref" (message))
 (declare-function xref-make "xref" (description location))
 (declare-function xref-collect-matches "xref" (input dir &optional kind))
+(declare-function xref-collect-references "xref" (symbol dir))
 
 (defun elisp-xref-find (action id)
   (require 'find-func)

diff --git a/lisp/version.el b/lisp/version.el
index b8555cbb2f5d7e0c0b7f90c18ed5e3cbc11fb1c0..7b636f329761803313acfe5b73452ec617395cf2 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -47,6 +47,7 @@ This variable first existed in version 19.23.")
 (defvar motif-version-string)
 (defvar gtk-version-string)
 (defvar ns-version-string)
+(defvar cairo-version-string)
 
 (defun emacs-version (&optional here)
   "Return string describing the version of Emacs that is running.