# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
#   w839hdjykp7buf2h
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk/
# testament_sha1: 6a061e3480db7d5854f2d1d911820f89d5e26063
# timestamp: 2009-12-31 21:52:56 +0100
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'lisp/simple.el'
--- lisp/simple.el	2009-12-12 17:01:03 +0000
+++ lisp/simple.el	2009-12-31 20:52:48 +0000
@@ -768,10 +768,14 @@
        (constrain-to-field nil orig-pos)))))
 
 (defun just-one-space (&optional n)
-  "Delete all spaces and tabs around point, leaving one space (or N spaces)."
+  "Delete all spaces and tabs around point, leaving one space (or
+N spaces).  If N is negative, deletes carriage return and
+linefeed characters as well."
   (interactive "*p")
-  (let ((orig-pos (point)))
-    (skip-chars-backward " \t")
+  (let ((orig-pos (point))
+        (skip-characters (if (< n 0) " \t\n\r" " \t"))
+        (n (abs n)))
+    (skip-chars-backward skip-characters)
     (constrain-to-field nil orig-pos)
     (dotimes (i (or n 1))
       (if (= (following-char) ?\s)
@@ -780,7 +784,7 @@
     (delete-region
      (point)
      (progn
-       (skip-chars-forward " \t")
+       (skip-chars-forward skip-characters)
        (constrain-to-field nil orig-pos t)))))
 
 (defun beginning-of-buffer (&optional arg)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeooGREAAcRfgEwQUGf/91Yj
AAS////wUAQGu3aGd5CrKOCUQUzUyMARoaU8mNT1PUmmjDUGgykxJsm0T0immRoZBoDIAADEIJoS
n6m1M0p6NGo0NqeoNGTQGgykZGpmp6npPUNqAAAAAACSiYhT9JqfqaRsk9TEep5QeoAAA4KNpFA/
OZVTa9ijbGljtPvOIP2RNudsMnX0gjBNtOp3z5+3zK/0bH6TKKqRHqlsj9ItDy5jRy1LFXD6mnso
nPu1NM3QdT9keXpHh2z5Vw8Wxxi7AMGDed7wN9RwrxzG2y3c5NOaNiYgomK+Ksx8ZjomErKZd+ix
s6d6TuIfxInIIUuV+sxXMLHA1mujyEzpBDiUSm+TaVMluhQAzoGwg98QH7wzHsRORBgykZDIRKHV
TCAn6/r6q5C3xu4TeXP0AumwgRgLVuPb5IWapJVN520O1wtOcIJVGZL7M5B8yFYLEB4QVoB0gwMU
KBS2gCM15AJmLg+kGpmk2ybWJsmDgJmWBuaMUCuBmg2GJo51BEwZoCnSpaxqg36DjcLhQNbJkAfv
NOJYLc+mi7kyWR3GqoGFJuDzZiwSecZqpXWaLdlCxrTZqDKPQLZMh7Bc5EMBvHKC3jU6pG+VMAcK
jmbAPNuH6DJGuZHgdA11oOOrMdMFyDsOCAtRbrhaKiWMwaTuNyo0p0sqMXcUYqikKgTqsfln9hy2
3+/IOu7x4czMmV1AEPOPhK9WK9ZVjUVj0OvBo/FE3ODRZWZR18i5Uh1CENx18LwtEfLtNlfcBO5Z
agxJIcdLhpUqCWXPgXGo3Z3YG6wgL9W8VBJ5gxXbKnsCD3DOZIi0ItoLBdos01BNvdwK9caaEpc3
sa+sSedWQ2S3E7C2e10ZyPsJeiSZ7k54dFzb4bHK4I8LmcYsaIJl211EzNUAzqa6hU1VQCidfvUE
E0Jphisnww78czKVzkStxaiorbbclDfqYtcClNKD0a79+WQnAwvcxLScwHluISHLy7YKdM1aQyAp
IizF9CMbswvZU3aDBaxVvmki80UqWMf6nFmSR+t5CsQvR5SmzqHOhnS8l33aIBEhCMIeEhYBO6Eh
Wj2cYaZ0WrvFoUOByZuEMaEAa0Jrkhh0HOQ1/TEOH91toI5k7yyBG81nfiNKXzkJHHU0Xf2K1QkT
DQ5sqAQFAZj10AE+ZaAiEijw6preqs9qVpsBUhXRnQWRBlSpZMmyfxckUNvFMFWtIwKdLHCVtUqe
Xadlt25OdHAgDmwwRCu4MHzrxqBjsfKgmAgpyQFE97s2yYgQhyNNkajnhx8FeA+3oCFh1qUVQtrV
4HJNlpojk7v6C6U3w7AHkO67TbgGh8QLwHPsOHIXx2FDjz8QOuykrYM/txeg8zQ5Y4AaQapkFNTa
XG6YMgBFgf/i7kinChIdRQMiIA==