diff options
| author | Eli Zaretskii | 2023-06-10 06:42:43 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2023-06-10 06:42:43 -0400 |
| commit | acfd261a61a5bdc00f714aeec74635ac9ef87457 (patch) | |
| tree | cf1b824856df65c05fc2f22079e3b538814c3b84 /test/src/comp-resources | |
| parent | c777779bf24507e4bf55cfff77e2cc31d8d25ef3 (diff) | |
| parent | 0d8b69e0ad37fe2d801e16a0ccafd8759dd33d02 (diff) | |
| download | emacs-acfd261a61a5bdc00f714aeec74635ac9ef87457.tar.gz emacs-acfd261a61a5bdc00f714aeec74635ac9ef87457.zip | |
Merge from origin/emacs-29
0d8b69e0ad3 Don't ding when completion succeeded
f11e2d36999 ; * admin/git-bisect-start: Update failing commits
9855a3ea744 ; * src/xdisp.c (redisplay_tool_bar): Fix a typo in a com...
f4ee696b887 Improve documentation of color-related functions
90eadc3e234 Revert "* package.el (package--get-activatable-pkg): Pref...
65f355ea0a3 ; Update my mail address
a3a69ec2342 Fix connection-local user options handling (bug#63300)
240803cc3e1 Document 'startup-redirect-eln-cache'
026afb22984 ; * etc/PROBLEMS: Entry about crashes due to anti-virus (...
bcc222251e1 Fix `emacs-lisp-native-compile-and-load' for C-h f (bug#5...
07c8211ca30 Add 'infer' as a keyword to typescript-ts-mode (bug#63880)
dd2d8ff2f5c ; * etc/NEWS: Mention the issue with PGTK on WSL (bug#633...
fa8135f8916 Revert changes to the order in which package descs are lo...
27fcfa2c0a7 ; * etc/NEWS: Improve instructions for grammar libraries.
2a84ab905c8 Handle point in last file-name component in minibuffer co...
05f25238b7b Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
4bc043ff45d Avoid asking redundant question in emacsbug.el
2eadf328d05 * test/infra/Dockerfile.emba (emacs-base): Don't install ...
583ba1db7ee typescript-ts-mode: Add a rule for function_signature
# Conflicts:
# etc/NEWS
# lisp/minibuffer.el
Diffstat (limited to 'test/src/comp-resources')
| -rw-r--r-- | test/src/comp-resources/comp-test-funcs-dyn.el | 2 | ||||
| -rw-r--r-- | test/src/comp-resources/comp-test-funcs.el | 2 | ||||
| -rw-r--r-- | test/src/comp-resources/comp-test-pure.el | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/src/comp-resources/comp-test-funcs-dyn.el b/test/src/comp-resources/comp-test-funcs-dyn.el index 7f9daf67019..8cd127f7e1b 100644 --- a/test/src/comp-resources/comp-test-funcs-dyn.el +++ b/test/src/comp-resources/comp-test-funcs-dyn.el | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2020-2023 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2020-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Andrea Corallo <akrl@sdf.org> | 5 | ;; Author: Andrea Corallo <acorallo@gnu.org> |
| 6 | 6 | ||
| 7 | ;; This file is part of GNU Emacs. | 7 | ;; This file is part of GNU Emacs. |
| 8 | 8 | ||
diff --git a/test/src/comp-resources/comp-test-funcs.el b/test/src/comp-resources/comp-test-funcs.el index d8c72c1a920..6d0cb353513 100644 --- a/test/src/comp-resources/comp-test-funcs.el +++ b/test/src/comp-resources/comp-test-funcs.el | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2019-2023 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2019-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Andrea Corallo <akrl@sdf.org> | 5 | ;; Author: Andrea Corallo <acorallo@gnu.org> |
| 6 | 6 | ||
| 7 | ;; This file is part of GNU Emacs. | 7 | ;; This file is part of GNU Emacs. |
| 8 | 8 | ||
diff --git a/test/src/comp-resources/comp-test-pure.el b/test/src/comp-resources/comp-test-pure.el index 9b4c1ee2dae..cc5ba7edef7 100644 --- a/test/src/comp-resources/comp-test-pure.el +++ b/test/src/comp-resources/comp-test-pure.el | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2020-2023 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2020-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Andrea Corallo <akrl@sdf.org> | 5 | ;; Author: Andrea Corallo <acorallo@gnu.org> |
| 6 | 6 | ||
| 7 | ;; This file is part of GNU Emacs. | 7 | ;; This file is part of GNU Emacs. |
| 8 | 8 | ||