aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2007-08-25 20:20:26 +0000
committerStefan Monnier2007-08-25 20:20:26 +0000
commitc65e69424495d059ff072f92c68ad3cb85c68012 (patch)
tree843dcd4278dfa16f30aee4ba13225241c170178c
parentc382ec4021151ec004b4612f2177e5d29e83b63c (diff)
downloademacs-c65e69424495d059ff072f92c68ad3cb85c68012.tar.gz
emacs-c65e69424495d059ff072f92c68ad3cb85c68012.zip
(invisible-p): Rename from text-invisible-p. Update callers.
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/simple.el26
3 files changed, 20 insertions, 15 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 2c7fc83ed57..ce397e56e70 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -81,7 +81,7 @@ in to make it use the scrollbars from the system theme.
81 81
82* Lisp Changes in Emacs 22.2. 82* Lisp Changes in Emacs 22.2.
83 83
84** The function text-invisible-p returns non-nil if the character 84** The function invisible-p returns non-nil if the character
85 after a specified position is invisible. 85 after a specified position is invisible.
86 86
87+++ 87+++
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f5ba6de009..e49ba253922 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,14 @@
12007-08-25 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * simple.el (invisible-p): Rename from text-invisible-p.
4 Update callers.
5
12007-08-25 Alan Mackenzie <acm@muc.de> 62007-08-25 Alan Mackenzie <acm@muc.de>
2 7
3 * progmodes/cc-langs.el (c-other-decl-block-key-in-symbols-alist): 8 * progmodes/cc-langs.el (c-other-decl-block-key-in-symbols-alist):
4 new language variable. 9 new language variable.
5 10
6 * progmodes/cc-engine.el (c-brace-anchor-point): new function. 11 * progmodes/cc-engine.el (c-brace-anchor-point): New function.
7 (c-add-stmt-syntax): Give accurate anchor points for "namespace", 12 (c-add-stmt-syntax): Give accurate anchor points for "namespace",
8 "extern" etc., rather than BOI. Fix addition of spurious 13 "extern" etc., rather than BOI. Fix addition of spurious
9 syntactic-symbol 'defun-block-intro, replacing it with 14 syntactic-symbol 'defun-block-intro, replacing it with
diff --git a/lisp/simple.el b/lisp/simple.el
index 43d210aa151..2aee3e43cfe 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3477,7 +3477,7 @@ Outline mode sets this."
3477 :type 'boolean 3477 :type 'boolean
3478 :group 'editing-basics) 3478 :group 'editing-basics)
3479 3479
3480(defun text-invisible-p (pos) 3480(defun invisible-p (pos)
3481 "Return non-nil if the character after POS is currently invisible." 3481 "Return non-nil if the character after POS is currently invisible."
3482 (let ((prop 3482 (let ((prop
3483 (get-char-property pos 'invisible))) 3483 (get-char-property pos 'invisible)))
@@ -3485,7 +3485,7 @@ Outline mode sets this."
3485 prop 3485 prop
3486 (or (memq prop buffer-invisibility-spec) 3486 (or (memq prop buffer-invisibility-spec)
3487 (assq prop buffer-invisibility-spec))))) 3487 (assq prop buffer-invisibility-spec)))))
3488(define-obsolete-function-alias 'line-move-invisible-p 'text-invisible-p) 3488(define-obsolete-function-alias 'line-move-invisible-p 'invisible-p)
3489 3489
3490;; Returns non-nil if partial move was done. 3490;; Returns non-nil if partial move was done.
3491(defun line-move-partial (arg noerror to-end) 3491(defun line-move-partial (arg noerror to-end)
@@ -3606,7 +3606,7 @@ Outline mode sets this."
3606 (while (and (> arg 0) (not done)) 3606 (while (and (> arg 0) (not done))
3607 ;; If the following character is currently invisible, 3607 ;; If the following character is currently invisible,
3608 ;; skip all characters with that same `invisible' property value. 3608 ;; skip all characters with that same `invisible' property value.
3609 (while (and (not (eobp)) (text-invisible-p (point))) 3609 (while (and (not (eobp)) (invisible-p (point)))
3610 (goto-char (next-char-property-change (point)))) 3610 (goto-char (next-char-property-change (point))))
3611 ;; Move a line. 3611 ;; Move a line.
3612 ;; We don't use `end-of-line', since we want to escape 3612 ;; We don't use `end-of-line', since we want to escape
@@ -3624,7 +3624,7 @@ Outline mode sets this."
3624 (setq done t))) 3624 (setq done t)))
3625 ((and (> arg 1) ;; Use vertical-motion for last move 3625 ((and (> arg 1) ;; Use vertical-motion for last move
3626 (not (integerp selective-display)) 3626 (not (integerp selective-display))
3627 (not (text-invisible-p (point)))) 3627 (not (invisible-p (point))))
3628 ;; We avoid vertical-motion when possible 3628 ;; We avoid vertical-motion when possible
3629 ;; because that has to fontify. 3629 ;; because that has to fontify.
3630 (forward-line 1)) 3630 (forward-line 1))
@@ -3653,7 +3653,7 @@ Outline mode sets this."
3653 (setq done t))) 3653 (setq done t)))
3654 ((and (< arg -1) ;; Use vertical-motion for last move 3654 ((and (< arg -1) ;; Use vertical-motion for last move
3655 (not (integerp selective-display)) 3655 (not (integerp selective-display))
3656 (not (text-invisible-p (1- (point))))) 3656 (not (invisible-p (1- (point)))))
3657 (forward-line -1)) 3657 (forward-line -1))
3658 ((zerop (vertical-motion -1)) 3658 ((zerop (vertical-motion -1))
3659 (if (not noerror) 3659 (if (not noerror)
@@ -3665,7 +3665,7 @@ Outline mode sets this."
3665 ;; if our target is the middle of this line. 3665 ;; if our target is the middle of this line.
3666 (or (zerop (or goal-column temporary-goal-column)) 3666 (or (zerop (or goal-column temporary-goal-column))
3667 (< arg 0)) 3667 (< arg 0))
3668 (not (bobp)) (text-invisible-p (1- (point)))) 3668 (not (bobp)) (invisible-p (1- (point))))
3669 (goto-char (previous-char-property-change (point)))))))) 3669 (goto-char (previous-char-property-change (point))))))))
3670 ;; This is the value the function returns. 3670 ;; This is the value the function returns.
3671 (= arg 0)) 3671 (= arg 0))
@@ -3697,7 +3697,7 @@ Outline mode sets this."
3697 (save-excursion 3697 (save-excursion
3698 ;; Like end-of-line but ignores fields. 3698 ;; Like end-of-line but ignores fields.
3699 (skip-chars-forward "^\n") 3699 (skip-chars-forward "^\n")
3700 (while (and (not (eobp)) (text-invisible-p (point))) 3700 (while (and (not (eobp)) (invisible-p (point)))
3701 (goto-char (next-char-property-change (point))) 3701 (goto-char (next-char-property-change (point)))
3702 (skip-chars-forward "^\n")) 3702 (skip-chars-forward "^\n"))
3703 (point)))) 3703 (point))))
@@ -3780,13 +3780,13 @@ and `current-column' to be able to ignore invisible text."
3780 (move-to-column col)) 3780 (move-to-column col))
3781 3781
3782 (when (and line-move-ignore-invisible 3782 (when (and line-move-ignore-invisible
3783 (not (bolp)) (text-invisible-p (1- (point)))) 3783 (not (bolp)) (invisible-p (1- (point))))
3784 (let ((normal-location (point)) 3784 (let ((normal-location (point))
3785 (normal-column (current-column))) 3785 (normal-column (current-column)))
3786 ;; If the following character is currently invisible, 3786 ;; If the following character is currently invisible,
3787 ;; skip all characters with that same `invisible' property value. 3787 ;; skip all characters with that same `invisible' property value.
3788 (while (and (not (eobp)) 3788 (while (and (not (eobp))
3789 (text-invisible-p (point))) 3789 (invisible-p (point)))
3790 (goto-char (next-char-property-change (point)))) 3790 (goto-char (next-char-property-change (point))))
3791 ;; Have we advanced to a larger column position? 3791 ;; Have we advanced to a larger column position?
3792 (if (> (current-column) normal-column) 3792 (if (> (current-column) normal-column)
@@ -3799,7 +3799,7 @@ and `current-column' to be able to ignore invisible text."
3799 ;; but with a more reasonable buffer position. 3799 ;; but with a more reasonable buffer position.
3800 (goto-char normal-location) 3800 (goto-char normal-location)
3801 (let ((line-beg (save-excursion (beginning-of-line) (point)))) 3801 (let ((line-beg (save-excursion (beginning-of-line) (point))))
3802 (while (and (not (bolp)) (text-invisible-p (1- (point)))) 3802 (while (and (not (bolp)) (invisible-p (1- (point))))
3803 (goto-char (previous-char-property-change (point) line-beg)))))))) 3803 (goto-char (previous-char-property-change (point) line-beg))))))))
3804 3804
3805(defun move-end-of-line (arg) 3805(defun move-end-of-line (arg)
@@ -3820,7 +3820,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
3820 (and (line-move arg t) 3820 (and (line-move arg t)
3821 (not (bobp)) 3821 (not (bobp))
3822 (progn 3822 (progn
3823 (while (and (not (bobp)) (text-invisible-p (1- (point)))) 3823 (while (and (not (bobp)) (invisible-p (1- (point))))
3824 (goto-char (previous-char-property-change (point)))) 3824 (goto-char (previous-char-property-change (point))))
3825 (backward-char 1))) 3825 (backward-char 1)))
3826 (point))))) 3826 (point)))))
@@ -3856,13 +3856,13 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
3856 3856
3857 ;; Move to beginning-of-line, ignoring fields and invisibles. 3857 ;; Move to beginning-of-line, ignoring fields and invisibles.
3858 (skip-chars-backward "^\n") 3858 (skip-chars-backward "^\n")
3859 (while (and (not (bobp)) (text-invisible-p (1- (point)))) 3859 (while (and (not (bobp)) (invisible-p (1- (point))))
3860 (goto-char (previous-char-property-change (point))) 3860 (goto-char (previous-char-property-change (point)))
3861 (skip-chars-backward "^\n")) 3861 (skip-chars-backward "^\n"))
3862 (setq start (point)) 3862 (setq start (point))
3863 3863
3864 ;; Now find first visible char in the line 3864 ;; Now find first visible char in the line
3865 (while (and (not (eobp)) (text-invisible-p (point))) 3865 (while (and (not (eobp)) (invisible-p (point)))
3866 (goto-char (next-char-property-change (point)))) 3866 (goto-char (next-char-property-change (point))))
3867 (setq first-vis (point)) 3867 (setq first-vis (point))
3868 3868