(eldoc-minor-mode-string): New variable.

[gnu-emacs] / lisp / emacs-lisp / lucid.el

diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el
index eaa405afd336484a35177e9b9fe4224cd89b91f9..cf99004c2374559473e91c184486d7d90676eca7 100644 (file)
--- a/lisp/emacs-lisp/lucid.el
+++ b/lisp/emacs-lisp/lucid.el
@@ -1,5 +1,5 @@
 ;;; lucid.el --- Emulate some Lucid Emacs functions.
-;; Copyright (C) 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -46,24 +46,12 @@
     tail))
 
 (defun set-keymap-parent (keymap new-parent)
-  (let ((tail (cdr keymap)))
+  (let ((tail keymap))
     (while (and tail (cdr tail) (not (eq (car (cdr tail)) 'keymap)))
       (setq tail (cdr tail)))
     (if tail
        (setcdr tail new-parent))))
 
-(defun remove-hook (hook-var function)
-  "Remove a function from a hook, if it is present.
-First argument HOOK-VAR (a symbol) is the name of a hook, second
- argument FUNCTION is the function to remove (compared with `eq')."
-  (if (boundp 'hook-var)
-      (let ((old (symbol-value hook-var)))
-       ;; If the hook value is a single function, turn it into a list.
-       (if (or (not (listp old)) (eq (car old) 'lambda))
-           (set hook-var (list old)))
-       ;; Now delete FUNCTION.
-       (set hook-var (delq function (symbol-value hook-var))))))
-
 (defun remprop (symbol prop)
   (let ((plist (symbol-plist symbol)))
     (while (eq (car plist) prop)
@@ -111,6 +99,27 @@ type that you get.  That will work in both versions of Emacs."
                (setq i (1- i))))))
       (setq keymap (cdr keymap)))))
 
+(defun read-number (prompt &optional integers-only)
+  "Read a number from the minibuffer.
+Keep reentering the minibuffer until we get suitable input.
+If optional argument INTEGERS-ONLY is non-nil, insist on an integer."
+  (interactive)
+  (let (success
+       (number nil)
+       (predicate (if integers-only 'integerp 'numberp)))
+    (while (not success)
+      (let ((input-string (read-string prompt)))
+       (condition-case ()
+           (setq number (read input-string))
+         (error))
+       (if (funcall predicate number)
+           (setq success t)
+         (let ((cursor-in-echo-area t))
+           (message "Please type %s"
+                    (if integers-only "an integer" "a number"))
+           (sit-for 1)))))
+    number))
+
 (defun real-path-name (name &optional default)
   (file-truename (expand-file-name name default)))
 
@@ -130,7 +139,7 @@ bottom of the buffer stack."
       (bury-buffer (current-buffer)))
   (switch-to-buffer
    (if (<= arg 1) (other-buffer (current-buffer))
-     (nth (1+ arg)
+     (nth arg
          (apply 'nconc
                 (mapcar
                  (lambda (buf)
@@ -143,6 +152,38 @@ bottom of the buffer stack."
 (defalias 'get-face 'internal-get-face)
 (defalias 'try-face-font 'internal-try-face-font)
 \f
+(defun make-extent (beg end &optional buffer)
+  (make-overlay beg end buffer))
+
+(defun set-extent-property (extent prop value)
+  (if (eq prop 'duplicable)
+      (cond ((and value (not (overlay-get extent prop)))
+            ;; If becoming duplicable, copy all overlayprops to text props.
+            (add-text-properties (overlay-start extent)
+                                 (overlay-end extent)
+                                 (overlay-properties extent)
+                                 (overlay-buffer extent)))
+           ;; If becoming no longer duplicable, remove these text props.
+           ((and (not value) (overlay-get extent prop))
+            (remove-text-properties (overlay-start extent)
+                                    (overlay-end extent)
+                                    (overlay-properties extent)
+                                    (overlay-buffer extent))))
+    ;; If extent is already duplicable, put this property
+    ;; on the text as well as on the overlay.
+    (if (overlay-get extent 'duplicable)
+       (put-text-property  (overlay-start extent)
+                           (overlay-end extent)
+                           prop value (overlay-buffer extent))))
+  (overlay-put extent prop value))
+
+(defun set-extent-face (extent face)
+  (set-extent-property extent 'face face))
+
+(defun delete-extent (extent)
+  (set-extent-property extent 'duplicable nil)
+  (delete-overlay extent))
+\f
 ;; Support the Lucid names with `screen' instead of `frame'.
 
 (defalias 'current-screen-configuration 'current-frame-configuration)
@@ -191,7 +232,7 @@ bottom of the buffer stack."
 (defalias 'visible-screen-list 'visible-frame-list)
 (defalias 'window-screen 'window-frame)
 (defalias 'x-create-screen 'x-create-frame)
-(defalias 'x-new-screen 'new-frame)
+(defalias 'x-new-screen 'make-frame)
 
 (provide 'lucid)