Commit 73e6f36e authored by Dmitry Gutov's avatar Dmitry Gutov
Browse files

Replace uses of in-string-p; make it obsolete

* lisp/thingatpt.el (in-string-p): Declare obsolete (bug#20732).
(end-of-sexp, beginning-of-sexp): Use syntax-ppss instead.
parent e5108ff1
...@@ -180,6 +180,7 @@ The bounds of THING are determined by `bounds-of-thing-at-point'." ...@@ -180,6 +180,7 @@ The bounds of THING are determined by `bounds-of-thing-at-point'."
(defun in-string-p () (defun in-string-p ()
"Return non-nil if point is in a string. "Return non-nil if point is in a string.
\[This is an internal function.]" \[This is an internal function.]"
(declare (obsolete "use (nth 3 (syntax-ppss)) instead." "25.1"))
(let ((orig (point))) (let ((orig (point)))
(save-excursion (save-excursion
(beginning-of-defun) (beginning-of-defun)
...@@ -190,7 +191,7 @@ The bounds of THING are determined by `bounds-of-thing-at-point'." ...@@ -190,7 +191,7 @@ The bounds of THING are determined by `bounds-of-thing-at-point'."
\[This is an internal function.]" \[This is an internal function.]"
(let ((char-syntax (syntax-after (point)))) (let ((char-syntax (syntax-after (point))))
(if (or (eq char-syntax ?\)) (if (or (eq char-syntax ?\))
(and (eq char-syntax ?\") (in-string-p))) (and (eq char-syntax ?\") (nth 3 (syntax-ppss))))
(forward-char 1) (forward-char 1)
(forward-sexp 1)))) (forward-sexp 1))))
...@@ -201,7 +202,7 @@ The bounds of THING are determined by `bounds-of-thing-at-point'." ...@@ -201,7 +202,7 @@ The bounds of THING are determined by `bounds-of-thing-at-point'."
\[This is an internal function.]" \[This is an internal function.]"
(let ((char-syntax (char-syntax (char-before)))) (let ((char-syntax (char-syntax (char-before))))
(if (or (eq char-syntax ?\() (if (or (eq char-syntax ?\()
(and (eq char-syntax ?\") (in-string-p))) (and (eq char-syntax ?\") (nth 3 (syntax-ppss))))
(forward-char -1) (forward-char -1)
(forward-sexp -1)))) (forward-sexp -1))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment