aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2003-06-19 15:55:31 +0000
committerStefan Monnier2003-06-19 15:55:31 +0000
commit87d9913f72f05aa1aa60d9609e6e0de028dc478b (patch)
tree13fbc57321c2a4d337de58fd5aebc4a46ab512a1
parentc3f6b2b4128b438cf8134137cbee8ed496f27869 (diff)
downloademacs-87d9913f72f05aa1aa60d9609e6e0de028dc478b.tar.gz
emacs-87d9913f72f05aa1aa60d9609e6e0de028dc478b.zip
(c-mode): Reverting last change.
-rw-r--r--lisp/ChangeLog15
-rw-r--r--lisp/progmodes/cc-mode.el3
2 files changed, 15 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 038c11b662e..1464a5ff799 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
12003-06-19 Stefan Monnier <monnier@cs.yale.edu>
2
3 * progmodes/cc-mode.el (c-mode): Reverting last change.
4
52003-06-18 Stefan Monnier <monnier@cs.yale.edu>
6
7 * progmodes/gud.el (gud-find-expr-function): Rename from gud-find-expr.
8 (gud-find-fortran-expr): Move to fortran.el.
9
10 * progmodes/fortran.el (fortran-gud-find-expr): Move from gud.el
11 where it was called gud-find-fortran-expr.
12 (fortran-mode): Set gud-find-expr-function.
13
12003-06-18 Nick Roberts <nick@nick.uklinux.net> 142003-06-18 Nick Roberts <nick@nick.uklinux.net>
2 15
3 * gdb-ui.el (gud-display1): Keep the gdb command, "display", in 16 * gdb-ui.el (gud-display1): Keep the gdb command, "display", in
@@ -7,7 +20,7 @@
7 (gdb-source-info, gdba): Display assembler if there is no symbol 20 (gdb-source-info, gdba): Display assembler if there is no symbol
8 table for main, or message if there is no main. 21 table for main, or message if there is no main.
9 (gdb-assembler-custom): Move point to current line of assembler. 22 (gdb-assembler-custom): Move point to current line of assembler.
10 23
11 * progmodes/gud.el (gud-menu-map): Add dbx support for "run" and 24 * progmodes/gud.el (gud-menu-map): Add dbx support for "run" and
12 "nexti". 25 "nexti".
13 (dbx): Define gud-nexti and gud-run. 26 (dbx): Define gud-nexti and gud-run.
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 8564319ab4b..03b2f178239 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1,6 +1,6 @@
1;;; cc-mode.el --- major mode for editing C, C++, Objective-C, and Java code 1;;; cc-mode.el --- major mode for editing C, C++, Objective-C, and Java code
2 2
3;; Copyright (C) 1985,1987,1992-2001 Free Software Foundation, Inc. 3;; Copyright (C) 1985,1987,1992-2001,2003 Free Software Foundation, Inc.
4 4
5;; Authors: 2000- Martin Stjernholm 5;; Authors: 2000- Martin Stjernholm
6;; 1998-1999 Barry A. Warsaw and Martin Stjernholm 6;; 1998-1999 Barry A. Warsaw and Martin Stjernholm
@@ -464,7 +464,6 @@ Key bindings:
464 (use-local-map c-mode-map) 464 (use-local-map c-mode-map)
465 (c-common-init 'c-mode) 465 (c-common-init 'c-mode)
466 (cc-imenu-init cc-imenu-c-generic-expression) 466 (cc-imenu-init cc-imenu-c-generic-expression)
467 (set (make-local-variable 'gud-find-expr) 'gud-find-c-expr)
468 (run-hooks 'c-mode-common-hook) 467 (run-hooks 'c-mode-common-hook)
469 (run-hooks 'c-mode-hook) 468 (run-hooks 'c-mode-hook)
470 (c-update-modeline)) 469 (c-update-modeline))