From 0e3265ea546b92110b6e666094269763be7c21bc Mon Sep 17 00:00:00 2001 From: shuhei-k Date: Sun, 16 May 1999 06:55:45 +0000 Subject: [PATCH] (insert-binary-file-contents-literally): Removed, since provided by emu.el. (char-before, char-after): Use `fboundp', not `boundp'. Use error-conditions directly. --- poem-om.el | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/poem-om.el b/poem-om.el index 010527c..764ec45 100644 --- a/poem-om.el +++ b/poem-om.el @@ -270,17 +270,6 @@ applied to `coding-system-for-write'." (defalias 'set-process-input-coding-system 'set-process-coding-system) -(defun insert-binary-file-contents-literally (filename - &optional visit beg end replace) - "Like `insert-file-contents-literally', q.v., but don't code conversion. -A buffer may be modified in several ways after reading into the buffer due -to advanced Emacs features, such as file-name-handlers, format decoding, -find-file-hooks, etc. - This function ensures that none of these modifications will take place." - (as-binary-input-file - ;; Returns list absolute file name and length of data inserted. - (insert-file-contents-literally filename visit beg end replace))) - (defun insert-file-contents-as-binary (filename &optional visit beg end replace) "Like `insert-file-contents', q.v., but don't code and format conversion. @@ -383,32 +372,30 @@ but the contents viewed as characters do change. (if (subr-fboundp 'char-before) (condition-case err (char-before) - (error - (when (and (eq (car (get (car err) 'error-conditions)) - 'wrong-number-of-arguments) - (not (boundp 'si:char-before))) - (fset 'si:char-before (symbol-function 'char-before)) - (defun char-before (&optional pos) - "Return character in current buffer preceding position POS. + (wrong-number-of-arguments + (or (fboundp 'si:char-before) + (progn + (fset 'si:char-before (symbol-function 'char-before)) + (defun 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." - (si:char-before (or pos (point))) - ))))) + (si:char-before (or pos (point)))) + ))))) (if (subr-fboundp 'char-after) - (condition-case err + (condition-case nil (char-after) - (error - (when (and (eq (car (get (car err) 'error-conditions)) - 'wrong-number-of-arguments) - (not (boundp 'si:char-after))) - (fset 'si:char-after (symbol-function 'char-after)) - (defun char-after (&optional pos) - "Return character in current buffer at position POS. + (wrong-number-of-arguments + (or (fboundp 'si:char-after) + (progn + (fset 'si:char-after (symbol-function 'char-after)) + (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))) - ))))) + (si:char-after (or pos (point)))) + ))))) ;;; @@ obsoleted aliases ;;; -- 1.7.10.4