diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-30 14:22:58 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-30 14:22:58 -0800 |
| commit | 4eec7f8b2b465c6fc2c09d37d4da2b540f607df0 (patch) | |
| tree | 9f4e30300e4f96dd3c72f5f435032f8180ce1a6c /src/dired.c | |
| parent | fcabb1a6e66f7e6cf4fe0984c4d5c169f4decd8a (diff) | |
| parent | 42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (diff) | |
| download | emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.tar.gz emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.tar.bz2 emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.zip | |
Use SSDATA when the context wants char *.
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/dired.c b/src/dired.c index 0f1b07a395d..08aa230f65f 100644 --- a/src/dired.c +++ b/src/dired.c @@ -176,7 +176,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object m which might compile a new regexp until we're done with the loop! */ BLOCK_INPUT; - d = opendir (SDATA (dirfilename)); + d = opendir (SSDATA (dirfilename)); UNBLOCK_INPUT; if (d == NULL) report_file_error ("Opening directory", Fcons (directory, Qnil)); @@ -258,7 +258,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object m QUIT; if (NILP (match) - || (0 <= re_search (bufp, SDATA (name), len, 0, len, 0))) + || (0 <= re_search (bufp, SSDATA (name), len, 0, len, 0))) wanted = 1; immediate_quit = 0; @@ -498,7 +498,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v encoded_dir = ENCODE_FILE (dirname); BLOCK_INPUT; - d = opendir (SDATA (Fdirectory_file_name (encoded_dir))); + d = opendir (SSDATA (Fdirectory_file_name (encoded_dir))); UNBLOCK_INPUT; if (!d) report_file_error ("Opening directory", Fcons (dirname, Qnil)); @@ -970,7 +970,7 @@ so last access time will always be midnight of that day. */) encoded = ENCODE_FILE (filename); UNGCPRO; - if (lstat (SDATA (encoded), &s) < 0) + if (lstat (SSDATA (encoded), &s) < 0) return Qnil; switch (s.st_mode & S_IFMT) @@ -1099,4 +1099,3 @@ It ignores directory names if they match any string in this list which ends in a slash. */); Vcompletion_ignored_extensions = Qnil; } - |