From 4f879b7214b1c7288f42db98d9fb8ff8b33b4600 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 19 Dec 2000 23:07:42 +0000
Subject: [PATCH] * poe.el (current-fill-column): New emulating function.
 (current-left-margin): New emulating function.

* poe-18.el (numberp): Use `defalias-maybe' instead of `defalias'.
(mod): Ditto.
---
 ChangeLog |    8 ++++++++
 poe-18.el |    6 +++---
 poe.el    |   13 +++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 385d773..1eb4188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-19  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+	* poe.el (current-fill-column): New emulating function.
+	(current-left-margin): New emulating function.
+
+	* poe-18.el (numberp): Use `defalias-maybe' instead of `defalias'.
+	(mod): Ditto.
+
 2000-12-20  NAKAJIMA Mikio  <minakaji@osaka.email.ne.jp>
 
 	* poe-18.el (set-frame-height): Typo fixed.
diff --git a/poe-18.el b/poe-18.el
index ba4219b..e5e3d5d 100644
--- a/poe-18.el
+++ b/poe-18.el
@@ -450,7 +450,7 @@ resolution finer than a second."
 ;;; @@ Floating point numbers.
 ;;;
 
-(defalias 'numberp 'integerp)
+(defalias-maybe 'numberp 'integerp)
 
 (defun abs (arg)
   "Return the absolute value of ARG."
@@ -465,7 +465,7 @@ With optional DIVISOR, return the largest integer no greater than ARG/DIVISOR."
       (- (/ (- divisor 1 arg) divisor))
     (/ arg divisor)))
 
-(defalias 'mod '%)
+(defalias-maybe 'mod '%)
 
 ;;; @ Basic lisp subroutines.
 ;;;
@@ -628,7 +628,7 @@ Optional third argunemt ALL-FRAMES is ignored in this implementation."
 (defun buffer-disable-undo (&optional buffer)
   "Make BUFFER stop keeping undo information.
 No argument or nil as argument means do this for the current buffer."
-  (buffer-flush-undo (or buffer (current-buffer))))
+   (buffer-flush-undo (or buffer (current-buffer))))
 
 
 ;;; @@ Frame (Emacs 18 cannot make frame)
diff --git a/poe.el b/poe.el
index e118c91..767ba23 100644
--- a/poe.el
+++ b/poe.el
@@ -1557,6 +1557,19 @@ The extension, in a file name, is the part that follows the last `.'."
 	filename))))
 
 
+;;; @ Miscellanea.
+
+;; Emacs 19.29 and later: (current-fill-column)
+(defun-maybe current-fill-column ()
+  "Return the fill-column to use for this line."
+  fill-column)
+
+;; Emacs 19.29 and later: (current-left-margin)
+(defun-maybe current-left-margin ()
+  "Return the left margin to use for this line."
+  left-margin)
+
+
 ;;; @ XEmacs emulation.
 ;;;
 
-- 
1.7.10.4