Update for Emacs 29

- Update CI
- Update indentations

Author: taku0

.github/workflows/run-test.yml

@@ -16,7 +16,20 @@ jobs:
         # '25.1' fails for some reason even though `make lint_in_docker` succeeds.
         # swift-mode-beginning-of-defun.el:1081: All variables and subroutines might as well have a documentation string
         # swift-mode-beginning-of-defun.el:1135: All variables and subroutines might as well have a documentation string
-        version: ['24.4', '24.5', '25.2', '25.3', '26.1', '26.2', '26.3', '27.1', '27.2', '28.1', 'snapshot']
+        version:
+          - '29.1'
+          - '28.2'
+          - '28.1'
+          - '27.2'
+          - '27.1'
+          - '26.3'
+          - '26.2'
+          - '26.1'
+          - '25.3'
+          - '25.2'
+          - '24.5'
+          - '24.4'
+          - 'snapshot'
 
     env:
       ELDEV_DIR: .eldev
@@ -33,6 +46,8 @@ jobs:
         curl -fsSL https://raw.github.com/doublep/eldev/master/bin/eldev > $ELDEV_DIR/bin/eldev
         chmod a+x $ELDEV_DIR/bin/eldev
     - name: Run linters
+      # Indentation rules changed since 29.
+      if: ${{ startsWith(matrix.version, '29.') }}
       run: find ./*.el test/*.el '!' -name '*autoloads.el' -exec ${ELDEV} lint '{}' '+'
     - name: Run tests
       run: ./scripts/run_test.sh

scripts/lint_in_docker.sh

@@ -2,7 +2,8 @@
 
 # Run linter in Docker.  Used in Makefile.
 
-for version in 28 27 26 25 24
+# Indentation rules changed since 29.
+for version in 29 # 28 27 26 25 24
 do
     docker \
         run \

scripts/test_in_docker.sh

@@ -2,7 +2,7 @@
 
 # Run tests in Docker.  Used in Makefile.
 
-for version in 28 27 26 25 24
+for version in 29 28 27 26 25 24
 do
     rm -f *.elc test/*.elc
     rm -f *-autoloads.el
@@ -14,7 +14,7 @@ do
         --workdir="/src" \
         --env=ELDEV_DIR=/src/.eldev \
         --env=HOME=/tmp \
-        silex/emacs:${version} \
+        silex/emacs:${version}-ci \
         bash -c "/src/scripts/run_test.sh" \
         || exit 1
 done

swift-mode-beginning-of-defun.el

@@ -167,12 +167,12 @@ Otherwise, return nil.
 The cursor must be at the beginning of a statement."
   (let ((token (swift-mode:forward-token-or-list))
         (defun-keywords
-          '("import" "typealias" "associatedtype"
-            "enum" "struct" "actor" "protocol" "extension"
-            "func" "init" "deinit" "subscript" "get" "set" "willSet" "didSet"
-            "prefix" "postfix" "infix" "precedencegroup"
-            "var" "let"
-            "case"))
+         '("import" "typealias" "associatedtype"
+           "enum" "struct" "actor" "protocol" "extension"
+           "func" "init" "deinit" "subscript" "get" "set" "willSet" "didSet"
+           "prefix" "postfix" "infix" "precedencegroup"
+           "var" "let"
+           "case"))
         (stop-tokens '(\; implicit-\; {} { } \( \) \[ \]
                        anonymous-function-parameter-in outside-of-buffer))
         (class-token nil))

swift-mode-indent.el

@@ -1485,7 +1485,7 @@ When this function returns, the cursor is at the start of the token.
 
 If there is no open curly braces, return `outside-of-buffer' token.
 
-This is optimized version of (swift-mode:backward-sexps-until '({}))."
+This is optimized version of (swift-mode:backward-sexps-until \\='({}))."
   (let* ((parent-position (nth 1 (syntax-ppss))))
     (while (and parent-position
                 (and (goto-char parent-position)

swift-mode-repl.el

@@ -571,9 +571,9 @@ SCHEME is the name of the project scheme in Xcode.  If it is nil or omitted,
 the value of `swift-mode:ios-project-scheme' is used."
   (interactive
    (let* ((default-project-directory
-            (or
-             (swift-mode:find-xcode-workspace-directory)
-             (swift-mode:find-xcode-project-directory)))
+           (or
+            (swift-mode:find-xcode-workspace-directory)
+            (swift-mode:find-xcode-project-directory)))
           (project-directory
            (if current-prefix-arg
                (swift-mode:read-project-directory default-project-directory)
@@ -902,9 +902,9 @@ SCHEME is the name of the project scheme in Xcode.  If it is nil or omitted,
 the value of `swift-mode:ios-project-scheme' is used."
   (interactive
    (let* ((default-project-directory
-            (or
-             (swift-mode:find-xcode-workspace-directory)
-             (swift-mode:find-xcode-project-directory)))
+           (or
+            (swift-mode:find-xcode-workspace-directory)
+            (swift-mode:find-xcode-project-directory)))
           (project-directory
            (if current-prefix-arg
                (swift-mode:read-project-directory default-project-directory)

swift-mode.el

@@ -66,7 +66,7 @@
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map prog-mode-map)
     (define-key map [remap indent-new-comment-line]
-      #'swift-mode:indent-new-comment-line)
+                #'swift-mode:indent-new-comment-line)
     (define-key map (kbd "C-c C-z") #'swift-mode:run-repl)
     (define-key map (kbd "C-c C-f") #'swift-mode:send-buffer)
     (define-key map (kbd "C-c C-r") #'swift-mode:send-region)
@@ -78,7 +78,7 @@
     (define-key map [remap forward-sentence] #'swift-mode:forward-sentence)
     (define-key map [remap kill-sentence] #'swift-mode:kill-sentence)
     (define-key map [remap backward-kill-sentence]
-      #'swift-mode:backward-kill-sentence)
+                #'swift-mode:backward-kill-sentence)
     ;; (define-key map (kbd "???") #'swift-mode:mark-sentence)
     (define-key map [remap narrow-to-sentence] #'swift-mode:narrow-to-sentence)