[Emacs-diffs] /srv/bzr/emacs/trunk r104372: Allow empty regions in transpose-regions

[Leo Liu]

------------------------------------------------------------
revno: 104372
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Thu 2011-05-26 13:36:55 +0800
message:
  Allow empty regions in transpose-regions
  
  See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8699.
modified:
  src/ChangeLog
  src/editfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-25 03:45:04 +0000
+++ b/src/ChangeLog     2011-05-26 05:36:55 +0000
@@ -1,3 +1,7 @@
+2011-05-26  Leo Liu  <address@hidden>
+
+       * editfns.c (Ftranspose_regions): Allow empty regions.  (Bug#8699)
+
 2011-05-25  YAMAMOTO Mitsuharu  <address@hidden>
 
        * dispextern.h (struct glyph_row): New member fringe_bitmap_periodic_p.

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2011-05-15 17:17:44 +0000
+++ b/src/editfns.c     2011-05-26 05:36:55 +0000
@@ -4353,8 +4353,9 @@
 
   if (start2 < end1)
     error ("Transposed regions overlap");
-  else if (start1 == end1 || start2 == end2)
-    error ("Transposed region has length 0");
+  /* Nothing to change for adjacent regions with one being empty */
+  else if ((start1 == end1 || start2 == end2) && end1 == start2)
+    return Qnil;
 
   /* The possibilities are:
      1. Adjacent (contiguous) regions, or separate but equal regions