branch: externals/wisi
commit f2945aa7f63d9708281d90343a825b472d68d5e3
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Minor cosmetic changes
Fixes to help the build from ELPA's Makefile, mostly.
Also, use #' to quote function names.
* prj-alire.el, prj-wisi.el: Fix first line so Makefile parses it correctly.
* wisi-process-parse.el: Require `wisi`.
(parse_max_parallel, mckenzie_zombie_limit, mckenzie_enqueue_limit):
* wisi-parse-common.el (wisi-incremental-parse-enable): Declare vars.
---
prj-alire.el | 4 ++--
prj-wisi.el | 4 ++--
wisi-parse-common.el | 6 ++++--
wisi-process-parse.el | 8 +++++++-
wisi-run-indent-test.el | 14 +++++++-------
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/prj-alire.el b/prj-alire.el
index 269b4d8f25..d79cf8d754 100644
--- a/prj-alire.el
+++ b/prj-alire.el
@@ -1,6 +1,6 @@
-;; Set up building with Alire -*- no-byte-compile : t -*-
+;; Set up building with Alire -*- no-byte-compile: t; lexical-binding: t; -*-
;;
-;; Copyright (C) 2021, 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
;;
;; This file is part of GNU Emacs.
;;
diff --git a/prj-wisi.el b/prj-wisi.el
index f8e41afdbf..f26767e056 100644
--- a/prj-wisi.el
+++ b/prj-wisi.el
@@ -1,6 +1,6 @@
-;; Set up building with gprbuild in elpa -*- no-byte-compile : t -*-
+;; Set up building with gprbuild in elpa -*- no-byte-compile: t;
lexical-binding: t; -*-
;;
-;; Copyright (C) 2021, 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
;;
;; This file is part of GNU Emacs.
;;
diff --git a/wisi-parse-common.el b/wisi-parse-common.el
index d565c712e7..89400f1020 100644
--- a/wisi-parse-common.el
+++ b/wisi-parse-common.el
@@ -1,6 +1,6 @@
;;; wisi-parse-common.el --- declarations used by wisi-parse.el,
wisi-ada-parse.el, and wisi.el -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2014, 2015, 2017 - 2023 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2024 Free Software Foundation, Inc.
;;
;; Author: Stephen Leake <stephen_le...@member.fsf.org>
;;
@@ -50,7 +50,7 @@ for the changes. The filename is the visited file name with
\"-wisi-change-start\"' appended."
:type 'boolean
:group 'wisi
- :safe 'booleanp)
+ :safe #'booleanp)
(defcustom wisi-save-text-tree nil
"When non-nil, save the parser's copy of the full text and the
@@ -619,6 +619,8 @@ Normally set from a language-specific option.")
(write-file file-name))
(message "keyboard macro saved to file '%s'" file-name))
+(defvar wisi-incremental-parse-enable) ;FIXME: cyclic dependency with wisi.el.
+
(defun wisi-parse-incremental-none ()
"Force an incremental parse.
Signals an error if `wisi-incremental-parse-enable' is nil."
diff --git a/wisi-process-parse.el b/wisi-process-parse.el
index 60bbdaa2bf..cd5d957043 100644
--- a/wisi-process-parse.el
+++ b/wisi-process-parse.el
@@ -1,6 +1,6 @@
;;; wisi-process-parse.el --- interface to external parse program -*-
lexical-binding: t; -*-
;;
-;; Copyright (C) 2014, 2017 - 2023 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2024 Free Software Foundation, Inc.
;;
;; Author: Stephen Leake <stephen_le...@member.fsf.org>
;;
@@ -21,6 +21,7 @@
(require 'cl-lib)
(require 'wisi-parse-common)
+(require 'wisi) ;For `wisi--changes' and `wisi-incremental-parse-enable'.
(defconst wisi-process-parse-protocol-version "7"
"Defines data exchanged between this package and the background process.
@@ -1344,6 +1345,11 @@ Source buffer is current."
(wisi-parse-tree-query parser 'dump (concat save-file-root
".tree_text")))))
+;; FIXME: Use proper `wisi-' prefix for those vars.
+(defvar parse_max_parallel)
+(defvar mckenzie_zombie_limit)
+(defvar mckenzie_enqueue_limit)
+
(defun wisi-process-all-changes-to-cmd (&optional cmd-buffer-name)
"Convert wisi-parser-local-all-changes in current buffer to command file
in CMD-BUFFER-NAME."
diff --git a/wisi-run-indent-test.el b/wisi-run-indent-test.el
index 5b9e0d820b..e642c5888b 100644
--- a/wisi-run-indent-test.el
+++ b/wisi-run-indent-test.el
@@ -1,6 +1,6 @@
;;; wisi-run-indent-test.el --- utils for automating indentation and casing
tests -*- lexical-binding: t; -*-
;;
-;; Copyright (C) 2018 - 2023 Free Software Foundation, Inc.
+;; Copyright (C) 2018 - 2024 Free Software Foundation, Inc.
;;
;; This file is part of GNU Emacs.
;;
@@ -229,7 +229,7 @@ Each item is a list (ACTION PARSE-BEGIN PARSE-END
EDIT-BEGIN)")
;; for test-face
(setq jit-lock-context-time 0.0)
- (setq-local font-lock-ensure-function 'jit-lock-fontify-now) ;; it's
not at all clear what's resetting this
+ (setq-local font-lock-ensure-function #'jit-lock-fontify-now) ;; it's
not at all clear what's resetting this
(setq-local eglot-send-changes-idle-time 0.0) ;; FIXME: did not help
test-face
;; Test files use wisi-prj-select-cached to parse and select a project
file.
@@ -477,22 +477,22 @@ Each item is a list (ACTION PARSE-BEGIN PARSE-END
EDIT-BEGIN)")
(cons 'height 103) ;; characters
(cons 'left 0)
(cons 'top 0))))))
-(define-key global-map "\C-cp" 'wisi-half-screen)
+(define-key global-map "\C-cp" #'wisi-half-screen)
(defun wisi-first-error ()
(interactive)
(pop-to-buffer "*Messages*")
(goto-char (point-min))
(search-forward "error:"))
-(define-key global-map [f6] 'wisi-first-error)
+(define-key global-map [f6] #'wisi-first-error)
(defun wisi-prev-window ()
"move to previous window"
(interactive)
(other-window -1))
-(define-key global-map [M-C-up] 'wisi-prev-window)
-(define-key global-map [M-C-down] 'other-window)
-(define-key global-map [f11] 'switch-to-buffer)
+(define-key global-map [M-C-up] #'wisi-prev-window)
+(define-key global-map [M-C-down] #'other-window)
+(define-key global-map [f11] #'switch-to-buffer)
(defun run-test (file-name)
"Run an indentation and casing test on FILE-NAME."
