From: Glenn Morris <rgm@gnu.org>
Date: Wed, 18 Sep 2013 05:16:36 +0000 (-0700)
Subject: * progmodes/gud.el (gud-find-file): Silence --without-x compilation.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1537
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=30810a057cc36f9374cef60c615e3a66c8e40c4a;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a23dc06ec91..9c9d400f438 100644
--- 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 c549d9eedef..c03c64b21ad 100644
--- 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)