aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2005-06-30 21:10:27 +0000
committerAndreas Schwab2005-06-30 21:10:27 +0000
commit0a0157ba2ca8e3fade0f7f225cdfd125573e59d6 (patch)
treee2a5e3f2487a50236b01fe94b2bc4a22c6acf863
parenta6d0ae558ac9a0ebd3e084c883efdadcc00289a0 (diff)
downloademacs-0a0157ba2ca8e3fade0f7f225cdfd125573e59d6.tar.gz
emacs-0a0157ba2ca8e3fade0f7f225cdfd125573e59d6.zip
(gud-filter): Remove unneeded progn.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/gud.el5
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c777d056d98..97b25eb35a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-06-30 Andreas Schwab <schwab@suse.de>
2
3 * progmodes/gud.el (gud-filter): Remove unneeded progn.
4
12005-06-30 Glenn Morris <gmorris@ast.cam.ac.uk> 52005-06-30 Glenn Morris <gmorris@ast.cam.ac.uk>
2 6
3 * progmodes/sh-script.el (sh-get-kw): `&' also separates words. 7 * progmodes/sh-script.el (sh-get-kw): `&' also separates words.
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index dc7e64e6e35..fd8bfeb5d72 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -4,7 +4,7 @@
4;; Maintainer: FSF 4;; Maintainer: FSF
5;; Keywords: unix, tools 5;; Keywords: unix, tools
6 6
7;; Copyright (C) 1992,93,94,95,96,1998,2000,02,03,04 Free Software Foundation, Inc. 7;; Copyright (C) 1992,93,94,95,96,1998,2000,02,03,04,05 Free Software Foundation, Inc.
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
10 10
@@ -2534,9 +2534,8 @@ It is saved for when this flag is not set.")
2534 ;; This must be outside of the save-excursion 2534 ;; This must be outside of the save-excursion
2535 ;; in case the source file is our current buffer. 2535 ;; in case the source file is our current buffer.
2536 (if process-window 2536 (if process-window
2537 (progn
2538 (with-selected-window process-window 2537 (with-selected-window process-window
2539 (gud-display-frame))) 2538 (gud-display-frame))
2540 ;; We have to be in the proper buffer, (process-buffer proc), 2539 ;; We have to be in the proper buffer, (process-buffer proc),
2541 ;; but not in a save-excursion, because that would restore point. 2540 ;; but not in a save-excursion, because that would restore point.
2542 (with-current-buffer (process-buffer proc) 2541 (with-current-buffer (process-buffer proc)