From 50ea0f87d6e13642ae3851e3516a5e716a39584b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 5 Apr 2014 11:33:55 -0700 Subject: [PATCH] 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. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/trouble.texi | 4 +++- doc/lispref/ChangeLog | 4 ++++ doc/lispref/os.texi | 13 ++----------- lisp/ChangeLog | 4 ++++ lisp/help.el | 5 ++--- src/ChangeLog | 16 +++++++++------- src/keyboard.c | 8 +++++--- 8 files changed, 33 insertions(+), 25 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index c0581424833..56daee10101 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2014-04-05 Glenn Morris + + * trouble.texi (Checklist): Dribble files may contain passwords. + 2014-04-04 Glenn Morris * files.texi (Backup Names): diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index e7bff6c28a4..52e5b9c4045 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -759,7 +759,9 @@ customizations. One way to record the input to Emacs precisely is to write a dribble file. To start the file, use the @kbd{M-x open-dribble-file @key{RET}} command. From then on, Emacs copies all your input to the -specified dribble file until the Emacs process is killed. +specified dribble file until the Emacs process is killed. Be aware +that sensitive information (such as passwords) may end up recorded in +the dribble file. @item @findex open-termscript diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 1fb664893f8..b31398fffc4 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2014-04-05 Glenn Morris + + * os.texi (Recording Input): Dribble files may contain passwords. + 2014-04-04 Glenn Morris * backups.texi (Making Backups, Reverting): diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index df30ac12e2e..c80dfda096c 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1991,20 +1991,11 @@ This function opens a @dfn{dribble file} named @var{filename}. When a dribble file is open, each input event from the keyboard or mouse (but not those from keyboard macros) is written in that file. A non-character event is expressed using its printed representation -surrounded by @samp{<@dots{}>}. +surrounded by @samp{<@dots{}>}. Be aware that sensitive information +(such as passwords) may end up recorded in the dribble file. You close the dribble file by calling this function with an argument of @code{nil}. - -This function is normally used to record the input necessary to -trigger an Emacs bug, for the sake of a bug report. - -@example -@group -(open-dribble-file "~/dribble") - @result{} nil -@end group -@end example @end deffn See also the @code{open-termscript} function (@pxref{Terminal Output}). diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 71f3749a19c..2084cbbb7b6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-04-05 Glenn Morris + + * help.el (view-lossage): Doc tweak. + 2014-04-05 Matthias Dahl * faces.el (face-spec-recalc): Call make-face-x-resource-internal diff --git a/lisp/help.el b/lisp/help.el index 14dda6456cf..fdbf91f7dbd 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1,7 +1,6 @@ ;;; help.el --- help commands for Emacs -;; Copyright (C) 1985-1986, 1993-1994, 1998-2014 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985-1986, 1993-1994, 1998-2014 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: help, internal @@ -450,7 +449,7 @@ is specified by the variable `message-log-max'." (defun view-lossage () "Display last 300 input keystrokes. -To record all your input on a file, use `open-dribble-file'." +To record all your input, use `open-dribble-file'." (interactive) (help-setup-xref (list #'view-lossage) (called-interactively-p 'interactive)) diff --git a/src/ChangeLog b/src/ChangeLog index c370bdc0404..9b084701933 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,15 +1,17 @@ +2014-04-05 Glenn Morris + + * keyboard.c (Fopen_dribble_file): Doc tweak. + 2014-04-04 Jan Djärv Backport from trunk. * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool - bar is zero height, just return (Bug#16976). - (initFrameFromEmacs:): Initialize wait_for_tool_bar. - - * nsterm.h (EmacsView): Add wait_for_tool_bar. - - * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar + bar is zero height, just return (Bug#16976). + (initFrameFromEmacs:): Initialize wait_for_tool_bar. + * nsterm.h (EmacsView): Add wait_for_tool_bar. + * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar is nil. If waiting for toolbar to complete, force a redraw. - (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976) + (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976). 2014-04-03 Ken Brown 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 @@ /* 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. @@ -10071,7 +10070,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) -- 2.39.2