aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorPo Lu2024-08-29 08:53:52 +0800
committerPo Lu2024-08-29 08:53:52 +0800
commit413489fe80a4736d6dc026cfc3b6d2ce3af44005 (patch)
treebadcfd28962a0dbc06f04c624916a8e5eb71140b /nt
parente97ab1c41332e179939f457cc010a606a5124ff8 (diff)
parente6c72aec9d7eba8f3312811a1b6dc925850460f4 (diff)
downloademacs-413489fe80a4736d6dc026cfc3b6d2ce3af44005.tar.gz
emacs-413489fe80a4736d6dc026cfc3b6d2ce3af44005.zip
Merge from savannah/emacs-30
e6c72aec9d7 ; Fix typos 9ffa38d3925 Eglot: fix completion highlighting (bug#72824) d6880bc24dd ; * admin/make-tarball.txt: Document gotcha. afee71273b7 Discuss commit log messages on feature branches 77302ccb6aa * admin/authors.el (authors-fixed-entries): Update docstr... 3a4839d1427 More consistent treesit-forward-sexp around comments (bug... 31293155879 Improve php-ts-mode font lock and support latest grammar ... b8c05d73a11 Fix tree-sitter local parser overlay cleanup routine aa6ed7f67ec Fix copyright years by hand (Bug#72809)
Diffstat (limited to 'nt')
-rw-r--r--nt/emacs.rc.in2
-rw-r--r--nt/emacsclient.rc.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/nt/emacs.rc.in b/nt/emacs.rc.in
index ed217887c5d..5ef3da1c537 100644
--- a/nt/emacs.rc.in
+++ b/nt/emacs.rc.in
@@ -31,7 +31,7 @@ BEGIN
31 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" 31 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
32 VALUE "FileVersion", "@comma_space_version@\0" 32 VALUE "FileVersion", "@comma_space_version@\0"
33 VALUE "InternalName", "Emacs\0" 33 VALUE "InternalName", "Emacs\0"
34 VALUE "LegalCopyright", "Copyright (C) 2001-2021\0" 34 VALUE "LegalCopyright", "Copyright (C) 2001-2024\0"
35 VALUE "OriginalFilename", "emacs.exe" 35 VALUE "OriginalFilename", "emacs.exe"
36 VALUE "ProductName", "Emacs\0" 36 VALUE "ProductName", "Emacs\0"
37 VALUE "ProductVersion", "@comma_space_version@\0" 37 VALUE "ProductVersion", "@comma_space_version@\0"
diff --git a/nt/emacsclient.rc.in b/nt/emacsclient.rc.in
index c061f06528e..b5f865c6092 100644
--- a/nt/emacsclient.rc.in
+++ b/nt/emacsclient.rc.in
@@ -25,7 +25,7 @@ BEGIN
25 VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" 25 VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
26 VALUE "FileVersion", "@comma_space_version@\0" 26 VALUE "FileVersion", "@comma_space_version@\0"
27 VALUE "InternalName", "EmacsClient\0" 27 VALUE "InternalName", "EmacsClient\0"
28 VALUE "LegalCopyright", "Copyright (C) 2001-2021\0" 28 VALUE "LegalCopyright", "Copyright (C) 2001-2024\0"
29 VALUE "OriginalFilename", "emacsclientw.exe" 29 VALUE "OriginalFilename", "emacsclientw.exe"
30 VALUE "ProductName", "EmacsClient\0" 30 VALUE "ProductName", "EmacsClient\0"
31 VALUE "ProductVersion", "@comma_space_version@\0" 31 VALUE "ProductVersion", "@comma_space_version@\0"