[Emacs-diffs] emacs/src ChangeLog minibuf.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/12/27 08:11:13

Modified files:
        src            : ChangeLog minibuf.c 

Log message:
        * minibuf.c (Fall_completions): Minor optimization.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7935&r2=1.7936
http://cvs.savannah.gnu.org/viewcvs/emacs/src/minibuf.c?cvsroot=emacs&r1=1.367&r2=1.368

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7935
retrieving revision 1.7936
diff -u -b -r1.7935 -r1.7936
--- ChangeLog   26 Dec 2009 15:56:43 -0000      1.7935
+++ ChangeLog   27 Dec 2009 08:11:12 -0000      1.7936
@@ -1,3 +1,7 @@
+2009-12-27  Chong Yidong  <address@hidden>
+
+       * minibuf.c (Fall_completions): Minor optimization.
+
 2009-12-26  Eli Zaretskii  <address@hidden>
 
        * .gdbinit (pgx): Fix display of composite glyphs.  Display

Index: minibuf.c
===================================================================
RCS file: /sources/emacs/emacs/src/minibuf.c,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -b -r1.367 -r1.368
--- minibuf.c   6 Nov 2009 06:50:58 -0000       1.367
+++ minibuf.c   27 Dec 2009 08:11:13 -0000      1.368
@@ -1647,10 +1647,10 @@
          && SCHARS (string) <= SCHARS (eltstring)
          /* If HIDE_SPACES, reject alternatives that start with space
             unless the input starts with space.  */
-         && ((SBYTES (string) > 0
+         && (NILP (hide_spaces)
+             || (SBYTES (string) > 0
               && SREF (string, 0) == ' ')
-             || SREF (eltstring, 0) != ' '
-             || NILP (hide_spaces))
+             || SREF (eltstring, 0) != ' ')
          && (tem = Fcompare_strings (eltstring, zero,
                                      make_number (SCHARS (string)),
                                      string, zero,