aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2005-12-10 17:20:10 +0000
committerRomain Francoise2005-12-10 17:20:10 +0000
commitd50d22f1f405d91ffdb3b828e97c165c184a125b (patch)
tree45d21d32412cea514bc757d5ac235352e7bf0ec3
parent5fdf9b7cf0a58e164766538c84f56e68d7bb93ee (diff)
downloademacs-d50d22f1f405d91ffdb3b828e97c165c184a125b.tar.gz
emacs-d50d22f1f405d91ffdb3b828e97c165c184a125b.zip
(help-for-help-internal): Add `r' in doc string.
-rw-r--r--lisp/ChangeLog14
-rw-r--r--lisp/help.el3
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2552cbf9c97..78362e1e108 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-12-10 Romain Francoise <romain@orebokech.com>
2
3 * help.el (help-for-help-internal): Add `r' in doc string.
4
12005-12-10 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> 52005-12-10 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se>
2 6
3 * align.el (align-regexp, align-highlight-rule): Use 7 * align.el (align-regexp, align-highlight-rule): Use
@@ -5,7 +9,7 @@
5 repetition (with `repeat-complex-command') recomputes the region 9 repetition (with `repeat-complex-command') recomputes the region
6 bounds. 10 bounds.
7 11
82005-12-10 Lennart Borgman <lennart.borgman.073@student.lu.se> 122005-12-10 Lennart Borgman <lennart.borgman.073@student.lu.se>
9 13
10 * window.el (bw-get-tree, bw-get-tree-1, bw-find-tree-sub) 14 * window.el (bw-get-tree, bw-get-tree-1, bw-find-tree-sub)
11 (bw-find-tree-sub-1, bw-l, bw-t, bw-r, bw-b, bw-dir, bw-eqdir) 15 (bw-find-tree-sub-1, bw-l, bw-t, bw-r, bw-b, bw-dir, bw-eqdir)
@@ -14,11 +18,11 @@
14 18
152005-12-10 David Koppelman <koppel@ece.lsu.edu> 192005-12-10 David Koppelman <koppel@ece.lsu.edu>
16 20
17 * hi-lock.el: (hi-lock-mode) Renamed from hi-lock-buffer-mode; 21 * hi-lock.el: (hi-lock-mode) Renamed from hi-lock-buffer-mode;
18 react if global-hi-lock-mode seems intended. 22 react if global-hi-lock-mode seems intended.
19 (global-hi-lock-mode) Renamed from hi-lock-mode. 23 (global-hi-lock-mode) Renamed from hi-lock-mode.
20 (hi-lock-archaic-interface-message-used) 24 (hi-lock-archaic-interface-message-used)
21 (hi-lock-archaic-interface-deduce): New variables. 25 (hi-lock-archaic-interface-deduce): New variables.
22 (turn-on-hi-lock-if-enabled, hi-lock-line-face-buffer) 26 (turn-on-hi-lock-if-enabled, hi-lock-line-face-buffer)
23 (hi-lock-face-buffer, hi-lock-face-phrase-buffer) 27 (hi-lock-face-buffer, hi-lock-face-phrase-buffer)
24 (hi-lock-find-patterns, hi-lock-font-lock-hook): Replace 28 (hi-lock-find-patterns, hi-lock-font-lock-hook): Replace
@@ -78,7 +82,7 @@
782005-12-09 Reiner Steib <Reiner.Steib@gmx.de> 822005-12-09 Reiner Steib <Reiner.Steib@gmx.de>
79 83
80 * files.el (save-buffer): 84 * files.el (save-buffer):
81 * international/ucs-tables.el (ucs-set-table-for-input): 85 * international/ucs-tables.el (ucs-set-table-for-input):
82 * mail/mail-extr.el (mail-extract-address-components): 86 * mail/mail-extr.el (mail-extract-address-components):
83 * mail/sendmail.el (mail-mode): Reformat doc string. 87 * mail/sendmail.el (mail-mode): Reformat doc string.
84 88
@@ -278,7 +282,7 @@
2782005-12-08 Alan Mackenzie <bug-cc-mode@gnu.org> 2822005-12-08 Alan Mackenzie <bug-cc-mode@gnu.org>
279 283
280 * progmodes/cc-mode.el: Give c-hungry-backspace and 284 * progmodes/cc-mode.el: Give c-hungry-backspace and
281 c-hungry-delete-forward permanent key bindings. 285 c-hungry-delete-forward permanent key bindings.
282 286
283 * progmodes/cc-cmds.el (c-electric-semi&comma): Bind 287 * progmodes/cc-cmds.el (c-electric-semi&comma): Bind
284 c-syntactic-context for calls to "criteria functions", for 288 c-syntactic-context for calls to "criteria functions", for
diff --git a/lisp/help.el b/lisp/help.el
index 9a779f14d0c..02040007f6e 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -178,7 +178,7 @@ specifies what to do when the user exits the help buffer."
178(defalias 'help-for-help 'help-for-help-internal) 178(defalias 'help-for-help 'help-for-help-internal)
179;; It can't find this, but nobody will look. 179;; It can't find this, but nobody will look.
180(make-help-screen help-for-help-internal 180(make-help-screen help-for-help-internal
181 "a b c C e f F i I k C-k l L m p s t v w C-c C-d C-f C-n C-p C-t C-w . or ? :" 181 "a b c C e f F i I k C-k l L m p r s t v w C-c C-d C-f C-n C-p C-t C-w . or ? :"
182 "You have typed %THIS-KEY%, the help character. Type a Help option: 182 "You have typed %THIS-KEY%, the help character. Type a Help option:
183\(Use SPC or DEL to scroll through this text. Type \\<help-map>\\[help-quit] to exit the Help command.) 183\(Use SPC or DEL to scroll through this text. Type \\<help-map>\\[help-quit] to exit the Help command.)
184 184
@@ -217,6 +217,7 @@ m describe-mode. Display documentation of current minor modes,
217 and the current major mode, including their special commands. 217 and the current major mode, including their special commands.
218n view-emacs-news. Display news of recent Emacs changes. 218n view-emacs-news. Display news of recent Emacs changes.
219p finder-by-keyword. Find packages matching a given topic keyword. 219p finder-by-keyword. Find packages matching a given topic keyword.
220r info-emacs-manual. Display the Emacs manual in Info mode.
220s describe-syntax. Display contents of syntax table, plus explanations. 221s describe-syntax. Display contents of syntax table, plus explanations.
221S info-lookup-symbol. Display the definition of a specific symbol 222S info-lookup-symbol. Display the definition of a specific symbol
222 as found in the manual for the language this buffer is written in. 223 as found in the manual for the language this buffer is written in.