Slight namespace cleanup for thingatpt.el.

[gnu-emacs] / lisp / thingatpt.el

diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index b3fe1bc79507f5ea2dd06e447ac0eb9f0f360fc5..ac4a3d342d7250aa3ea1850e157f0fe188739279 100644 (file)
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -177,35 +177,45 @@ The bounds of THING are determined by `bounds-of-thing-at-point'."
 
 ;;  Sexps
 
-(defun in-string-p ()
-  "Return non-nil if point is in a string.
-\[This is an internal function.]"
+(defun thing-at-point--in-string-p ()
+  "Return non-nil if point is in a string."
+  (declare (obsolete "use (nth 3 (syntax-ppss)) instead." "25.1"))
   (let ((orig (point)))
     (save-excursion
       (beginning-of-defun)
       (nth 3 (parse-partial-sexp (point) orig)))))
 
-(defun end-of-sexp ()
-  "Move point to the end of the current sexp.
-\[This is an internal function.]"
+(define-obsolete-function-alias 'in-string-p
+  'thing-at-point--in-string-p "25.1"
+  "This is an internal thingatpt function and should not be used.")
+
+(defun thing-at-point--end-of-sexp ()
+  "Move point to the end of the current sexp."
   (let ((char-syntax (syntax-after (point))))
     (if (or (eq char-syntax ?\))
-           (and (eq char-syntax ?\") (in-string-p)))
+           (and (eq char-syntax ?\") (nth 3 (syntax-ppss))))
        (forward-char 1)
       (forward-sexp 1))))
 
-(put 'sexp 'end-op 'end-of-sexp)
+(define-obsolete-function-alias 'end-of-sexp
+  'thing-at-point--end-of-sexp "25.1"
+  "This is an internal thingatpt function and should not be used.")
+
+(put 'sexp 'end-op 'thing-at-point--end-of-sexp)
 
-(defun beginning-of-sexp ()
-  "Move point to the beginning of the current sexp.
-\[This is an internal function.]"
+(defun thing-at-point--beginning-of-sexp ()
+  "Move point to the beginning of the current sexp."
   (let ((char-syntax (char-syntax (char-before))))
     (if (or (eq char-syntax ?\()
-           (and (eq char-syntax ?\") (in-string-p)))
+           (and (eq char-syntax ?\") (nth 3 (syntax-ppss))))
        (forward-char -1)
       (forward-sexp -1))))
 
-(put 'sexp 'beginning-op 'beginning-of-sexp)
+(define-obsolete-function-alias 'beginning-of-sexp
+  'thing-at-point--beginning-of-sexp "25.1"
+  "This is an internal thingatpt function and should not be used.")
+
+(put 'sexp 'beginning-op 'thing-at-point--beginning-of-sexp)
 
 ;;  Lists
 
@@ -550,7 +560,7 @@ with angle brackets.")
   "Return the sentence at point.  See `thing-at-point'."
   (thing-at-point 'sentence))
 
-(defun read-from-whole-string (str)
+(defun thing-at-point--read-from-whole-string (str)
   "Read a Lisp expression from STR.
 Signal an error if the entire string was not used."
   (let* ((read-data (read-from-string str))
@@ -564,9 +574,14 @@ Signal an error if the entire string was not used."
        (error "Can't read whole string")
       (car read-data))))
 
+(define-obsolete-function-alias 'read-from-whole-string
+  'thing-at-point--read-from-whole-string "25.1"
+  "This is an internal thingatpt function and should not be used.")
+
 (defun form-at-point (&optional thing pred)
   (let ((sexp (ignore-errors
-               (read-from-whole-string (thing-at-point (or thing 'sexp))))))
+               (thing-at-point--read-from-whole-string
+                (thing-at-point (or thing 'sexp))))))
     (if (or (not pred) (funcall pred sexp)) sexp)))
 
 ;;;###autoload