aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2001-11-13 14:25:57 +0000
committerStefan Monnier2001-11-13 14:25:57 +0000
commit5ebcaf360935d9219372ad014b79825aebc94cb6 (patch)
tree1489781be74479cf52df772cd26e93e12e433cd0
parent4bb962be221f8cbc879c02ed9168c59875af735e (diff)
downloademacs-5ebcaf360935d9219372ad014b79825aebc94cb6.tar.gz
emacs-5ebcaf360935d9219372ad014b79825aebc94cb6.zip
(ada-fill-comment-prefix): GNAT wants 2 spaces.
-rw-r--r--lisp/ChangeLog20
-rw-r--r--lisp/progmodes/ada-mode.el6
2 files changed, 15 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4c76659976..832c70ad3e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12001-11-13 Stefan Monnier <monnier@cs.yale.edu>
2
3 * progmodes/ada-mode.el (ada-fill-comment-prefix): GNAT wants 2 spaces.
4
12001-11-13 Colin Walters <walters@debian.org> 52001-11-13 Colin Walters <walters@debian.org>
2 6
3 * calc/calc.el (calc-unread-command): Use `unread-command-events'. 7 * calc/calc.el (calc-unread-command): Use `unread-command-events'.
@@ -6,8 +10,8 @@
6 "~/.emacs"; use `read-file-name'. 10 "~/.emacs"; use `read-file-name'.
7 11
8 * calc/calc-graph.el, calc/calc-embed.el, calc/calc-graph.el 12 * calc/calc-graph.el, calc/calc-embed.el, calc/calc-graph.el
9 * calc/calc-misc.el, calc/calc-mode.el, calc/calc-prog.el 13 * calc/calc-misc.el, calc/calc-mode.el, calc/calc-prog.el
10 * calc/calc-sel.el, calc/calc-store.el, calc/calc-yank.el 14 * calc/calc-sel.el, calc/calc-store.el, calc/calc-yank.el
11 * calc/calc.el: Use `frame-width' instead of `screen-width', 15 * calc/calc.el: Use `frame-width' instead of `screen-width',
12 `frame-height' instead of `screen-height', and, 16 `frame-height' instead of `screen-height', and,
13 `executing-kbd-macro' instead of `executing-macro'. 17 `executing-kbd-macro' instead of `executing-macro'.
@@ -15,8 +19,8 @@
15 * calc/calc-embed.el (calc-do-embedded): Call `y-or-n-p' with 19 * calc/calc-embed.el (calc-do-embedded): Call `y-or-n-p' with
16 correct number of arguments. 20 correct number of arguments.
17 21
18 * calc/calc-aent.el (calc-do-alg-entry): Use 22 * calc/calc-aent.el (calc-do-alg-entry):
19 `blink-paren-function' instead of `blink-paren-hook'. 23 Use `blink-paren-function' instead of `blink-paren-hook'.
20 24
212001-11-12 Richard M. Stallman <rms@gnu.org> 252001-11-12 Richard M. Stallman <rms@gnu.org>
22 26
@@ -84,8 +88,8 @@
84 88
852001-11-12 Pavel Jan,Bm(Bk <Pavel@Janik.cz> 892001-11-12 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
86 90
87 * textmodes/flyspell.el (flyspell-default-dictionary): Fix 91 * textmodes/flyspell.el (flyspell-default-dictionary):
88 previous change. 92 Fix previous change.
89 93
902001-11-12 Richard M. Stallman <rms@gnu.org> 942001-11-12 Richard M. Stallman <rms@gnu.org>
91 95
@@ -171,8 +175,8 @@
171 175
1722001-11-10 Peter Kleiweg <kleiweg@let.rug.nl> 1762001-11-10 Peter Kleiweg <kleiweg@let.rug.nl>
173 177
174 * progmodes/ps-mode.el (ps-mode-font-lock-keywords-1): Merge 178 * progmodes/ps-mode.el (ps-mode-font-lock-keywords-1):
175 two regular expressions into one. 179 Merge two regular expressions into one.
176 (ps-mode): Make local bindings for `comment-start' and 180 (ps-mode): Make local bindings for `comment-start' and
177 `comment-start-skip'. 181 `comment-start-skip'.
178 (ps-mode-looking-at-nested): Simplify an if-else construct; 182 (ps-mode-looking-at-nested): Simplify an if-else construct;
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index f1b79284b98..b927a7019d4 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -7,7 +7,7 @@
7;; Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de> 7;; Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
8;; Emmanuel Briot <briot@gnat.com> 8;; Emmanuel Briot <briot@gnat.com>
9;; Maintainer: Emmanuel Briot <briot@gnat.com> 9;; Maintainer: Emmanuel Briot <briot@gnat.com>
10;; Ada Core Technologies's version: $Revision: 1.42 $ 10;; Ada Core Technologies's version: $Revision: 1.43 $
11;; Keywords: languages ada 11;; Keywords: languages ada
12 12
13;; This file is part of GNU Emacs. 13;; This file is part of GNU Emacs.
@@ -281,9 +281,9 @@ An example is:
281 "*Non-nil means indent according to the innermost open parenthesis." 281 "*Non-nil means indent according to the innermost open parenthesis."
282 :type 'boolean :group 'ada) 282 :type 'boolean :group 'ada)
283 283
284(defcustom ada-fill-comment-prefix "-- " 284(defcustom ada-fill-comment-prefix "-- "
285 "*Text inserted in the first columns when filling a comment paragraph. 285 "*Text inserted in the first columns when filling a comment paragraph.
286Note: if you modify this variable, you will have to restart the ada-mode to 286Note: if you modify this variable, you will have to restart the `ada-mode' to
287reread this variable." 287reread this variable."
288 :type 'string :group 'ada) 288 :type 'string :group 'ada)
289 289