Nuke whitespace foolish enough to expose itself during the great

"warning:" rectification.

29 files changed, 119 insertions, 119 deletions

diff --git a/gnu/lib/libreadline/bind.c b/gnu/lib/libreadline/bind.c
index 3fa2f06572c..2c47e00e702 100644
--- a/gnu/lib/libreadline/bind.c
+++ b/gnu/lib/libreadline/bind.c
@@ -381,7 +381,7 @@ rl_translate_keyseq (seq, array, len)
 		  array[l++] = (seq[i] == '?') ? RUBOUT : CTRL (_rl_to_upper (seq[i]));
 		}
 	      continue;
-	    }	      
+	    }
 
 	  /* Translate other backslash-escaped characters.  These are the
 	     same escape sequences that bash's `echo' and `printf' builtins
@@ -523,12 +523,12 @@ _rl_untranslate_macro_value (seq)
 	  c = _rl_to_lower (UNCTRL (c));
 	}
       else if (c == RUBOUT)
- 	{
- 	  *r++ = '\\';
- 	  *r++ = 'C';
- 	  *r++ = '-';
- 	  c = '?';
- 	}
+	{
+	  *r++ = '\\';
+	  *r++ = 'C';
+	  *r++ = '-';
+	  c = '?';
+	}
 
       if (c == ESC)
 	{
@@ -738,7 +738,7 @@ _rl_read_init_file (filename, include_level)
 
   if (buffer == 0)
     return (errno);
-  
+
   if (include_level == 0 && filename != last_readline_init_file)
     {
       FREE (last_readline_init_file);
@@ -800,7 +800,7 @@ _rl_init_file_error (msg)
 
 /* **************************************************************** */
 /*								    */
-/*			Parser Directives       		    */
+/*			Parser Directives			    */
 /*								    */
 /* **************************************************************** */
 
@@ -962,7 +962,7 @@ parser_include (args)
 
   return r;
 }
-  
+
 /* Associate textual names with actual functions. */
 static struct {
   const char *name;
@@ -1525,7 +1525,7 @@ sv_isrchterm (value)
   free (v);
   return 0;
 }
-      
+
 /* Return the character which matches NAME.
    For example, `Space' returns ' '. */
 
@@ -1602,7 +1602,7 @@ rl_get_keymap_name (map)
       return ((char *)keymap_names[i].name);
   return ((char *)NULL);
 }
-  
+
 void
 rl_set_keymap (map)
      Keymap map;
@@ -1828,7 +1828,7 @@ rl_invoking_keyseqs_in_map (function, map)
 		    keyname[0] = (char) key;
 		    keyname[1] = '\0';
 		  }
-		
+
 		strlcat (keyname, seqs[i], len);
 		free (seqs[i]);
 
diff --git a/gnu/lib/libreadline/callback.c b/gnu/lib/libreadline/callback.c
index 5b05ea5c5b7..57f3b7ddf75 100644
--- a/gnu/lib/libreadline/callback.c
+++ b/gnu/lib/libreadline/callback.c
@@ -54,7 +54,7 @@
    things to handle at once, and dispatches them via select().  Call
    rl_callback_handler_install() with the prompt and a function to call
    whenever a complete line of input is ready.  The user must then
-   call rl_callback_read_char() every time some input is available, and 
+   call rl_callback_read_char() every time some input is available, and
    rl_callback_read_char() will call the user's function with the complete
    text read in at each end of line.  The terminal is kept prepped and
    signals handled all the time, except during calls to the user's function. */
diff --git a/gnu/lib/libreadline/chardefs.h b/gnu/lib/libreadline/chardefs.h
index a537be220b0..9dcaab090da 100644
--- a/gnu/lib/libreadline/chardefs.h
+++ b/gnu/lib/libreadline/chardefs.h
@@ -117,8 +117,8 @@
 
 #define HEXVALUE(c) \
   (((c) >= 'a' && (c) <= 'f') \
-  	? (c)-'a'+10 \
-  	: (c) >= 'A' && (c) <= 'F' ? (c)-'A'+10 : (c)-'0')
+	? (c)-'a'+10 \
+	: (c) >= 'A' && (c) <= 'F' ? (c)-'A'+10 : (c)-'0')
 
 #ifndef NEWLINE
 #define NEWLINE '\n'
diff --git a/gnu/lib/libreadline/complete.c b/gnu/lib/libreadline/complete.c
index 4cfebb1becd..0209fc20987 100644
--- a/gnu/lib/libreadline/complete.c
+++ b/gnu/lib/libreadline/complete.c
@@ -261,7 +261,7 @@ rl_compignore_func_t *rl_ignore_some_completions_function = (rl_compignore_func_
    and a pointer to the quoting character to be used, which the function can
    reset if desired. */
 rl_quote_func_t *rl_filename_quoting_function = rl_quote_filename;
-         
+
 /* Function to call to remove quoting characters from a filename.  Called
    before completion is attempted, so the embedded quotes do not interfere
    with matching names in the file system.  Readline doesn't do anything
@@ -557,7 +557,7 @@ print_filename (to_print, full_pathname)
     {
       PUTX (*s);
     }
-#else  
+#else
   char *s, c, *new_full_pathname;
   int extension_char;
 
@@ -697,7 +697,7 @@ _rl_find_completion_word (fp, dp)
 	      else if (quote_char == '"')
 		found_quote |= RL_QF_DOUBLE_QUOTE;
 	      else
-		found_quote |= RL_QF_OTHER_QUOTE;      
+		found_quote |= RL_QF_OTHER_QUOTE;
 	    }
 	}
     }
@@ -809,7 +809,7 @@ gen_completion_matches (text, start, end, our_func, found_quote, quote_char)
 
   matches = rl_completion_matches (text, our_func);
   FREE (temp);
-  return matches;  
+  return matches;
 }
 
 /* Filter out duplicates in MATCHES.  This frees up the strings in
@@ -1212,7 +1212,7 @@ display_matches (matches)
       (*rl_completion_display_matches_hook) (matches, len, max);
       return;
     }
-	
+
   /* If there are many items, then ask the user if she really wants to
      see them all. */
   if (len >= rl_completion_query_items)
@@ -1671,7 +1671,7 @@ rl_username_completion_function (text, state)
     }
   else
     {
-      int len = 2 + strlen(entry->pw_name);	    
+      int len = 2 + strlen(entry->pw_name);
       value = (char *)xmalloc (len);
 
       *value = *text;
@@ -1741,7 +1741,7 @@ rl_filename_completion_function (text, state)
       /* searches from current directory on the drive */
       else if (ISALPHA ((unsigned char)dirname[0]) && dirname[1] == ':')
         {
-	  /* XXX DOS strlcpy anyone? */	
+	  /* XXX DOS strlcpy anyone? */
           strlcpy (filename, dirname + 2, filename_len);
           dirname[2] = '\0';
         }
@@ -1854,7 +1854,7 @@ rl_filename_completion_function (text, state)
       /* dirname && (strcmp (dirname, ".") != 0) */
       if (dirname && (dirname[0] != '.' || dirname[1]))
 	{
-	  int templen;	
+	  int templen;
 	  if (rl_complete_with_tilde_expansion && *users_dirname == '~')
 	    {
 	      dirlen = strlen (dirname);
@@ -1959,12 +1959,12 @@ rl_menu_complete (count, ignore)
 
       if (matches == 0 || postprocess_matches (&matches, matching_filenames) == 0)
 	{
-    	  rl_ding ();
+	  rl_ding ();
 	  FREE (matches);
 	  matches = (char **)0;
 	  FREE (orig_text);
 	  orig_text = (char *)0;
-    	  completion_changed_buffer = 0;
+	  completion_changed_buffer = 0;
           return (0);
 	}
 
@@ -1978,7 +1978,7 @@ rl_menu_complete (count, ignore)
      rl_line_buffer[orig_start] and rl_line_buffer[rl_point] with
      matches[match_list_index], and add any necessary closing char. */
 
-  if (matches == 0 || match_list_size == 0) 
+  if (matches == 0 || match_list_size == 0)
     {
       rl_ding ();
       FREE (matches);
diff --git a/gnu/lib/libreadline/display.c b/gnu/lib/libreadline/display.c
index 98055047354..c6fcea6edec 100644
--- a/gnu/lib/libreadline/display.c
+++ b/gnu/lib/libreadline/display.c
@@ -190,7 +190,7 @@ static int prompt_last_screen_line;
 	\002 (^B) end non-visible characters
    all characters except \001 and \002 (following a \001) are copied to
    the returned string; all characters except those between \001 and
-   \002 are assumed to be `visible'. */	
+   \002 are assumed to be `visible'. */
 
 static char *
 expand_prompt (pmt, lp, lip, niflp)
@@ -373,7 +373,7 @@ init_line_structures (minsize)
       inv_lbreaks[0] = vis_lbreaks[0] = 0;
     }
 }
-  
+
 /* Basic redisplay algorithm. */
 void
 rl_redisplay ()
@@ -491,7 +491,7 @@ rl_redisplay ()
 	  } \
       } while (0)
 
-#if defined (HANDLE_MULTIBYTE)	  
+#if defined (HANDLE_MULTIBYTE)
 #define CHECK_LPOS() \
       do { \
 	lpos++; \
@@ -1121,7 +1121,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
 	}
     }
 
-      
+
   /* Find first difference. */
 #if defined (HANDLE_MULTIBYTE)
   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
@@ -1399,7 +1399,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
 	    col_lendiff = lendiff;
 
 	  if (col_lendiff)
-	    {	  
+	    {
 	      if (_rl_term_autowrap && current_line < inv_botlin)
 		space_to_eol (col_lendiff);
 	      else
@@ -2027,7 +2027,7 @@ redraw_prompt (t)
   prompt_last_invisible = oldlast;
   prompt_invis_chars_first_line = oldninvis;
 }
-      
+
 /* Redisplay the current line after a SIGWINCH is received. */
 void
 _rl_redisplay_after_sigwinch ()
diff --git a/gnu/lib/libreadline/emacs_keymap.c b/gnu/lib/libreadline/emacs_keymap.c
index ca9d1343b65..5b939ab3e4c 100644
--- a/gnu/lib/libreadline/emacs_keymap.c
+++ b/gnu/lib/libreadline/emacs_keymap.c
@@ -83,7 +83,7 @@ KEYMAP_ENTRY_ARRAY emacs_standard_keymap = {
   { ISFUNC, rl_insert },		/* - */
   { ISFUNC, rl_insert },		/* . */
   { ISFUNC, rl_insert },		/* / */
-	
+
 	  /* Regular digits. */
   { ISFUNC, rl_insert },		/* 0 */
   { ISFUNC, rl_insert },		/* 1 */
@@ -329,7 +329,7 @@ KEYMAP_ENTRY_ARRAY emacs_meta_keymap = {
   { ISFUNC, rl_vi_editing_mode },	/* Meta-Control-j */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-Control-k */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-Control-l */
-  { ISFUNC, rl_vi_editing_mode }, 	/* Meta-Control-m */
+  { ISFUNC, rl_vi_editing_mode },	/* Meta-Control-m */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-Control-n */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-Control-o */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-Control-p */
@@ -364,21 +364,21 @@ KEYMAP_ENTRY_ARRAY emacs_meta_keymap = {
   { ISFUNC, rl_insert_completions },	/* Meta-* */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-+ */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-, */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-- */
+  { ISFUNC, rl_digit_argument },	/* Meta-- */
   { ISFUNC, rl_yank_last_arg},		/* Meta-. */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-/ */
 
   /* Regular digits. */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-0 */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-1 */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-2 */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-3 */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-4 */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-5 */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-6 */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-7 */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-8 */
-  { ISFUNC, rl_digit_argument }, 	/* Meta-9 */
+  { ISFUNC, rl_digit_argument },	/* Meta-0 */
+  { ISFUNC, rl_digit_argument },	/* Meta-1 */
+  { ISFUNC, rl_digit_argument },	/* Meta-2 */
+  { ISFUNC, rl_digit_argument },	/* Meta-3 */
+  { ISFUNC, rl_digit_argument },	/* Meta-4 */
+  { ISFUNC, rl_digit_argument },	/* Meta-5 */
+  { ISFUNC, rl_digit_argument },	/* Meta-6 */
+  { ISFUNC, rl_digit_argument },	/* Meta-7 */
+  { ISFUNC, rl_digit_argument },	/* Meta-8 */
+  { ISFUNC, rl_digit_argument },	/* Meta-9 */
 
   /* A little more punctuation. */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-: */
@@ -428,7 +428,7 @@ KEYMAP_ENTRY_ARRAY emacs_meta_keymap = {
   /* Lowercase alphabet. */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-a */
   { ISFUNC, rl_backward_word },		/* Meta-b */
-  { ISFUNC, rl_capitalize_word }, 	/* Meta-c */
+  { ISFUNC, rl_capitalize_word },	/* Meta-c */
   { ISFUNC, rl_kill_word },		/* Meta-d */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-e */
   { ISFUNC, rl_forward_word },		/* Meta-f */
@@ -445,7 +445,7 @@ KEYMAP_ENTRY_ARRAY emacs_meta_keymap = {
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-q */
   { ISFUNC, rl_revert_line },		/* Meta-r */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-s */
-  { ISFUNC, rl_transpose_words }, 	/* Meta-t */
+  { ISFUNC, rl_transpose_words },	/* Meta-t */
   { ISFUNC, rl_upcase_word },		/* Meta-u */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-v */
   { ISFUNC, (rl_command_func_t *)0x0 },	/* Meta-w */
diff --git a/gnu/lib/libreadline/funmap.c b/gnu/lib/libreadline/funmap.c
index fe9a1da43d7..489110f9732 100644
--- a/gnu/lib/libreadline/funmap.c
+++ b/gnu/lib/libreadline/funmap.c
@@ -197,7 +197,7 @@ rl_add_funmap_entry (name, function)
       funmap_size += 64;
       funmap = (FUNMAP **)xrealloc (funmap, funmap_size * sizeof (FUNMAP *));
     }
-  
+
   funmap[funmap_entry] = (FUNMAP *)xmalloc (sizeof (FUNMAP));
   funmap[funmap_entry]->name = name;
   funmap[funmap_entry]->function = function;
diff --git a/gnu/lib/libreadline/histexpand.c b/gnu/lib/libreadline/histexpand.c
index 121e6af292f..4e3148646e1 100644
--- a/gnu/lib/libreadline/histexpand.c
+++ b/gnu/lib/libreadline/histexpand.c
@@ -268,7 +268,7 @@ get_history_event (string, caller_index, delimiting_quote)
 	{
 	  entry = current_history ();
 	  history_offset = history_length;
-	
+
 	  /* If this was a substring search, then remember the
 	     string that we matched for word substitution. */
 	  if (substring_okay)
@@ -395,7 +395,7 @@ hist_error(s, start, current, errtype)
       break;
     }
 
-  len = ll + elen + 3; 
+  len = ll + elen + 3;
   temp = (char *)xmalloc (len);
   strncpy (temp, s + start, ll);
   strlcat (temp, ": ", len);
@@ -566,13 +566,13 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
 	    quoted_search_delimiter = c;
 	}
       else
-#endif /* HANDLE_MULTIBYTE */	  
+#endif /* HANDLE_MULTIBYTE */
 	if (i && (string[i - 1] == '\'' || string[i - 1] == '"'))
 	  quoted_search_delimiter = string[i - 1];
 
       event = get_history_event (string, &i, quoted_search_delimiter);
     }
-	  
+
   if (event == 0)
     {
       *ret_string = hist_error (string, start, i, EVENT_NOT_FOUND);
@@ -904,7 +904,7 @@ history_expand (hstring, output)
       *output = savestring (hstring);
       return (0);
     }
-    
+
   /* Prepare the buffer for printing error messages. */
   result = (char *)xmalloc (result_len = 256);
   result[0] = '\0';
@@ -1000,7 +1000,7 @@ history_expand (hstring, output)
 		i++;
 	    }
 	}
-	  
+
       if (string[i] != history_expansion_char)
 	{
 	  free (result);
@@ -1325,7 +1325,7 @@ history_arg_extract (first, last, string)
 	  offset += strlen (list[i]);
 	  if (i + 1 < last)
 	    {
-      	      result[offset++] = ' ';
+	      result[offset++] = ' ';
 	      result[offset] = 0;
 	    }
 	}
@@ -1371,7 +1371,7 @@ history_tokenize_internal (string, wind, indp)
 	return (result);
 
       start = i;
-      
+
       if (member (string[i], "()\n"))
 	{
 	  i++;
diff --git a/gnu/lib/libreadline/histfile.c b/gnu/lib/libreadline/histfile.c
index 05c657d05e5..060344e70ba 100644
--- a/gnu/lib/libreadline/histfile.c
+++ b/gnu/lib/libreadline/histfile.c
@@ -109,7 +109,7 @@ history_filename (filename)
 
   if (return_val)
     return (return_val);
-  
+
   home = sh_get_env_value ("HOME");
 
   if (home == 0 || *home == '\0') {
@@ -425,11 +425,11 @@ mmap_error:
 	close (file);
 	return rv;
       }
-#else    
+#else
     buffer = (char *)malloc (buffer_size);
     if (buffer == 0)
       {
-      	rv = errno;
+	rv = errno;
 	FREE (output);
 	close (file);
 	return rv;
diff --git a/gnu/lib/libreadline/histlib.h b/gnu/lib/libreadline/histlib.h
index 7a1e207a1e8..559bdbf7767 100644
--- a/gnu/lib/libreadline/histlib.h
+++ b/gnu/lib/libreadline/histlib.h
@@ -37,12 +37,12 @@
 #if !defined (savestring)
 #include <stdio.h>
 static char *
-xstrdup(const char *s) 
+xstrdup(const char *s)
 {
 	char * cp;
 	cp = strdup(s);
 	if (cp == NULL) {
-		fprintf (stderr, "xstrdup: out of virtual memory\n"); 
+		fprintf (stderr, "xstrdup: out of virtual memory\n");
 		exit (2);
 	}
 	return(cp);
diff --git a/gnu/lib/libreadline/history.c b/gnu/lib/libreadline/history.c
index 4242f33efe1..dfe5d7ebf67 100644
--- a/gnu/lib/libreadline/history.c
+++ b/gnu/lib/libreadline/history.c
@@ -154,7 +154,7 @@ history_set_pos (pos)
   history_offset = pos;
   return (1);
 }
- 
+
 /* Return the current history array.  The caller has to be carefull, since this
    is the actual array of data, and could be bashed or made corrupt easily.
    The array is terminated with a NULL pointer. */
diff --git a/gnu/lib/libreadline/history.h b/gnu/lib/libreadline/history.h
index 58b5de4655f..039427ac4c0 100644
--- a/gnu/lib/libreadline/history.h
+++ b/gnu/lib/libreadline/history.h
@@ -110,7 +110,7 @@ extern HIST_ENTRY **history_list PARAMS((void));
 /* Returns the number which says what history element we are now
    looking at.  */
 extern int where_history PARAMS((void));
-  
+
 /* Return the history entry at the current position, as determined by
    history_offset.  If there is no entry there, return a NULL pointer. */
 extern HIST_ENTRY *current_history PARAMS((void));
diff --git a/gnu/lib/libreadline/histsearch.c b/gnu/lib/libreadline/histsearch.c
index d94fd6cd9c6..170f8e758cc 100644
--- a/gnu/lib/libreadline/histsearch.c
+++ b/gnu/lib/libreadline/histsearch.c
@@ -68,7 +68,7 @@ history_search_internal (string, direction, anchored)
   register char *line;
   register int line_index;
   int string_len;
-  HIST_ENTRY **the_history; 	/* local */
+  HIST_ENTRY **the_history;	/* local */
 
   i = history_offset;
   reverse = (direction < 0);
diff --git a/gnu/lib/libreadline/input.c b/gnu/lib/libreadline/input.c
index 6bd58a07019..52eeb9b8e57 100644
--- a/gnu/lib/libreadline/input.c
+++ b/gnu/lib/libreadline/input.c
@@ -91,7 +91,7 @@ static int rl_gather_tyi PARAMS((void));
 
 /* **************************************************************** */
 /*								    */
-/*			Character Input Buffering       	    */
+/*			Character Input Buffering		    */
 /*								    */
 /* **************************************************************** */
 
@@ -308,8 +308,8 @@ _rl_input_queued (t)
 
 void
 _rl_insert_typein (c)
-     int c;     
-{    	
+     int c;
+{
   int key, t, i;
   char *string;
 
@@ -489,7 +489,7 @@ _rl_read_mbchar (mbchar, size)
 
   memset(&ps, 0, sizeof (mbstate_t));
   memset(&ps_back, 0, sizeof (mbstate_t));
-  
+
   while (mb_len < size)
     {
       RL_SETSTATE(RL_STATE_MOREINPUT);
@@ -504,7 +504,7 @@ _rl_read_mbchar (mbchar, size)
 	  /* shorted bytes */
 	  ps = ps_back;
 	  continue;
-	} 
+	}
       else if (mbchar_bytes_length > (size_t)(0))
 	break;
     }
diff --git a/gnu/lib/libreadline/kill.c b/gnu/lib/libreadline/kill.c
index 6205229cdfc..12d5b9a1c18 100644
--- a/gnu/lib/libreadline/kill.c
+++ b/gnu/lib/libreadline/kill.c
@@ -458,7 +458,7 @@ rl_copy_backward_word (count, key)
 
   return (_rl_copy_word_as_kill (count, -1));
 }
-  
+
 /* Yank back the last killed text.  This ignores arguments. */
 int
 rl_yank (count, ignore)
@@ -606,7 +606,7 @@ rl_yank_last_arg (count, key)
       if (history_skip < 0)
 	history_skip = 0;
     }
- 
+
   if (explicit_arg_p)
     retval = rl_yank_nth_arg_internal (count_passed, key, history_skip);
   else
diff --git a/gnu/lib/libreadline/macro.c b/gnu/lib/libreadline/macro.c
index b73c3af9aa4..6dae992019c 100644
--- a/gnu/lib/libreadline/macro.c
+++ b/gnu/lib/libreadline/macro.c
@@ -51,7 +51,7 @@
 
 /* **************************************************************** */
 /*								    */
-/*			Hacking Keyboard Macros 		    */
+/*			Hacking Keyboard Macros			    */
 /*								    */
 /* **************************************************************** */
 
diff --git a/gnu/lib/libreadline/mbutil.c b/gnu/lib/libreadline/mbutil.c
index 8794d02ddca..00066683d34 100644
--- a/gnu/lib/libreadline/mbutil.c
+++ b/gnu/lib/libreadline/mbutil.c
@@ -94,7 +94,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
   if (seed < point)
     count --;
 
-  while (count > 0)  
+  while (count > 0)
     {
       tmp = mbrtowc (&wc, string+point, strlen(string + point), &ps);
       if ((size_t)(tmp) == (size_t)-1 || (size_t)(tmp) == (size_t)-2)
@@ -150,7 +150,7 @@ _rl_find_prev_mbchar_internal (string, seed, find_non_zero)
 
   memset(&ps, 0, sizeof(mbstate_t));
   length = strlen(string);
-  
+
   if (seed < 0)
     return 0;
   else if (length < seed)
@@ -180,7 +180,7 @@ _rl_find_prev_mbchar_internal (string, seed, find_non_zero)
 		prev = point;
 	    }
 	  else
-	    prev = point;  
+	    prev = point;
 	}
 
       point += tmp;
@@ -190,9 +190,9 @@ _rl_find_prev_mbchar_internal (string, seed, find_non_zero)
 }
 
 /* return the number of bytes parsed from the multibyte sequence starting
-   at src, if a non-L'\0' wide character was recognized. It returns 0, 
-   if a L'\0' wide character was recognized. It  returns (size_t)(-1), 
-   if an invalid multibyte sequence was encountered. It returns (size_t)(-2) 
+   at src, if a non-L'\0' wide character was recognized. It returns 0,
+   if a L'\0' wide character was recognized. It  returns (size_t)(-1),
+   if an invalid multibyte sequence was encountered. It returns (size_t)(-2)
    if it couldn't parse a complete  multibyte character.  */
 int
 _rl_get_char_len (src, ps)
@@ -236,7 +236,7 @@ _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
 {
   int i, w1, w2;
 
-  if ((w1 = _rl_get_char_len (&buf1[pos1], ps1)) <= 0 || 
+  if ((w1 = _rl_get_char_len (&buf1[pos1], ps1)) <= 0 ||
 	(w2 = _rl_get_char_len (&buf2[pos2], ps2)) <= 0 ||
 	(w1 != w2) ||
 	(buf1[pos1] != buf2[pos2]))
@@ -269,7 +269,7 @@ _rl_adjust_point(string, point, ps)
     return -1;
   if (length < point)
     return -1;
-  
+
   while (pos < point)
     {
       tmp = mbrlen (string + pos, length - pos, ps);
diff --git a/gnu/lib/libreadline/misc.c b/gnu/lib/libreadline/misc.c
index f3775d30ecb..e974938c632 100644
--- a/gnu/lib/libreadline/misc.c
+++ b/gnu/lib/libreadline/misc.c
@@ -323,7 +323,7 @@ rl_replace_from_history (entry, flags)
       rl_mark = rl_end;
     }
 #endif
-}  
+}
 
 /* **************************************************************** */
 /*								    */
diff --git a/gnu/lib/libreadline/nls.c b/gnu/lib/libreadline/nls.c
index d784a6862cf..38394a0c8fa 100644
--- a/gnu/lib/libreadline/nls.c
+++ b/gnu/lib/libreadline/nls.c
@@ -50,7 +50,7 @@
 #include "rlshell.h"
 #include "rlprivate.h"
 
-#if !defined (HAVE_SETLOCALE)    
+#if !defined (HAVE_SETLOCALE)
 /* A list of legal values for the LANG or LC_CTYPE environment variables.
    If a locale name in this list is the value for the LC_ALL, LC_CTYPE,
    or LANG environment variable (using the first of those with a value),
diff --git a/gnu/lib/libreadline/readline.c b/gnu/lib/libreadline/readline.c
index 65e612bcf1e..362518beeb0 100644
--- a/gnu/lib/libreadline/readline.c
+++ b/gnu/lib/libreadline/readline.c
@@ -206,12 +206,12 @@ int _rl_horizontal_scroll_mode = 0;
 
 /* Non-zero means to display an asterisk at the starts of history lines
    which have been modified. */
-int _rl_mark_modified_lines = 0;  
+int _rl_mark_modified_lines = 0;
 
 /* The style of `bell' notification preferred.  This can be set to NO_BELL,
    AUDIBLE_BELL, or VISIBLE_BELL. */
 int _rl_bell_preference = AUDIBLE_BELL;
-     
+
 /* String inserted into the line by rl_insert_comment (). */
 char *_rl_comment_begin;
 
@@ -233,7 +233,7 @@ int rl_line_buffer_len = 0;
 
 /* **************************************************************** */
 /*								    */
-/*			`Forward' declarations  		    */
+/*			`Forward' declarations			    */
 /*								    */
 /* **************************************************************** */
 
@@ -271,7 +271,7 @@ rl_set_prompt (prompt)
   rl_visible_prompt_length = rl_expand_prompt (rl_prompt);
   return 0;
 }
-  
+
 /* Read a line of input.  Prompt with PROMPT.  An empty PROMPT means
    none.  A return value of NULL means that EOF was encountered. */
 char *
@@ -693,7 +693,7 @@ _rl_dispatch_subseq (key, map, got_subseq)
 
 /* **************************************************************** */
 /*								    */
-/*			Initializations 			    */
+/*			Initializations				    */
 /*								    */
 /* **************************************************************** */
 
@@ -814,7 +814,7 @@ readline_initialize_everything ()
 
   /* Decide whether we should automatically go into eight-bit mode. */
   _rl_init_eightbit ();
-      
+
   /* Read in the init file. */
   rl_read_init_file ((char *)NULL);
 
diff --git a/gnu/lib/libreadline/readline.h b/gnu/lib/libreadline/readline.h
index f11b3d0357c..870df46d57d 100644
--- a/gnu/lib/libreadline/readline.h
+++ b/gnu/lib/libreadline/readline.h
@@ -309,7 +309,7 @@ extern rl_command_func_t *rl_function_of_keyseq PARAMS((const char *, Keymap, in
 extern void rl_list_funmap_names PARAMS((void));
 extern char **rl_invoking_keyseqs_in_map PARAMS((rl_command_func_t *, Keymap));
 extern char **rl_invoking_keyseqs PARAMS((rl_command_func_t *));
- 
+
 extern void rl_function_dumper PARAMS((int));
 extern void rl_macro_dumper PARAMS((int));
 extern void rl_variable_dumper PARAMS((int));
@@ -411,7 +411,7 @@ extern int rl_clear_signals PARAMS((void));
 extern void rl_cleanup_after_signal PARAMS((void));
 extern void rl_reset_after_signal PARAMS((void));
 extern void rl_free_line_state PARAMS((void));
- 
+
 extern int rl_set_paren_blink_timeout PARAMS((int));
 
 /* Undocumented. */
@@ -524,7 +524,7 @@ extern rl_hook_func_t *rl_startup_hook;
    readline_internal_setup () returns and readline_internal starts
    reading input characters. */
 extern rl_hook_func_t *rl_pre_input_hook;
-      
+
 /* The address of a function to call periodically while Readline is
    awaiting character input, or NULL, for no event handling. */
 extern rl_hook_func_t *rl_event_hook;
@@ -606,7 +606,7 @@ extern const char *rl_basic_word_break_characters;
 extern const char *rl_completer_word_break_characters;
 
 /* List of characters which can be used to quote a substring of the line.
-   Completion occurs on the entire substring, and within the substring   
+   Completion occurs on the entire substring, and within the substring
    rl_completer_word_break_characters are treated as any other character,
    unless they also appear within this list. */
 extern const char *rl_completer_quote_characters;
diff --git a/gnu/lib/libreadline/rldefs.h b/gnu/lib/libreadline/rldefs.h
index 93eb773f2ee..f1c8f1a9466 100644
--- a/gnu/lib/libreadline/rldefs.h
+++ b/gnu/lib/libreadline/rldefs.h
@@ -112,12 +112,12 @@ extern char *_rl_strpbrk PARAMS((const char *, const char *));
 #if !defined (savestring)
 #include <stdio.h>
 static char *
-xstrdup(const char *s) 
+xstrdup(const char *s)
 {
 	char * cp;
 	cp = strdup(s);
 	if (cp == NULL) {
-		fprintf (stderr, "xstrdup: out of virtual memory\n"); 
+		fprintf (stderr, "xstrdup: out of virtual memory\n");
 		exit (2);
 	}
 	return(cp);
diff --git a/gnu/lib/libreadline/rltty.c b/gnu/lib/libreadline/rltty.c
index 755efebaadf..539edfd7e22 100644
--- a/gnu/lib/libreadline/rltty.c
+++ b/gnu/lib/libreadline/rltty.c
@@ -123,7 +123,7 @@ release_sigint ()
 
 /* **************************************************************** */
 /*								    */
-/*		      Saving and Restoring the TTY	    	    */
+/*		      Saving and Restoring the TTY		    */
 /*								    */
 /* **************************************************************** */
 
@@ -544,7 +544,7 @@ set_tty_settings (tty, tiop)
 {
   if (_set_tty_settings (tty, tiop) < 0)
     return -1;
-    
+
 #if 0
 
 #if defined (TERMIOS_TTY_DRIVER)
@@ -705,7 +705,7 @@ rl_deprep_terminal ()
 
 /* **************************************************************** */
 /*								    */
-/*			Bogus Flow Control      		    */
+/*			Bogus Flow Control			    */
 /*								    */
 /* **************************************************************** */
 
diff --git a/gnu/lib/libreadline/savestring.c b/gnu/lib/libreadline/savestring.c
index 7eb2dccc9d7..c30c3bc3b56 100644
--- a/gnu/lib/libreadline/savestring.c
+++ b/gnu/lib/libreadline/savestring.c
@@ -35,7 +35,7 @@ savestring (s)
 	char * cp;
 	cp = strdup(s);
 	if (cp == NULL) {
-		fprintf (stderr, "savestring: out of virtual memory\n"); 
+		fprintf (stderr, "savestring: out of virtual memory\n");
 		exit (2);
 	}
 	return(cp);
diff --git a/gnu/lib/libreadline/signals.c b/gnu/lib/libreadline/signals.c
index 0a1468b6b2a..200be554dbf 100644
--- a/gnu/lib/libreadline/signals.c
+++ b/gnu/lib/libreadline/signals.c
@@ -91,7 +91,7 @@ static int signals_set_flag;
 static int sigwinch_set_flag;
 
 /* **************************************************************** */
-/*					        		    */
+/*								    */
 /*			   Signal Handling                          */
 /*								    */
 /* **************************************************************** */
@@ -378,7 +378,7 @@ rl_reset_after_signal ()
 /* Free up the readline variable line state for the current line (undo list,
    any partial history entry, any keyboard macros in progress, and any
    numeric arguments in process) after catching a signal, before calling
-   rl_cleanup_after_signal(). */ 
+   rl_cleanup_after_signal(). */
 void
 rl_free_line_state ()
 {
diff --git a/gnu/lib/libreadline/terminal.c b/gnu/lib/libreadline/terminal.c
index 6970856adb0..03237e608c0 100644
--- a/gnu/lib/libreadline/terminal.c
+++ b/gnu/lib/libreadline/terminal.c
@@ -82,7 +82,7 @@ static int tcap_initialized;
 
 #if !defined (__linux__)
 #  if defined (__EMX__) || defined (NEED_EXTERN_PC)
-extern 
+extern
 #  endif /* __EMX__ || NEED_EXTERN_PC */
 char PC, *BC, *UP;
 #endif /* __linux__ */
@@ -280,7 +280,7 @@ rl_get_screen_size (rows, cols)
   if (cols)
     *cols = _rl_screenwidth;
 }
-     
+
 void
 rl_resize_terminal ()
 {
@@ -610,7 +610,7 @@ rl_ding ()
 
 /* **************************************************************** */
 /*								    */
-/*	 	Controlling the Meta Key and Keypad		    */
+/*		Controlling the Meta Key and Keypad		    */
 /*								    */
 /* **************************************************************** */
 
@@ -637,7 +637,7 @@ _rl_control_keypad (on)
 
 /* **************************************************************** */
 /*								    */
-/*	 		Controlling the Cursor			    */
+/*			Controlling the Cursor			    */
 /*								    */
 /* **************************************************************** */
 
diff --git a/gnu/lib/libreadline/text.c b/gnu/lib/libreadline/text.c
index 549fdb7f00c..60bfe53480d 100644
--- a/gnu/lib/libreadline/text.c
+++ b/gnu/lib/libreadline/text.c
@@ -314,7 +314,7 @@ rl_forward_char (count, key)
   return (rl_forward_byte (count, key));
 }
 #endif /* !HANDLE_MULTIBYTE */
-  
+
 /* Backwards compatibility. */
 int
 rl_forward (count, key)
@@ -679,7 +679,7 @@ _rl_insert_char (count, c)
 	}
     }
 #endif /* HANDLE_MULTIBYTE */
-	  
+
   /* If we can optimize, then do it.  But don't let people crash
      readline because of extra large arguments. */
   if (count > 1 && count <= 1024)
@@ -826,7 +826,7 @@ rl_insert (count, c)
      int count, c;
 {
   return (rl_insert_mode == RL_IM_INSERT ? _rl_insert_char (count, c)
-  					 : _rl_overwrite_char (count, c));
+					 : _rl_overwrite_char (count, c));
 }
 
 /* Insert the next typed character verbatim. */
@@ -848,7 +848,7 @@ rl_quoted_insert (count, key)
   _rl_restore_tty_signals ();
 #endif
 
-  return (_rl_insert_char (count, c));  
+  return (_rl_insert_char (count, c));
 }
 
 /* Insert a tab character. */
@@ -943,7 +943,7 @@ _rl_overwrite_rubout (count, key)
 
   return 0;
 }
-  
+
 /* Rubout the character behind point. */
 int
 rl_rubout (count, key)
@@ -1067,7 +1067,7 @@ rl_delete (count, key)
 	new_point = _rl_find_next_mbchar (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
       else
 	new_point = rl_point + 1;
-	
+
       return (rl_delete_text (rl_point, new_point));
     }
 }
@@ -1075,7 +1075,7 @@ rl_delete (count, key)
 /* Delete the character under the cursor, unless the insertion
    point is at the end of the line, in which case the character
    behind the cursor is deleted.  COUNT is obeyed and may be used
-   to delete forward or backward that many characters. */      
+   to delete forward or backward that many characters. */
 int
 rl_rubout_or_delete (count, key)
      int count, key;
@@ -1084,7 +1084,7 @@ rl_rubout_or_delete (count, key)
     return (_rl_rubout_char (count, key));
   else
     return (rl_delete (count, key));
-}  
+}
 
 /* Delete all spaces and tabs around point. */
 int
diff --git a/gnu/lib/libreadline/tilde.c b/gnu/lib/libreadline/tilde.c
index 83948325686..c84a6c6e297 100644
--- a/gnu/lib/libreadline/tilde.c
+++ b/gnu/lib/libreadline/tilde.c
@@ -34,7 +34,7 @@
 #  include <string.h>
 #else /* !HAVE_STRING_H */
 #  include <strings.h>
-#endif /* !HAVE_STRING_H */  
+#endif /* !HAVE_STRING_H */
 
 #if defined (HAVE_STDLIB_H)
 #  include <stdlib.h>
@@ -61,12 +61,12 @@ extern struct passwd *getpwnam PARAMS((const char *));
 #if !defined (savestring)
 #include <stdio.h>
 static char *
-xstrdup(const char *s) 
+xstrdup(const char *s)
 {
 	char * cp;
 	cp = strdup(s);
 	if (cp == NULL) {
-		fprintf (stderr, "xstrdup: out of virtual memory\n"); 
+		fprintf (stderr, "xstrdup: out of virtual memory\n");
 		exit (2);
 	}
 	return(cp);
diff --git a/gnu/lib/libreadline/vi_mode.c b/gnu/lib/libreadline/vi_mode.c
index 89303644c59..6a591d299df 100644
--- a/gnu/lib/libreadline/vi_mode.c
+++ b/gnu/lib/libreadline/vi_mode.c
@@ -193,7 +193,7 @@ rl_vi_undo (count, key)
 {
   return (rl_undo_command (count, key));
 }
-    
+
 /* Yank the nth arg from the previous line into this line at point. */
 int
 rl_vi_yank_arg (count, key)
@@ -621,7 +621,7 @@ _rl_vi_save_insert (up)
   strncpy (vi_insert_buffer, rl_line_buffer + start, len - 1);
   vi_insert_buffer[len-1] = '\0';
 }
-    
+
 void
 _rl_vi_done_inserting ()
 {
@@ -1074,7 +1074,7 @@ rl_vi_delete (count, key)
     end = rl_end;
 
   rl_kill_text (rl_point, end);
-  
+
   if (rl_point > 0 && rl_point == rl_end)
     rl_backward_char (1, key);
   return (0);