aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-06-06 12:12:06 -0700
committerGlenn Morris2015-06-06 12:12:06 -0700
commit809885c2173d212e54570f1da7e5e8a4f45a9f62 (patch)
tree73fa4cf2ca05920badc9b33cc40d4220c213f54b
parentf1baa156503f089d6627171e0e9ad73bbdbb7268 (diff)
downloademacs-809885c2173d212e54570f1da7e5e8a4f45a9f62.tar.gz
emacs-809885c2173d212e54570f1da7e5e8a4f45a9f62.zip
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.el2
-rw-r--r--lisp/international/mule-cmds.el3
-rw-r--r--lisp/progmodes/elisp-mode.el1
-rw-r--r--lisp/version.el1
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'."
4185 ;; server's setting if we haven't 4185 ;; server's setting if we haven't
4186 ;; established a connection yet 4186 ;; established a connection yet
4187 (- 9 (length erc-nick-uniquifier)))) 4187 (- 9 (length erc-nick-uniquifier))))
4188 erc-nick-uniqifier))) 4188 erc-nick-uniquifier)))
4189 (erc-cmd-NICK newnick) 4189 (erc-cmd-NICK newnick)
4190 (erc-display-error-notice 4190 (erc-display-error-notice
4191 nil 4191 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\",
2519;; too, for setting things such as calendar holidays, ps-print paper 2519;; too, for setting things such as calendar holidays, ps-print paper
2520;; size, spelling dictionary. 2520;; size, spelling dictionary.
2521 2521
2522(declare-function w32-get-console-codepage "w32proc.c" ())
2523(declare-function w32-get-console-output-codepage "w32proc.c" ())
2524
2522(defun locale-translate (locale) 2525(defun locale-translate (locale)
2523 "Expand LOCALE according to `locale-translation-file-name', if possible. 2526 "Expand LOCALE according to `locale-translation-file-name', if possible.
2524For example, translate \"swedish\" into \"sv_SE.ISO8859-1\"." 2527For 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."
582(declare-function xref-make-bogus-location "xref" (message)) 582(declare-function xref-make-bogus-location "xref" (message))
583(declare-function xref-make "xref" (description location)) 583(declare-function xref-make "xref" (description location))
584(declare-function xref-collect-matches "xref" (input dir &optional kind)) 584(declare-function xref-collect-matches "xref" (input dir &optional kind))
585(declare-function xref-collect-references "xref" (symbol dir))
585 586
586(defun elisp-xref-find (action id) 587(defun elisp-xref-find (action id)
587 (require 'find-func) 588 (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.")
47(defvar motif-version-string) 47(defvar motif-version-string)
48(defvar gtk-version-string) 48(defvar gtk-version-string)
49(defvar ns-version-string) 49(defvar ns-version-string)
50(defvar cairo-version-string)
50 51
51(defun emacs-version (&optional here) 52(defun emacs-version (&optional here)
52 "Return string describing the version of Emacs that is running. 53 "Return string describing the version of Emacs that is running.