aboutsummaryrefslogtreecommitdiffstats
path: root/src/dired.c
diff options
context:
space:
mode:
authorPaul Eggert2011-01-30 14:22:58 -0800
committerPaul Eggert2011-01-30 14:22:58 -0800
commit4eec7f8b2b465c6fc2c09d37d4da2b540f607df0 (patch)
tree9f4e30300e4f96dd3c72f5f435032f8180ce1a6c /src/dired.c
parentfcabb1a6e66f7e6cf4fe0984c4d5c169f4decd8a (diff)
parent42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (diff)
downloademacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.tar.gz
emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.zip
Use SSDATA when the context wants char *.
Diffstat (limited to 'src/dired.c')
-rw-r--r--src/dired.c9
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
176 which might compile a new regexp until we're done with the loop! */ 176 which might compile a new regexp until we're done with the loop! */
177 177
178 BLOCK_INPUT; 178 BLOCK_INPUT;
179 d = opendir (SDATA (dirfilename)); 179 d = opendir (SSDATA (dirfilename));
180 UNBLOCK_INPUT; 180 UNBLOCK_INPUT;
181 if (d == NULL) 181 if (d == NULL)
182 report_file_error ("Opening directory", Fcons (directory, Qnil)); 182 report_file_error ("Opening directory", Fcons (directory, Qnil));
@@ -258,7 +258,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object m
258 QUIT; 258 QUIT;
259 259
260 if (NILP (match) 260 if (NILP (match)
261 || (0 <= re_search (bufp, SDATA (name), len, 0, len, 0))) 261 || (0 <= re_search (bufp, SSDATA (name), len, 0, len, 0)))
262 wanted = 1; 262 wanted = 1;
263 263
264 immediate_quit = 0; 264 immediate_quit = 0;
@@ -498,7 +498,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
498 encoded_dir = ENCODE_FILE (dirname); 498 encoded_dir = ENCODE_FILE (dirname);
499 499
500 BLOCK_INPUT; 500 BLOCK_INPUT;
501 d = opendir (SDATA (Fdirectory_file_name (encoded_dir))); 501 d = opendir (SSDATA (Fdirectory_file_name (encoded_dir)));
502 UNBLOCK_INPUT; 502 UNBLOCK_INPUT;
503 if (!d) 503 if (!d)
504 report_file_error ("Opening directory", Fcons (dirname, Qnil)); 504 report_file_error ("Opening directory", Fcons (dirname, Qnil));
@@ -970,7 +970,7 @@ so last access time will always be midnight of that day. */)
970 encoded = ENCODE_FILE (filename); 970 encoded = ENCODE_FILE (filename);
971 UNGCPRO; 971 UNGCPRO;
972 972
973 if (lstat (SDATA (encoded), &s) < 0) 973 if (lstat (SSDATA (encoded), &s) < 0)
974 return Qnil; 974 return Qnil;
975 975
976 switch (s.st_mode & S_IFMT) 976 switch (s.st_mode & S_IFMT)
@@ -1099,4 +1099,3 @@ It ignores directory names if they match any string in this list which
1099ends in a slash. */); 1099ends in a slash. */);
1100 Vcompletion_ignored_extensions = Qnil; 1100 Vcompletion_ignored_extensions = Qnil;
1101} 1101}
1102