aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDani Moncayo2012-12-08 11:25:28 +0800
committerChong Yidong2012-12-08 11:25:28 +0800
commit6ce49f24590f0dbd9cf127756c6ea57311657cb8 (patch)
treee373c44a91a45babaf2073a82de0eb739a4b7aaf /doc
parent76b92feef1ce7919484065b0ee66e8bb891aff51 (diff)
downloademacs-6ce49f24590f0dbd9cf127756c6ea57311657cb8.tar.gz
emacs-6ce49f24590f0dbd9cf127756c6ea57311657cb8.zip
* lisp/simple.el (just-one-space): Doc fix.
* doc/emacs/killing.texi (Deletion): Doc fix. Fixes: debbugs:12748
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/killing.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7599c1e823e..0825cda9044 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12012-12-08 Dani Moncayo <dmoncayo@gmail.com>
2
3 * killing.texi (Deletion): Doc fix (Bug#12748).
4
12012-12-03 Juanma Barranquero <lekktu@gmail.com> 52012-12-03 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * vc1-xtra.texi (General VC Options): Remove obsolete reference 7 * vc1-xtra.texi (General VC Options): Remove obsolete reference
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index a8d08bd6602..fcd881a6bdc 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -123,7 +123,7 @@ point, regardless of the number of spaces that existed previously
123(even if there were none before). With a numeric argument @var{n}, it 123(even if there were none before). With a numeric argument @var{n}, it
124leaves @var{n} spaces before point if @var{n} is positive; if @var{n} 124leaves @var{n} spaces before point if @var{n} is positive; if @var{n}
125is negative, it deletes newlines in addition to spaces and tabs, 125is negative, it deletes newlines in addition to spaces and tabs,
126leaving a single space before point. 126leaving @var{-n} spaces before point.
127 127
128 @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines 128 @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines
129after the current line. If the current line is blank, it deletes all 129after the current line. If the current line is blank, it deletes all