from trunk

etc/ChangeLog

+2010-02-26  Glenn Morris  <rgm@gnu.org>
+
+	* tutorials/TUTORIAL.es, tutorials/TUTORIAL.pt_BR:
+	Fix some keybinding typos.
+
 2010-02-14  Chong Yidong  <cyd@stupidchicken.com>
 
 	* etc/images/custom/down-pushed.xpm, etc/images/custom/down.xpm:

etc/tutorials/TUTORIAL.es

@@ -152,7 +152,7 @@ Aqu
 incluyendo los comandos de movimiento por palabra y oración:
 
 	C-f 	Avanzar un carácter
-	C-d 	Retroceder un carácter
+	C-b 	Retroceder un carácter
 
 	M-f 	Avanzar una palabra
 	M-b 	Retroceder una palabra

etc/tutorials/TUTORIAL.pt_BR

@@ -356,7 +356,7 @@ Emacs e corrigir os erros. Voc
 também. Aqui vai um sumário dos comandos de deleção:
 
         <Delete>     remove o caractere imediatamente antes do cursor
-        M-d          remove o próximo caractere apos o cursor
+        C-d          remove o próximo caractere apos o cursor
 
         M-<Delete>   Mata a palavra imediatamente antes do cursor
         M-d          Mata a próxima palavra depois do cursor

lisp/ChangeLog

@@ -9,6 +9,13 @@
 	* international/characters.el (script-list): Add Myanmar
 	Extended-A.
 
+2010-02-26  Glenn Morris  <rgm@gnu.org>
+
+	* custom.el (custom-initialize-delay): Doc fix.
+
+	* mail/sendmail.el (send-mail-function): Autoload the call
+	to custom-initialize-delay, not otherwise preserved in loaddefs.el.
+
 2010-02-25  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-engine.el (c-clear-<-pair-props)

lisp/custom.el

@@ -113,10 +113,17 @@ For the standard setting, use `set-default'."
 
 (defun custom-initialize-delay (symbol value)
   "Delay initialization of SYMBOL to the next Emacs start.
-This is used in files that are preloaded, so that the initialization is
-done in the run-time context rather than the build-time context.
-This also has the side-effect that the (delayed) initialization is performed
-with the :setter."
+This is used in files that are preloaded (or for autoloaded
+variables), so that the initialization is done in the run-time
+context rather than the build-time context.  This also has the
+side-effect that the (delayed) initialization is performed with
+the :set function.
+
+For variables in preloaded files, you can simply use this
+function for the :initialize property.  For autoloaded variables,
+you will also need to add an autoload stanza calling this
+function, and another one setting the standard-value property.
+See `send-mail-function' in sendmail.el for an example."
   ;; Until the var is actually initialized, it is kept unbound.
   ;; This seemed to be at least as good as setting it to an arbitrary
   ;; value like nil (evaluating `value' is not an option because it

lisp/gnus/ChangeLog

+2010-02-26  Glenn Morris  <rgm@gnu.org>
+
+	* message.el (message-send-mail-function): Change the default, so that
+	it inherits from a customized send-mail-function.  (Bug#5643)
+
 2010-02-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* gnus-art.el (gnus-treat-display-x-face): Don't burp if

lisp/gnus/message.el

@@ -675,7 +675,12 @@ Done before generating the new subject of a forward."
 	   (error "Don't know how to send mail.  Please customize `message-send-mail-function'")))))
 
 ;; Useful to set in site-init.el
-(defcustom message-send-mail-function (message-send-mail-function)
+(defcustom message-send-mail-function
+  (cond ((eq send-mail-function 'smtpmail-send-it) 'message-smtpmail-send-it)
+	((eq send-mail-function 'feedmail-send-it) 'feedmail-send-it)
+	((eq send-mail-function 'mailclient-send-it)
+	 'message-send-mail-with-mailclient)
+	(t (message-send-mail-function)))
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line whose contents match the
 variable `mail-header-separator'.
@@ -698,7 +703,7 @@ See also `send-mail-function'."
 			       :tag "Use Mailclient package")
  		(function :tag "Other"))
   :group 'message-sending
-  :version "23.1" ;; No Gnus
+  :version "23.2"
   :initialize 'custom-initialize-default
   :link '(custom-manual "(message)Mail Variables")
   :group 'message-mail)

lisp/mail/sendmail.el

@@ -170,6 +170,8 @@ This is used by the default mail-sending commands.  See also
   :initialize 'custom-initialize-delay
   :group 'sendmail)
 
+;;;###autoload(custom-initialize-delay 'send-mail-function nil)
+
 ;;;###autoload
 (defcustom mail-header-separator (purecopy "--text follows this line--")
   "Line used to separate headers from text in messages being composed."