From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 24 Feb 2017 02:19:20 +0000 (-0500)
Subject: Fix left over uses of `call-next-method'
X-Git-Tag: emacs-26.0.90~722
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f1f17265c9b029929a2f52d206cff0e943690847;p=emacs.git

Fix left over uses of `call-next-method'

* lisp/cedet/semantic/db-global.el (object-print):
* lisp/cedet/semantic/db.el (object-print): Use `cl-call-next-method'.
---

diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index 8cb9dab5aaa..61af619b292 100644
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -115,7 +115,7 @@ if optional DONT-ERR-IF-NOT-AVAILABLE is non-nil; else throw an error."
 (cl-defmethod object-print ((obj semanticdb-table-global) &rest strings)
   "Pretty printer extension for `semanticdb-table-global'.
 Adds the number of tags in this file to the object print name."
-  (apply 'call-next-method obj (cons " (proxy)" strings)))
+  (apply #'cl-call-next-method obj (cons " (proxy)" strings)))
 
 (cl-defmethod semanticdb-equivalent-mode ((table semanticdb-table-global) &optional buffer)
   "Return t, pretend that this table's mode is equivalent to BUFFER.
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index d9eef326161..0ba9f2f9c68 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -180,7 +180,7 @@ Adds the number of tags in this file to the object print name."
       ;; Else, add a tags quantifier.
       (cl-call-next-method obj (format " (%d tags)" (length (semanticdb-get-tags obj))))
     ;; Pass through.
-    (apply 'call-next-method obj strings)
+    (apply #'cl-call-next-method obj strings)
     ))
 
 ;;; Index Cache
@@ -324,9 +324,10 @@ If OBJ's file is not loaded, read it in first."
 (cl-defmethod object-print ((obj semanticdb-table) &rest strings)
   "Pretty printer extension for `semanticdb-table'.
 Adds the number of tags in this file to the object print name."
-  (apply 'call-next-method obj
-	 (cons (format " (%d tags)" (length (semanticdb-get-tags obj)))
-	       (cons (if (oref obj dirty) ", DIRTY" "") strings))))
+  (apply #'cl-call-next-method obj
+	 (format " (%d tags)" (length (semanticdb-get-tags obj)))
+         (if (oref obj dirty) ", DIRTY" "")
+         strings))
 
 ;;; DATABASE BASE CLASS
 ;;
@@ -382,13 +383,13 @@ where it may need to resynchronize with some persistent storage."
 (cl-defmethod object-print ((obj semanticdb-project-database) &rest strings)
   "Pretty printer extension for `semanticdb-project-database'.
 Adds the number of tables in this file to the object print name."
-  (apply 'call-next-method obj
-	 (cons (format " (%d tables%s)"
-		       (length (semanticdb-get-database-tables obj))
-		       (if (semanticdb-dirty-p obj)
-			   " DIRTY" "")
-		       )
-	       strings)))
+  (apply #'cl-call-next-method obj
+	 (format " (%d tables%s)"
+                 (length (semanticdb-get-database-tables obj))
+                 (if (semanticdb-dirty-p obj)
+                     " DIRTY" "")
+                 )
+         strings))
 
 (cl-defmethod semanticdb-create-database ((dbc (subclass semanticdb-project-database)) directory)
   "Create a new semantic database of class DBC for DIRECTORY and return it.