From: Noah Friedman <friedman@splode.com>
Date: Mon, 10 Dec 2001 10:22:22 +0000 (+0000)
Subject: (battery-insert-file-contents): Obsolete function removed.
X-Git-Tag: ttn-vms-21-2-B4~17821
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=440c4d7aa858844a0ff64ce28e76c2628ad978a3;p=emacs.git

(battery-insert-file-contents): Obsolete function removed.
(battery-read-function): Obsolete function removed.
(battery-linux-proc-apm): Use insert-file-contents.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3450233bcc..9a01ba38fa6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-10  Noah Friedman  <friedman@splode.com>
+
+	* battery.el (battery-insert-file-contents): Obsolete function
+	removed.
+	(battery-read-function): Obsolete function removed.
+	(battery-linux-proc-apm): Use insert-file-contents.
+
 2001-12-07  Stephen Eglen  <stephen@gnu.org>
 
 	* iswitchb.el (iswitchb-visit-buffer): Use
@@ -45,8 +52,8 @@
 	unibyte codes.
 
 	* language/european.el (diacritic-composition-pattern): New constant.
-	(diacritic-compose-region, diacritic-compose-string) 
-	(diacritic-compose-buffer, diacritic-post-read-conversion) 
+	(diacritic-compose-region, diacritic-compose-string)
+	(diacritic-compose-buffer, diacritic-post-read-conversion)
 	(diacritic-composition-function): New functions.
 
 	* international/utf-8.el (ucs-mule-to-mule-unicode): New
diff --git a/lisp/battery.el b/lisp/battery.el
index b4e07f74a53..5980a839a4a 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -171,7 +171,7 @@ The following %-sequences are provided:
 	  (setq buffer (get-buffer-create " *battery*"))
 	  (set-buffer buffer)
 	  (erase-buffer)
-	  (battery-insert-file-contents "/proc/apm")
+	  (insert-file-contents "/proc/apm")
 	  (re-search-forward battery-linux-proc-apm-regexp)
 	  (setq driver-version (match-string 1))
 	  (setq bios-version (match-string 2))
@@ -242,24 +242,6 @@ The following %-sequences are provided:
 	(setq result (concat result "%")))
     result))
 
-(defun battery-insert-file-contents (file-name)
-  "Insert contents of file FILE-NAME after point.
-FILE-NAME can be a non-ordinary file, for example, a named pipe.
-Return t if file exists."
-  (let ((load-read-function 'battery-read-function)
-	(load-source-file-function nil)
-	(load-path '("."))
-	(load-history nil))
-    (save-excursion
-      (load file-name nil t t))))
-
-(defun battery-read-function (&optional stream)
-  "Function for reading expressions from STREAM.
-Value is always nil."
-  (let (char)
-    (while (not (< (setq char (get-file-char)) 0))
-      (insert char))))
-
 (defconst battery-hex-map '((?0 .  0) (?1 .  1) (?2 .  2) (?3 .  3)
 			    (?4 .  4) (?5 .  5) (?6 .  6) (?7 .  7)
 			    (?8 .  8) (?9 .  9) (?a . 10) (?b . 11)