diff options
author | Glenn Morris <rgm@gnu.org> | 2015-06-06 12:12:06 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2015-06-06 12:12:06 -0700 |
commit | 809885c2173d212e54570f1da7e5e8a4f45a9f62 (patch) | |
tree | 73fa4cf2ca05920badc9b33cc40d4220c213f54b | |
parent | f1baa156503f089d6627171e0e9ad73bbdbb7268 (diff) | |
download | emacs-809885c2173d212e54570f1da7e5e8a4f45a9f62.tar.gz |
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.
-rw-r--r-- | lisp/erc/erc.el | 2 | ||||
-rw-r--r-- | lisp/international/mule-cmds.el | 3 | ||||
-rw-r--r-- | lisp/progmodes/elisp-mode.el | 1 | ||||
-rw-r--r-- | lisp/version.el | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index a860951634e..88732cb7ea6 100644 --- 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 474806d204e..76436682225 100644 --- 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 61709c326d6..e12d1331601 100644 --- 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 b8555cbb2f5..7b636f32976 100644 --- 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. |