aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2014-04-05 11:33:55 -0700
committerGlenn Morris2014-04-05 11:33:55 -0700
commit50ea0f87d6e13642ae3851e3516a5e716a39584b (patch)
tree3a7404ac5d13b30ff3b85480b81e4e50b2cd6e22 /src
parentf5e4494cd06f7624382f815585419f489bfe36c3 (diff)
downloademacs-50ea0f87d6e13642ae3851e3516a5e716a39584b.tar.gz
emacs-50ea0f87d6e13642ae3851e3516a5e716a39584b.zip
Minor doc updates related to dribble files
* doc/emacs/trouble.texi (Checklist): * doc/lispref/os.texi (Recording Input): Dribble files may contain passwords. * lisp/help.el (view-lossage): Doc tweak. * src/keyboard.c (Fopen_dribble_file): Doc tweak.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog16
-rw-r--r--src/keyboard.c8
2 files changed, 14 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c370bdc0404..9b084701933 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,15 +1,17 @@
12014-04-05 Glenn Morris <rgm@gnu.org>
2
3 * keyboard.c (Fopen_dribble_file): Doc tweak.
4
12014-04-04 Jan Djärv <jan.h.d@swipnet.se> 52014-04-04 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 Backport from trunk. 7 Backport from trunk.
4 * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool 8 * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool
5 bar is zero height, just return (Bug#16976). 9 bar is zero height, just return (Bug#16976).
6 (initFrameFromEmacs:): Initialize wait_for_tool_bar. 10 (initFrameFromEmacs:): Initialize wait_for_tool_bar.
7 11 * nsterm.h (EmacsView): Add wait_for_tool_bar.
8 * nsterm.h (EmacsView): Add wait_for_tool_bar. 12 * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar
9
10 * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar
11 is nil. If waiting for toolbar to complete, force a redraw. 13 is nil. If waiting for toolbar to complete, force a redraw.
12 (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976) 14 (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976).
13 15
142014-04-03 Ken Brown <kbrown@cornell.edu> 162014-04-03 Ken Brown <kbrown@cornell.edu>
15 17
diff --git a/src/keyboard.c b/src/keyboard.c
index 20e75822fd3..3b50140684e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1,7 +1,6 @@
1/* Keyboard and mouse input; editor command loop. 1/* Keyboard and mouse input; editor command loop.
2 2
3Copyright (C) 1985-1989, 1993-1997, 1999-2014 Free Software Foundation, 3Copyright (C) 1985-1989, 1993-1997, 1999-2014 Free Software Foundation, Inc.
4Inc.
5 4
6This file is part of GNU Emacs. 5This file is part of GNU Emacs.
7 6
@@ -10071,7 +10070,10 @@ DEFUN ("open-dribble-file", Fopen_dribble_file, Sopen_dribble_file, 1, 1,
10071 "FOpen dribble file: ", 10070 "FOpen dribble file: ",
10072 doc: /* Start writing all keyboard characters to a dribble file called FILE. 10071 doc: /* Start writing all keyboard characters to a dribble file called FILE.
10073If FILE is nil, close any open dribble file. 10072If FILE is nil, close any open dribble file.
10074The file will be closed when Emacs exits. */) 10073The file will be closed when Emacs exits.
10074
10075Be aware that this records ALL characters you type!
10076This may include sensitive information such as passwords. */)
10075 (Lisp_Object file) 10077 (Lisp_Object file)
10076{ 10078{
10077 if (dribble) 10079 if (dribble)