From a1ee7a099365f583e4a82b4dab4bfb04dc374168 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Sun, 6 Jun 2010 03:59:03 +0200
Subject: Conflicts between view-mode and geiser-doc-mode keymaps removed.

---
 README                | 10 +++++-----
 elisp/geiser-doc.el   | 13 +++++--------
 elisp/geiser-popup.el |  7 ++++---
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/README b/README
index c422806..89c33ee 100644
--- a/README
+++ b/README
@@ -150,13 +150,13 @@
 *** In the documentation browser:
 
     |-----------+----------------------------------------------|
-    | n/p       | next/previous page                           |
-    | l         | previous page                                |
+    | C-c C-f   | next page                                    |
+    | C-c C-b   | previous page                                |
     | SPC/S-SPC | scroll up/down                               |
     | TAB/S-TAB | next/previous link                           |
-    | k         | kill current page and go to previous or next |
-    | r         | refresh page                                 |
-    | c         | clean browsing history                       |
+    | C-c C-k   | kill current page and go to previous or next |
+    | C-c C-r   | refresh page                                 |
+    | C-c C-c   | clean browsing history                       |
     | M-.       | edit identifier at point                     |
     | C-cz      | switch to REPL                               |
     | q         | bury buffer                                  |
diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index a329755..866d65b 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -279,14 +279,11 @@ With prefix, the current page is deleted from history."
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
     (set-keymap-parent map button-buffer-map)
-    (define-key map "a" 'geiser-apropos)
-    (define-key map "c" 'geiser-doc-clean-history)
-    (define-key map "k" 'geiser-doc-kill-page)
-    (define-key map "n" 'geiser-doc-next)
-    (define-key map "l" 'geiser-doc-previous)
-    (define-key map "p" 'geiser-doc-previous)
-    (define-key map "r" 'geiser-doc-refresh)
-    (define-key map (kbd "SPC")  'scroll-up)
+    (define-key map "\C-c\C-c" 'geiser-doc-clean-history)
+    (define-key map "\C-c\C-k" 'geiser-doc-kill-page)
+    (define-key map "\C-c\C-f" 'geiser-doc-next)
+    (define-key map "\C-c\C-b" 'geiser-doc-previous)
+    (define-key map "\C-c\C-r" 'geiser-doc-refresh)
     (define-key map (kbd "S-SPC") 'scroll-down)
     (define-key map "\M-." 'geiser-doc-edit-symbol-at-point)
     (define-key map "\C-cz" 'run-geiser)
diff --git a/elisp/geiser-popup.el b/elisp/geiser-popup.el
index 2f78763..ea3fc5f 100644
--- a/elisp/geiser-popup.el
+++ b/elisp/geiser-popup.el
@@ -30,9 +30,10 @@
              (current-buffer))))
      (defun ,pop-buff (&optional ,method)
        (let ((,buffer (,get-buff)))
-         (cond ((eq ,method 'buffer) (view-buffer ,buffer))
-               ((eq ,method 'frame) (view-buffer-other-frame ,buffer))
-               (t (view-buffer-other-window ,buffer)))))
+         (unless (eq ,buffer (current-buffer))
+           (cond ((eq ,method 'buffer) (view-buffer ,buffer))
+                 ((eq ,method 'frame) (view-buffer-other-frame ,buffer))
+                 (t (view-buffer-other-window ,buffer))))))
      (defmacro ,with-macro (&rest body)
        (let ((buff ',get-buff))
          `(with-current-buffer (funcall ',buff)
-- 
cgit v1.2.3