diff options
Diffstat (limited to 'lisp/thingatpt.el')
| -rw-r--r-- | lisp/thingatpt.el | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index 70f25da673a..4dd56862913 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el @@ -32,11 +32,11 @@ ;; forward-"thing" operator (eg. forward-word, forward-line). ;; ;; Special cases are allowed for using properties associated with the named -;; "thing": +;; "thing": ;; ;; forward-op Function to call to skip forward over a "thing" (or ;; with a negative argument, backward). -;; +;; ;; beginning-op Function to call to skip to the beginning of a "thing". ;; end-op Function to call to skip to the end of a "thing". ;; @@ -80,14 +80,14 @@ of the textual entity that was found." (condition-case nil (save-excursion ;; Try moving forward, then back. - (let ((end (progn - (funcall - (or (get thing 'end-op) + (let ((end (progn + (funcall + (or (get thing 'end-op) (function (lambda () (forward-thing thing 1))))) (point))) - (beg (progn - (funcall - (or (get thing 'beginning-op) + (beg (progn + (funcall + (or (get thing 'beginning-op) (function (lambda () (forward-thing thing -1))))) (point)))) (if (not (and beg (> beg orig))) @@ -95,9 +95,9 @@ of the textual entity that was found." ;; it worked. But END may not be the real end. ;; So find the real end that corresponds to BEG. (let ((real-end - (progn - (funcall - (or (get thing 'end-op) + (progn + (funcall + (or (get thing 'end-op) (function (lambda () (forward-thing thing 1))))) (point)))) (if (and beg real-end (<= beg orig) (<= orig real-end)) @@ -105,20 +105,20 @@ of the textual entity that was found." (goto-char orig) ;; Try a second time, moving backward first and then forward, ;; so that we can find a thing that ends at ORIG. - (let ((beg (progn - (funcall - (or (get thing 'beginning-op) + (let ((beg (progn + (funcall + (or (get thing 'beginning-op) (function (lambda () (forward-thing thing -1))))) (point))) - (end (progn - (funcall - (or (get thing 'end-op) + (end (progn + (funcall + (or (get thing 'end-op) (function (lambda () (forward-thing thing 1))))) (point))) (real-beg - (progn - (funcall - (or (get thing 'beginning-op) + (progn + (funcall + (or (get thing 'beginning-op) (function (lambda () (forward-thing thing -1))))) (point)))) (if (and real-beg end (<= real-beg orig) (<= orig end)) @@ -137,7 +137,7 @@ a symbol as a valid THING." (if (get thing 'thing-at-point) (funcall (get thing 'thing-at-point)) (let ((bounds (bounds-of-thing-at-point thing))) - (if bounds + (if bounds (buffer-substring (car bounds) (cdr bounds)))))) ;; Go to beginning/end @@ -152,9 +152,9 @@ a symbol as a valid THING." (or bounds (error "No %s here" thing)) (goto-char (cdr bounds)))) -;; Special cases +;; Special cases -;; Lines +;; Lines ;; bolp will be false when you click on the last line in the buffer ;; and it has no final newline. @@ -162,7 +162,7 @@ a symbol as a valid THING." (put 'line 'beginning-op (function (lambda () (if (bolp) (forward-line -1) (beginning-of-line))))) -;; Sexps +;; Sexps (defun in-string-p () (let ((orig (point))) @@ -188,7 +188,7 @@ a symbol as a valid THING." (put 'sexp 'beginning-op 'beginning-of-sexp) -;; Lists +;; Lists (put 'list 'end-op (function (lambda () (up-list 1)))) (put 'list 'beginning-op 'backward-sexp) @@ -198,7 +198,7 @@ a symbol as a valid THING." (defvar thing-at-point-file-name-chars "-~/[:alnum:]_.${}#%,:" "Characters allowable in filenames.") -(put 'filename 'end-op +(put 'filename 'end-op (lambda () (re-search-forward (concat "\\=[" thing-at-point-file-name-chars "]*") nil t))) @@ -339,11 +339,11 @@ point." (goto-char (car bounds)) (error "No URL here")))))) -;; Whitespace +;; Whitespace (defun forward-whitespace (arg) (interactive "p") - (if (natnump arg) + (if (natnump arg) (re-search-forward "[ \t]+\\|\n" nil 'move arg) (while (< arg 0) (if (re-search-backward "[ \t]+\\|\n" nil 'move) @@ -351,35 +351,35 @@ point." (skip-chars-backward " \t"))) (setq arg (1+ arg))))) -;; Buffer +;; Buffer (put 'buffer 'end-op (lambda () (goto-char (point-max)))) (put 'buffer 'beginning-op (lambda () (goto-char (point-min)))) -;; Symbols +;; Symbols (defun forward-symbol (arg) (interactive "p") - (if (natnump arg) + (if (natnump arg) (re-search-forward "\\(\\sw\\|\\s_\\)+" nil 'move arg) (while (< arg 0) (if (re-search-backward "\\(\\sw\\|\\s_\\)+" nil 'move) (skip-syntax-backward "w_")) (setq arg (1+ arg))))) -;; Syntax blocks +;; Syntax blocks (defun forward-same-syntax (&optional arg) (interactive "p") (while (< arg 0) - (skip-syntax-backward + (skip-syntax-backward (char-to-string (char-syntax (char-after (1- (point)))))) (setq arg (1+ arg))) (while (> arg 0) (skip-syntax-forward (char-to-string (char-syntax (char-after (point))))) (setq arg (1- arg)))) -;; Aliases +;; Aliases (defun word-at-point () (thing-at-point 'word)) (defun sentence-at-point () (thing-at-point 'sentence)) @@ -388,7 +388,7 @@ point." "Read a lisp expression from STR. Signal an error if the entire string was not used." (let* ((read-data (read-from-string str)) - (more-left + (more-left (condition-case nil ;; The call to `ignore' suppresses a compiler warning. (progn (ignore (read-from-string (substring str (cdr read-data)))) @@ -398,8 +398,8 @@ Signal an error if the entire string was not used." (error "Can't read whole string") (car read-data)))) -(defun form-at-point (&optional thing pred) - (let ((sexp (condition-case nil +(defun form-at-point (&optional thing pred) + (let ((sexp (condition-case nil (read-from-whole-string (thing-at-point (or thing 'sexp))) (error nil)))) (if (or (not pred) (funcall pred sexp)) sexp))) |