[Emacs-diffs] /srv/bzr/emacs/trunk r112547: Fix some declarations

[Glenn Morris]

------------------------------------------------------------
revno: 112547
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-05-10 19:27:28 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/calc/calc-aent.el
  lisp/cedet/ChangeLog
  lisp/cedet/ede/locate.el
  lisp/cedet/semantic/grammar.el
  lisp/emacs-lisp/package.el
  lisp/faces.el
  lisp/frame.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-11 02:25:11 +0000
+++ b/lisp/ChangeLog    2013-05-11 02:27:28 +0000
@@ -1,5 +1,11 @@
 2013-05-11  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/calc/calc-aent.el'
--- a/lisp/calc/calc-aent.el    2013-01-01 09:11:05 +0000
+++ b/lisp/calc/calc-aent.el    2013-05-11 02:27:28 +0000
@@ -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" ())

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2013-05-11 02:21:29 +0000
+++ b/lisp/cedet/ChangeLog      2013-05-11 02:27:28 +0000
@@ -1,5 +1,10 @@
 2013-05-11  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/cedet/ede/locate.el'
--- a/lisp/cedet/ede/locate.el  2013-03-21 22:11:03 +0000
+++ b/lisp/cedet/ede/locate.el  2013-05-11 02:27:28 +0000
@@ -310,8 +310,8 @@
 ;;; 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")
 

=== modified file 'lisp/cedet/semantic/grammar.el'
--- a/lisp/cedet/semantic/grammar.el    2013-03-21 22:11:03 +0000
+++ b/lisp/cedet/semantic/grammar.el    2013-05-11 02:27:28 +0000
@@ -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")
 
 
 ;;;;

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-04-27 13:32:53 +0000
+++ b/lisp/emacs-lisp/package.el        2013-05-11 02:27:28 +0000
@@ -613,8 +613,8 @@
 
 (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.

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2013-05-08 15:06:28 +0000
+++ b/lisp/faces.el     2013-05-11 02:27:28 +0000
@@ -297,7 +297,7 @@
 
 
 (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))

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2013-05-09 15:17:38 +0000
+++ b/lisp/frame.el     2013-05-11 02:27:28 +0000
@@ -1495,7 +1495,7 @@
 
 (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)