Replace lisp-indent-hook with lisp-indent-function throughout.

[gnu-emacs] / lisp / ielm.el

diff --git a/lisp/ielm.el b/lisp/ielm.el
index 53e3d83cdaa17b155cd323953b6cfcc11445840a..cbfbf57e36fcc490208fde1b52e1e9a7486c928b 100644 (file)
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -51,12 +51,33 @@
 
 (defcustom ielm-prompt-read-only t
   "If non-nil, the IELM prompt is read only.
+The read only region includes the newline before the prompt.
 Setting this variable does not affect existing IELM runs.
 This works by setting the buffer-local value of `comint-prompt-read-only'.
-Setting that value directly affects new prompts in the current buffer."
+Setting that value directly affects new prompts in the current buffer.
+
+If this option is enabled, then the safe way to temporarily
+override the read-only-ness of ielm prompts is to call
+`comint-kill-whole-line' or `comint-kill-region' with no
+narrowing in effect.  This way you will be certain that none of
+the remaining prompts will be accidentally messed up.  You may
+wish to put something like the following in your `.emacs' file:
+
+\(add-hook 'ielm-mode-hook
+         '(lambda ()
+            (define-key ielm-map \"\C-w\" 'comint-kill-region)
+            (define-key ielm-map [C-S-backspace]
+              'comint-kill-whole-line)))
+
+If you set `comint-prompt-read-only' to t, you might wish to use
+`comint-mode-hook' and `comint-mode-map' instead of
+`ielm-mode-hook' and `ielm-map'.  That will affect all comint
+buffers, including ielm buffers.  If you sometimes use ielm on
+text-only terminals or with `emacs -nw', you might wish to use
+another binding for `comint-kill-whole-line'."
   :type 'boolean
   :group 'ielm
-  :version "21.4")
+  :version "22.1")
 
 (defcustom ielm-prompt "ELISP> "
   "Prompt used in IELM.
@@ -177,7 +198,7 @@ This variable is buffer-local.")
 ;;; Completion stuff
 
 (defun ielm-tab nil
-  "Possibly indent the current line as lisp code."
+  "Possibly indent the current line as Lisp code."
   (interactive)
   (if (or (eq (preceding-char) ?\n)
          (eq (char-syntax (preceding-char)) ? ))
@@ -186,7 +207,7 @@ This variable is buffer-local.")
        t)))
 
 (defun ielm-complete-symbol nil
-  "Complete the lisp symbol before point."
+  "Complete the Lisp symbol before point."
   ;; A wrapper for lisp-complete symbol that returns non-nil if
   ;; completion has occurred
   (let* ((btick (buffer-modified-tick))
@@ -507,7 +528,7 @@ Customized bindings may be defined in `ielm-map', which currently contains:
     (condition-case nil
        (start-process "ielm" (current-buffer) "hexl")
       (file-error (start-process "ielm" (current-buffer) "cat")))
-    (process-kill-without-query (ielm-process))
+    (set-process-query-on-exit-flag (ielm-process) nil)
     (goto-char (point-max))
 
     ;; Lisp output can include raw characters that confuse comint's