diff options
| author | K. Handa | 2016-06-01 09:16:32 +0900 |
|---|---|---|
| committer | K. Handa | 2016-06-01 09:16:32 +0900 |
| commit | 8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6 (patch) | |
| tree | 98c0480e0765c4f2b3d24ff5a1617e64a9109d80 /src | |
| parent | 6d66089127313a1c5b5c5584eaf3e9edec010955 (diff) | |
| parent | 25cc0f2aada3e321e5f1c6d1e492a93d16da45b2 (diff) | |
| download | emacs-8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6.tar.gz emacs-8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src')
| -rw-r--r-- | src/dired.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/dired.c b/src/dired.c index 2dffbb756ac..e468147e8b2 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -416,8 +416,7 @@ DEFUN ("file-name-all-completions", Ffile_name_all_completions, | |||
| 416 | These are all file names in directory DIRECTORY which begin with FILE. | 416 | These are all file names in directory DIRECTORY which begin with FILE. |
| 417 | 417 | ||
| 418 | This function ignores some of the possible completions as determined | 418 | This function ignores some of the possible completions as determined |
| 419 | by the variables `completion-regexp-list' and | 419 | by `completion-regexp-list', which see. `completion-regexp-list' |
| 420 | `completion-ignored-extensions', which see. `completion-regexp-list' | ||
| 421 | is matched against file and directory names relative to DIRECTORY. */) | 420 | is matched against file and directory names relative to DIRECTORY. */) |
| 422 | (Lisp_Object file, Lisp_Object directory) | 421 | (Lisp_Object file, Lisp_Object directory) |
| 423 | { | 422 | { |