diff options
| author | Stefan Monnier | 2008-05-12 18:31:26 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-05-12 18:31:26 +0000 |
| commit | 728bb8e020a1ac1480787e715e7297eaaf6fad26 (patch) | |
| tree | 476ba097f97ee6c23e60d50966154f44ff33b870 /src | |
| parent | d5c1493791cad75d488d6364687c3b35e4299fb9 (diff) | |
| download | emacs-728bb8e020a1ac1480787e715e7297eaaf6fad26.tar.gz emacs-728bb8e020a1ac1480787e715e7297eaaf6fad26.zip | |
(double_dollars): Remove dead code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 14 | ||||
| -rw-r--r-- | src/fileio.c | 37 |
2 files changed, 9 insertions, 42 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7cdd8cc69ca..afc440673c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-05-12 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * fileio.c (double_dollars): Remove dead code. | ||
| 4 | |||
| 1 | 2008-05-10 Eli Zaretskii <eliz@gnu.org> | 5 | 2008-05-10 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * dired.c (Ffile_attributes, Fdirectory_files_and_attributes): | 7 | * dired.c (Ffile_attributes, Fdirectory_files_and_attributes): |
| @@ -19,7 +23,7 @@ | |||
| 19 | 23 | ||
| 20 | * w32.c: Rename the_passwd_* to dflt_passwd_*. | 24 | * w32.c: Rename the_passwd_* to dflt_passwd_*. |
| 21 | (dflt_group_name): New static variable. | 25 | (dflt_group_name): New static variable. |
| 22 | (dflt_group): Renamed from the_group. | 26 | (dflt_group): Rename from the_group. |
| 23 | (init_user_info): Init dflt_group fields. Get user's group name | 27 | (init_user_info): Init dflt_group fields. Get user's group name |
| 24 | from LookupAccountSid. | 28 | from LookupAccountSid. |
| 25 | (g_b_init_get_file_security, g_b_init_get_security_descriptor_owner) | 29 | (g_b_init_get_file_security, g_b_init_get_security_descriptor_owner) |
| @@ -37,8 +41,8 @@ | |||
| 37 | (get_file_owner_and_group): New functions. | 41 | (get_file_owner_and_group): New functions. |
| 38 | (stat): Use get_file_security_desc and get_file_owner_and_group to | 42 | (stat): Use get_file_security_desc and get_file_owner_and_group to |
| 39 | report the owner and primary group of each file. Don't ignore the | 43 | report the owner and primary group of each file. Don't ignore the |
| 40 | high 32 bits of file's size, now that st_size is 64-bit wide. Fix | 44 | high 32 bits of file's size, now that st_size is 64-bit wide. |
| 41 | test when to get true file attributes. | 45 | Fix test when to get true file attributes. |
| 42 | (init_user_info): Use get_rid instead of equivalent inline code. | 46 | (init_user_info): Use get_rid instead of equivalent inline code. |
| 43 | (fstat): Don't ignore the high 32 bits of file's size. | 47 | (fstat): Don't ignore the high 32 bits of file's size. |
| 44 | 48 | ||
| @@ -146,8 +150,8 @@ | |||
| 146 | 2008-05-02 Juri Linkov <juri@jurta.org> | 150 | 2008-05-02 Juri Linkov <juri@jurta.org> |
| 147 | 151 | ||
| 148 | * minibuf.c (Fread_from_minibuffer, Fread_string, Fread_command) | 152 | * minibuf.c (Fread_from_minibuffer, Fread_string, Fread_command) |
| 149 | (Fread_variable, Fread_buffer, Fcompleting_read): Document | 153 | (Fread_variable, Fread_buffer, Fcompleting_read): Document the |
| 150 | the DEFAULT argument as a list of default values in docstrings. | 154 | DEFAULT argument as a list of default values in docstrings. |
| 151 | 155 | ||
| 152 | 2008-05-01 Chong Yidong <cyd@stupidchicken.com> | 156 | 2008-05-01 Chong Yidong <cyd@stupidchicken.com> |
| 153 | 157 | ||
diff --git a/src/fileio.c b/src/fileio.c index 20e1cd551af..e86932f491c 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -6088,43 +6088,6 @@ then any auto-save counts as "recent". */) | |||
| 6088 | } | 6088 | } |
| 6089 | 6089 | ||
| 6090 | /* Reading and completing file names */ | 6090 | /* Reading and completing file names */ |
| 6091 | extern Lisp_Object Ffile_name_completion (), Ffile_name_all_completions (); | ||
| 6092 | extern Lisp_Object Qcompletion_ignore_case; | ||
| 6093 | |||
| 6094 | /* In the string VAL, change each $ to $$ and return the result. */ | ||
| 6095 | |||
| 6096 | static Lisp_Object | ||
| 6097 | double_dollars (val) | ||
| 6098 | Lisp_Object val; | ||
| 6099 | { | ||
| 6100 | register const unsigned char *old; | ||
| 6101 | register unsigned char *new; | ||
| 6102 | register int n; | ||
| 6103 | int osize, count; | ||
| 6104 | |||
| 6105 | osize = SBYTES (val); | ||
| 6106 | |||
| 6107 | /* Count the number of $ characters. */ | ||
| 6108 | for (n = osize, count = 0, old = SDATA (val); n > 0; n--) | ||
| 6109 | if (*old++ == '$') count++; | ||
| 6110 | if (count > 0) | ||
| 6111 | { | ||
| 6112 | old = SDATA (val); | ||
| 6113 | val = make_uninit_multibyte_string (SCHARS (val) + count, | ||
| 6114 | osize + count); | ||
| 6115 | new = SDATA (val); | ||
| 6116 | for (n = osize; n > 0; n--) | ||
| 6117 | if (*old != '$') | ||
| 6118 | *new++ = *old++; | ||
| 6119 | else | ||
| 6120 | { | ||
| 6121 | *new++ = '$'; | ||
| 6122 | *new++ = '$'; | ||
| 6123 | old++; | ||
| 6124 | } | ||
| 6125 | } | ||
| 6126 | return val; | ||
| 6127 | } | ||
| 6128 | 6091 | ||
| 6129 | DEFUN ("next-read-file-uses-dialog-p", Fnext_read_file_uses_dialog_p, | 6092 | DEFUN ("next-read-file-uses-dialog-p", Fnext_read_file_uses_dialog_p, |
| 6130 | Snext_read_file_uses_dialog_p, 0, 0, 0, | 6093 | Snext_read_file_uses_dialog_p, 0, 0, 0, |