From db7d70d3cadd9f7825b8d279c512c03706ca580e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 3 Aug 2023 11:26:32 +0300 Subject: [PATCH 1/5] ; Add commentary to 'describe-function's completion * lisp/help-fns.el (help-fns--describe-function-or-command-prompt): Add a comment (bug#64902). --- lisp/help-fns.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 044bcf8b51f..068c3a5b559 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -229,6 +229,10 @@ interactive command." (lambda (f) (if want-command (commandp f) (or (fboundp f) (get f 'function-documentation)))) + ;; We use 'confirm' here, unlike in other describe-* + ;; commands, for cases like a function that is advised + ;; but not yet defined (e.g., if 'advice-add' is called + ;; before defining the function). 'confirm nil nil (and fn (symbol-name fn))))) (unless (equal val "") From 573fcf2712221f30274de0b217a5702250f43704 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 3 Aug 2023 11:31:41 +0300 Subject: [PATCH 2/5] Add new keyword to 'typescript-ts-mode' * lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--keywords): Add "satisfies", a new operator in Typescript 4.9. (Bug#64924) --- lisp/progmodes/typescript-ts-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el index d234bf2f6e6..96ea18523e3 100644 --- a/lisp/progmodes/typescript-ts-mode.el +++ b/lisp/progmodes/typescript-ts-mode.el @@ -142,7 +142,7 @@ Argument LANGUAGE is either `typescript' or `tsx'." "export" "extends" "finally" "for" "from" "function" "get" "if" "implements" "import" "in" "instanceof" "interface" "is" "infer" "keyof" "let" "namespace" "new" "of" "private" "protected" - "public" "readonly" "return" "set" "static" "switch" + "public" "readonly" "return" "satisfies" "set" "static" "switch" "target" "throw" "try" "type" "typeof" "var" "void" "while" "with" "yield") "TypeScript keywords for tree-sitter font-locking.") From 04996b21241468979ac7f8b4a80563186bee9fad Mon Sep 17 00:00:00 2001 From: john muhl Date: Sun, 30 Jul 2023 13:43:10 -0500 Subject: [PATCH 3/5] Handle tabs in the SQL shown in the column listing * lisp/sqlite-mode.el (sqlite-mode-list-columns): Handle tabs. (Bug#64964) --- lisp/sqlite-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/sqlite-mode.el b/lisp/sqlite-mode.el index c3047c786f7..8cb94485369 100644 --- a/lisp/sqlite-mode.el +++ b/lisp/sqlite-mode.el @@ -126,7 +126,7 @@ (forward-line 1) (if (looking-at " ") ;; Delete the info. - (delete-region (point) (if (re-search-forward "^[^ ]" nil t) + (delete-region (point) (if (re-search-forward "^[^ \t]" nil t) (match-beginning 0) (point-max))) ;; Insert the info. From acfcf7f3690630344b090b4af6afa4d02d0147a3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 4 Aug 2023 09:34:55 +0300 Subject: [PATCH 4/5] Fix "Paste from Kill Menu" in non X toolkit builds * src/keymap.c (possibly_translate_key_sequence): Don't signal an error if 'key-valid-p' returns nil. Suggested by Stefan Monnier . (Bug#64927) --- src/keymap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/keymap.c b/src/keymap.c index 7f5777c9251..41ca43d6a95 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1065,8 +1065,12 @@ possibly_translate_key_sequence (Lisp_Object key, ptrdiff_t *length) xsignal2 (Qerror, build_string ("`key-valid-p' is not defined, so this syntax can't be used: %s"), key); + /* If key-valid-p is unhappy about KEY, we return it as-is. + This happens when menu items define as bindings strings that + should be inserted into the buffer, not commands. See + bug#64927, for example. */ if (NILP (call1 (Qkey_valid_p, AREF (key, 0)))) - xsignal2 (Qerror, build_string ("Invalid `key-parse' syntax: %S"), key); + return key; key = call1 (Qkey_parse, AREF (key, 0)); *length = CHECK_VECTOR_OR_STRING (key); if (*length == 0) From 0f183770c56fab7917fc975222f074ca7eb4a410 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 4 Aug 2023 09:41:30 +0300 Subject: [PATCH 5/5] Fix byte-compiled files that use 'bind-key' from use-package * lisp/use-package/bind-key.el (bind-key): Ensure 'bind-key' is loaded at run time. Patch by John Wiegley . (Bug#64901) --- lisp/use-package/bind-key.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el index 0ab72eafce2..95dda958375 100644 --- a/lisp/use-package/bind-key.el +++ b/lisp/use-package/bind-key.el @@ -196,6 +196,7 @@ can safely be called at any time." (key-description ,namevar)) (if (symbolp ,keymap) ,keymap (quote ,keymap)))) (,bindingvar (lookup-key ,kmapvar ,keyvar))) + (require 'bind-key) ; ensure `personal-keybindings' is in scope (let ((entry (assoc ,kdescvar personal-keybindings)) (details (list ,command (unless (numberp ,bindingvar)