diff options
| author | Daniel Colascione <dancol@dancol.org> | 2014-04-07 13:54:16 -0700 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2014-04-07 13:54:16 -0700 |
| commit | 7e31acf6b81fdce7258077645bc239767c484841 (patch) | |
| tree | 1f0d7b063a19b54982550797df063e0a9f87eaed /src/keyboard.c | |
| parent | 608a4502b9fa8f5681368657fba5d5fd0fa46817 (diff) | |
| parent | e3b838807bf9fbbbec9826de6c1e4efdf72acb78 (diff) | |
| download | emacs-7e31acf6b81fdce7258077645bc239767c484841.tar.gz | |
Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 277d4f1047c..87a2f91a17c 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1,7 +1,6 @@ /* Keyboard and mouse input; editor command loop. -Copyright (C) 1985-1989, 1993-1997, 1999-2014 Free Software Foundation, -Inc. +Copyright (C) 1985-1989, 1993-1997, 1999-2014 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2379,7 +2378,7 @@ read_decoded_event_from_main_queue (struct timespec *end_time, -2 means do neither. 1 means do both. */ -/* The arguments MAP is for menu prompting. MAP is a keymap. +/* The argument MAP is a keymap for menu prompting. PREV_EVENT is the previous input event, or nil if we are reading the first event of a key sequence (or not reading a key sequence). @@ -10068,7 +10067,10 @@ DEFUN ("open-dribble-file", Fopen_dribble_file, Sopen_dribble_file, 1, 1, "FOpen dribble file: ", doc: /* Start writing all keyboard characters to a dribble file called FILE. If FILE is nil, close any open dribble file. -The file will be closed when Emacs exits. */) +The file will be closed when Emacs exits. + +Be aware that this records ALL characters you type! +This may include sensitive information such as passwords. */) (Lisp_Object file) { if (dribble) |