From 23c124a8957c8f458cf3d3cf84713fda579486a8 Mon Sep 17 00:00:00 2001 From: Jesper Harder Date: Thu, 16 Jan 2003 00:53:34 +0000 Subject: [PATCH] * message.el (message-mode-menu): Use it. (message-mode-menu): Deactivate "Yank Original" if there's no reply buffer. * messagexmas.el (message-xmas-redefine): Redefine in XEmacs. * message.el (message-mark-active-p): New function. --- lisp/ChangeLog | 10 ++++++++++ lisp/message.el | 21 ++++++++++++++++----- lisp/messagexmas.el | 5 +++-- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3557b55fd..5f77ff8f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2003-01-16 Jesper Harder + + * message.el (message-mode-menu): Use it. + (message-mode-menu): Deactivate "Yank Original" if there's no + reply buffer. + + * messagexmas.el (message-xmas-redefine): Redefine in XEmacs. + + * message.el (message-mark-active-p): New function. + 2003-01-15 Teodor Zlatanov * spam.el (spam-use-bogofilter-headers, spam-bogofilter-header) diff --git a/lisp/message.el b/lisp/message.el index d1d7fc93a..f9a6e6c0b 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1411,6 +1411,10 @@ no, only reply back to the author." `(delete-region (progn (beginning-of-line) (point)) (progn (forward-line ,(or n 1)) (point)))) +(defun message-mark-active-p () + "Non-nil means the mark and region are currently active in this buffer." + mark-active) + (defun message-unquote-tokens (elems) "Remove double quotes (\") from strings in list ELEMS." (mapcar (lambda (item) @@ -2053,13 +2057,19 @@ Point is left at the beginning of the narrowed-to region." (easy-menu-define message-mode-menu message-mode-map "Message Menu." `("Message" - ["Yank Original" message-yank-original t] + ["Yank Original" message-yank-original message-reply-buffer] ["Fill Yanked Message" message-fill-yanked-message t] ["Insert Signature" message-insert-signature t] ["Caesar (rot13) Message" message-caesar-buffer-body t] - ["Caesar (rot13) Region" message-caesar-region (mark t)] - ["Elide Region" message-elide-region (mark t)] - ["Delete Outside Region" message-delete-not-region (mark t)] + ["Caesar (rot13) Region" message-caesar-region (message-mark-active-p)] + ["Elide Region" message-elide-region + :active (message-mark-active-p) + ,@(if (featurep 'xemacs) nil + '(:help "Replace text in region with an ellipsis"))] + ["Delete Outside Region" message-delete-not-region + :active (message-mark-active-p) + ,@(if (featurep 'xemacs) nil + '(:help "Delete all quoted text outside region"))] ["Kill To Signature" message-kill-to-signature t] ["Newline and Reformat" message-newline-and-reformat t] ["Rename buffer" message-rename-buffer t] @@ -2068,7 +2078,8 @@ Point is left at the beginning of the narrowed-to region." '(:help "Spellcheck this message"))] "----" ["Insert Region Marked" message-mark-inserted-region - ,@(if (featurep 'xemacs) '(t) + :active (message-mark-active-p) + ,@(if (featurep 'xemacs) nil '(:help "Mark region with enclosing tags"))] ["Insert File Marked..." message-mark-insert-file ,@(if (featurep 'xemacs) '(t) diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el index bc02b00a9..694626e18 100644 --- a/lisp/messagexmas.el +++ b/lisp/messagexmas.el @@ -1,6 +1,6 @@ ;;; messagexmas.el --- XEmacs extensions to message -;; Copyright (C) 1996, 1997, 1998, 1999, 2000 +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -120,7 +120,8 @@ If it is non-nil, it must be a toolbar. The five valid values are "Redefine message functions for XEmacs." (defalias 'message-exchange-point-and-mark 'message-xmas-exchange-point-and-mark) - + (defalias 'message-mark-active-p + 'region-exists-p) (when (>= emacs-major-version 20) (defalias 'message-make-caesar-translation-table 'message-xmas-make-caesar-translation-table))) -- 2.25.1