2 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e8f9655460..74bcabfb575 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.el (auto-mode-alist): Support OBJFILE-gdb.gdb script files
+        recognized by GDB 7.5 and later.
+
 2013-09-21  Xue Fuqiao  <xfq.free@gmail.com>
 
         * vc/vc-dir.el (vc-dir-mode-map): Add keybinding for vc-log-incoming.
diff --git a/lisp/files.el b/lisp/files.el
index ca55c646699..1a268200289 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2269,6 +2269,10 @@ since only a single case-insensitive search through the alist is made."
      ;; .PROCESSORNAME-gdbinit so that the host and target gdbinit files
      ;; don't interfere with each other.
      ("/\\.[a-z0-9-]*gdbinit" . gdb-script-mode)
+     ;; GDB 7.5 introduced OBJFILE-gdb.gdb script files; e.g. a file
+     ;; named 'emacs-gdb.gdb', if it exists, will be automatically
+     ;; loaded when GDB reads an objfile called 'emacs'.
+     ("-gdb\\.gdb" . gdb-script-mode)
      ("[cC]hange\\.?[lL]og?\\'" . change-log-mode)
      ("[cC]hange[lL]og[-.][0-9]+\\'" . change-log-mode)
      ("\\$CHANGE_LOG\\$\\.TXT" . change-log-mode)