diff options
| author | K. Handa <handa@gnu.org> | 2015-09-27 17:06:12 +0900 |
|---|---|---|
| committer | K. Handa <handa@gnu.org> | 2015-09-27 17:06:12 +0900 |
| commit | 52beda922d2cb523a03661bf74b8678c8b45e440 (patch) | |
| tree | 04617b37298746a61d5324a5b35c9b71f439d762 /lisp/vcursor.el | |
| parent | 94ed5167557112fb00eeca05e62589db744206de (diff) | |
| parent | 1ac5a9c20cb22efb398fa18781c6b932dd4e54df (diff) | |
| download | emacs-52beda922d2cb523a03661bf74b8678c8b45e440.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/vcursor.el')
| -rw-r--r-- | lisp/vcursor.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vcursor.el b/lisp/vcursor.el index 440a2786551..7e503269a8a 100644 --- a/lisp/vcursor.el +++ b/lisp/vcursor.el @@ -573,11 +573,11 @@ With optional NOT-THIS non-nil never return the current window. With NEW-WIN non-nil, display the virtual cursor buffer in another window if the virtual cursor is not currently visible \(note, however, -that this function never changes `window-point'\). +that this function never changes `window-point'). With THIS-FRAME non-nil, don't search other frames for a new window \(though if the vcursor is already off-frame then its current window is -always considered, and the value of `pop-up-frames' is always respected\). +always considered, and the value of `pop-up-frames' is always respected). Returns nil if the virtual cursor is not visible anywhere suitable. Set `vcursor-window' to the returned value as a side effect." |