inputrc: add missing keybindings from Fedora and structure file in similar order

Due to the restructuring it might seem like some keybindings are
removed. No keybinding is removed, they're just moved around. Sometimes
also the comment is aligned with Fedora. Makes comparing the files
easier. Mageia still has way more keybindings than Fedora!

1 files changed, 30 insertions, 23 deletions

diff --git a/inputrc b/inputrc
index 2f65fa9..278b2a4 100644
--- a/inputrc
+++ b/inputrc
@@ -2,15 +2,12 @@
 # (c) Mandriva 1999-2005
 # (c) Mageia 2011-2012
 # Chmouel Boudjnah, Pablo Saratxaga <pablo@mandriva.com> 
-#	$Id: inputrc 105875 2005-12-07 06:56:46Z flepied $	
-
+# do not bell on tab-completion
+#set bell-style none
 
 # Show all if ambigious.
 set show-all-if-ambiguous on
 
-# Add / to symlink to directory
-set mark-symlinked-directories on
-
 # 8Bits supports.
 set meta-flag on
 set input-meta on
@@ -20,28 +17,42 @@ set output-meta on
 # bash completions does not use more
 set page-completions off
 
+# Completed names which are symbolic links to
+# directories have a slash appended.
+set mark-symlinked-directories on
+
 # definition of keys in vi mode if vi mode is set at login result
 # in totally messed up command line... so it safer to activate it
 # only for emacs mode; until the bug is fixed (in libreadline?)
 $if mode=emacs
 
-# Keyboard configuration
-"[2~": yank			# Insert
-"[3~":delete-char		# Suppr
-
-"[1~": beginning-of-line	# Home
-"[4~": end-of-line		# End
-
-# typing the beginning of a previous command then
-# PgUp/PgDw cycles trough history only for matching entries
-"[5~": history-search-backward	# Previous
-"[6~": history-search-forward		# Next
+# for linux console and RH/Debian xterm
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+# commented out keymappings for pgup/pgdown to reach begin/end of history
+#"\e[5~": beginning-of-history
+#"\e[6~": end-of-history
+"\e[5~": history-search-backward
+"\e[6~": history-search-forward
+"\e[3~": delete-char
+"\e[2~": overwrite-mode
+"\e[5C": forward-word
+"\e[5D": backward-word
+# on gnome-terminal (mdvbz#36287)
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
 
-# those two are for rxvt
+# for rxvt
 "\e[7~":beginning-of-line
-"\e[8~":end-of-line
+"\e[8~": end-of-line
+"\eOc": forward-word
+"\eOd": backward-word
 
-# on some xterm
+# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
+"\eOH": beginning-of-line
+"\eOF": end-of-line
+
+# for freebsd console
 "\e[H": beginning-of-line
 "\e[F": end-of-line
 
@@ -88,9 +99,5 @@ $endif
 "\eOB":         next-history
 "\eOE":         re-read-init-file
 
-# on gnome-terminal (mdvbz#36287)
-"\e[1;5D": backward-word
-"\e[1;5C": forward-word
-
 # emacs mode
 $endif