6 files changed, 31 insertions, 36 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56311198831..549b70a1de1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2012-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/debug.el (debugger-outer-unread-command-char, debug)
+        (debugger-env-macro): Remove support for unread-command-char.
+
+        * subr.el (set-temporary-overlay-map): Minimize slightly the impact of
+        the temporary map re-appearing on emulation-mode-map-alists.
+
+        * emacs-lisp/edebug.el (def-edebug-form-spec): Remove, it's been broken
+        since 22.1.
+
+        * ehelp.el (with-electric-help): Accept functions in
+        electric-help-form-to-execute.
+        (electric-help-execute-extended, electric-help-ctrl-x-prefix): Use it.
+        And replace unread-command-char -> unread-command-events.
+
 2012-09-12  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.2.6.
@@ -9,8 +25,8 @@
 
 2012-09-12  Martin Rudalics  <rudalics@gmx.at>
 
-        * emacs-lisp/debug.el (debugger-previous-window-height): New
-        variable.
+        * emacs-lisp/debug.el (debugger-previous-window-height):
+        New variable.
         (debug): When debugger-jumping-flag is non-nil try to restore
         height of debugger window.  (Bug#8789)
 
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index abb897f73f6..281148d9cf6 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -193,7 +193,9 @@ BUFFER is put back into its original major mode."
         (replace-buffer-in-windows buffer)
         ;; must do this outside of save-window-excursion
         (bury-buffer buffer))
-      (eval electric-help-form-to-execute))))
+      (if (functionp electric-help-form-to-execute)
+          (funcall electric-help-form-to-execute)
+        (eval electric-help-form-to-execute)))))
 
 (defun electric-help-command-loop ()
   (catch 'exit
@@ -349,14 +351,19 @@ will select it.)"
 ;; continues with execute-extended-command.
 (defun electric-help-execute-extended (_prefixarg)
   (interactive "p")
-  (setq electric-help-form-to-execute '(execute-extended-command nil))
+  (setq electric-help-form-to-execute
+        (lambda () (execute-extended-command nil)))
   (electric-help-retain))
 
 ;; This is to be buond to C-x in ehelp mode. Retains ehelp buffer and then
 ;; continues with ctrl-x prefix.
 (defun electric-help-ctrl-x-prefix (_prefixarg)
   (interactive "p")
-  (setq electric-help-form-to-execute '(progn (message nil) (setq unread-command-char ?\C-x)))
+  (setq electric-help-form-to-execute
+        (lambda ()
+          (message nil)
+          (setq unread-command-events
+                (append unread-command-events '(?\C-x)))))
   (electric-help-retain))
 
 
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 8b89e65c5d9..774b4d3d600 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -110,10 +110,6 @@ This is to optimize `debugger-make-xrefs'.")
 (defvar debugger-outer-track-mouse)
 (defvar debugger-outer-last-command)
 (defvar debugger-outer-this-command)
-;; unread-command-char is obsolete,
-;; but we still save and restore it
-;; in case some user program still tries to set it.
-(defvar debugger-outer-unread-command-char)
 (defvar debugger-outer-unread-command-events)
 (defvar debugger-outer-unread-post-input-method-events)
 (defvar debugger-outer-last-input-event)
@@ -185,8 +181,6 @@ first will be printed into the backtrace buffer."
           (debugger-outer-track-mouse track-mouse)
           (debugger-outer-last-command last-command)
           (debugger-outer-this-command this-command)
-          (debugger-outer-unread-command-char
-           (with-no-warnings unread-command-char))
           (debugger-outer-unread-command-events unread-command-events)
           (debugger-outer-unread-post-input-method-events
            unread-post-input-method-events)
@@ -221,8 +215,6 @@ first will be printed into the backtrace buffer."
             (cursor-in-echo-area nil))
         (unwind-protect
             (save-excursion
-              (with-no-warnings
-                (setq unread-command-char -1))
               (when (eq (car debugger-args) 'debug)
                 ;; Skip the frames for backtrace-debug, byte-code,
                 ;; and implement-debug-on-entry.
@@ -302,8 +294,6 @@ first will be printed into the backtrace buffer."
       (setq track-mouse debugger-outer-track-mouse)
       (setq last-command debugger-outer-last-command)
       (setq this-command debugger-outer-this-command)
-      (with-no-warnings
-        (setq unread-command-char debugger-outer-unread-command-char))
       (setq unread-command-events debugger-outer-unread-command-events)
       (setq unread-post-input-method-events
             debugger-outer-unread-post-input-method-events)
@@ -605,16 +595,7 @@ Applies to the frame whose line point is on in the backtrace."
           (cursor-in-echo-area debugger-outer-cursor-in-echo-area))
       (set-match-data debugger-outer-match-data)
       (prog1
-          (let ((save-ucc (with-no-warnings unread-command-char)))
-            (unwind-protect
-                (progn
-                  (with-no-warnings
-                    (setq unread-command-char debugger-outer-unread-command-char))
-                  (prog1 (progn ,@body)
-                    (with-no-warnings
-                      (setq debugger-outer-unread-command-char unread-command-char))))
-              (with-no-warnings
-                (setq unread-command-char save-ucc))))
+          (progn ,@body)
         (setq debugger-outer-match-data (match-data))
         (setq debugger-outer-load-read-function load-read-function)
         (setq debugger-outer-overriding-terminal-local-map
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 17f6f79cd66..f147fba167d 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -235,11 +235,6 @@ If the result is non-nil, then break.  Errors are ignored."
 
 ;;; Form spec utilities.
 
-(defmacro def-edebug-form-spec (symbol spec-form)
-  "For compatibility with old version."
-  (def-edebug-spec symbol (eval spec-form)))
-(make-obsolete 'def-edebug-form-spec 'def-edebug-spec "22.1")
-
 (defun get-edebug-spec (symbol)
   ;; Get the spec of symbol resolving all indirection.
   (let ((edebug-form-spec nil)
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 1d29011762e..8ac54d6524e 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -4210,7 +4210,7 @@ NUMBER-OF-STATIC-VARIABLES:"
 ;; this will select the buffer from which the buffer menu was
 ;; invoked.  But this buffer is not displayed in the buffer list if
 ;; it isn't a tree buffer.  I therefore let the buffer menu command
-;; loop read the command `p' via `unread-command-char'.  This command
+;; loop read the command `p' via `unread-command-events'.  This command
 ;; has no effect since we are on the first line of the buffer.
 
 (defvar electric-buffer-menu-mode-hook nil)
diff --git a/lisp/subr.el b/lisp/subr.el
index 23b62b25c9c..aa1b10ce17d 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1250,11 +1250,6 @@ is converted into a string by expressing it in decimal."
  'mode-line-inverse-video
  "use the appropriate faces instead."
  "21.1")
-(make-obsolete-variable
- 'unread-command-char
- "use `unread-command-events' instead.  That variable is a list of events
-to reread, so it now uses nil to mean `no event', instead of -1."
- "before 19.15")
 
 ;; Lisp manual only updated in 22.1.
 (define-obsolete-variable-alias 'executing-macro 'executing-kbd-macro
@@ -3928,6 +3923,7 @@ When KEEP-PRED is nil, the temporary keymap is used only once."
                                   (lookup-key ',map
                                               (this-command-keys-vector))))
                             (t `(funcall ',keep-pred)))
+               (set ',overlaysym nil)   ;Just in case.
                (remove-hook 'pre-command-hook ',clearfunsym)
                (setq emulation-mode-map-alists
                      (delq ',alist emulation-mode-map-alists))))))