* progmodes/gud.el (gud-find-file): Silence --without-x compilation.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a23dc06ec919195bba175772b069bdde043e7bbd..9c9d400f4380a5f555baa6a9ea8e3226238a9037 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -20,6 +20,8 @@
        * mail/rmailmm.el (rmail-mime-set-bulk-data):
        Silence --without-x compilation.
 
+       * progmodes/gud.el (gud-find-file): Silence --without-x compilation.
+
        * wdired.el (dired-backup-overwrite): Remove declaration.
        (wdired-mode-map): Add doc string.
 

diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index c549d9eedef90ab4f9789f3b027110e2aef4efea..c03c64b21adad6949da350b64cb48d4bb0e0bd89 100644 (file)
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -1,7 +1,6 @@
 ;;; gud.el --- Grand Unified Debugger mode for running GDB and other debuggers
 
-;; Copyright (C) 1992-1996, 1998, 2000-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1992-1996, 1998, 2000-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
@@ -321,8 +320,9 @@ Uses `gud-<MINOR-MODE>-directories' to find the source files."
     (when buf
       ;; Copy `gud-minor-mode' to the found buffer to turn on the menu.
       (with-current-buffer buf
-       (set (make-local-variable 'gud-minor-mode) minor-mode)
-       (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
+       (setq-local gud-minor-mode minor-mode)
+       (if (boundp 'tool-bar-map)
+           (setq-local tool-bar-map gud-tool-bar-map))
        (when (and gud-tooltip-mode
                   (eq gud-minor-mode 'gdbmi))
          (make-local-variable 'gdb-define-alist)