From 5e7a93b46cfce51cbafb542980d9be968c70243a Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Fri, 15 Jun 2007 18:48:06 +0000 Subject: [PATCH] Make C-c C-i do the same thing as C-c TAB * lisp/muse-colors.el (muse-colors-toggle-inline-images): Docfix. Remove C-c C-i keybinding, since it conflicts with C-c TAB in the terminal, and C-c TAB is more important. Most people will not want to toggle images on and off that often. * lisp/muse-mode.el (muse-mode-map): Bind muse-insert-thing to C-c C-i as well, so that it works in the terminal. * texi/muse.texi: (Keystroke Summary): Remove C-c C-i (`muse-insert-tag') documentation, and mention C-c C-i as an alternative keybinding to the C-c TAB stuff. Mention muse-colors-toggle-inline-images. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-358 --- ChangeLog | 13 +++++++++++++ lisp/muse-colors.el | 5 +---- lisp/muse-mode.el | 1 + texi/muse.texi | 23 ++++++++++++----------- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30ca6ef..e26d400 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-06-15 Michael Olson + * lisp/muse-colors.el (muse-colors-toggle-inline-images): Docfix. + Remove C-c C-i keybinding, since it conflicts with C-c TAB in the + terminal, and C-c TAB is more important. Most people will not + want to toggle images on and off that often. + + * lisp/muse-mode.el (muse-mode-map): Bind muse-insert-thing to C-c + C-i as well, so that it works in the terminal. + * lisp/muse-regexps.el (muse-list-item-regexp): Put definition list regexp part before other parts. (muse-ol-item-regexp): New regexp that specifies how to match an @@ -20,6 +28,11 @@ For some reason, Emacs 21 was not populating match 2 correctly, unlike Emacs 22, so this workaround was needed. + * texi/muse.texi: (Keystroke Summary): Remove C-c + C-i (`muse-insert-tag') documentation, and mention C-c C-i as an + alternative keybinding to the C-c TAB stuff. Mention + muse-colors-toggle-inline-images. + 2007-06-14 Michael Olson * README: Mention that RelaxNG schema is in etc/ directory. diff --git a/lisp/muse-colors.el b/lisp/muse-colors.el index 651aada..6cb615e 100644 --- a/lisp/muse-colors.el +++ b/lisp/muse-colors.el @@ -107,7 +107,7 @@ used as the filename of the image." ;;;###autoload (defun muse-colors-toggle-inline-images () - "Toggle inlined images on/off." + "Toggle display of inlined images on/off." (interactive) ;; toggle the custom setting (if (not muse-colors-inline-images) @@ -116,9 +116,6 @@ used as the filename of the image." ;; reprocess the buffer (muse-colors-buffer)) -(define-key muse-mode-map [(control ?c) (control ?i)] - 'muse-colors-toggle-inline-images) - (defvar muse-colors-outline-faces-list (if (facep 'outline-1) '(outline-1 outline-2 outline-3 outline-4 outline-5) diff --git a/lisp/muse-mode.el b/lisp/muse-mode.el index de26edb..1a73feb 100644 --- a/lisp/muse-mode.el +++ b/lisp/muse-mode.el @@ -178,6 +178,7 @@ index at intervals." (define-key map [(control ?c) (control ?f)] 'muse-project-find-file) (define-key map [(control ?c) (control ?p)] 'muse-project-publish) + (define-key map [(control ?c) (control ?i)] 'muse-insert-thing) (define-key map [(control ?c) tab] 'muse-insert-thing) ;; Searching functions diff --git a/texi/muse.texi b/texi/muse.texi index b612bcd..9d4f419 100644 --- a/texi/muse.texi +++ b/texi/muse.texi @@ -14,7 +14,8 @@ @copying This manual is for Emacs Muse version 3.02.93 (3.03 RC3). -Copyright @copyright{} 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +Copyright @copyright{} 2004, 2005, 2006, +2007 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -460,9 +461,15 @@ Edit link at point. @item C-c C-f (`muse-project-find-file') Open another Muse page. Prompt for the name. -@item C-c C-i (`muse-insert-tag') +@item C-c C-i l, C-c TAB l (`muse-insert-relative-link-to-file') +Insert a link to a file interactively. + +@item C-c C-i t, C-c TAB t (`muse-insert-tag') Insert a tag interactively. +@item C-c C-i u, C-c TAB u (`muse-insert-url') +Insert a URL interactively. + @item C-c C-l (`font-lock-mode') Toggle font lock / highlighting for the current buffer. @@ -486,15 +493,6 @@ Show the published result of this page. @item C-c = (`muse-what-changed') Diff this page against the last backup version. -@item C-c TAB l (`muse-insert-relative-link-to-file') -Insert a link to a file interactively. - -@item C-c TAB t (`muse-insert-tag') -Insert a tag interactively. - -@item C-c TAB u (`muse-insert-url') -Insert a URL interactively. - @item TAB Move to the next Wiki reference. @@ -513,6 +511,9 @@ Decrease the indentation of the list item at point. @item C-> Increase the indentation of the list item at point. +@item M-x muse-colors-toggle-inline-images RET +Toggle display of inlined images on/off. + @end table -- 2.11.4.GIT