From: Glenn Morris <rgm@gnu.org>
Date: Sat, 11 May 2013 02:27:28 +0000 (-0700)
Subject: Fix some declarations
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~121
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f20def1f2e5ba9e0b093b050315b80b517c02dfb;p=emacs.git

Fix some declarations

* lisp/faces.el (internal-face-x-get-resource):
* lisp/frame.el (ns-display-monitor-attributes-list):
* lisp/calc/calc-aent.el (math-to-radians-2):
* lisp/cedet/ede/locate.el (cedet-cscope-version-check)
(cedet-cscope-support-for-directory):
* lisp/cedet/semantic/grammar.el (semantic-grammar-wy--install-parser):
* lisp/emacs-lisp/package.el (tar-header-name, tar-header-link-type):
Fix declarations.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b112313d60..3195d379b54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2013-05-11  Glenn Morris  <rgm@gnu.org>
 
+	* faces.el (internal-face-x-get-resource):
+	* frame.el (ns-display-monitor-attributes-list):
+	* calc/calc-aent.el (math-to-radians-2): Fix declarations.
+
+	* emacs-lisp/package.el (tar-header-name, tar-header-link-type):
+
 	* calc/calc-menu.el: Make it loadable in isolation.
 
 	* net/eudcb-bbdb.el: Make it loadable without bbdb.
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index ae0230633af..6b0cfbb55d9 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -42,7 +42,7 @@
 (declare-function math-simplify "calc-alg" (top-expr))
 (declare-function math-known-matrixp "calc-arith" (a))
 (declare-function math-parse-fortran-subscr "calc-lang" (sym args))
-(declare-function math-to-radians-2 "calc-math" (a))
+(declare-function math-to-radians-2 "calc-math" (a &optional force-symbolic))
 (declare-function math-read-string "calc-ext" ())
 (declare-function math-read-brackets "calc-vec" (space-sep math-rb-close))
 (declare-function math-read-angle-brackets "calc-forms" ())
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 1290a3c8c51..7360fc6e958 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,5 +1,10 @@
 2013-05-11  Glenn Morris  <rgm@gnu.org>
 
+	* ede/locate.el (cedet-cscope-version-check)
+	(cedet-cscope-support-for-directory):
+	* semantic/grammar.el (semantic-grammar-wy--install-parser):
+	Fix declarations.
+
 	* ede/project-am.el (project-am-compile-project-command): Fix :type.
 
 2013-05-09  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index 3dbe3153680..d8b29d3f0be 100644
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -310,8 +310,8 @@ that created this EDE locate object."
 ;;; CSCOPE
 ;;
 
-(declare-function cedet-cscope-version-check "cedet-scope")
-(declare-function cedet-cscope-support-for-directory "cedet-scope")
+(declare-function cedet-cscope-version-check "cedet-cscope")
+(declare-function cedet-cscope-support-for-directory "cedet-cscope")
 (declare-function cedet-cscope-expand-filename "cedet-cscope")
 (declare-function cedet-cscope-create/update-database "cedet-cscope")
 
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 9cb0f60b80a..66e7379ea6f 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -48,11 +48,7 @@
   (require 'semantic/find)
   (require 'semantic/db))
 
-(declare-function semantic-grammar-wy--install-parser
-		  "semantic/gram-wy-fallback")
-
-(declare-function semantic-grammar-wy--install-parser
-		  "semantic/gram-wy-fallback")
+(declare-function semantic-grammar-wy--install-parser "semantic/grammar-wy")
 
 
 ;;;;
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index c80b8d970dc..199fdc8cfcb 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -613,8 +613,8 @@ EXTRA-PROPERTIES is currently unused."
 
 (defvar tar-parse-info)
 (declare-function tar-untar-buffer "tar-mode" ())
-(declare-function tar-header-name "tar-mode" (tar-header))
-(declare-function tar-header-link-type "tar-mode" (tar-header))
+(declare-function tar-header-name "tar-mode" (tar-header) t)
+(declare-function tar-header-link-type "tar-mode" (tar-header) t)
 
 (defun package-untar-buffer (dir)
   "Untar the current buffer.
diff --git a/lisp/faces.el b/lisp/faces.el
index 6225769d161..6b4441e2814 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -297,7 +297,7 @@ X resource class for the attribute."
 
 
 (declare-function internal-face-x-get-resource "xfaces.c"
-		  (resource class frame))
+		  (resource class &optional frame))
 
 (declare-function internal-set-lisp-face-attribute-from-resource "xfaces.c"
 		  (face attr value &optional frame))
diff --git a/lisp/frame.el b/lisp/frame.el
index e1a55bdffc4..0f8fc523a1b 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1495,7 +1495,7 @@ The value is one of the symbols `static-gray', `gray-scale',
 
 (declare-function x-display-monitor-attributes-list "xfns.c"
 		  (&optional terminal))
-(declare-function ns-display-monitor-attributes-list "nsfns.c"
+(declare-function ns-display-monitor-attributes-list "nsfns.m"
 		  (&optional terminal))
 
 (defun display-monitor-attributes-list (&optional display)