From: <bl...@us...> - 2008-01-28 06:18:54
|
Author: blais Date: 2008-01-28 07:18:42 +0100 (Mon, 28 Jan 2008) New Revision: 5506 Modified: trunk/docutils/tools/editors/emacs/rst.el Log: rst.el: Added rst-minor-mode, to be used along mail-mode and other modes derived from text-mode. Modified: trunk/docutils/tools/editors/emacs/rst.el =================================================================== --- trunk/docutils/tools/editors/emacs/rst.el 2008-01-26 01:50:57 UTC (rev 5505) +++ trunk/docutils/tools/editors/emacs/rst.el 2008-01-28 06:18:42 UTC (rev 5506) @@ -322,7 +322,8 @@ ("contents" ".. contents::\n..\n " nil 0) ("con" ".. contents::\n..\n " nil 0) ("cont" "[...]" nil 0) - ("skip" "[...]" nil 0) + ("skip" "\n\n[...]\n\n " nil 0) + ("seq" "\n\n[...]\n\n " nil 0) ;; FIXME: Add footnotes, links, and more. )) @@ -443,8 +444,33 @@ ) +;;;###autoload +(define-minor-mode rst-minor-mode + "ReST Minor Mode. +Toggle ReST minor mode. +With no argument, this command toggles the mode. +Non-null prefix argument turns on the mode. +Null prefix argument turns off the mode. +When ReST minor mode is enabled, the ReST mode +keybindings are installed on top of the major +mode bindings. Use this for modes derived from +text-mode, like mail-mode.." + ;; The initial value. + nil + ;; The indicator for the mode line. + " ReST" + ;; The minor mode bindings. + rst-mode-map + :group 'rst) +;; FIXME: can I somehow install these too? +;; :abbrev-table rst-mode-abbrev-table +;; :syntax-table rst-mode-syntax-table + + + + ;; Bulleted item lists. (defcustom rst-bullets @@ -3386,11 +3412,9 @@ (defun rst-portable-mark-active-p () "A portable function that returns non-nil if the mark is active." - (or - (and (fboundp 'region-active-p) - (region-active-p) (region-exists-p)) - (and (boundp 'transient-mark-mode) - transient-mark-mode mark-active))) + (cond + ((fboundp 'region-active-p) (region-active-p)) + ((boundp 'transient-mark-mode) transient-mark-mode mark-active))) |