From 048a2dabfc4aab33d9097bce2971839e051f9d0d Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 12 Feb 2023 07:47:09 +0100 Subject: [PATCH 1/8] ; Fix typo --- doc/lispref/internals.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index e1a4613875c..6a8aaf8ebaf 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -2550,7 +2550,7 @@ variable names have underscores replaced with dashes. For instance, @code{mode_line_format} stores the value of @code{mode-line-format}. @item overlays -The inveral tree containing this buffer's overlays. +The interval tree containing this buffer's overlays. @item last_selected_window This is the last window that was selected with this buffer in it, or @code{nil} From 7287b7b53a17f9b2d1b474466106806a9d57af47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Thu, 9 Feb 2023 10:58:48 +0100 Subject: [PATCH 2/8] Support webkit2gtk-4.1 * configure.ac: Check for webkit2gtk API version 4.1 first, then fall back to 4.0. --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 645082c9746..bc7e61048c3 100644 --- a/configure.ac +++ b/configure.ac @@ -3613,8 +3613,12 @@ XWIDGETS_OBJ= if test "$with_xwidgets" != "no"; then if test "$USE_GTK_TOOLKIT" = "GTK3" && test "$window_system" != "none"; then WEBKIT_REQUIRED=2.12 - WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED" + WEBKIT_MODULES="webkit2gtk-4.1 >= $WEBKIT_REQUIRED" EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES]) + if test "$HAVE_WEBKIT" = "no"; then + WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED" + EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES]) + fi HAVE_XWIDGETS=$HAVE_WEBKIT XWIDGETS_OBJ="xwidget.o" if test "$HAVE_X_WINDOWS" = "yes" && test "${with_cairo}" = "no"; then From 86ca7df6a345f743f381c67bb0d14879b2858f13 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 12 Feb 2023 14:05:44 +0200 Subject: [PATCH 3/8] ; Mention Hunspell private-dictionary misfeature in doc strings * lisp/textmodes/ispell.el (ispell-personal-dictionary) (ispell-local-pdict): Mention Hunspell misfeatures in doc strings. (Bug#61190) --- lisp/textmodes/ispell.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 3da6effbcfe..bb2bcfd8052 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -318,7 +318,9 @@ window system by evaluating the following on startup to set this variable: ;;;###autoload (defcustom ispell-personal-dictionary nil "File name of your personal spelling dictionary, or nil. -If nil, the default personal dictionary for your spelling checker is used." +If nil, the default personal dictionary for your spelling checker is used. +Due to a misfeature of Hunspell, if the value is an absolute file name, the +file by that name must already exist for Hunspell to be able to use it." :type '(choice file (const :tag "default" nil))) @@ -1730,7 +1732,10 @@ If you specify a personal dictionary for the current buffer which is different from the current personal dictionary, the effect is similar to calling \\[ispell-change-dictionary]. This variable is automatically set when defined in the file with either `ispell-pdict-keyword' or the -local variable syntax.") +local variable syntax. + +Due to a misfeature of Hunspell, if the value is an absolute file name, the +file by that name must already exist for Hunspell to be able to use it.") ;;;###autoload(put 'ispell-local-pdict 'safe-local-variable 'stringp) From 3d17aee13d9fa02f6b4cc03be7f323a48d480f09 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sun, 12 Feb 2023 13:10:04 +0100 Subject: [PATCH 4/8] ; Fix installation of dependencies for VC packages * lisp/emacs-lisp/package-vc.el (package-vc-install-dependencies): Maintain a list of package-desc objects instead of package names to install. --- lisp/emacs-lisp/package-vc.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index 33bd0bfd5cd..1bc5c883161 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -426,8 +426,8 @@ version of that package." ((let* ((pac package-archive-contents) (desc (cadr (assoc (car pkg) pac)))) (if desc - (let ((reqs (package-desc-reqs pkg))) - (push pkg to-install) + (let ((reqs (package-desc-reqs desc))) + (push desc to-install) (mapc #'search reqs)) (push pkg missing)))))) (version-order (a b) From 8bc1b7d0b27176e1d9039aec40d6e6f4d50f34b7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 12 Feb 2023 14:20:48 +0200 Subject: [PATCH 5/8] Avoid warning about 'load-path' in non-interactive sessions * lisp/startup.el (command-line): Emit the warning about 'user-emacs-directory' in 'load-path' only in interactive sessions. (Bug#61014) --- lisp/startup.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/startup.el b/lisp/startup.el index bb6250d3968..e5ec15eebea 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1596,7 +1596,8 @@ please check its value") ;; or EMACSLOADPATH, so we basically always have to check. (let (warned) (dolist (dir load-path) - (and (not warned) + (and (not noninteractive) + (not warned) (stringp dir) (string-equal (file-name-as-directory (expand-file-name dir)) (expand-file-name user-emacs-directory)) From d4fc70129786f0c90f76e1868203d63a59f3f92d Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sun, 12 Feb 2023 13:25:54 +0100 Subject: [PATCH 6/8] Tolerate missing elpa-packages.eld files * lisp/emacs-lisp/package-vc.el (package-vc--download-and-read-archives): Replace 'condition-case-unless-debug' with a regular 'condition-case'. It appears a few people using third-party archives that don't serve package specifications have been having issues with package-vc, when toggle-on-error is enabled. In their case, package-vc would raise an error in its first invocation, but it would go on working normally afterwards. As this behaviour is confusing and the user can't do much about a missing elpa-packages.eld to begin with, we satisfy ourselves with printing out a message and continuing on. --- lisp/emacs-lisp/package-vc.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index 1bc5c883161..a3d5200f0f8 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -269,9 +269,9 @@ Populate `package-vc--archive-spec-alist' with the result. If optional argument ASYNC is non-nil, perform the downloads asynchronously." (dolist (archive package-archives) - (condition-case-unless-debug nil + (condition-case err (package--download-one-archive archive "elpa-packages.eld" async) - (error (message "Failed to download `%s' archive." (car archive)))))) + (error (message "Failed to download `%s' archive: %S" (car archive) err))))) (add-hook 'package-read-archive-hook #'package-vc--read-archive-data 20) From 2da05876edb5bc8ec0f39ac679c806930e16e5c7 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sun, 12 Feb 2023 14:29:26 +0100 Subject: [PATCH 7/8] ; Use the right name when specifying VC packages * lisp/emacs-lisp/package-vc.el (package-vc-install-selected-packages): Generate dummy package descriptors in here, if necessary. (package-vc--unpack): Remove dummy-descriptor generation. --- lisp/emacs-lisp/package-vc.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index a3d5200f0f8..bf49f274bfd 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -134,7 +134,10 @@ the `clone' function." (package-vc-install name spec)) ((listp spec) (package-vc--archives-initialize) - (package-vc--unpack (cadr pkg-descs) spec))))))) + (package-vc--unpack + (or (cadr (assoc name package-archive-contents)) + (package-desc-create :name name :kind 'vc)) + spec))))))) ;;;###autoload (defcustom package-vc-selected-packages '() @@ -600,8 +603,6 @@ PKG-SPEC is a package specification, a property list describing how to fetch and build the package. See `package-vc--archive-spec-alist' for details. The optional argument REV specifies a specific revision to checkout. This overrides the `:branch' attribute in PKG-SPEC." - (unless pkg-desc - (setq pkg-desc (package-desc-create :name (car pkg-spec) :kind 'vc))) (pcase-let* (((map :lisp-dir) pkg-spec) (name (package-desc-name pkg-desc)) (dirname (package-desc-full-name pkg-desc)) From eb2b0931cf1258b875b031f81a3685eda8ddf5cb Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Sun, 12 Feb 2023 18:57:40 +0100 Subject: [PATCH 8/8] Add lambda_expression to c-ts-common-indent-type-regexp-alist * lisp/progmodes/java-ts-mode.el (java-ts-mode): Tweak regexp. --- lisp/progmodes/java-ts-mode.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el index dc651c11a00..e15da7110f1 100644 --- a/lisp/progmodes/java-ts-mode.el +++ b/lisp/progmodes/java-ts-mode.el @@ -309,6 +309,7 @@ Return nil if there is no name or if NODE is not a defun node." "constructor_body" "annotation_type_body" "interface_body" + "lambda_expression" "enum_body" "switch_block" "record_declaration_body"