From 97fbb9f239e16f66d978d6a126cff3b46eb3c36b Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Mon, 6 Nov 2006 14:04:21 +0000 Subject: [PATCH] Merged from mwolson@gnu.org--2006-muse-el/muse-el--devel--0 (patch 106-115) Patches applied: * mwolson@gnu.org--2006-muse-el/muse-el--devel--0--patch-114 Remove C-c C-c binding for muse-follow-name-at-point, since no one objected in the last 1.5 months. * mwolson@gnu.org--2006-muse-el/muse-el--devel--0--patch-115 Remove C-c C-c binding from manual. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-243 --- ChangeLog | 6 ++++++ lisp/muse-mode.el | 1 - muse.texi | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7c1058..85af9c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,12 @@ * lisp/muse-project.el (muse-project-find-file): Fix bug when following a relative link worked even when the path was incorrect. +2006-11-04 John Sullivan + + * lisp/muse-mode.el (muse-mode-map): Remove C-c C-c binding for + muse-follow-name-at-point to reduce collisions with other + modes (Planner). + 2006-11-04 Michael Olson * lisp/muse-wiki.el (muse-wiki-update-interwiki-regexp): Make page diff --git a/lisp/muse-mode.el b/lisp/muse-mode.el index 5228bd0..da59452 100644 --- a/lisp/muse-mode.el +++ b/lisp/muse-mode.el @@ -144,7 +144,6 @@ index at intervals." (defvar muse-mode-map (let ((map (make-sparse-keymap))) (define-key map [(control ?c) (control ?a)] 'muse-index) - (define-key map [(control ?c) (control ?c)] 'muse-follow-name-at-point) (define-key map [(control ?c) (control ?e)] 'muse-edit-link-at-point) (define-key map [(control ?c) (control ?l)] 'font-lock-mode) (define-key map [(control ?c) (control ?t)] diff --git a/muse.texi b/muse.texi index 07dc8e8..c0fa09d 100644 --- a/muse.texi +++ b/muse.texi @@ -425,9 +425,6 @@ Display an index of all known Muse pages. @item C-c C-b (`muse-find-backlinks') Find all pages that link to this page. -@item C-c C-c (`muse-follow-name-at-point') -Visit the link at point. - @item C-c C-e (`muse-edit-link-at-point') Edit link at point. -- 2.11.4.GIT