# HG changeset patch
# User Karl Fogel <kfogel@red-bean.com>
# Date 1184463255 0
# Node ID a7d43c06a61a3c79dd0e73bb06bd64eb71e343a7
# Parent  6dda9a9e467bd93e03656f16ed53dc25138d239d
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 revision 1.90 (commitid mWoPbju3pgNotDps).

* etc/NEWS: Revert revision 1.1509 (commitid xdXJjPiU1ZfI9Fps), 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.

diff -r 6dda9a9e467b -r a7d43c06a61a etc/ChangeLog
--- a/etc/ChangeLog	Sun Jul 15 01:14:34 2007 +0000
+++ b/etc/ChangeLog	Sun Jul 15 01:34:15 2007 +0000
@@ -1,3 +1,8 @@
+2007-07-15  Karl Fogel  <kfogel@red-bean.com>
+
+	* NEWS: Revert revision 1.1509 (commitid xdXJjPiU1ZfI9Fps), 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 -r 6dda9a9e467b -r a7d43c06a61a etc/NEWS
--- a/etc/NEWS	Sun Jul 15 01:14:34 2007 +0000
+++ b/etc/NEWS	Sun Jul 15 01:34:15 2007 +0000
@@ -57,9 +57,6 @@
 
 ** 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 -r 6dda9a9e467b -r a7d43c06a61a lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jul 15 01:14:34 2007 +0000
+++ b/lisp/ChangeLog	Sun Jul 15 01:34:15 2007 +0000
@@ -1,3 +1,9 @@
+2007-07-15  Karl Fogel  <kfogel@red-bean.com>
+
+	* bookmark.el: Revert revision 1.90 (commitid mWoPbju3pgNotDps),
+	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 -r 6dda9a9e467b -r a7d43c06a61a lisp/bookmark.el
--- a/lisp/bookmark.el	Sun Jul 15 01:14:34 2007 +0000
+++ b/lisp/bookmark.el	Sun Jul 15 01:34:15 2007 +0000
@@ -224,6 +224,10 @@
 ;; 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 @@
 
 ;;;###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 -r 6dda9a9e467b -r a7d43c06a61a man/ChangeLog
--- a/man/ChangeLog	Sun Jul 15 01:14:34 2007 +0000
+++ b/man/ChangeLog	Sun Jul 15 01:34:15 2007 +0000
@@ -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 revision 1.90 (commitid mWoPbju3pgNotDps) and
-	revision 1.92 (commitid iTjqYHP9NtkZuDps).
-
 2007-07-13  Eli Zaretskii  <eliz@gnu.org>
 
 	* Makefile.in (../info/emacs-mime): Use --enable-encoding.