procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 'wrong-type-argument' in 'php-ts-mode--webserver-read-args'

Browse source 
Prevents php-ts-mode--webserver-read-args from throwing an
error if the current buffer is not associated with a file.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--webserver-read-args):
Use 'default-directory if' the current buffer is not associated
with a file.  (Bug#71574)
(php-ts-mode-run-php-webserver): Fix doc string.
This commit is contained in:
Vincenzo Pupillo 2024-06-15 18:57:29 +02:00 • committed by Eli Zaretskii
parent 0910f6fe3f
commit 13c4fc3dc7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/progmodes/php-ts-mode.el
View file

@ -1467,7 +1467,7 @@ for PORT, HOSTNAME, DOCUMENT-ROOT and ROUTER-SCRIPT."
(derived-mode-add-parents 'php-ts-mode '(php-mode))
(defun php-ts-mode--webserver-read-args (&optional type)
"Helper for php-ts-mode-run-php-webserver.
"Helper for `php-ts-mode-run-php-webserver'.
The optional TYPE can be the symbol \"port\", \"hostname\", \"document-root\" or
\"router-script\", otherwise it requires all of them."
(let ((ask-port (lambda ()
@ -1477,11 +1477,15 @@ The optional TYPE can be the symbol \"port\", \"hostname\", \"document-root\" or
(ask-document-root (lambda ()
(expand-file-name
(read-directory-name "Document root: "
(file-name-directory (buffer-file-name))))))
(file-name-directory
(or (buffer-file-name)
default-directory))))))
(ask-router-script (lambda ()
(expand-file-name
(read-file-name "Router script: "
(file-name-directory (buffer-file-name)))))))
(file-name-directory
(or (buffer-file-name)
default-directory)))))))
(cl-case type
(port (funcall ask-port))
(hostname (funcall ask-hostname))