[Qemacs-commit] qemacs dired.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        17/04/25 13:14:30

Modified files:
        .              : dired.c 

Log message:
        dired: update sort order prompt

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/dired.c?cvsroot=qemacs&r1=1.77&r2=1.78

Patches:
Index: dired.c
===================================================================
RCS file: /sources/qemacs/qemacs/dired.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- dired.c     15 Mar 2017 07:32:48 -0000      1.77
+++ dired.c     25 Apr 2017 17:14:30 -0000      1.78
@@ -828,8 +828,7 @@
         do_bol(s);
         flags = s->b->flags & BF_READONLY;
         s->b->flags ^= flags;
-        eb_delete_uchar(s->b, s->offset);
-        eb_insert_uchar(s->b, s->offset, ch);
+        eb_replace_uchar(s->b, s->offset, ch);
         s->b->flags ^= flags;
     }
     if (dir > 0)
@@ -855,15 +854,18 @@
             sort_mode &= ~DIRED_SORT_MASK;
             sort_mode |= DIRED_SORT_SIZE;
             break;
-        case 'd':       /* direct */
+        case 'd':       /* date */
             sort_mode &= ~DIRED_SORT_MASK;
             sort_mode |= DIRED_SORT_DATE;
             break;
+        case 'g':       /* group */
+            sort_mode |= DIRED_SORT_GROUP;
+            break;
         case 'u':       /* ungroup */
             sort_mode &= ~DIRED_SORT_GROUP;
             break;
-        case 'g':       /* group */
-            sort_mode |= DIRED_SORT_GROUP;
+        case 'r':       /* reverse */
+            sort_mode ^= DIRED_SORT_DESCENDING;
             break;
         case '+':       /* ascending */
             sort_mode &= ~DIRED_SORT_DESCENDING;
@@ -871,9 +873,6 @@
         case '-':       /* descending */
             sort_mode |= DIRED_SORT_DESCENDING;
             break;
-        case 'r':       /* reverse */
-            sort_mode ^= DIRED_SORT_DESCENDING;
-            break;
         }
     }
     if (dired_sort_mode != sort_mode) {
@@ -1320,7 +1319,7 @@
           "dired-unmark-backward", dired_mark, -1)
     CMD2( 's', KEY_NONE,
           "dired-sort", dired_sort, ESs,
-          "s{Sort order: }|sortkey|")
+          "s{Sort order [nesdug+-r]: }|sortkey|")
     CMD2( 't', KEY_NONE,
           "dired-set-time-format", dired_set_time_format, ESi,
           "i{Time format: }[timeformat]")