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

Fix problem with recently-added defcustom's

Browse source 
* lisp/progmodes/php-ts-mode.el (php-ts-mode-php-config)
(php-ts-mode-ws-port, php-ts-mode-ws-document-root)
(php-ts-mode-ws-workers): Fix :type and :safe attributes.
(Bug#71566)
This commit is contained in:
Eli Zaretskii 2024-06-15 16:20:01 +03:00
parent 2cbea4f35c
commit 9e8c0ec991
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,7 +130,7 @@ If nil the default one is used to run the embedded webserver or
inferior PHP process."
:tag "PHP Init file"
:version "30.1"
:type 'file)
:type '(choice (const :tag "Default init file" nil) file))
(defcustom php-ts-mode-ws-hostname "localhost"
"The hostname that will be served by the PHP built-in webserver.
@ -146,23 +146,23 @@ See `https://www.php.net/manual/en/features.commandline.webserver.php'."
If nil `php-ts-mode-run-php-webserver' will ask you for the port number."
:tag "PHP built-in web server port"
:version "30.1"
:type 'integer
:safe 'integerp)
:type '(choice (const :tag "Ask which port to use" nil) integer)
:safe 'integer-or-null-p)
(defcustom php-ts-mode-ws-document-root nil
"The root of the documents that the PHP built-in webserver will serve.
If nil `php-ts-mode-run-php-webserver' will ask you for the document root."
:tag "PHP built-in web server document root"
:version "30.1"
:type 'directory)
:type '(choice (const :tag "Ask for document root" nil) directory))
(defcustom php-ts-mode-ws-workers nil
"The number of workers the PHP built-in webserver will fork.
Useful for testing code against multiple simultaneous requests."
:tag "PHP built-in number of workers"
:version "30.1"
:type 'integer
:safe 'integerp)
:type '(choice (const :tag "No workers" nil) integer)
:safe 'integer-or-null-p)
(defcustom php-ts-mode-inferior-php-buffer "*PHP*"
"Name of the inferior PHP buffer."

6
lisp/subr.el
View file

@ -4460,6 +4460,12 @@ or byte-code."
(or (and (subrp object) (not (eq 'unevalled (cdr (subr-arity object)))))
(byte-code-function-p object)))
(defun integer-or-null-p (object)
"Return non-nil if OBJECT is either an integer or nil.
Otherwise, return nil."
(declare (pure t) (side-effect-free error-free))
(or (integerp object) (null object)))
(defun field-at-pos (pos)
"Return the field at position POS, taking stickiness etc into account."
(declare (important-return-value t))