diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-06-06 03:59:03 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-06-06 03:59:03 +0200 |
| commit | a1ee7a099365f583e4a82b4dab4bfb04dc374168 (patch) | |
| tree | a565d6f9e8766ede755eea3505760ab58f0c66fd /elisp | |
| parent | 57868869d80cd388f2cb7588e563034dedb0932a (diff) | |
| download | geiser-a1ee7a099365f583e4a82b4dab4bfb04dc374168.tar.gz geiser-a1ee7a099365f583e4a82b4dab4bfb04dc374168.tar.bz2 | |
Conflicts between view-mode and geiser-doc-mode keymaps removed.
Diffstat (limited to 'elisp')
| -rw-r--r-- | elisp/geiser-doc.el | 13 | ||||
| -rw-r--r-- | elisp/geiser-popup.el | 7 |
2 files changed, 9 insertions, 11 deletions
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) |