;; 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.2.1 $ $Locker: $
;; ========================================================================
;; NOTE: XEmacs must be redumped if this file is changed.
;;
;;; ChangeLog:
;; 4/26/97: sb Mule-ize.
-;; 6/24/1999 much rewriting from Bob Weiner
;;; Code:
;;=== 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)
(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."
(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:.el.Z:.elc")))
+ '(".el" ".el.gz" ".elc")))
(t library))))
-(defun read-library-name (prompt)
- "PROMPTs for and returns an existing Elisp library name (without any suffix) or the empty string."
- (interactive)
- (let ((read-library-internal-search-path load-path))
- (completing-read prompt
- 'read-library-internal
- (lambda (fn)
- (cond
- ;; decompression doesn't work with mule -slb
- ((string-match (if (featurep 'mule)
- "\\.el$"
- "\\.el\\(\\.gz\\|\\.Z\\)?$") fn)
- (substring fn 0 (match-beginning 0)))))
- t nil)))
-
;; NOTE: as a special case, read-library may be used to read a filename
;; relative to the current directory, returning a *relative* pathname
;; (read-file-name returns a full pathname).
;;
;; eg. (read-library "Local header: " '(nil) nil)
+(defun get-library-path ()
+ "Front end to read-library"
+ (read-library "Find Library file: " load-path nil t t
+ (function (lambda (fn)
+ (cond
+ ;; decompression doesn't work with mule -slb
+ ((string-match (if (featurep 'mule)
+ "\\.el$"
+ "\\.el\\(\\.gz\\)?$") fn)
+ (substring fn 0 (match-beginning 0))))))
+ ))
+
;;=== Replacement for load-library with completion ========================
(defun load-library (library)
"Load the library named LIBRARY.
This is an interface to the function `load'."
(interactive
- (list (read-library "Load library: " load-path nil nil nil
- (function (lambda (fn)
- (cond
- ((string-match "\\.elc?$" fn)
- (substring fn 0 (match-beginning 0))))))
- )))
+ (list (read-library "Load Library: " load-path nil nil nil
+ (function (lambda (fn)
+ (cond
+ ((string-match "\\.elc?$" fn)
+ (substring fn 0 (match-beginning 0))))))
+ )))
(load library))
-;;=== find-library with completion (Author: Bob Weiner) ===================
+;;=== find-library with completion (Author: Heiko Muenkel) ===================
-(defun find-library (library &optional codesys display-function)
- "Find and display in the current window the source for the Elisp LIBRARY.
-LIBRARY should be a name without any path information and may include or omit
-the \".el\" suffix. Under XEmacs/Mule, the optional second argument CODESYS
-specifies the coding system to use when decoding the file. Interactively,
-with a prefix argument, this prompts for the coding system. Optional third
-argument DISPLAY-FUNCTION must take two arguments, the filename to display
-and CODESYS. The default for DISPLAY-FUNCTION is `find-file'."
+(defun find-library (library &optional codesys)
+ "Find and edit the source for the library named LIBRARY.
+The extension of the LIBRARY must be omitted.
+Under XEmacs/Mule, the optional second argument specifies the
+coding system to use when decoding the file. Interactively,
+with a prefix argument, you will be prompted for the coding system."
(interactive
- (list (read-library-name "Find library: ")
+ (list (get-library-path)
(if current-prefix-arg
(read-coding-system "Coding System: "))))
- (let ((path (if (or (null library) (equal library ""))
- nil
- (locate-file library load-path
- ;; decompression doesn't work with Mule -slb
- (if (featurep 'mule)
- ":.el:.elc"
- ":.el:.el.gz:.el.Z:.elc")))))
- (if path (funcall (if (fboundp display-function)
- display-function 'find-file)
- path codesys)
- (error "(find-library): Cannot locate library `%s'" library))))
+ (find-file library codesys))
(defun find-library-other-window (library &optional codesys)
- "Find and display in another window the source for the Elisp LIBRARY.
-LIBRARY should be a name without any path information and may include or omit
-the \".el\" suffix. Under XEmacs/Mule, the optional second argument CODESYS
-specifies the coding system to use when decoding the file. Interactively,
-with a prefix argument, this prompts for the coding system."
+ "Load the library named LIBRARY in another window.
+Under XEmacs/Mule, the optional second argument specifies the
+coding system to use when decoding the file. Interactively,
+with a prefix argument, you will be prompted for the coding system."
(interactive
- (list (read-library-name "Find library in other window: ")
+ (list (get-library-path)
(if current-prefix-arg
- (read-coding-system "Coding System: "))))
- (find-library library codesys 'find-file-other-window))
+ (read-coding-system "Coding System: "))))
+ (find-file-other-window library codesys))
(defun find-library-other-frame (library &optional codesys)
- "Find and display in another frame the source for the Elisp LIBRARY.
-LIBRARY should be a name without any path information and may include or omit
-the \".el\" suffix. Under XEmacs/Mule, the optional second argument CODESYS
-specifies the coding system to use when decoding the file. Interactively,
-with a prefix argument, this prompts for the coding system."
+ "Load the library named LIBRARY in a newly-created frame.
+Under XEmacs/Mule, the optional second argument specifies the
+coding system to use when decoding the file. Interactively,
+with a prefix argument, you will be prompted for the coding system."
(interactive
- (list (read-library-name "Find library in other frame: ")
+ (list (get-library-path)
(if current-prefix-arg
(read-coding-system "Coding System: "))))
- (find-library library codesys 'find-file-other-frame))
+ (find-file-other-frame library codesys))
-;; This conflicts with an existing binding.
-;;(define-key global-map "\C-xl" 'find-library)
+; This conflicts with an existing binding
+;(define-key global-map "\C-xl" 'find-library)
(define-key global-map "\C-x4l" 'find-library-other-window)
(define-key global-map "\C-x5l" 'find-library-other-frame)
projects / chise / xemacs-chise.git / blobdiff