Revert recent bookmark keybinding changes, thus returning to using

three slots under C-x r.  See this message and its thread for details:
http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00705.html.

* lisp/bookmark.el: Revert 2007-07-13T18:16:17Z!kfogel@red-bean.com.

* etc/NEWS: Revert 2007-07-13T23:20:21Z!kfogel@red-bean.com, which
  documented bookmark keybinding changes that were later reverted.

* man/ChangeLog: Remove ChangeLog entry for accidentally uncommitted
  changes to regs.texi that would have documented the keybinding
  change reverted above.

5 files changed, 15 insertions, 11 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index be966266ee0..3b459fc952b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-15  Karl Fogel  <kfogel@red-bean.com>
+
+        * NEWS: Revert 2007-07-13T23:20:21Z!kfogel@red-bean.com, which
+        documented bookmark keybinding changes that were later reverted.
+
 2007-07-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * PROBLEMS: Mention gtk-engines-qt problem.
diff --git a/etc/NEWS b/etc/NEWS
index 9f46b982483..6b21ba4eb1a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -57,9 +57,6 @@ recenter the visited source file.  Its value can be a number (for example,
 
 ** New command kill-matching-buffers kills buffers whose name matches a regexp.
 
-** Bookmark commands live under prefix C-x p now, instead of C-x r.  Some of
-   the individual bindings have changed; do C-x p C-h for details.
-
 
 * New Modes and Packages in Emacs 23.1
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e206d111f4..526d7d021e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-15  Karl Fogel  <kfogel@red-bean.com>
+
+        * bookmark.el: Revert 2007-07-13T18:16:17Z!kfogel@red-bean.com,
+        thus restoring bookmark bindings to three slots under C-x r.  See
+        http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00705.html.
+
 2007-07-15  Jeff Miller  <jmiller@cablespeed.com>  (tiny change)
 
         * calendar/cal-bahai.el (calendar-goto-bahai-date): Add autoload
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 6ef2ea198d3..75c4826ae0b 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -224,6 +224,10 @@ following in your `.emacs' file:
 ;; Set up these bindings dumping time *only*;
 ;; if the user alters them, don't override the user when loading bookmark.el.
 
+;;;###autoload (define-key ctl-x-map "rb" 'bookmark-jump)
+;;;###autoload (define-key ctl-x-map "rm" 'bookmark-set)
+;;;###autoload (define-key ctl-x-map "rl" 'bookmark-bmenu-list)
+
 ;;;###autoload
 (defvar bookmark-map nil
   "Keymap containing bindings to bookmark functions.
@@ -234,8 +238,6 @@ functions have a binding in this keymap.")
 
 ;;;###autoload (define-prefix-command 'bookmark-map)
 
-;;;###autoload (define-key ctl-x-map "p" bookmark-map)
-
 ;; Read the help on all of these functions for details...
 ;;;###autoload (define-key bookmark-map "x" 'bookmark-set)
 ;;;###autoload (define-key bookmark-map "m" 'bookmark-set) ;"m"ark
diff --git a/man/ChangeLog b/man/ChangeLog
index 8afb01ed216..ad39b9fce15 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,9 +1,3 @@
-2007-07-13  Karl Fogel  <kfogel@red-bean.com>
-
-        * regs.texi (Bookmarks): Adjust for recent keybinding changes in
-        bookmark.el, namely 2007-07-13T18:16:17Z!kfogel@red-bean.com and
-        2007-07-13T18:20:55Z!kfogel@red-bean.com.
-
 2007-07-13  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (../info/emacs-mime): Use --enable-encoding.