* doc/emacs/ack.texi (Acknowledgments): Update emacs-lock info.

* etc/NEWS: Related edits.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 160a040..383784a 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
 2012-02-08  Glenn Morris  <rgm@gnu.org>
 
+       * ack.texi (Acknowledgments): Update emacs-lock info.
+
        * rmail.texi (Rmail Display): Mention rmail-epa-decrypt.
 
        * text.texi (LaTeX Editing): Mention latex-electric-env-pair-mode.

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 184f827..f32227d 100644 (file)
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1341,8 +1341,10 @@ Francis J.@: Wright wrote @file{woman.el}, a package for browsing
 manual pages without the @code{man} command.
 
 @item
-Tom Wurgler wrote @file{emacs-lock.el}, which makes it harder
-to exit with valuable buffers unsaved.
+Juanma Barranquero wrote @file{emacs-lock.el} (based on the original
+version by Tom Wurgler), which makes it harder to exit with valuable
+buffers unsaved.  He also made many other contributions to other
+areas, including MS Windows support.
 
 @item
 Masatake Yamato wrote @file{ld-script.el}, an editing mode for GNU

diff --git a/etc/NEWS b/etc/NEWS
index 4d67a0f..d99ec7b 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -970,12 +970,13 @@ soap-inspect.el is an interactive inspector for SOAP WSDL structures.
 ---
 ** New generic mode, xmodmap-generic-mode, for xmodmap files.
 
+---
 ** New emacs-lock.el package.
-(The pre-existing one has been renamed to old-emacs-lock.el and moved
-to obsolete/.)  Now, Emacs Lock is a proper minor mode
-`emacs-lock-mode'.  Protection against exiting Emacs and killing the
-buffer can be set separately.  The mechanism for auto turning off
-protection for buffers with inferior processes has been generalized.
+(The previous version has been moved to obsolete/old-emacs-lock.el.)
+Now, there is a proper minor mode `emacs-lock-mode'.
+Protection against exiting Emacs and killing the buffer can be set
+separately.  The mechanism for automatically turning off protection
+for buffers with dead inferior processes has been generalized.
 
 \f
 * Incompatible Lisp Changes in Emacs 24.1