diff options
| author | Paul Eggert | 2011-03-14 18:42:54 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-14 18:42:54 -0700 |
| commit | f14b7e14bb9284b6020431789ebc4c0dac1ef487 (patch) | |
| tree | 0a5be4134a9937d83a54265c7271ae085b870d58 /src | |
| parent | 62137a95f36f5d8b1d43e805811c8f7a15cb8f44 (diff) | |
| download | emacs-f14b7e14bb9284b6020431789ebc4c0dac1ef487.tar.gz emacs-f14b7e14bb9284b6020431789ebc4c0dac1ef487.zip | |
* fileio.c (file_name_as_directory, directory_file_name):
(barf_or_query_if_file_exists, auto_save_error, auto_save_1):
Now static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2fb5e03ca96..1a7f0bbf7b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2011-03-15 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-03-15 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * fileio.c (file_name_as_directory, directory_file_name): | ||
| 4 | (barf_or_query_if_file_exists, auto_save_error, auto_save_1): | ||
| 5 | Now static. | ||
| 6 | |||
| 3 | * minibuf.c (choose_minibuf_frame_1): Now static. | 7 | * minibuf.c (choose_minibuf_frame_1): Now static. |
| 4 | (Ftry_completion, Fall_completions): Rename or remove locals | 8 | (Ftry_completion, Fall_completions): Rename or remove locals |
| 5 | to avoid shadowing. | 9 | to avoid shadowing. |
diff --git a/src/fileio.c b/src/fileio.c index 18e9dbe9680..e68fcbc65b5 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -433,7 +433,7 @@ get a current directory to run processes in. */) | |||
| 433 | } | 433 | } |
| 434 | 434 | ||
| 435 | 435 | ||
| 436 | char * | 436 | static char * |
| 437 | file_name_as_directory (char *out, char *in) | 437 | file_name_as_directory (char *out, char *in) |
| 438 | { | 438 | { |
| 439 | int size = strlen (in) - 1; | 439 | int size = strlen (in) - 1; |
| @@ -496,7 +496,7 @@ For a Unix-syntax file name, just appends a slash. */) | |||
| 496 | * Value is nonzero if the string output is different from the input. | 496 | * Value is nonzero if the string output is different from the input. |
| 497 | */ | 497 | */ |
| 498 | 498 | ||
| 499 | int | 499 | static int |
| 500 | directory_file_name (char *src, char *dst) | 500 | directory_file_name (char *src, char *dst) |
| 501 | { | 501 | { |
| 502 | long slen; | 502 | long slen; |
| @@ -1734,7 +1734,7 @@ expand_and_dir_to_file (Lisp_Object filename, Lisp_Object defdir) | |||
| 1734 | 1734 | ||
| 1735 | If QUICK is nonzero, we ask for y or n, not yes or no. */ | 1735 | If QUICK is nonzero, we ask for y or n, not yes or no. */ |
| 1736 | 1736 | ||
| 1737 | void | 1737 | static void |
| 1738 | barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring, | 1738 | barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring, |
| 1739 | int interactive, struct stat *statptr, int quick) | 1739 | int interactive, struct stat *statptr, int quick) |
| 1740 | { | 1740 | { |
| @@ -5059,7 +5059,7 @@ An argument specifies the modification time value to use | |||
| 5059 | return Qnil; | 5059 | return Qnil; |
| 5060 | } | 5060 | } |
| 5061 | 5061 | ||
| 5062 | Lisp_Object | 5062 | static Lisp_Object |
| 5063 | auto_save_error (Lisp_Object error) | 5063 | auto_save_error (Lisp_Object error) |
| 5064 | { | 5064 | { |
| 5065 | Lisp_Object args[3], msg; | 5065 | Lisp_Object args[3], msg; |
| @@ -5095,7 +5095,7 @@ auto_save_error (Lisp_Object error) | |||
| 5095 | return Qnil; | 5095 | return Qnil; |
| 5096 | } | 5096 | } |
| 5097 | 5097 | ||
| 5098 | Lisp_Object | 5098 | static Lisp_Object |
| 5099 | auto_save_1 (void) | 5099 | auto_save_1 (void) |
| 5100 | { | 5100 | { |
| 5101 | struct stat st; | 5101 | struct stat st; |