mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-30

Browse source 
f2d3659cf5 Handle remote file names in cmuscheme.el
d1ab95b175 * lisp/vc/vc.el (vc-register): Fix interactive spec (bug#...
f58b738042 ; windows installer: set x64 registry keys (tiny change)
This commit is contained in:
Eli Zaretskii 2025-08-09 09:33:20 -04:00
commit d76fe5f31f
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
admin/nt/dist-build/emacs.nsi
View file

@ -70,6 +70,9 @@ Section
# create uninstaller # create uninstaller
WriteUninstaller "$UninstallerPath" WriteUninstaller "$UninstallerPath"
# request to set x64 registry keys
SetRegView 64
# add registry key to enable uninstall from control panel # add registry key to enable uninstall from control panel
WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "GNU Emacs ${VERSION_BRANCH}" WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "GNU Emacs ${VERSION_BRANCH}"
WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$\"$UninstallerPath$\"" WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$\"$UninstallerPath$\""

4
lisp/cmuscheme.el
View file

@ -416,7 +416,7 @@ in the next one.")
(setq scheme-prev-l/c-dir/file (cons (file-name-directory file-name) (setq scheme-prev-l/c-dir/file (cons (file-name-directory file-name)
(file-name-nondirectory file-name))) (file-name-nondirectory file-name)))
(comint-send-string (scheme-proc) (concat "(load \"" (comint-send-string (scheme-proc) (concat "(load \""
file-name (file-local-name file-name)
"\")\n"))) "\")\n")))
(defun scheme-compile-file (file-name) (defun scheme-compile-file (file-name)
@ -430,7 +430,7 @@ in the next one.")
(setq scheme-prev-l/c-dir/file (cons (file-name-directory file-name) (setq scheme-prev-l/c-dir/file (cons (file-name-directory file-name)
(file-name-nondirectory file-name))) (file-name-nondirectory file-name)))
(comint-send-string (scheme-proc) (concat "(compile-file \"" (comint-send-string (scheme-proc) (concat "(compile-file \""
file-name (file-local-name file-name)
"\")\n"))) "\")\n")))

2
lisp/vc/vc.el
View file

@ -1752,7 +1752,7 @@ itself responsible for the file (usually because other files in that
directory are already registered under that backend) will be used to directory are already registered under that backend) will be used to
register the file. If no backend declares itself responsible, the register the file. If no backend declares itself responsible, the
first backend that could register the file is used." first backend that could register the file is used."
(interactive "P") (interactive)
(let* ((fileset-arg (or vc-fileset (vc-deduce-fileset nil t))) (let* ((fileset-arg (or vc-fileset (vc-deduce-fileset nil t)))
(backend (car fileset-arg)) (backend (car fileset-arg))
(files (nth 1 fileset-arg))) (files (nth 1 fileset-arg)))