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.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index be966266ee0793f84aae1369b001d8835fb776a5..3b459fc952b0e8dc666f1cba0c1f7b73672eaff0 100644 (file)
--- 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\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * PROBLEMS: Mention gtk-engines-qt problem.

diff --git a/etc/NEWS b/etc/NEWS
index 9f46b98248313b4da69a045e90b081848d3fbec1..6b21ba4eb1a71db9ec3bb015db123f0323b7390a 100644 (file)
--- 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.
-
 \f
 * New Modes and Packages in Emacs 23.1
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e206d111f4529861831195bf51cef5d138e8698..526d7d021e8bf58e6ea6a5fc321e96f9ce6a3cc3 100644 (file)
--- 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 6ef2ea198d3ff230b3b8957730dca3ccb3ab5206..75c4826ae0b31fba54c5f04787d5b9244447cba4 100644 (file)
--- 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 8afb01ed216176da0ded306412e02c115c064fd9..ad39b9fce152621a9c5fe36be39c4b89246adea0 100644 (file)
--- 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.