aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Sobek2012-01-16 11:00:08 -0500
committerStefan Monnier2012-01-16 11:00:08 -0500
commit01ec1eed4e0490ecbd6e577d35aebe9a22b0e19d (patch)
tree6f29ecf9924938990540c5d9ea9473a88b855d5b
parent1d00653d9e0aa9535402f202954444656a6e2462 (diff)
downloademacs-01ec1eed4e0490ecbd6e577d35aebe9a22b0e19d.tar.gz
emacs-01ec1eed4e0490ecbd6e577d35aebe9a22b0e19d.zip
* doc/emacs/programs.texi (Comment Commands): Typo.
Fixes: debbugs:10514
-rw-r--r--doc/emacs/ChangeLog9
-rw-r--r--doc/emacs/programs.texi2
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4f3e5f77fd5..90a7f69ea72 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12012-01-16 Volker Sobek <reklov@live.com> (tiny change)
2
3 * programs.texi (Comment Commands): Typo (bug#10514).
4
12012-01-15 Chong Yidong <cyd@gnu.org> 52012-01-15 Chong Yidong <cyd@gnu.org>
2 6
3 * xresources.texi (X Resources): Describe GTK+ case first. 7 * xresources.texi (X Resources): Describe GTK+ case first.
@@ -21,8 +25,7 @@
21 25
222012-01-14 Chong Yidong <cyd@gnu.org> 262012-01-14 Chong Yidong <cyd@gnu.org>
23 27
24 * cmdargs.texi (Action Arguments): No need to mention 28 * cmdargs.texi (Action Arguments): No need to mention EMACSLOADPATH.
25 EMACSLOADPATH.
26 (General Variables): Add xref to Lisp Libraries. 29 (General Variables): Add xref to Lisp Libraries.
27 (Initial Options): Copyedits. 30 (Initial Options): Copyedits.
28 (Resume Arguments): Node deleted; emacs.bash/csh are obsolete. 31 (Resume Arguments): Node deleted; emacs.bash/csh are obsolete.
@@ -8847,7 +8850,7 @@
8847;; coding: utf-8 8850;; coding: utf-8
8848;; End: 8851;; End:
8849 8852
8850 Copyright (C) 1993-1999, 2001-2011 Free Software Foundation, Inc. 8853 Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
8851 8854
8852 This file is part of GNU Emacs. 8855 This file is part of GNU Emacs.
8853 8856
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 7fef7fb1e22..8ba9b78603a 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -952,7 +952,7 @@ comment text.
952comment on the current line, along with the whitespace before it. 952comment on the current line, along with the whitespace before it.
953Since the comment is saved to the kill ring, you can reinsert it on 953Since the comment is saved to the kill ring, you can reinsert it on
954another line by moving to the end of that line, doing @kbd{C-y}, and 954another line by moving to the end of that line, doing @kbd{C-y}, and
955then @kbd{M-;} to realign the command. You can achieve the same 955then @kbd{M-;} to realign the comment. You can achieve the same
956effect as @kbd{C-u M-;} by typing @kbd{M-x comment-kill} 956effect as @kbd{C-u M-;} by typing @kbd{M-x comment-kill}
957(@code{comment-dwim} actually calls @code{comment-kill} as a 957(@code{comment-dwim} actually calls @code{comment-kill} as a
958subroutine when it is given a prefix argument). 958subroutine when it is given a prefix argument).