diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc/log-view.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9ee16e10162..c1c7f74bf75 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-02-09 Glenn Morris <rgm@gnu.org> + * vc/log-view.el (log-view-toggle-entry-display): + * vc/vc.el (vc-merge, vc-pull): Doc fixes. + * mail/emacsbug.el (report-emacs-bug-can-use-osx-open) (report-emacs-bug-can-use-xdg-email): (report-emacs-bug-insert-to-mailer): Doc fixes. diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el index 849954f2cf8..7512c9283eb 100644 --- a/lisp/vc/log-view.el +++ b/lisp/vc/log-view.el @@ -376,6 +376,8 @@ log entries." marked-list))) (defun log-view-toggle-entry-display () + "If possible, expand the current Log View entry. +This calls `log-view-expanded-log-entry-function' to do the work." (interactive) ;; Don't do anything unless `log-view-expanded-log-entry-function' ;; is defined in this mode. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 19da4102872..e1141cb392d 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1889,6 +1889,7 @@ The headers are reset to their non-expanded form." ;;;###autoload (defun vc-merge () "Perform a version control merge operation. +You must be visiting a version controlled file, or in a `vc-dir' buffer. On a distributed version control system, this runs a \"merge\" operation to incorporate changes from another branch onto the current branch, prompting for an argument list. @@ -2366,6 +2367,7 @@ depending on the underlying version-control system." ;;;###autoload (defun vc-pull (&optional arg) "Update the current fileset or branch. +You must be visiting a version controlled file, or in a `vc-dir' buffer. On a distributed version control system, this runs a \"pull\" operation to update the current branch, prompting for an argument list if required. Optional prefix ARG forces a prompt. |