Changeset 3249

Timestamp:

Apr 30, 2007, 1:16:42 AM (18 years ago)

Author:

bird

Message:

Applied bash31-014

Location:

trunk/essentials/app-shells/bash

Files:

• lib/readline/display.c (modified) (2 diffs)
• patchlevel.h (modified) (1 diff)

trunk/essentials/app-shells/bash/lib/readline/display.c

@@ -1984 +1984 @@
 {
   int len;
-  char *pmt;
+  char *pmt, *p;
 
   rl_save_prompt ();
 
-  if (saved_local_prompt == 0)
+  /* We've saved the prompt, and can do anything with the various prompt
+     strings we need before they're restored.  We want the unexpanded
+     portion of the prompt string after any final newline. */
+  p = rl_prompt ? strrchr (rl_prompt, '\n') : 0;
+  if (p == 0)
     {
       len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
@@ -1999 +2003 @@
   else
     {
-      len = *saved_local_prompt ? strlen (saved_local_prompt) : 0;
+      p++;
+      len = strlen (p);
       pmt = (char *)xmalloc (len + 2);
       if (len)
-        strcpy (pmt, saved_local_prompt);
+        strcpy (pmt, p);
       pmt[len] = pchar;
       pmt[len+1] = '\0';
-      local_prompt = savestring (pmt);
-      prompt_last_invisible = saved_last_invisible;
-      prompt_visible_length = saved_visible_length + 1;
-    }
-
+    }  
+
+  /* will be overwritten by expand_prompt, called from rl_message */
   prompt_physical_chars = saved_physical_chars + 1;
-
   return pmt;
 }

trunk/essentials/app-shells/bash/patchlevel.h

@@ -26 +26 @@
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 13
+#define PATCHLEVEL 14
 
 #endif /* _PATCHLEVEL_H_ */