aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorGlenn Morris2014-03-21 00:00:21 -0700
committerGlenn Morris2014-03-21 00:00:21 -0700
commitf167458b5ec8e09baed154d12efa5b70cf1ad9d4 (patch)
tree3e25eed806710a422a08df16eb61dd975bf9b33a /doc/misc
parent3e77f05d9185cdd3b1c7d60ac028e8031596e9ab (diff)
downloademacs-f167458b5ec8e09baed154d12efa5b70cf1ad9d4.tar.gz
emacs-f167458b5ec8e09baed154d12efa5b70cf1ad9d4.zip
Tiny doc/misc edits
* doc/misc/ede.texi (ede-linux): * doc/misc/vip.texi (New Bindings): Tiny copyedits.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/ede.texi2
-rw-r--r--doc/misc/vip.texi2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8796cafa4d6..34021fd3d9b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12014-03-21 Glenn Morris <rgm@gnu.org>
2
3 * ede.texi (ede-linux):
4 * vip.texi (New Bindings): Tiny copyedits.
5
12014-03-18 Stefan Monnier <monnier@iro.umontreal.ca> 62014-03-18 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * vip.texi (Other Vi Commands): Adjust doc of C-j. 8 * vip.texi (Other Vi Commands): Adjust doc of C-j.
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 954427d10bf..ab1e8a418da 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -917,7 +917,7 @@ and has an optimized include file identification function.
917 917
918Through the variables @code{project-linux-build-directory-default} and 918Through the variables @code{project-linux-build-directory-default} and
919@code{project-linux-architecture-default}, you can set the build 919@code{project-linux-architecture-default}, you can set the build
920directory and its architecture, resp. The default is to assume that 920directory and its architecture, respectively. The default is to assume that
921the build happens in the source directory and to auto-detect the 921the build happens in the source directory and to auto-detect the
922architecture; if the auto-detection fails, you will be asked. 922architecture; if the auto-detection fails, you will be asked.
923 923
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index 07f12fdf882..25605aadcac 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -569,7 +569,7 @@ in the current window, while @kbd{S} selects buffer in another window.
569@kindex 1300 @kbd{X} (@code{vip-ctl-x-equivalent}) 569@kindex 1300 @kbd{X} (@code{vip-ctl-x-equivalent})
570These keys will exit from vi mode and return to emacs mode temporarily. 570These keys will exit from vi mode and return to emacs mode temporarily.
571If you type @kbd{C} (@kbd{X}), Emacs will be in emacs mode and will believe 571If you type @kbd{C} (@kbd{X}), Emacs will be in emacs mode and will believe
572that you have typed @kbd{C-c} (@kbd{C-x}, resp.) in emacs mode. Moreover, 572that you have typed @kbd{C-c} (@kbd{C-x}) in emacs mode. Moreover,
573if the following character you type is an upper-case letter, then Emacs 573if the following character you type is an upper-case letter, then Emacs
574will believe that you have typed the corresponding control character. 574will believe that you have typed the corresponding control character.
575You will be in vi mode again after the command is executed. For example, 575You will be in vi mode again after the command is executed. For example,