a slew of little fixes courtesy of the byte compiler

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/skels/jao-skel-cpp.el b/lib/skels/jao-skel-cpp.el
index 0ddb61e..1180495 100644
--- a/lib/skels/jao-skel-cpp.el
+++ b/lib/skels/jao-skel-cpp.el
@@ -1,6 +1,6 @@
 ;;; jao-skel-cpp.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2005, 2008, 2009, 2022 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2004, 2005, 2008, 2009, 2022, 2026 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: tools
@@ -50,7 +50,7 @@
 ;;; Auxiliar functions
 (defun jao-skel-cpp--find-other (ext)
   (file-name-nondirectory
-   (or (ff-other-file-name)
+   (or (ff-get-other-file)
        (concat (file-name-sans-extension (buffer-name)) "." ext))))
 
 (defun jao-skel-cpp-make-guard-name (ns)
@@ -68,7 +68,7 @@
 (defsubst jao-skel-cpp--ns2str (ns) (mapconcat 'identity ns "::"))
 
 (defun jao-skel-cpp--get-ns-list (&optional acc)
-  (do* ((result acc (cons next result))
+  (cl-do* ((result acc (cons next result))
         (next (jao-skel-cpp--read-ns (jao-skel-cpp--ns2str acc))
               (jao-skel-cpp--read-ns (jao-skel-cpp--ns2str (reverse result)))))
       ((string= next "") (reverse result))))
@@ -98,11 +98,11 @@
       (while (re-search-forward "namespace\\s-\\w+\\s-{\\|}+\\s-//\\s-namespace"
                                 nil t)
         (push (thing-at-point 'line) lines)
-        (next-line)))
+        (forward-line)))
     lines))
 
 (defun jao-skel-cpp--copy-namespace ()
-  (let* ((name (ff-other-file-name))
+  (let* ((name (ff-get-file-name))
          (buff (and name (find-file-noselect name)))
          (nlines))
     (when buff