X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=poe.el;h=b65246f64ad43d4714f77daa99a0d6a6dac0a5b9;hb=eab58cc3766df97608ac8434115c98ec42ccdafb;hp=0e778466666fd11b934b81df098bf455cd9ddd31;hpb=cd1f8452827eca227aaa47ea5fbeff3476849920;p=elisp%2Fapel.git diff --git a/poe.el b/poe.el index 0e77846..b65246f 100644 --- a/poe.el +++ b/poe.el @@ -1,8 +1,8 @@ ;;; poe.el --- Portable Outfit for Emacsen; -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. +;; Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc. -;; Author: MORIOKA Tomohiko +;; Author: MORIOKA Tomohiko ;; Keywords: emulation, compatibility, NEmacs, MULE, Emacs/mule, XEmacs ;; This file is part of APEL (A Portable Emacs Library). @@ -24,105 +24,142 @@ ;;; Commentary: -;; This modules does not includes MULE related features. MULE related -;; features are supported by `poem'. +;; This modules does not includes MULE related features. +;; MULE related features are supported by `poem'. ;;; Code: +(provide 'poe) + +(or (boundp 'current-load-list) (setq current-load-list nil)) + +(put 'defun-maybe 'lisp-indent-function 'defun) (defmacro defun-maybe (name &rest everything-else) + "Define NAME as a function if NAME is not defined. +See also the function `defun'." (or (and (fboundp name) (not (get name 'defun-maybe))) (` (or (fboundp (quote (, name))) - (progn - (defun (, name) (,@ everything-else)) - (put (quote (, name)) 'defun-maybe t) - )) - ))) + (prog1 + (defun (, name) (,@ everything-else)) + ;; This `defun' will be compiled to `fset', which does + ;; not update `load-history'. + (setq current-load-list + (cons (quote (, name)) current-load-list)) + (put (quote (, name)) 'defun-maybe t)))))) +(put 'defmacro-maybe 'lisp-indent-function 'defun) (defmacro defmacro-maybe (name &rest everything-else) + "Define NAME as a macro if NAME is not defined. +See also the function `defmacro'." (or (and (fboundp name) (not (get name 'defmacro-maybe))) (` (or (fboundp (quote (, name))) - (progn - (defmacro (, name) (,@ everything-else)) - (put (quote (, name)) 'defmacro-maybe t) - )) - ))) - -(defmacro-maybe defsubst (name arglist &rest body) - "Define an inline function. The syntax is just like that of `defun'." - (cons 'defun (cons name (cons arglist body))) - ) + (prog1 + (defmacro (, name) (,@ everything-else)) + (setq current-load-list + (cons (quote (, name)) current-load-list)) + (put (quote (, name)) 'defmacro-maybe t)))))) +(put 'defsubst-maybe 'lisp-indent-function 'defun) (defmacro defsubst-maybe (name &rest everything-else) + "Define NAME as an inline function if NAME is not defined. +See also the macro `defsubst'." (or (and (fboundp name) (not (get name 'defsubst-maybe))) (` (or (fboundp (quote (, name))) - (progn - (defsubst (, name) (,@ everything-else)) - (put (quote (, name)) 'defsubst-maybe t) - )) - ))) + (prog1 + (defsubst (, name) (,@ everything-else)) + (setq current-load-list + (cons (quote (, name)) current-load-list)) + (put (quote (, name)) 'defsubst-maybe t)))))) (defmacro defalias-maybe (symbol definition) + "Define SYMBOL as an alias for DEFINITION if SYMBOL is not defined. +See also the function `defalias'." (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) + (prog1 + (defalias (quote (, symbol)) (, definition)) + (setq current-load-list + (cons (quote (, symbol)) current-load-list)) + (put (quote (, symbol)) 'defalias-maybe t)))))) (defmacro defvar-maybe (name &rest everything-else) + "Define NAME as a variable if NAME is not defined. +See also the function `defvar'." (or (and (boundp name) (not (get name 'defvar-maybe))) (` (or (boundp (quote (, name))) - (progn - (defvar (, name) (,@ everything-else)) - (put (quote (, name)) 'defvar-maybe t) - )) - ))) + (prog1 + (defvar (, name) (,@ everything-else)) + ;; byte-compiler will generate code to update + ;; `load-history'. + (put (quote (, name)) 'defvar-maybe t)))))) (defmacro defconst-maybe (name &rest everything-else) + "Define NAME as a constant variable if NAME is not defined. +See also the function `defconst'." (or (and (boundp name) - (not (get name 'defconst-maybe)) - ) + (not (get name 'defconst-maybe))) (` (or (boundp (quote (, name))) - (progn - (defconst (, name) (,@ everything-else)) - (put (quote (, name)) 'defconst-maybe t) - )) - ))) + (prog1 + (defconst (, name) (,@ everything-else)) + ;; byte-compiler will generate code to update + ;; `load-history'. + (put (quote (, name)) 'defconst-maybe t)))))) (defmacro defun-maybe-cond (name args &optional doc &rest everything-else) - (unless (stringp doc) - (setq everything-else (cons doc everything-else) - doc nil) - ) + (or (stringp doc) + (setq everything-else (cons doc everything-else) + doc nil)) (or (and (fboundp name) (not (get name 'defun-maybe))) - (` (unless (fboundp (quote (, name))) - (cond (,@ (mapcar (function - (lambda (case) - (list (car case) - (if doc - (` (defun (, name) (, args) - (, doc) - (,@ (cdr case)))) - (` (defun (, name) (, args) - (,@ (cdr case)))) - )))) - everything-else))) - (put (quote (, name)) 'defun-maybe t) - )))) - -(defsubst subr-fboundp (symbol) + (` (or (fboundp (quote (, name))) + (prog1 + (cond + (,@ (mapcar + (function + (lambda (case) + (list (car case) + (if doc + (` (defun (, name) (, args) + (, doc) + (,@ (cdr case)))) + (` (defun (, name) (, args) + (,@ (cdr case)))))))) + everything-else))) + (setq current-load-list + (cons (quote (, name)) current-load-list)) + (put (quote (, name)) 'defun-maybe t)))))) + +(defmacro defmacro-maybe-cond (name args &optional doc &rest everything-else) + (or (stringp doc) + (setq everything-else (cons doc everything-else) + doc nil)) + (or (and (fboundp name) + (not (get name 'defmacro-maybe))) + (` (or (fboundp (quote (, name))) + (prog1 + (cond + (,@ (mapcar + (function + (lambda (case) + (list (car case) + (if doc + (` (defmacro (, name) (, args) + (, doc) + (,@ (cdr case)))) + (` (defmacro (, name) (, args) + (,@ (cdr case)))))))) + everything-else))) + (setq current-load-list + (cons (quote (, name)) current-load-list)) + (put (quote (, name)) 'defmacro-maybe t)))))) + +(defun subr-fboundp (symbol) "Return t if SYMBOL's function definition is a built-in function." (and (fboundp symbol) (subrp (symbol-function symbol)))) @@ -151,10 +188,47 @@ (defalias 'string 'concat-chars) )) ) - ((= emacs-major-version 19)) + ((= emacs-major-version 19) + ;; XXX: should do compile-time and load-time check before loading + ;; "localhook". But, it is difficult since "localhook" is + ;; already loaded via "install" at compile-time. any idea? + (if (< emacs-minor-version 29) + (require 'localhook))) (t (require 'poe-18) - )) + ;; XXX: should do compile-time and load-time check before loading + ;; "localhook". But, it is difficult since "localhook" is + ;; already loaded via "install" at compile-time. any idea? + (require 'localhook))) + +;;; `eval-when-compile' is defined in "poe-18" under v18 with old compiler. +(eval-when-compile (require 'static)) + +;; imported from emacs-20.3/lisp/emacs-lisp/edebug.el. +;; `def-edebug-spec' is an autoloaded macro in v19 and later. +(defmacro-maybe def-edebug-spec (symbol spec) + "Set the edebug-form-spec property of SYMBOL according to SPEC. +Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol +\(naming a function\), or a list." + (` (put (quote (, symbol)) 'edebug-form-spec (quote (, spec))))) + +(def-edebug-spec defun-maybe defun) +(def-edebug-spec defmacro-maybe defmacro) +(def-edebug-spec defsubst-maybe defun) + +;;; Emacs 20.1 emulation + +;; imported from emacs-20.3/lisp/subr.el. +(defmacro-maybe when (cond &rest body) + "If COND yields non-nil, do BODY, else return nil." + (list 'if cond (cons 'progn body))) +;; (def-edebug-spec when (&rest form)) + +;; imported from emacs-20.3/lisp/subr.el. +(defmacro-maybe unless (cond &rest body) + "If COND yields nil, do BODY, else return nil." + (cons 'if (cons cond (cons nil body)))) +;; (def-edebug-spec unless (&rest form)) ;;; @ Emacs 19.23 emulation @@ -171,16 +245,18 @@ ;;; (defvar-maybe path-separator ":" - "Character used to separate concatenated paths.") + "The directory separator in search paths, as a string.") (defun-maybe buffer-substring-no-properties (start end) "Return the characters of part of the buffer, without the text properties. The two arguments START and END are character positions; -they can be in either order. [Emacs 19.29 emulating function]" +they can be in either order. +\[Emacs 19.29 emulating function]" (let ((string (buffer-substring start end))) (set-text-properties 0 (length string) nil string) string)) +;; imported from emacs-19.34/lisp/subr.el. (defun-maybe match-string (num &optional string) "Return string of text matched by last search. NUM specifies which parenthesized expression in the last regexp. @@ -193,59 +269,59 @@ STRING should be given if the last search was by `string-match' on STRING. (substring string (match-beginning num) (match-end num)) (buffer-substring (match-beginning num) (match-end num))))) -(or (featurep 'xemacs) - (>= emacs-major-version 20) - (and (= emacs-major-version 19) - (>= emacs-minor-version 29)) - ;; for Emacs 19.28 or earlier - (fboundp 'si:read-string) - (eval-and-compile - (fset 'si:read-string (symbol-function 'read-string)) - (defun read-string (prompt &optional initial-input history) - "Read a string from the minibuffer, prompting with string PROMPT. +(static-unless (or (featurep 'xemacs) + (>= emacs-major-version 20) + (and (= emacs-major-version 19) + (>= emacs-minor-version 29))) + ;; for Emacs 19.28 or earlier + (unless (fboundp 'si:read-string) + (fset 'si:read-string (symbol-function 'read-string)) + (defun read-string (prompt &optional initial-input history) + "Read a string from the minibuffer, prompting with string PROMPT. If non-nil, second arg INITIAL-INPUT is a string to insert before reading. The third arg HISTORY, is dummy for compatibility. See `read-from-minibuffer' for details of HISTORY argument." - (si:read-string prompt initial-input)) - )) + (si:read-string prompt initial-input)) + )) (defun-maybe rassoc (key list) "Return non-nil if KEY is `equal' to the cdr of an element of LIST. -The value is actually the element of LIST whose cdr equals KEY." +The value is actually the element of LIST whose cdr equals KEY. +\[Emacs 19.29 emulating function]" (catch 'found (while list (if (equal (cdr (car list)) key) - (throw 'found (car list)) - ) - (setq list (cdr list))) - )) - -(defmacro-maybe make-local-hook (hook)) - -;; They are not Emacs features - -(defmacro-maybe add-local-hook (hook function &optional append) - (if (fboundp 'make-local-hook) - (list 'add-hook hook function append t) - (list 'add-hook hook function append) - )) + (throw 'found (car list))) + (setq list (cdr list))))) -(defmacro-maybe remove-local-hook (hook function) - (if (fboundp 'make-local-hook) - (list 'remove-hook hook function t) - (list 'remove-hook hook function) - )) +;; imported from emacs-19.34/lisp/files.el. +(defun-maybe file-name-sans-extension (filename) + "Return FILENAME sans final \"extension\". +The extension, in a file name, is the part that follows the last `.'. +\[Emacs 19.29 emulating function]" + (save-match-data + (let ((file (file-name-sans-versions (file-name-nondirectory filename))) + directory) + (if (string-match "\\.[^.]*\\'" file) + (if (setq directory (file-name-directory filename)) + (expand-file-name (substring file 0 (match-beginning 0)) + directory) + (substring file 0 (match-beginning 0))) + filename)))) ;;; @ Emacs 19.30 emulation ;;; -;; imported from Emacs 19.30. +;; imported from emacs-19.34/lisp/subr.el. (defun-maybe add-to-list (list-var element) "Add to the value of LIST-VAR the element ELEMENT if it isn't there yet. +The test for presence of ELEMENT is done with `equal'. If you want to use `add-to-list' on a variable that is not defined until a certain package is loaded, you should put the call to `add-to-list' into a hook function that will be run only after loading the package. +`eval-after-load' provides one way to do this. In some cases +other hooks, such as major mode hooks, can do the job. \[Emacs 19.30 emulating function]" (or (member element (symbol-value list-var)) (set list-var (cons element (symbol-value list-var))))) @@ -277,9 +353,10 @@ Value is nil if OBJECT is not a buffer or if it has been killed. \[Emacs 19.31 emulating function]" (and object (get-buffer object) - (buffer-name (get-buffer object)))) + (buffer-name (get-buffer object)) + t)) -;; imported from Emacs 19.33. +;; imported from emacs-19.34/lisp/window.el. (defmacro-maybe save-selected-window (&rest body) "Execute BODY, then select the window that was selected before BODY. \[Emacs 19.31 emulating function]" @@ -293,17 +370,27 @@ Value is nil if OBJECT is not a buffer or if it has been killed. ;;; @ Emacs 20.1 emulation ;;; -;; imported from 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/lisp/subr.el. +(defsubst-maybe caar (x) + "Return the car of the car of X." + (car (car x))) -;; imported from 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)))) +;; imported from emacs-20.3/lisp/subr.el. +(defsubst-maybe cadr (x) + "Return the car of the cdr of X." + (car (cdr x))) + +;; imported from emacs-20.3/lisp/subr.el. +(defsubst-maybe cdar (x) + "Return the cdr of the car of X." + (cdr (car x))) + +;; imported from emacs-20.3/lisp/subr.el. +(defsubst-maybe cddr (x) + "Return the cdr of the cdr of X." + (cdr (cdr x))) -;; imported from Emacs 20.3. +;; imported from emacs-20.3/lisp/subr.el. (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. @@ -319,15 +406,17 @@ If N is bigger than the length of X, return X." (setq x (cdr x))) x)) +;; In Emacs 20.3, save-current-buffer is defined in src/editfns.c. (defmacro-maybe save-current-buffer (&rest body) "Save the current buffer; execute BODY; restore the current buffer. Executes BODY just like `progn'." (` (let ((orig-buffer (current-buffer))) (unwind-protect (progn (,@ body)) - (set-buffer orig-buffer))))) + (if (buffer-live-p orig-buffer) + (set-buffer orig-buffer)))))) -;; imported from Emacs 20.2. +;; imported from emacs-20.3/lisp/subr.el. (with macro style change) (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. @@ -336,7 +425,7 @@ See also `with-temp-buffer'." (set-buffer (, buffer)) (,@ body)))) -;; imported from Emacs 20.2. +;; imported from emacs-20.3/lisp/subr.el. (with macro style change) (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'. @@ -356,7 +445,7 @@ See also `with-temp-buffer'." (and (buffer-name (, temp-buffer)) (kill-buffer (, temp-buffer)))))))) -;; imported from Emacs 20.2. +;; imported from emacs-20.3/lisp/subr.el. (with macro style change) (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'." @@ -373,13 +462,20 @@ See also `with-temp-file' and `with-output-to-string'." "Execute BODY." (cons 'progn body)) -;; imported from Emacs 20.3. (cl function) +;; imported from emacs-20.3/lisp/subr.el. +(defun-maybe functionp (object) + "Non-nil if OBJECT is a type of object that can be called as a function." + (or (subrp object) (byte-code-function-p object) + (eq (car-safe object) 'lambda) + (and (symbolp object) (fboundp object)))) + +;; imported from emacs-20.3/lisp/emacs-lisp/cl.el. (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) +;; imported from emacs-20.3/lisp/emacs-lisp/cl.el. (defun-maybe nbutlast (x &optional n) "Modifies LIST to remove the last N elements." (let ((m (length x))) @@ -403,11 +499,145 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." start (match-end 0))) (nreverse (cons (substring string start) parts)))) +;; emulating char-before of Emacs 20. +(static-condition-case nil + ;; compile-time check. + (progn + ;; XXX: this file is already loaded at compile-time, + ;; so this test will always success. + (char-before) + ;; If our definition is found at compile-time, signal an error. + ;; XXX: should signal more specific error. + (if (get 'char-before 'defun-maybe) + (error ""))) + (wrong-number-of-arguments ; Mule 1.*, 2.*. + ;; load-time check. + (or (fboundp 'si:char-before) + (progn + (fset 'si:char-before (symbol-function 'char-before)) + (put 'char-before 'defun-maybe t) + ;; takes IGNORED for backward compatibility. + (defun char-before (&optional pos ignored) + "\ +Return character in current buffer preceding position POS. +POS is an integer or a buffer pointer. +If POS is out of range, the value is nil." + (si:char-before (or pos (point))))))) + (void-function ; non-Mule. + ;; load-time check. + (defun-maybe char-before (&optional pos) + "\ +Return character in current buffer preceding position POS. +POS is an integer or a buffer pointer. +If POS is out of range, the value is nil." + (if pos + (save-excursion + (and (= (goto-char pos) (point)) + (not (bobp)) + (preceding-char))) + (and (not (bobp)) + (preceding-char))))) + (error ; found our definition at compile-time. + ;; load-time check. + (condition-case nil + (char-before) + (wrong-number-of-arguments ; Mule 1.*, 2.*. + (or (fboundp 'si:char-before) + (progn + (fset 'si:char-before (symbol-function 'char-before)) + (put 'char-before 'defun-maybe t) + ;; takes IGNORED for backward compatibility. + (defun char-before (&optional pos ignored) + "\ +Return character in current buffer preceding position POS. +POS is an integer or a buffer pointer. +If POS is out of range, the value is nil." + (si:char-before (or pos (point))))))) + (void-function ; non-Mule. + (defun-maybe char-before (&optional pos) + "\ +Return character in current buffer preceding position POS. +POS is an integer or a buffer pointer. +If POS is out of range, the value is nil." + (if pos + (save-excursion + (and (= (goto-char pos) (point)) + (not (bobp)) + (preceding-char))) + (and (not (bobp)) + (preceding-char)))))))) + +;; emulating char-after of Emacs 20. +(static-condition-case nil + ;; compile-time check. + (progn + ;; XXX: this file is already loaded at compile-time, + ;; so this test will always success. + (char-after) + ;; If our definition is found at compile-time, signal an error. + ;; XXX: should signal more specific error. + (if (get 'char-after 'defun-maybe) + (error ""))) + (wrong-number-of-arguments ; v18, v19 + ;; load-time check. + (or (fboundp 'si:char-after) + (progn + (fset 'si:char-after (symbol-function 'char-after)) + (put 'char-after 'defun-maybe t) + (defun char-after (&optional pos) + "\ +Return character in current buffer at position POS. +POS is an integer or a buffer pointer. +If POS is out of range, the value is nil." + (si:char-after (or pos (point))))))) + (void-function ; NEVER happen? + ;; load-time check. + (defun-maybe char-after (&optional pos) + "\ +Return character in current buffer at position POS. +POS is an integer or a buffer pointer. +If POS is out of range, the value is nil." + (if pos + (save-excursion + (and (= (goto-char pos) (point)) + (not (eobp)) + (following-char))) + (and (not (eobp)) + (following-char))))) + (error ; found our definition at compile-time. + ;; load-time check. + (condition-case nil + (char-after) + (wrong-number-of-arguments ; v18, v19 + (or (fboundp 'si:char-after) + (progn + (fset 'si:char-after (symbol-function 'char-after)) + (put 'char-after 'defun-maybe t) + (defun char-after (&optional pos) + "\ +Return character in current buffer at position POS. +POS is an integer or a buffer pointer. +If POS is out of range, the value is nil." + (si:char-after (or pos (point))))))) + (void-function ; NEVER happen? + (defun-maybe char-after (&optional pos) + "\ +Return character in current buffer at position POS. +POS is an integer or a buffer pointer. +If POS is out of range, the value is nil." + (if pos + (save-excursion + (and (= (goto-char pos) (point)) + (not (eobp)) + (following-char))) + (and (not (eobp)) + (following-char)))))))) + ;;; @ Emacs 20.3 emulation ;;; -;; imported from Emacs 20.3.91. +;; imported from emacs-20.3/lisp/files.el. (defvar-maybe temporary-file-directory (file-name-as-directory (cond ((memq system-type '(ms-dos windows-nt)) @@ -424,10 +654,7 @@ With argument N not nil or 1, move forward N - 1 lines first. If scan reaches end of buffer, return that position. This function does not move point." (save-excursion - (if n - (forward-line (1- n)) - ) - (beginning-of-line) + (forward-line (1- (or n 1))) (point))) (defun-maybe line-end-position (&optional n) @@ -436,16 +663,12 @@ With argument N not nil or 1, move forward N - 1 lines first. If scan reaches end of buffer, return that position. This function does not move point." (save-excursion - (if n - (forward-line (1- n)) - ) - (end-of-line) + (end-of-line (or n 1)) (point))) (defun-maybe string (&rest chars) "Concatenate all the argument characters and make the result a string." - (mapconcat (function char-to-string) chars "") - ) + (mapconcat (function char-to-string) chars "")) ;;; @ XEmacs emulation @@ -457,49 +680,37 @@ If FACE-OR-NAME is a face object, it is simply returned. Otherwise, FACE-OR-NAME should be a symbol. If there is no such face, nil is returned. Otherwise the associated face object is returned. \[XEmacs emulating function]" - (car (memq face-or-name (face-list))) - ) + (car (memq face-or-name (face-list)))) (defun-maybe point-at-bol (&optional n buffer) "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. If scan reaches end of buffer, return that position. -This function does not move point. [XEmacs emulating function]" +This function does not move point. +\[XEmacs emulating function]" (save-excursion - (if buffer - (set-buffer buffer) - ) - (line-beginning-position n) - )) + (if buffer (set-buffer buffer)) + (forward-line (1- (or n 1))) + (point))) (defun-maybe point-at-eol (&optional n buffer) "Return the character position of the last character on the current line. With argument N not nil or 1, move forward N - 1 lines first. If scan reaches end of buffer, return that position. -This function does not move point. [XEmacs emulating function]" - (save-excursion - (if buffer - (set-buffer buffer) - ) - (line-end-position n) - )) - -(defun-maybe functionp (obj) - "Returns t if OBJ is a function, nil otherwise. +This function does not move point. \[XEmacs emulating function]" - (or (subrp obj) - (byte-code-function-p obj) - (and (symbolp obj)(fboundp obj)) - (and (consp obj)(eq (car obj) 'lambda)) - )) + (save-excursion + (if buffer (set-buffer buffer)) + (end-of-line (or n 1)) + (point))) (defsubst-maybe define-obsolete-function-alias (oldfun newfun) "Define OLDFUN as an obsolete alias for function NEWFUN. This makes calling OLDFUN equivalent to calling NEWFUN and marks OLDFUN -as obsolete. [XEmacs emulating function]" +as obsolete. +\[XEmacs emulating function]" (defalias oldfun newfun) - (make-obsolete oldfun newfun) - ) + (make-obsolete oldfun newfun)) (when (subr-fboundp 'read-event) ;; for Emacs 19 or later @@ -527,7 +738,7 @@ Note that CH (the keystroke specifier) can be an integer, a character or a symbol such as 'clear. [XEmacs emulating function]" ch) - (defun-maybe event-to-character (event) + (defsubst-maybe event-to-character (event) "Return the character approximation to the given event object. If the event isn't a keypress, this returns nil. \[XEmacs emulating function]" @@ -539,8 +750,7 @@ If the event isn't a keypress, this returns nil. (if base (logior base (car (cdr mask))) ))))) - ((integerp event) event) - )) + ((integerp event) event))) ) @@ -564,6 +774,4 @@ If the event isn't a keypress, this returns nil. ;;; @ end ;;; -(provide 'poe) - ;;; poe.el ends here