* lisp/emulation/edt-mapper.el: In batch mode, error rather than hang.

2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec747affc95..5b9cf1dc455 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-05-11  Glenn Morris  <rgm@gnu.org>
 
+        * emulation/edt-mapper.el: In batch mode, error rather than hang.
+
         * term.el (term-set-escape-char): Make it idempotent.
 
 2013-05-10  Leo Liu  <sdl.web@gmail.com>
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 5ddb9513f0a..138e3e6d0da 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -96,6 +96,10 @@
 
 ;;; Code:
 
+;; Otherwise it just hangs.  This seems preferable.
+(if noninteractive
+    (error "edt-mapper cannot be loaded in batch mode"))
+
 ;;;
 ;;;  Decide Emacs Variant, GNU Emacs or XEmacs (aka Lucid Emacs).
 ;;;  Determine Window System, and X Server Vendor (if appropriate).