diff options
| author | Andreas Schwab | 2013-03-24 13:59:45 +0100 |
|---|---|---|
| committer | Andreas Schwab | 2013-03-24 13:59:45 +0100 |
| commit | 908589fd28437a9b0995b103e22ce5e4d421eb8a (patch) | |
| tree | ce3a4207b04f84fdc97ee1ca2dfbc369fcf07c2a /src/dired.c | |
| parent | 7b0e2f853fcd88c58715fd159923d50dfdeb9cba (diff) | |
| download | emacs-908589fd28437a9b0995b103e22ce5e4d421eb8a.tar.gz emacs-908589fd28437a9b0995b103e22ce5e4d421eb8a.zip | |
Reorder conditions that are written backwards
* alloc.c (xpalloc, Fgarbage_collect): Reorder conditions that are
written backwards.
* blockinput.h (input_blocked_p): Likewise.
* bytecode.c (exec_byte_code): Likewise.
* callproc.c (call_process_kill, call_process_cleanup)
(Fcall_process): Likewise.
* ccl.c (ccl_driver, resolve_symbol_ccl_program)
(Fccl_execute_on_string): Likewise.
* character.c (string_escape_byte8): Likewise.
* charset.c (read_hex): Likewise.
* cm.c (calccost): Likewise.
* data.c (cons_to_unsigned): Likewise.
* dired.c (directory_files_internal, file_name_completion):
Likewise.
* dispnew.c (scrolling_window, update_frame_1, Fsleep_for)
(sit_for): Likewise.
* doc.c (Fsubstitute_command_keys): Likewise.
* doprnt.c (doprnt): Likewise.
* editfns.c (hi_time, decode_time_components, Fformat): Likewise.
* emacsgtkfixed.c: Likewise.
* fileio.c (file_offset, Fwrite_region): Likewise.
* floatfns.c (Fexpt, fmod_float): Likewise.
* fns.c (larger_vector, make_hash_table, Fmake_hash_table):
Likewise.
* font.c (font_intern_prop): Likewise.
* frame.c (x_set_alpha): Likewise.
* gtkutil.c (get_utf8_string): Likewise.
* indent.c (check_display_width): Likewise.
* intervals.c (create_root_interval, rotate_right, rotate_left)
(split_interval_right, split_interval_left)
(adjust_intervals_for_insertion, delete_node)
(interval_deletion_adjustment, adjust_intervals_for_deletion)
(merge_interval_right, merge_interval_left, copy_intervals)
(set_intervals_multibyte_1): Likewise.
* keyboard.c (gobble_input, append_tool_bar_item): Likewise.
* keymap.c (Fkey_description): Likewise.
* lisp.h (FIXNUM_OVERFLOW_P, vcopy): Likewise.
* lread.c (openp, read_integer, read1, string_to_number):
Likewise.
* menu.c (ensure_menu_items): Likewise.
* minibuf.c (read_minibuf_noninteractive): Likewise.
* print.c (printchar, strout): Likewise.
* process.c (create_process, Faccept_process_output)
(wait_reading_process_output, read_process_output, send_process)
(wait_reading_process_output): Likewise.
* profiler.c (make_log, handle_profiler_signal): Likewise.
* regex.c (re_exec): Likewise.
* regex.h: Likewise.
* search.c (looking_at_1, Freplace_match): Likewise.
* sysdep.c (get_child_status, procfs_ttyname)
(procfs_get_total_memory): Likewise.
* systime.h (EMACS_TIME_VALID_P): Likewise.
* term.c (dissociate_if_controlling_tty): Likewise.
* window.c (get_phys_cursor_glyph): Likewise.
* xdisp.c (init_iterator, redisplay_internal, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, pint2hrstr):
Likewise.
* xfns.c (Fx_window_property): Likewise.
* xmenu.c (set_frame_menubar): Likewise.
* xselect.c (x_get_window_property, x_handle_dnd_message):
Likewise.
* xsmfns.c (smc_save_yourself_CB): Likewise.
* xterm.c (x_scroll_bar_set_handle): Likewise.
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/dired.c b/src/dired.c index 0e37568f211..ab48488966b 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -258,7 +258,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, | |||
| 258 | QUIT; | 258 | QUIT; |
| 259 | 259 | ||
| 260 | if (NILP (match) | 260 | if (NILP (match) |
| 261 | || (0 <= re_search (bufp, SSDATA (name), len, 0, len, 0))) | 261 | || re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0) |
| 262 | wanted = 1; | 262 | wanted = 1; |
| 263 | 263 | ||
| 264 | immediate_quit = 0; | 264 | immediate_quit = 0; |
| @@ -517,8 +517,8 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag, | |||
| 517 | 517 | ||
| 518 | QUIT; | 518 | QUIT; |
| 519 | if (len < SCHARS (encoded_file) | 519 | if (len < SCHARS (encoded_file) |
| 520 | || 0 <= scmp (dp->d_name, SSDATA (encoded_file), | 520 | || scmp (dp->d_name, SSDATA (encoded_file), |
| 521 | SCHARS (encoded_file))) | 521 | SCHARS (encoded_file)) >= 0) |
| 522 | continue; | 522 | continue; |
| 523 | 523 | ||
| 524 | if (file_name_completion_stat (fd, dp, &st) < 0) | 524 | if (file_name_completion_stat (fd, dp, &st) < 0) |
| @@ -580,7 +580,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag, | |||
| 580 | if (skip < 0) | 580 | if (skip < 0) |
| 581 | continue; | 581 | continue; |
| 582 | 582 | ||
| 583 | if (0 <= scmp (dp->d_name + skip, p1, elt_len)) | 583 | if (scmp (dp->d_name + skip, p1, elt_len) >= 0) |
| 584 | continue; | 584 | continue; |
| 585 | break; | 585 | break; |
| 586 | } | 586 | } |
| @@ -602,9 +602,8 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag, | |||
| 602 | skip = len - SCHARS (elt); | 602 | skip = len - SCHARS (elt); |
| 603 | if (skip < 0) continue; | 603 | if (skip < 0) continue; |
| 604 | 604 | ||
| 605 | if (0 <= scmp (dp->d_name + skip, | 605 | if (scmp (dp->d_name + skip, SSDATA (elt), SCHARS (elt)) |
| 606 | SSDATA (elt), | 606 | >= 0) |
| 607 | SCHARS (elt))) | ||
| 608 | continue; | 607 | continue; |
| 609 | break; | 608 | break; |
| 610 | } | 609 | } |