summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-02-18 19:53:35 -0800
committerGlenn Morris <rgm@gnu.org>2011-02-18 19:53:35 -0800
commit30abce25f2c78c46994f22d60295c40578097b76 (patch)
tree456b892ad3e7e1d5ddfbfaa36f1c09f0edde8f4c /doc
parent4d737eb2db5f2847106fa18713381a72895217e5 (diff)
downloademacs-30abce25f2c78c46994f22d60295c40578097b76.tar.gz
Merge dired-x's dired-add-entry modifications into the main definition.
* lisp/dired-aux.el (dired-add-entry): Give it a doc-string. Merge dired-x's dired-omit handling here. (dired-omit-mode, dired-omit-regexp, dired-omit-localp): Declare. * lisp/dired-x.el (dired-omit-new-add-entry): Merge into dired-add-entry. * doc/misc/dired-x.texi (Technical Details): No longer redefines dired-add-entry.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/dired-x.texi11
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b0d006ce14b..c11618649da 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-19 Glenn Morris <rgm@gnu.org>
+
+ * dired-x.texi (Technical Details): No longer redefines dired-add-entry.
+
2011-02-18 Glenn Morris <rgm@gnu.org>
* dired-x.texi (Optional Installation File At Point): Simplify.
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index eff8e4600bd..931af07be4e 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -190,14 +190,9 @@ from @file{dired.el}
@end itemize
@noindent
-and the following functions from @file{dired-aux.el}
-
-@itemize @bullet
-@item
-@code{dired-add-entry}
-@item
-@code{dired-read-shell-command}
-@end itemize
+and from @file{dired-aux.el} the function @code{dired-read-shell-command}.
+In addition, once @file{dired.el} is loaded, @code{dired-add-entry}
+obeys Dired Omit mode (@pxref{Omitting Files in Dired}), if it is active.
@node Installation, Omitting Files in Dired, Introduction, Top
@chapter Installation