# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ibeasaj@unican.es-20140715115642-iib2s0brhncimhc3
# target_branch: bzr://bzr.sv.gnu.org/emacs/trunk/
# testament_sha1: cb7a2a788eb912a5bfd57aee447293256d8df616
# timestamp: 2014-07-15 13:57:38 +0200
# base_revision_id: dmantipov@yandex.ru-20140715095905-\
#   nl3wvw1cpwh3s1ot
# 
# Begin patch
=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- doc/lispintro/emacs-lisp-intro.texi	2014-07-03 06:00:53 +0000
+++ doc/lispintro/emacs-lisp-intro.texi	2014-07-15 11:56:42 +0000
@@ -1700,7 +1700,7 @@
 of drawers.  The function definition is put in one drawer, the value in
 another, and so on.  What is put in the drawer holding the value can be
 changed without affecting the contents of the drawer holding the
-function definition, and vice-verse.
+function definition, and vice versa.
 
 @menu
 * fill-column Example::
@@ -2653,7 +2653,7 @@
 evaluate the symbols as variables.  @xref{Variables}.)
 
 In spite of the distinction between files and buffers, you will often
-find that people refer to a file when they mean a buffer and vice-verse.
+find that people refer to a file when they mean a buffer and vice versa.
 Indeed, most people say, ``I am editing a file,'' rather than saying,
 ``I am editing a buffer which I will soon save to a file.''  It is
 almost always clear from context what people mean.  When dealing with
@@ -5756,7 +5756,7 @@
 @noindent
 @code{not} is a function that returns true if its argument is false
 and false if its argument is true.  So if @code{(bufferp buffer)}
-returns true, the @code{not} expression returns false and vice-verse:
+returns true, the @code{not} expression returns false and vice versa:
 what is ``not true'' is false and what is ``not false'' is true.
 
 Using this test, the @code{if} expression works as follows: when the
@@ -9805,7 +9805,7 @@
 being a chest of drawers.  The function definition is put in one
 drawer, the value in another, and so on.  What is put in the drawer
 holding the value can be changed without affecting the contents of the
-drawer holding the function definition, and vice-verse.
+drawer holding the function definition, and vice versa.
 
 Actually, what is put in each drawer is the address of the value or
 function definition.  It is as if you found an old chest in the attic,
@@ -13235,7 +13235,7 @@
 @noindent
 This @code{while} loop has us searching forward for
 @code{sp-parstart}, which is the combination of possible whitespace
-with a the local value of the start of a paragraph or of a paragraph
+with the local value of the start of a paragraph or of a paragraph
 separator.  (The latter two are within an expression starting
 @code{\(?:} so that they are not referenced by the
 @code{match-beginning} function.)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUDHinYAAwPfxAAQUPf/91Mg
CAC////6IAAIAFAGHuJXVbZVZAANAEMAAAAAAAAAAAkpMjU2Iamain6m1ARkyMNAAIEpomlU/aJk
pjJPU8kwm1MT1Mj1HqNHqNMYAAAAAAAAAABJIE0BMJiBNMgyk9JtRkHpNNGOG472uG1b32hmGW7M
Gg2DrRBAtY3DxtVDdN0Ss2f77n0HcSISSG+0sHChUxcSMoHYyEZCmU/A+mnIWbR4nTKruqdR/r6S
fXfxIv3vGopz064sSTOMA4guywtn9l+PHhgF4LHtPcbDqNR2UfXuGpRxFPqou5GA7kVhn8LIAYUx
FBvPIX9hIN5kugtPA2ZaqrS7H5XiDDgoAaDG6uVtrnO9CF8wVwzCNo77XG1o5u+sflAx0xnuhqAQ
5e2mDnKUxpctBkgvcQETE7Ved9cxUoskP4Cpp2DigbFFjIJEm7+YKcpiKAsADaVlhLEujsHE42UL
7hWpyo2DAiQqQ5lhosmAKgDROrTzoIgbssXlPzwCtGphgS+Fm7nr0T6GcBVTDd2iwKqgREmLCkft
FURXFxk4cQIqVmVEEplzX+chVWDXlQ4guTxAxbNPthgzGVJNmeuCwcVoum+ejZGHMZGEQmty9isY
tU7CjBC4rxXCcYjywKsGRvFMfrbnjIGKQpDG00HkzBG3KTEFMLWAH1q66URHHWiBkRFmRJmdo5S+
RMrG+4m8xR3D8uItICvHcGseyeGRmiRnIjzUhaaiGfLxX7lEtTVexIGwOQ1Mto0y8qyLxSN9ngKo
pBYQpGnBwiNAPdBylSWEVo4sseFVxTbjgZMiPF+KldrFi6RC2tpg4apMPLS4TGBcRbcI3iKfprhd
MwsHBiaDKJaM8aTQQFRxkVMnkLma64RYg8jkEW+YtQaTuSTazebS3b/Bg4tYzMmEl+nqCMDEdmt3
wEh5QVxnqdZgeUNSuXWJT+ORPj7aAVeEy9Awgq5365mapkIJmYfNWJ5M63IVNIIlowUevjobMc8R
QcZ4xHyO9poPMD7lYgoKCoXvpmLmkdiwsszRT6+j8cJkuhOJVgIOhmW6QRKe3LwIsKtx8aGKgBEw
ZHvbn0LDI0tJozKBXmRAY7khMcTbIccDCa3dA9tFItsIiJZi47aRxvd1feD4tF7iUsocvnCBmZwk
2/0PMdUypHFZJLXZRWCOJWTF48/ctFzLsHHueviczCVhpY42d/6Hhy+f6jJjW4O4mFHLs2HLM8Zo
oNRB1ORWwwilTA82FbEh5Lt28xX8Kubw4cOVEA4ibhLqQMg9Pgs7DDTOrw7nIQxF/xE4fUR456II
ezjxOfyN/knXgQ8RMGEXN2EViw+2SBhSW0dHUXY7DVoYcM7caiDsihx9j8CYsOwOF1XdggGgsX+y
WX0pgcCpMDMdLzAmWHBhgGWIFYLficCP+UEvAQZKgzSzEQ4gQTwHjQP7oZME6gaDw0IZEP0aOtGZ
fZaI36gOS5ooKeBeIqIYjEAg56mwOEDCkONoriTwZJlEcniDEcOHL88BWFQTTCoQmFc4XPjI1YRU
LuIxM+McVi8rQuxFXW0Wpe70XPF7LPwgt4bynJjeMMJ4eoiMJmo8B38U4rj2rM1cLARTWZDnOJsv
q+CTH6nI44QEbHdLhhwTfMVXnBFhuQn0kUVMS3qScKBeRAMAvF7p5RxDUmIIHOF/6COTga8nvAcV
Bow1wMIgGbAWIdnUBda2AwxvD2uWuZAbYaAWBtNjhVkrC0MCRcrZsk5IHRJPFEvGjOK8hS/OVscu
QdggaX14qKk03ikJoZsD31gTXYr9nGnnJiLIXGtsRBQYwNipGtTsTv8Zn/F3JFOFCQQMeKdg