summaryrefslogtreecommitdiff
path: root/src/dired.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-05-31 08:07:41 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-05-31 08:07:41 -0700
commit25cc0f2aada3e321e5f1c6d1e492a93d16da45b2 (patch)
tree05309a9d1d74813cf25073015ef7aaf36d7a36bf /src/dired.c
parent4efef3db2fb1c3a20b83a67948e614d9b0c258dd (diff)
parent788c9b69e1801dd883dbe603281571ef3c78a724 (diff)
downloademacs-25cc0f2aada3e321e5f1c6d1e492a93d16da45b2.tar.gz
emacs-25cc0f2aada3e321e5f1c6d1e492a93d16da45b2.tar.bz2
emacs-25cc0f2aada3e321e5f1c6d1e492a93d16da45b2.zip
Merge from origin/emacs-25
788c9b6 ; Spelling fix 25c4a30 * lisp/recentf.el (recentf-dialog-mode-map): Remove follow-li... 0992ec3 Correct cl-flet usage (Bug#22317) 50caae3 Release MH-E manual version 8.6 602bb40 Update MH-E's documentation about HTML renderers 89018f0 Fx the we->the typo 845ee57 Restore frames into the current display by default ee28b4c * lisp/recentf.el (recentf-open-files-item): Quick fix for (b... 01c3cd1 etc/TODO: Remove out-of-place issue 5e18486 Clarify doc string of 'file-name-sans-extension' bffda22 Fix the MSDOS build f907f98 * lisp/progmodes/elisp-mode.el (elisp-function-argstring): Ca... 1a2ffd0 * src/dired.c (Ffile_name_all_completions): Doc fix. (Bug#23... f7ffc4b Fix infloop in 'number-sequence' 4ab2673 ; Spelling and punctuation fixes in comments 71c152e * lisp/emacs-lisp/find-func.el (find-function-library):
Diffstat (limited to 'src/dired.c')
-rw-r--r--src/dired.c3
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,
These are all file names in directory DIRECTORY which begin with FILE.
This function ignores some of the possible completions as determined
-by the variables `completion-regexp-list' and
-`completion-ignored-extensions', which see. `completion-regexp-list'
+by `completion-regexp-list', which see. `completion-regexp-list'
is matched against file and directory names relative to DIRECTORY. */)
(Lisp_Object file, Lisp_Object directory)
{