update.

[elisp/apel.git] / inv-19.el

diff --git a/inv-19.el b/inv-19.el
index 2fafbf3..00993e9 100644 (file)
--- a/inv-19.el
+++ b/inv-19.el
@@ -19,40 +19,37 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
-(defmacro enable-invisible ())
+(require 'poe)
 
-(defmacro end-of-invisible ())
+(defun enable-invisible ())
+(defun disable-invisible ())
+(defalias 'end-of-invisible 'disable-invisible)
+(make-obsolete 'end-of-invisible 'disable-invisible)
 
 (defun invisible-region (start end)
   (if (save-excursion
        (goto-char (1- end))
-       (eq (following-char) ?\n)
-       )
-      (setq end (1- end))
-    )
-  (put-text-property start end 'invisible t)
-  )
+       (eq (following-char) ?\n))
+      (setq end (1- end)))
+  (put-text-property start end 'invisible t))
 
 (defun visible-region (start end)
-  (put-text-property start end 'invisible nil)
-  )
+  (put-text-property start end 'invisible nil))
 
 (defun invisible-p (pos)
-  (get-text-property pos 'invisible)
-  )
+  (get-text-property pos 'invisible))
 
 (defun next-visible-point (pos)
-  (save-excursion
-    (goto-char (next-single-property-change pos 'invisible))
-    (if (eq (following-char) ?\n)
-       (forward-char)
-      )
-    (point)))
+  (if (setq pos (next-single-property-change pos 'invisible))
+      (if (eq ?\n (char-after pos))
+         (1+ pos)
+       pos)
+    (point-max)))
 
 
 ;;; @ end