branch: elpa/php-mode commit 6f9a471e5c0399e9277c1ad6af05de72b642c87a Merge: 954afdcff5 e4c764a8e1 Author: USAMI Kenta <tad...@pixiv.com> Commit: GitHub <nore...@github.com>
Merge pull request #706 from emacs-php/fix/docstring Fix quotes = and ' in docstring --- lisp/php-mode.el | 4 ++-- lisp/php.el | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/php-mode.el b/lisp/php-mode.el index de29cc0d56..cff90b08e2 100644 --- a/lisp/php-mode.el +++ b/lisp/php-mode.el @@ -895,8 +895,8 @@ This is was done due to the problem reported here: (defun php-lineup-string-cont (langelem) "Line up string toward equal sign or dot. e.g. -$str = 'some' - . 'string'; +$str \= \'some\' + . \'string\'; this ^ lineup" (save-excursion (goto-char (cdr langelem)) diff --git a/lisp/php.el b/lisp/php.el index 94fec3c4b2..161bf98b8d 100644 --- a/lisp/php.el +++ b/lisp/php.el @@ -243,12 +243,12 @@ an integer (the current comment nesting)." "Make a regular expression for methods with the given VISIBILITY. VISIBILITY must be a string that names the visibility for a PHP -method, e.g. 'public'. The parameter VISIBILITY can itself also +method, e.g. \'public\'. The parameter VISIBILITY can itself also be a regular expression. The regular expression this function returns will check for other -keywords that can appear in method signatures, e.g. 'final' and -'static'. The regular expression will have one capture group +keywords that can appear in method signatures, e.g. \'final\' and +\'static\'. The regular expression will have one capture group which will be the name of the method." (when (stringp visibility) (setq visibility (list visibility))) @@ -275,8 +275,8 @@ which will be the name of the method." '((* any) line-end)))))) (defun php-create-regexp-for-classlike (type) - "Accepts a `TYPE' of a 'classlike' object as a string, such as -'class' or 'interface', and returns a regexp as a string which + "Accepts a `TYPE' of a \'classlike\' object as a string, such as +\'class\' or \'interface\', and returns a regexp as a string which can be used to match against definitions for that classlike." (concat ;; First see if 'abstract' or 'final' appear, although really these