Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update.

  • Loading branch information...
commit 1d74f67baf013a9a9dc9d5248b9f8f4f669ca560 1 parent 34e8f58
morioka authored
6 ChangeLog
View
@@ -1,9 +1,3 @@
-1998-10-24 MORIOKA Tomohiko <morioka@jaist.ac.jp>
-
- * poe.el (defvar-maybe): New macro.
- (temporary-file-directory): New variable.
-
-
1998-10-23 MORIOKA Tomohiko <morioka@jaist.ac.jp>
* APEL: Version 9.5 was released.
4 poe-18.el
View
@@ -31,13 +31,13 @@ VARIABLE should be a string. VALUE is optional; if not provided or is
This function works by modifying `process-environment'."
t)
-(defvar-maybe data-directory exec-directory)
+(defvar data-directory exec-directory)
;;; @ for EMACS 18.55
;;;
-(defvar-maybe buffer-undo-list nil)
+(defvar buffer-undo-list nil)
;;; @ hook
24 poe-xemacs.el
View
@@ -1,7 +1,7 @@
-;;; poe-xemacs.el --- poe submodule for XEmacs -*-byte-compile-dynamic: t;-*-
+;;; poe-xemacs.el --- poe API implementation for XEmacs
;; Copyright (C) 1995 Free Software Foundation, Inc.
-;; Copyright (C) 1995,1996,1997,1998 MORIOKA Tomohiko
+;; Copyright (C) 1995,1996,1997 MORIOKA Tomohiko
;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; Keywords: emulation, compatibility, XEmacs
@@ -28,7 +28,8 @@
;;; @ face
;;;
-(defalias-maybe 'face-list 'list-faces)
+(or (fboundp 'face-list)
+ (defalias 'face-list 'list-faces))
(or (memq 'underline (face-list))
(and (fboundp 'make-face)
@@ -55,11 +56,12 @@
;;; @ dired
;;;
-(defun-maybe dired-other-frame (dirname &optional switches)
- "\"Edit\" directory DIRNAME. Like `dired' but makes a new frame."
- (interactive (dired-read-dir-and-switches "in other frame "))
- (switch-to-buffer-other-frame (dired-noselect dirname switches))
- )
+(or (fboundp 'dired-other-frame)
+ (defun dired-other-frame (dirname &optional switches)
+ "\"Edit\" directory DIRNAME. Like `dired' but makes a new frame."
+ (interactive (dired-read-dir-and-switches "in other frame "))
+ (switch-to-buffer-other-frame (dired-noselect dirname switches)))
+ )
;;; @ to avoid bug of XEmacs 19.14
@@ -87,9 +89,11 @@
;;; @ Emacs 20.3 emulation
;;;
-(defalias-maybe 'line-beginning-position 'point-at-bol)
+(or (fboundp 'line-beginning-position)
+ (defalias 'line-beginning-position 'point-at-bol))
-(defalias-maybe 'line-end-position 'point-at-eol)
+(or (fboundp 'line-end-position)
+ (defalias 'line-end-position 'point-at-eol))
;;; @ end
70 poe.el
View
@@ -1,4 +1,4 @@
-;;; poe.el --- Portable Outfit for Emacsen; -*-byte-compile-dynamic: t;-*-
+;;; poe.el --- Emulation module for each Emacs variants
;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
@@ -22,16 +22,12 @@
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
-;;; Commentary:
-
-;; This modules does not includes MULE related features. MULE related
-;; features are supported by `poem'.
-
;;; Code:
(defmacro defun-maybe (name &rest everything-else)
(or (and (fboundp name)
- (not (get name 'defun-maybe)))
+ (not (get name 'defun-maybe))
+ )
(` (or (fboundp (quote (, name)))
(progn
(defun (, name) (,@ everything-else))
@@ -41,7 +37,8 @@
(defmacro defsubst-maybe (name &rest everything-else)
(or (and (fboundp name)
- (not (get name 'defsubst-maybe)))
+ (not (get name 'defsubst-maybe))
+ )
(` (or (fboundp (quote (, name)))
(progn
(defsubst (, name) (,@ everything-else))
@@ -51,7 +48,8 @@
(defmacro defmacro-maybe (name &rest everything-else)
(or (and (fboundp name)
- (not (get name 'defmacro-maybe)))
+ (not (get name 'defmacro-maybe))
+ )
(` (or (fboundp (quote (, name)))
(progn
(defmacro (, name) (,@ everything-else))
@@ -59,31 +57,10 @@
))
)))
-(defmacro defalias-maybe (symbol definition)
- (setq symbol (eval symbol))
- (or (and (fboundp symbol)
- (not (get symbol 'defalias-maybe)))
- (` (or (fboundp (quote (, symbol)))
- (progn
- (defalias (quote (, symbol)) (, definition))
- (put (quote (, symbol)) 'defalias-maybe t)
- ))
- )))
-
(put 'defun-maybe 'lisp-indent-function 'defun)
(put 'defsubst-maybe 'lisp-indent-function 'defun)
(put 'defmacro-maybe 'lisp-indent-function 'defun)
-(defmacro defvar-maybe (name &rest everything-else)
- (or (and (boundp name)
- (not (get name 'defvar-maybe)))
- (` (or (boundp (quote (, name)))
- (progn
- (defvar (, name) (,@ everything-else))
- (put (quote (, name)) 'defvar-maybe t)
- ))
- )))
-
(defmacro defconst-maybe (name &rest everything-else)
(or (and (boundp name)
(not (get name 'defconst-maybe))
@@ -186,7 +163,7 @@ See `read-from-minibuffer' for details of HISTORY argument."
;;; @ Emacs 19.30 emulation
;;;
-;; imported from Emacs 19.30.
+;; This function was imported Emacs 19.30.
(defun-maybe add-to-list (list-var element)
"Add to the value of LIST-VAR the element ELEMENT if it isn't there yet.
If you want to use `add-to-list' on a variable that is not defined
@@ -225,7 +202,7 @@ Value is nil if OBJECT is not a buffer or if it has been killed.
(get-buffer object)
(buffer-name (get-buffer object))))
-;; imported from Emacs 19.33.
+;; This macro was imported Emacs 19.33.
(defmacro-maybe save-selected-window (&rest body)
"Execute BODY, then select the window that was selected before BODY.
\[Emacs 19.31 emulating function]"
@@ -239,12 +216,12 @@ Value is nil if OBJECT is not a buffer or if it has been killed.
;;; @ Emacs 20.1 emulation
;;;
-;; imported from Emacs 20.2.
+;; This macro was imported Emacs 20.2.
(defmacro-maybe when (cond &rest body)
"(when COND BODY...): if COND yields non-nil, do BODY, else return nil."
(list 'if cond (cons 'progn body)))
-;; imported from Emacs 20.3.
+;; This macro was imported Emacs 20.3.
(defmacro-maybe unless (cond &rest body)
"(unless COND BODY...): if COND yields nil, do BODY, else return nil."
(cons 'if (cons cond (cons nil body))))
@@ -257,7 +234,7 @@ Executes BODY just like `progn'."
(progn (,@ body))
(set-buffer orig-buffer)))))
-;; imported from Emacs 20.2.
+;; This macro was imported Emacs 20.2.
(defmacro-maybe with-current-buffer (buffer &rest body)
"Execute the forms in BODY with BUFFER as the current buffer.
The value returned is the value of the last form in BODY.
@@ -266,7 +243,7 @@ See also `with-temp-buffer'."
(set-buffer (, buffer))
(,@ body))))
-;; imported from Emacs 20.2.
+;; This macro was imported Emacs 20.2.
(defmacro-maybe with-temp-file (file &rest forms)
"Create a new buffer, evaluate FORMS there, and write the buffer to FILE.
The value of the last form in FORMS is returned, like `progn'.
@@ -286,7 +263,7 @@ See also `with-temp-buffer'."
(and (buffer-name (, temp-buffer))
(kill-buffer (, temp-buffer))))))))
-;; imported from Emacs 20.2.
+;; This macro was imported Emacs 20.2.
(defmacro-maybe with-temp-buffer (&rest forms)
"Create a temporary buffer, and evaluate FORMS there like `progn'.
See also `with-temp-file' and `with-output-to-string'."
@@ -299,7 +276,7 @@ See also `with-temp-file' and `with-output-to-string'."
(and (buffer-name (, temp-buffer))
(kill-buffer (, temp-buffer))))))))
-;; imported from Emacs 20.3.
+;; This function was imported Emacs 20.3.
(defun-maybe last (x &optional n)
"Return the last link of the list X. Its car is the last element.
If X is nil, return nil.
@@ -315,13 +292,13 @@ If N is bigger than the length of X, return X."
(setq x (cdr x)))
x))
-;; imported from Emacs 20.3. (cl function)
+;; This function was imported Emacs 20.3. (cl function)
(defun-maybe butlast (x &optional n)
"Returns a copy of LIST with the last N elements removed."
(if (and n (<= n 0)) x
(nbutlast (copy-sequence x) n)))
-;; imported from Emacs 20.3. (cl function)
+;; This function was imported Emacs 20.3. (cl function)
(defun-maybe nbutlast (x &optional n)
"Modifies LIST to remove the last N elements."
(let ((m (length x)))
@@ -331,7 +308,7 @@ If N is bigger than the length of X, return X."
(if (> n 0) (setcdr (nthcdr (- (1- m) n) x) nil))
x))))
-;; imported from XEmacs 21.
+;; This function was imported from XEmacs 21.
(defun-maybe split-string (string &optional pattern)
"Return a list of substrings of STRING which are separated by PATTERN.
If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
@@ -349,17 +326,6 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
;;; @ Emacs 20.3 emulation
;;;
-;; imported from Emacs 20.3.91.
-(defvar-maybe temporary-file-directory
- (file-name-as-directory
- (cond ((memq system-type '(ms-dos windows-nt))
- (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
- ((memq system-type '(vax-vms axp-vms))
- (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "SYS$SCRATCH:"))
- (t
- (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
- "The directory for writing temporary files.")
-
(defun-maybe line-beginning-position (&optional n)
"Return the character position of the first character on the current line.
With argument N not nil or 1, move forward N - 1 lines first.
3  poem-20.el
View
@@ -1,5 +1,4 @@
-;;; -*-byte-compile-dynamic: t;-*-
-;;; poem-20.el --- poem submodule for Emacs 20 and XEmacs-mule
+;;; poem-20.el --- poem implementation for Emacs 20 and XEmacs-mule
;; Copyright (C) 1997,1998 Free Software Foundation, Inc.
2  poem-e20.el
View
@@ -1,4 +1,4 @@
-;;; poem-e20.el --- poem submodule for Emacs 20; -*-byte-compile-dynamic: t;-*-
+;;; poem-e20.el --- poem implementation for XEmacs-mule
;; Copyright (C) 1998 Free Software Foundation, Inc.
3  poem-e20_3.el
View
@@ -1,5 +1,4 @@
-;;; -*-byte-compile-dynamic: t;-*-
-;;; poem-e20_3.el --- poem submodule for Emacs 20.3
+;;; poem-e20_3.el --- poem implementation for Emacs 20.3.
;; Copyright (C) 1998 Free Software Foundation, Inc.
17 poem.el
View
@@ -1,4 +1,4 @@
-;;; poem.el --- Emulate latest MULE features; -*-byte-compile-dynamic: t;-*-
+;;; poem.el --- Portable Outfit for Emacsen: about MULE API
;; Copyright (C) 1998 Free Software Foundation, Inc.
@@ -50,27 +50,30 @@
;;; @ Emacs 20.3 emulation
;;;
-(defsubst-maybe string-as-unibyte (string)
+(defmacro-maybe string-as-unibyte (string)
"Return a unibyte string with the same individual bytes as STRING.
If STRING is unibyte, the result is STRING itself.
\[Emacs 20.3 emulating macro]"
string)
-(defsubst-maybe string-as-multibyte (string)
+(defmacro-maybe string-as-multibyte (string)
"Return a multibyte string with the same individual bytes as STRING.
If STRING is multibyte, the result is STRING itself.
\[Emacs 20.3 emulating macro]"
string)
-;;; @ XEmacs-mule emulation
+;;; @ XEmacs 20 emulation
;;;
-(defalias-maybe 'char-int 'identity)
+(or (fboundp 'char-int)
+ (fset 'char-int (symbol-function 'identity)))
-(defalias-maybe 'int-char 'identity)
+(or (fboundp 'int-char)
+ (fset 'int-char (symbol-function 'identity)))
-(defalias-maybe 'char-or-char-int-p 'integerp)
+(or (fboundp 'char-or-char-int-p)
+ (fset 'char-or-char-int-p (symbol-function 'integerp)))
;;; @ end
Please sign in to comment.
Something went wrong with that request. Please try again.