(MAKEIT.BAT): Modify for apel-ja@lists.chise.org.

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

diff --git a/inv-18.el b/inv-18.el
index 21e54ca..f5220d8 100644 (file)
--- a/inv-18.el
+++ b/inv-18.el
@@ -19,67 +19,61 @@
 
 ;; 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 ()
-  (`
-   (progn
-     (make-local-variable 'original-selective-display)
-     (setq original-selective-display selective-display)
-     (setq selective-display t)
-     )))
+(require 'poe)
 
-(defmacro end-of-invisible ()
-  (` (setq selective-display
-          (if (boundp 'original-selective-display)
-              original-selective-display))
-     ))
+(defun enable-invisible ()
+  (make-local-variable 'original-selective-display)
+  (setq original-selective-display selective-display)
+  (setq selective-display t))
+
+(defun disable-invisible ()
+  (setq selective-display
+       (and (boundp 'original-selective-display)
+            original-selective-display)))
+(defalias 'end-of-invisible 'disable-invisible)
+(make-obsolete 'end-of-invisible 'disable-invisible)
 
 (defun invisible-region (start end)
-  (let ((buffer-read-only nil)         ;Okay even if write protected.
+  (let ((buffer-read-only nil)
        (modp (buffer-modified-p)))
     (if (save-excursion
          (goto-char (1- end))
-         (eq (following-char) ?\n)
-         )
-       (setq end (1- end))
-      )
+         (eq (following-char) ?\n))
+       (setq end (1- end)))
     (unwind-protect
-        (subst-char-in-region start end ?\n ?\^M t)
-      (set-buffer-modified-p modp)
-      )))
+        (subst-char-in-region start end ?\n ?\r t)
+      (set-buffer-modified-p modp))))
 
 (defun visible-region (start end)
-  (let ((buffer-read-only nil)         ;Okay even if write protected.
+  (let ((buffer-read-only nil)
        (modp (buffer-modified-p)))
     (unwind-protect
-        (subst-char-in-region start end ?\^M ?\n t)
-      (set-buffer-modified-p modp)
-      )))
+        (subst-char-in-region start end ?\r ?\n t)
+      (set-buffer-modified-p modp))))
 
 (defun invisible-p (pos)
   (save-excursion
     (goto-char pos)
-    (eq (following-char) ?\^M)
-    ))
+    (eq (following-char) ?\r)))
 
 (defun next-visible-point (pos)
   (save-excursion
     (goto-char pos)
     (end-of-line)
     (if (eq (following-char) ?\n)
-       (forward-char)
-      )
-    (point)
-    ))
+       (forward-char))
+    (point)))
 
 
 ;;; @ end
 ;;;
 
-(provide 'inv-18)
+(require 'product)
+(product-provide (provide 'inv-18) (require 'apel-ver))
 
 ;;; inv-18.el ends here