[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master cabaa99: Slight namespace cleanup for thingatpt.el.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master cabaa99: Slight namespace cleanup for thingatpt.el. |
Date: |
Wed, 10 Jun 2015 23:07:13 +0000 |
branch: master
commit cabaa992fa7f7f1bcde79be8c202d54a41a52c9f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Slight namespace cleanup for thingatpt.el.
* lisp/thingatpt.el (thing-at-point--in-string-p)
(thing-at-point--end-of-sexp, thing-at-point--beginning-of-sexp)
(thing-at-point--read-from-whole-string): Rename from
old versions without "thing-at-point--" prefix.
Keep old versions as obsolete aliases. Update all uses.
---
lisp/thingatpt.el | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 7fdb32c..ac4a3d3 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -177,36 +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 ?\") (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 ?\") (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
@@ -551,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))
@@ -565,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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master cabaa99: Slight namespace cleanup for thingatpt.el.,
Glenn Morris <=