mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

Merge from origin/emacs-29

Browse Source 
0f183770c5 Fix byte-compiled files that use 'bind-key' from use-package
acfcf7f369 Fix "Paste from Kill Menu" in non X toolkit builds
04996b2124 Handle tabs in the SQL shown in the column listing
573fcf2712 Add new keyword to 'typescript-ts-mode'
db7d70d3ca ; Add commentary to 'describe-function's completion
This commit is contained in:
Eli Zaretskii 2023-08-04 03:17:51 -04:00
commit dde3b9350e
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/help-fns.el
View File

@ -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 "")

2
lisp/progmodes/typescript-ts-mode.el
View File

@ -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.")

2
lisp/sqlite-mode.el
View File

@ -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.

1
lisp/use-package/bind-key.el
View File

@ -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)

6
src/keymap.c
View File

@ -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)