Merge GDB 7.5.1

gdb/linespec.h

 /* Header for GDB line completion.
    Copyright (C) 2000, 2007-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 75 matching lines @@
 
 /* Destroy a linespec_result.  */
 
 extern void destroy_linespec_result (struct linespec_result *);
 
 /* Return a cleanup that destroys a linespec_result.  */
 
 extern struct cleanup *
         make_cleanup_destroy_linespec_result (struct linespec_result *);
 
+/* Decode a linespec using the provided default symtab and line.  */
+
 extern struct symtabs_and_lines
         decode_line_1 (char **argptr, int flags,
                        struct symtab *default_symtab, int default_line);
 
 /* Parse *ARGPTR as a linespec and return results.  This is the "full"
    interface to this module, which handles multiple results
    properly.
 
    For FLAGS, see decode_line_flags.  DECODE_LINE_LIST_MODE is not
    valid for this function.
@@ skipping 26 matching lines @@
    non-NULL, then only locations whose canonical name is equal (in the
    strcmp sense) to FILTER will be returned; all others will be
    filtered out.  */
 
 extern void decode_line_full (char **argptr, int flags,
                               struct symtab *default_symtab, int default_line,
                               struct linespec_result *canonical,
                               const char *select_mode,
                               const char *filter);
 
+/* Given a string, return the line specified by it, using the current
+   source symtab and line as defaults.
+   This is for commands like "list" and "breakpoint".  */
+
+extern struct symtabs_and_lines decode_line_with_current_source (char *, int);
+
+/* Given a string, return the line specified by it, using the last displayed
+   codepoint's values as defaults, or nothing if they aren't valid.  */
+
+extern struct symtabs_and_lines decode_line_with_last_displayed (char *, int);
+
 #endif /* defined (LINESPEC_H) */