changeset 106003:acba2c6db48c

(x-selection-owner-p): Declare. (read-mail-command): Use custom radio type rather than choice. (completion-no-auto-exit): Doc fix.
author Glenn Morris <rgm@gnu.org>
date Sat, 14 Nov 2009 04:18:10 +0000
parents d75b0b0c50e6
children 4f7ad6136a3b
files lisp/ChangeLog lisp/simple.el
diffstat 2 files changed, 13 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Nov 14 04:16:17 2009 +0000
+++ b/lisp/ChangeLog	Sat Nov 14 04:18:10 2009 +0000
@@ -1,5 +1,9 @@
 2009-11-14  Glenn Morris  <rgm@gnu.org>
 
+	* simple.el (x-selection-owner-p): Declare.
+	(read-mail-command): Use custom radio type rather than choice.
+	(completion-no-auto-exit): Doc fix.
+
 	* custom.el (defgroup):
 	* epg-config.el (epg):
 	* ps-print.el (postscript): Doc fixes.
--- a/lisp/simple.el	Sat Nov 14 04:16:17 2009 +0000
+++ b/lisp/simple.el	Sat Nov 14 04:18:10 2009 +0000
@@ -3539,6 +3539,8 @@
   :group 'killing
   :version "23.1")
 
+(declare-function x-selection-owner-p "xselect.c" (&optional selection))
+
 ;; Many places set mark-active directly, and several of them failed to also
 ;; run deactivate-mark-hook.  This shorthand should simplify.
 (defsubst deactivate-mark (&optional force)
@@ -5500,10 +5502,11 @@
   "Your preference for a mail reading package.
 This is used by some keybindings which support reading mail.
 See also `mail-user-agent' concerning sending mail."
-  :type '(choice (function-item rmail)
-		 (function-item gnus)
-		 (function-item mh-rmail)
-		 (function :tag "Other"))
+  :type '(radio (function-item :tag "Rmail" :format "%t\n" rmail)
+                (function-item :tag "Gnus" :format "%t\n" gnus)
+                (function-item :tag "Emacs interface to MH"
+                               :format "%t\n" mh-rmail)
+                (function :tag "Other"))
   :version "21.1"
   :group 'mail)
 
@@ -5736,8 +5739,7 @@
 
 (defvar completion-no-auto-exit nil
   "Non-nil means `choose-completion-string' should never exit the minibuffer.
-This also applies to other functions such as `choose-completion'
-and `mouse-choose-completion'.")
+This also applies to other functions such as `choose-completion'.")
 
 (defvar completion-base-position nil
   "Position of the base of the text corresponding to the shown completions.
@@ -5840,7 +5842,7 @@
        (or (and (buffer-live-p buffer)
 		(get-buffer-window buffer 0))
 	   owindow)))
-    
+
     (choose-completion-string
      choice buffer
      (or base-position