[Emacs-diffs] /srv/bzr/emacs/trunk r110020: Update some function declarations

[Glenn Morris]

------------------------------------------------------------
revno: 110020
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-09-13 14:41:21 -0400
message:
  Update some function declarations
  
  * lisp/calc/calc-ext.el (math-compose-expr):
  * lisp/calc/calc.el (math-compose-expr):
  * lisp/progmodes/cc-defs.el (cl-macroexpand-all):
  * lisp/progmodes/cc-langs.el (delete-duplicates, mapcan)
  (cl-macroexpand-all): Update declarations.
modified:
  lisp/ChangeLog
  lisp/calc/calc-ext.el
  lisp/calc/calc.el
  lisp/progmodes/cc-defs.el
  lisp/progmodes/cc-langs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-13 18:23:33 +0000
+++ b/lisp/ChangeLog    2012-09-13 18:41:21 +0000
@@ -1,5 +1,11 @@
 2012-09-13  Glenn Morris  <address@hidden>
 
+       * calc/calc.el (math-compose-expr):
+       * calc/calc-ext.el (math-compose-expr):
+       * progmodes/cc-defs.el (cl-macroexpand-all):
+       * progmodes/cc-langs.el (delete-duplicates, mapcan)
+       (cl-macroexpand-all): Update declarations.
+
        * vc/vc.el: No need to require ediff.
        (ediff-load-version-control): Declare.
        (ediff-vc-internal): Fix declaration.

=== modified file 'lisp/calc/calc-ext.el'
--- a/lisp/calc/calc-ext.el     2012-08-07 16:12:20 +0000
+++ b/lisp/calc/calc-ext.el     2012-09-13 18:41:21 +0000
@@ -61,7 +61,7 @@
 (declare-function math-vector-is-string "calccomp" (a))
 (declare-function math-vector-to-string "calccomp" (a &optional quoted))
 (declare-function math-format-radix-float "calc-bin" (a prec))
-(declare-function math-compose-expr "calccomp" (a prec))
+(declare-function math-compose-expr "calccomp" (a prec &optional div))
 (declare-function math-abs "calc-arith" (a))
 (declare-function math-format-bignum-binary "calc-bin" (a))
 (declare-function math-format-bignum-octal "calc-bin" (a))

=== modified file 'lisp/calc/calc.el'
--- a/lisp/calc/calc.el 2012-07-31 21:32:28 +0000
+++ b/lisp/calc/calc.el 2012-09-13 18:41:21 +0000
@@ -199,7 +199,7 @@
 (declare-function calc-div-fractions "calc-frac" (a b))
 (declare-function math-div-objects-fancy "calc-arith" (a b))
 (declare-function math-div-symb-fancy "calc-arith" (a b))
-(declare-function math-compose-expr "calccomp" (a prec))
+(declare-function math-compose-expr "calccomp" (a prec &optional div))
 (declare-function math-comp-width "calccomp" (c))
 (declare-function math-composition-to-string "calccomp" (c &optional width))
 (declare-function math-stack-value-offset-fancy "calccomp" ())

=== modified file 'lisp/progmodes/cc-defs.el'
--- a/lisp/progmodes/cc-defs.el 2012-06-26 16:23:01 +0000
+++ b/lisp/progmodes/cc-defs.el 2012-09-13 18:41:21 +0000
@@ -1829,7 +1829,7 @@
   (eval form))
 
 ;; Only used at compile time - suppress "might not be defined at runtime".
-(declare-function cl-macroexpand-all "cl-extra" (form &optional env))
+(declare-function cl-macroexpand-all "cl" (form &optional env))
 
 (defmacro c-lang-defconst (name &rest args)
   "Set the language specific values of the language constant NAME.

=== modified file 'lisp/progmodes/cc-langs.el'
--- a/lisp/progmodes/cc-langs.el        2012-07-20 11:36:41 +0000
+++ b/lisp/progmodes/cc-langs.el        2012-09-13 18:41:21 +0000
@@ -208,9 +208,10 @@
 
 ;; Suppress "might not be defined at runtime" warning.
 ;; This file is only used when compiling other cc files.
-(declare-function delete-duplicates "cl-seq" (cl-seq &rest cl-keys))
-(declare-function mapcan "cl-extra" (cl-func cl-seq &rest cl-rest))
-(declare-function cl-macroexpand-all "cl-extra" (form &optional env))
+;; These are defined in cl as aliases to the cl- versions.
+(declare-function delete-duplicates "cl-seq" (cl-seq &rest cl-keys) t)
+(declare-function mapcan "cl-extra" (cl-func cl-seq &rest cl-rest) t)
+(declare-function cl-macroexpand-all "cl" (form &optional env))
 
 (eval-and-compile
   ;; Some helper functions used when building the language constants.