diff options
| author | Paul Eggert | 2011-04-11 22:20:44 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-11 22:20:44 -0700 |
| commit | 16390cd253ff51ab31e3f5c607827486959e1c64 (patch) | |
| tree | 98efacc7220d1bcb2f6e97e4c111f68ee500ddb7 /src | |
| parent | a25f4dfafb02f162dcfca3729b37ed2bbcfe44e0 (diff) | |
| download | emacs-16390cd253ff51ab31e3f5c607827486959e1c64.tar.gz emacs-16390cd253ff51ab31e3f5c607827486959e1c64.zip | |
* dired.c (file_name_completion): Now static.
* dbusbind.c (xd_in_read_queued_messages): Now static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/dbusbind.c | 2 | ||||
| -rw-r--r-- | src/dired.c | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1fbc25e07c8..22938117ff1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2011-04-12 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-12 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * dired.c (file_name_completion): Now static. | ||
| 4 | |||
| 5 | * dbusbind.c (xd_in_read_queued_messages): Now static. | ||
| 6 | |||
| 3 | * lisp.h (circular_list_error, FOREACH): Remove; unused. | 7 | * lisp.h (circular_list_error, FOREACH): Remove; unused. |
| 4 | * data.c (circular_list_error): Remove. | 8 | * data.c (circular_list_error): Remove. |
| 5 | 9 | ||
diff --git a/src/dbusbind.c b/src/dbusbind.c index b986724d792..792414b23d8 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -76,7 +76,7 @@ static Lisp_Object QCdbus_type_array, QCdbus_type_variant; | |||
| 76 | static Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; | 76 | static Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; |
| 77 | 77 | ||
| 78 | /* Whether we are reading a D-Bus event. */ | 78 | /* Whether we are reading a D-Bus event. */ |
| 79 | int xd_in_read_queued_messages = 0; | 79 | static int xd_in_read_queued_messages = 0; |
| 80 | 80 | ||
| 81 | 81 | ||
| 82 | /* We use "xd_" and "XD_" as prefix for all internal symbols, because | 82 | /* We use "xd_" and "XD_" as prefix for all internal symbols, because |
diff --git a/src/dired.c b/src/dired.c index 2b0ef275cde..20d5b586670 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -381,7 +381,9 @@ which see. */) | |||
| 381 | } | 381 | } |
| 382 | 382 | ||
| 383 | 383 | ||
| 384 | Lisp_Object file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate); | 384 | static Lisp_Object file_name_completion |
| 385 | (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, | ||
| 386 | Lisp_Object predicate); | ||
| 385 | 387 | ||
| 386 | DEFUN ("file-name-completion", Ffile_name_completion, Sfile_name_completion, | 388 | DEFUN ("file-name-completion", Ffile_name_completion, Sfile_name_completion, |
| 387 | 2, 3, 0, | 389 | 2, 3, 0, |
| @@ -441,7 +443,7 @@ These are all file names in directory DIRECTORY which begin with FILE. */) | |||
| 441 | static int file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr); | 443 | static int file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr); |
| 442 | static Lisp_Object Qdefault_directory; | 444 | static Lisp_Object Qdefault_directory; |
| 443 | 445 | ||
| 444 | Lisp_Object | 446 | static Lisp_Object |
| 445 | file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate) | 447 | file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate) |
| 446 | { | 448 | { |
| 447 | DIR *d; | 449 | DIR *d; |