aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-12-25 10:18:43 +0800
committerXue Fuqiao2013-12-25 10:18:43 +0800
commit3a79600aa78d4d148c4c6b6a0a7a5ce625c582dc (patch)
treefbaf575af33aab9ea57e8e3848616c94bbf8e034
parent89c868adeef16e407569a3d607dd64ccadba17c7 (diff)
downloademacs-3a79600aa78d4d148c4c6b6a0a7a5ce625c582dc.tar.gz
emacs-3a79600aa78d4d148c4c6b6a0a7a5ce625c582dc.zip
Doc fixes (index and comment).
-rw-r--r--admin/admin.el3
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/files.texi1
3 files changed, 8 insertions, 0 deletions
diff --git a/admin/admin.el b/admin/admin.el
index baf18992953..5e5e57cb3ce 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -75,6 +75,9 @@ Root must be the root of an Emacs source tree."
75 (interactive "DEmacs root directory: \nsVersion number: ") 75 (interactive "DEmacs root directory: \nsVersion number: ")
76 (unless (file-exists-p (expand-file-name "src/emacs.c" root)) 76 (unless (file-exists-p (expand-file-name "src/emacs.c" root))
77 (user-error "%s doesn't seem to be the root of an Emacs source tree" root)) 77 (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
78 ;; There's also a "version 3" (standing for GPLv3) at the end of
79 ;; `README', but since `set-version-in-file' only replaces the first
80 ;; occurence, it won't be replaced.
78 (set-version-in-file root "README" version 81 (set-version-in-file root "README" version
79 (rx (and "version" (1+ space) 82 (rx (and "version" (1+ space)
80 (submatch (1+ (in "0-9.")))))) 83 (submatch (1+ (in "0-9."))))))
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 00a6c6a29a1..9b6868857e8 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12013-12-25 Xue Fuqiao <xfq.free@gmail.com>
2
3 * files.texi (Diff Mode): Add an index.
4
12013-12-24 Xue Fuqiao <xfq.free@gmail.com> 52013-12-24 Xue Fuqiao <xfq.free@gmail.com>
2 6
3 * trouble.texi (Understanding Bug Reporting): Minor update. 7 * trouble.texi (Understanding Bug Reporting): Minor update.
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index c28a30bf823..5564f9a23f3 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1419,6 +1419,7 @@ In a multi-file patch, kill the current file part.
1419 1419
1420@item C-c C-a 1420@item C-c C-a
1421@findex diff-apply-hunk 1421@findex diff-apply-hunk
1422@cindex patches, applying
1422Apply this hunk to its target file (@code{diff-apply-hunk}). With a 1423Apply this hunk to its target file (@code{diff-apply-hunk}). With a
1423prefix argument of @kbd{C-u}, revert this hunk. 1424prefix argument of @kbd{C-u}, revert this hunk.
1424 1425