X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Flib-complete.el;h=7ae20c39ba202c7aba8ed204d409790a509af020;hp=83123c6e5f916babf73ca1c75306b6ea400bac27;hb=a5f466de30a3e927ed1146b0c7e3870e71465c8f;hpb=8b0299e2a613ab99d6e4dc2423e77ff93b715adc

diff --git a/lisp/lib-complete.el b/lisp/lib-complete.el
index 83123c6..7ae20c3 100644
--- a/lisp/lib-complete.el
+++ b/lisp/lib-complete.el
@@ -38,7 +38,7 @@
 ;; Last Modified By: Heiko M|nkel <muenkel@tnt.uni-hannover.de>
 ;; Additional XEmacs integration By: Chuck Thompson <cthomp@cs.uiuc.edu>
 ;; Last Modified On: Thu Jul 1 14:23:00 1994
-;; RCS Info        : $Revision: 1.3 $ $Locker:  $
+;; RCS Info        : $Revision: 1.3.2.1 $ $Locker:  $
 ;; ========================================================================
 ;; NOTE: XEmacs must be redumped if this file is changed.
 ;;
@@ -104,25 +104,24 @@ If optional fourth argument FAST is non-nil, don't sort the completions,
 
 ;;=== Utilities ===========================================================
 
-(defmacro progn-with-message (MESSAGE &rest FORMS)
+(defmacro progn-with-message (message &rest forms)
   "(progn-with-message MESSAGE FORMS ...)
 Display MESSAGE and evaluate FORMS, returning value of the last one."
   ;; based on Hallvard Furuseth's funcall-with-message
-  (` 
-   (if (eq (selected-window) (minibuffer-window))
+  `(if (eq (selected-window) (minibuffer-window))
        (save-excursion
 	 (goto-char (point-max))
 	 (let ((orig-pmax (point-max)))
 	   (unwind-protect
 	       (progn
-		 (insert " " (, MESSAGE)) (goto-char orig-pmax)
+		 (insert " " ,message) (goto-char orig-pmax)
 		 (sit-for 0)		; Redisplay
-		 (,@ FORMS))
+		 ,@forms)
 	     (delete-region orig-pmax (point-max)))))
      (prog2
-      (message "%s" (, MESSAGE))
-      (progn (,@ FORMS))
-      (message "")))))
+	 (message "%s" ,message)
+	 (progn ,@forms)
+       (message ""))))
 
 (put 'progn-with-message 'lisp-indent-hook 1)
 
@@ -218,6 +217,7 @@ where each <cache-record> has the form
       (if tail (setcdr tail nil)))))
 
 ;;=== Read a filename, with completion in a search path ===================
+(defvar read-library-internal-search-path)
 
 (defun read-library-internal (FILE FILTER FLAG)
   "Don't call this."
@@ -255,10 +255,7 @@ Optional sixth argument FILTER can be used to provide a function to
     (cond 
      ((equal library "") DEFAULT)
      (FULL (locate-file library read-library-internal-search-path
-			;; decompression doesn't work with Mule -slb
-			(if (featurep 'mule)
-			    ".el:.elc"
-			  ".el:.el.gz:.elc")))
+			  '(".el" ".el.gz" ".elc")))
      (t library))))
 
 ;; NOTE: as a special case, read-library may be used to read a filename