--- a/lisp/electric/echistory.el	Mon Aug 13 09:03:07 2007 +0200
+++ b/lisp/electric/echistory.el	Mon Aug 13 09:03:46 2007 +0200
@@ -4,6 +4,7 @@
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
+;; Keywords: extensions
 
 ;; This file is part of XEmacs.
 
@@ -19,9 +20,10 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
 
-;;; Synched up with: FSF 19.30.
+;;; Synched up with: FSF 19.34.
 
 ;;; Code:
 
@@ -31,7 +33,7 @@
 ;;;###autoload
 (defun Electric-command-history-redo-expression (&optional noconfirm)
   "Edit current history line in minibuffer and execute result.
-With prefix argument NOCONFIRM, execute current line as-is without editing."
+With prefix arg NOCONFIRM, execute current line as-is without editing."
   (interactive "P")
   (let (todo)
     (save-excursion
@@ -44,6 +46,7 @@
 (defvar electric-history-map ())
 (if electric-history-map
     ()
+  ;; XEmacs
   (setq electric-history-map (make-keymap))
   (set-keymap-name electric-history-map 'electric-history-map)
   (set-keymap-default-binding electric-history-map 'Electric-history-undefined)
@@ -64,8 +67,8 @@
   (define-key electric-history-map "\C-c\C-c" 'Electric-history-quit)
   (define-key electric-history-map "\C-]" 'Electric-history-quit)
   (define-key electric-history-map "\C-z" 'suspend-emacs)
-;;  (define-key electric-history-map "\C-h" 'Helper-help)
-  (define-key electric-history-map '(control h) 'Helper-help)
+  (define-key electric-history-map (char-to-string help-char) 'Helper-help)
+  ;; XEmacs
   (define-key electric-history-map 'backspace 'previous-line)
   (define-key electric-history-map "?" 'Helper-describe-bindings)
   (define-key electric-history-map "\e>" 'end-of-buffer)
@@ -99,12 +102,6 @@
 
 The history displayed is filtered by `list-command-history-filter' if non-nil.
 
-This pops up a window with the Command History listing.  If the very
-next character typed is Space, the listing is killed and the previous
-window configuration is restored.  Otherwise, you can browse in the
-Command History with  Return  moving down and  Delete  moving up, possibly
-selecting an expression to be redone with Space or quitting with `Q'.
-
 Like Emacs-Lisp mode except that characters do not insert themselves and
 Tab and Linefeed do not indent.  Instead these commands are provided:
 \\{electric-history-map}
@@ -153,7 +150,7 @@
   "Quit Electric Command History, restoring previous window configuration."
   (interactive)
   (if (boundp 'electric-history-in-progress)
-      (progn (message nil)
+      (progn (message "")
 	     (throw 'electric-history-quit nil))))
 
 ;;; echistory.el ends here