Include nt/inc/arpa and nt/inc/netinet in the dist.

[bpt/emacs.git] / lisp / echistory.el

diff --git a/lisp/echistory.el b/lisp/echistory.el
index 8402448..66e0b08 100644 (file)
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -18,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; 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.
 
 ;;; Code:
 
@@ -42,10 +43,10 @@ With prefix arg NOCONFIRM, execute current line as-is without editing."
 (defvar electric-history-map ())
 (if electric-history-map
     ()
-  (setq electric-history-map (make-keymap))
-  (fillarray electric-history-map 'Electric-history-undefined)
-  (define-key electric-history-map "\e" (make-keymap))
-  (fillarray (lookup-key electric-history-map "\e") 'Electric-history-undefined)
+  (setq electric-history-map (make-sparse-keymap))
+  (define-key electric-history-map [t] 'Electric-history-undefined)
+  (define-key electric-history-map "\e" (make-sparse-keymap))
+  (define-key electric-history-map [?\e t] 'Electric-history-undefined)
   (define-key electric-history-map "\C-u" 'universal-argument)
   (define-key electric-history-map " " 'Electric-command-history-redo-expression)
   (define-key electric-history-map "!" 'Electric-command-history-redo-expression)
@@ -63,7 +64,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing."
   (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 (char-to-string help-char) 'Helper-help)
   (define-key electric-history-map "?" 'Helper-describe-bindings)
   (define-key electric-history-map "\e>" 'end-of-buffer)
   (define-key electric-history-map "\e<" 'beginning-of-buffer)
@@ -74,6 +75,11 @@ With prefix arg NOCONFIRM, execute current line as-is without editing."
   (define-key electric-history-map "\C-p" 'previous-line)
   (define-key electric-history-map "\ev" 'scroll-down)
   (define-key electric-history-map "\C-v" 'scroll-up)
+  (define-key electric-history-map [home] 'beginning-of-buffer)
+  (define-key electric-history-map [down] 'next-line)
+  (define-key electric-history-map [up] 'previous-line)
+  (define-key electric-history-map [prior] 'scroll-down)
+  (define-key electric-history-map [next] 'scroll-up)
   (define-key electric-history-map "\C-l" 'recenter)
   (define-key electric-history-map "\e\C-v" 'scroll-other-window))
 
@@ -131,7 +137,7 @@ The Command History listing is recomputed each time this mode is invoked."
 (defun Electric-history-undefined ()
   (interactive)
   (ding)
-  (message "Type C-h for help, ? for commands, C-c to quit, Space to execute")
+  (message (substitute-command-keys "Type \\[Helper-help] for help, ? for commands, C-c C-c to quit, Space to execute"))
   (sit-for 4))
 
 (defun Electric-history-quit ()