aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeo Liu2011-05-26 13:36:55 +0800
committerLeo Liu2011-05-26 13:36:55 +0800
commit0f4aebc0ebc91099461f5af63f3034709336f233 (patch)
tree1d4f479bdedcd33ac1d90855b95cedf5eba88a86 /src
parente4245494bac8d6305d408772c1fa99b28b36612d (diff)
downloademacs-0f4aebc0ebc91099461f5af63f3034709336f233.tar.gz
emacs-0f4aebc0ebc91099461f5af63f3034709336f233.zip
Allow empty regions in transpose-regions
See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8699.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/editfns.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e98cb2848a9..c4f5ef4b920 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-05-26 Leo Liu <sdl.web@gmail.com>
2
3 * editfns.c (Ftranspose_regions): Allow empty regions. (Bug#8699)
4
12011-05-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 52011-05-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 6
3 * dispextern.h (struct glyph_row): New member fringe_bitmap_periodic_p. 7 * dispextern.h (struct glyph_row): New member fringe_bitmap_periodic_p.
diff --git a/src/editfns.c b/src/editfns.c
index 5e1dcce0275..881e0c7f3e2 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4353,8 +4353,9 @@ Transposing beyond buffer boundaries is an error. */)
4353 4353
4354 if (start2 < end1) 4354 if (start2 < end1)
4355 error ("Transposed regions overlap"); 4355 error ("Transposed regions overlap");
4356 else if (start1 == end1 || start2 == end2) 4356 /* Nothing to change for adjacent regions with one being empty */
4357 error ("Transposed region has length 0"); 4357 else if ((start1 == end1 || start2 == end2) && end1 == start2)
4358 return Qnil;
4358 4359
4359 /* The possibilities are: 4360 /* The possibilities are:
4360 1. Adjacent (contiguous) regions, or separate but equal regions 4361 1. Adjacent (contiguous) regions, or separate but equal regions