summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-05-01 09:20:05 -0700
committerGlenn Morris <rgm@gnu.org>2019-05-01 09:20:05 -0700
commit0ae7b2b88f5356480ba6f2082d76c55ad88dfb55 (patch)
tree41644674cfa98d1bfff4dd4e59c660a9ab6f595a /lisp
parent3e322df06003e64a491bca47fd14f652374ac3a4 (diff)
downloademacs-0ae7b2b88f5356480ba6f2082d76c55ad88dfb55.tar.gz
; Auto-commit of loaddefs files.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ldefs-boot.el24
1 files changed, 18 insertions, 6 deletions
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 3903463c8a1..405fe362f15 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -1819,7 +1819,7 @@ If `global-auto-revert-non-file-buffers' is non-nil, this mode
may also revert some non-file buffers, as described in the
documentation of that variable. It ignores buffers with modes
matching `global-auto-revert-ignore-modes', and buffers with a
-non-nil vale of `global-auto-revert-ignore-buffer'.
+non-nil value of `global-auto-revert-ignore-buffer'.
When a buffer is reverted, a message is generated. This can be
suppressed by setting `auto-revert-verbose' to nil.
@@ -18025,8 +18025,9 @@ Return a regular expression matching image-file filenames.
(autoload 'insert-image-file "image-file" "\
Insert the image file FILE into the current buffer.
-Optional arguments VISIT, BEG, END, and REPLACE are interpreted as for
-the command `insert-file-contents'.
+Optional arguments VISIT, BEG, END, and REPLACE are interpreted
+as for the command `insert-file-contents'. Return list of
+absolute file name and number of characters inserted.
\(fn FILE &optional VISIT BEG END REPLACE)" nil nil)
@@ -36011,7 +36012,12 @@ first backend that could register the file is used.
\(fn &optional VC-FILESET COMMENT)" t nil)
(autoload 'vc-version-diff "vc" "\
-Report diffs between revisions of the fileset in the repository history.
+Report diffs between revisions REV1 and REV2 in the repository history.
+This compares two revisions of the current fileset.
+If REV1 is nil, it defaults to the current revision, i.e. revision
+of the last commit.
+If REV2 is nil, it defaults to the work tree, i.e. the current
+state of each file in the fileset.
\(fn FILES REV1 REV2)" t nil)
@@ -36027,8 +36033,14 @@ saving the buffer.
\(fn &optional HISTORIC NOT-URGENT)" t nil)
(autoload 'vc-version-ediff "vc" "\
-Show differences between revisions of the fileset in the
-repository history using ediff.
+Show differences between REV1 and REV2 of FILES using ediff.
+This compares two revisions of the files in FILES. Currently,
+only a single file's revisions can be compared, i.e. FILES can
+specify only one file name.
+If REV1 is nil, it defaults to the current revision, i.e. revision
+of the last commit.
+If REV2 is nil, it defaults to the work tree, i.e. the current
+state of each file in FILES.
\(fn FILES REV1 REV2)" t nil)