aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2013-08-14 12:56:43 +0200
committerJoakim Verona2013-08-14 12:56:43 +0200
commit0c405d30ab1e3464cf3e03547db939fad0a765d0 (patch)
tree7d92d491129e2a7c8780f10f627797bdb8cc8c97
parent2d22a50de5de4dd7a952cb0ae7e7db7ee82a8a7d (diff)
parent5faf4899f09ea5a34b5a46cce132047a06de97d4 (diff)
downloademacs-0c405d30ab1e3464cf3e03547db939fad0a765d0.tar.gz
emacs-0c405d30ab1e3464cf3e03547db939fad0a765d0.zip
merge from trunk
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/files.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2b75a242656..f7e607f03cf 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12013-08-14 Xue Fuqiao <xfq.free@gmail.com>
2
3 * files.texi (Filesets): Add an index.
4
12013-08-12 Glenn Morris <rgm@gnu.org> 52013-08-12 Glenn Morris <rgm@gnu.org>
2 6
3 * macos.texi (GNUstep Support): 7 * macos.texi (GNUstep Support):
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 7daeca3bf38..bff0926f347 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1982,6 +1982,7 @@ thumbnails. @xref{Image-Dired}.
1982@node Filesets 1982@node Filesets
1983@section Filesets 1983@section Filesets
1984@cindex filesets 1984@cindex filesets
1985@cindex sets of files
1985 1986
1986@findex filesets-init 1987@findex filesets-init
1987 If you regularly edit a certain group of files, you can define them 1988 If you regularly edit a certain group of files, you can define them