(bad-packages-alist): Revert previous change.

[gnu-emacs] / lisp / ielm.el

diff --git a/lisp/ielm.el b/lisp/ielm.el
index 96969bfc878606962211d4de1a8592946db6ceee..a734f87ad92a5b95496d83a8b1a3e6b4f88af451 100644 (file)
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -1,6 +1,7 @@
 ;;; ielm.el --- interaction mode for Emacs Lisp
 
-;; Copyright (C) 1994, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Smith <maa036@lancaster.ac.uk>
 ;; Maintainer: FSF
@@ -11,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -21,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -65,7 +66,7 @@ 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-w\" 'comint-kill-region)
             (define-key ielm-map [C-S-backspace]
               'comint-kill-whole-line)))
 
@@ -77,7 +78,7 @@ 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.
@@ -102,7 +103,7 @@ prevent a running IELM process from being messed up when the user
 customizes `ielm-prompt'.")
 
 (defcustom ielm-dynamic-return t
-  "*Controls whether \\<ielm-map>\\[ielm-return] has intelligent behaviour in IELM.
+  "*Controls whether \\<ielm-map>\\[ielm-return] has intelligent behavior in IELM.
 If non-nil, \\[ielm-return] evaluates input for complete sexps, or inserts a newline
 and indents for incomplete sexps.  If nil, always inserts newlines."
   :type 'boolean
@@ -168,7 +169,7 @@ This variable is buffer-local.")
 
 (defvar ielm-map nil)
 (if ielm-map nil
-  (if (string-match "Lucid" emacs-version)
+  (if (featurep 'xemacs)
       ;; Lemacs
       (progn
        (setq ielm-map (make-sparse-keymap))
@@ -468,7 +469,7 @@ buffer, then the values in the working buffer are used.  The variables
 Expressions evaluated by IELM are not subject to `debug-on-quit' or
 `debug-on-error'.
 
-The behaviour of IELM may be customized with the following variables:
+The behavior of IELM may be customized with the following variables:
 * To stop beeping on error, set `ielm-noisy' to nil.
 * If you don't like the prompt, you can change it by setting `ielm-prompt'.
 * If you do not like that the prompt is (by default) read-only, set
@@ -480,8 +481,10 @@ The behaviour of IELM may be customized with the following variables:
 Customized bindings may be defined in `ielm-map', which currently contains:
 \\{ielm-map}"
   (interactive)
-  (comint-mode)
+  (delay-mode-hooks
+   (comint-mode))
   (setq comint-prompt-regexp (concat "^" (regexp-quote ielm-prompt)))
+  (set (make-local-variable 'paragraph-separate) "\\'")
   (make-local-variable 'paragraph-start)
   (setq paragraph-start comint-prompt-regexp)
   (setq comint-input-sender 'ielm-input-sender)
@@ -538,7 +541,7 @@ Customized bindings may be defined in `ielm-map', which currently contains:
     ;; Add a silly header
     (insert ielm-header)
     (ielm-set-pm (point-max))
-    (unless comint-use-prompt-regexp-instead-of-fields
+    (unless comint-use-prompt-regexp
       (let ((inhibit-read-only t))
         (add-text-properties
          (point-min) (point-max)
@@ -547,7 +550,7 @@ Customized bindings may be defined in `ielm-map', which currently contains:
     (set-marker comint-last-input-start (ielm-pm))
     (set-process-filter (get-buffer-process (current-buffer)) 'comint-output-filter))
 
-  (run-hooks 'ielm-mode-hook))
+  (run-mode-hooks 'ielm-mode-hook))
 
 (defun ielm-get-old-input nil
   ;; Return the previous input surrounding point