Now on revision 107291. ------------------------------------------------------------ revno: 107291 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-02-14 23:55:18 -0800 message: NEWS update re finder-inf changes diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-02-15 03:15:26 +0000 +++ etc/NEWS 2012-02-15 07:55:18 +0000 @@ -1111,7 +1111,10 @@ ** The following obsolete files were removed: sc.el, x-menu.el, rnews.el, rnewspost.el -** FIXME finder-inf.el changes. +--- +** The format of the finder-inf.el file has changed, since the finder +mechanism is now based on the package concept. The variable +finder-package-info is replaced by package--builtins and finder-keywords-hash. * Lisp changes in Emacs 24.1 ------------------------------------------------------------ revno: 107290 committer: Paul Eggert branch nick: trunk timestamp: Tue 2012-02-14 22:40:08 -0800 message: Increase default image size limit; don't unlimit Gnus. * lisp/gnus/shr.el (shr-rescale-image): Undo previous change; see . * src/image.c (MAX_IMAGE_SIZE): Increase from 6.0 to 10.0; see . diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-02-13 22:18:33 +0000 +++ lisp/gnus/ChangeLog 2012-02-15 06:40:08 +0000 @@ -1,3 +1,8 @@ +2012-02-15 Paul Eggert + + * shr.el (shr-rescale-image): Undo previous change; see + . + 2012-02-13 Lars Ingebrigtsen * nnimap.el (nnimap-record-commands): New variable. === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2012-02-13 11:25:56 +0000 +++ lisp/gnus/shr.el 2012-02-15 06:40:08 +0000 @@ -557,8 +557,7 @@ (insert alt))) (defun shr-rescale-image (data) - (let* ((max-image-size nil) - (image (create-image data nil t :ascent 100))) + (let ((image (create-image data nil t :ascent 100))) (if (or (not (fboundp 'imagemagick-types)) (not (get-buffer-window (current-buffer)))) image === modified file 'src/ChangeLog' --- src/ChangeLog 2012-02-15 04:00:34 +0000 +++ src/ChangeLog 2012-02-15 06:40:08 +0000 @@ -1,3 +1,8 @@ +2012-02-15 Paul Eggert + + * image.c (MAX_IMAGE_SIZE): Increase from 6.0 to 10.0; see + . + 2012-02-15 Chong Yidong * eval.c (Fdefvar, Fdefconst): Doc fix; note that the variable is === modified file 'src/image.c' --- src/image.c 2012-02-07 03:46:18 +0000 +++ src/image.c 2012-02-15 06:40:08 +0000 @@ -976,7 +976,7 @@ static void free_image (struct frame *f, struct image *img); -#define MAX_IMAGE_SIZE 6.0 +#define MAX_IMAGE_SIZE 10.0 /* Allocate and return a new image structure for image specification SPEC. SPEC has a hash value of HASH. */ ------------------------------------------------------------ revno: 107289 committer: Paul Eggert branch nick: trunk timestamp: Tue 2012-02-14 21:15:43 -0800 message: Spelling fixes. diff: === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2012-02-12 02:27:34 +0000 +++ doc/emacs/ack.texi 2012-02-15 05:15:43 +0000 @@ -1250,7 +1250,7 @@ Security protocol; @file{sasl-cram.el} and @file{sasl-digest.el} (with Kenichi Okada), and @file{sasl.el}, support for Simple Authentication and Security Layer (SASL); @file{plstore.el} for secure storage of -propery lists; and the EasyPG (and its predecessor PGG) +property lists; and the EasyPG (and its predecessor PGG) package, for GnuPG and PGP support. @item === modified file 'doc/lispref/macros.texi' --- doc/lispref/macros.texi 2012-02-05 06:44:47 +0000 +++ doc/lispref/macros.texi 2012-02-15 05:15:43 +0000 @@ -605,7 +605,7 @@ Within a macro definition, you can use the @code{declare} form (@pxref{Defining Macros}) to specify how to @key{TAB} should indent -calls to the macro. An indentation specifiction is written like this: +calls to the macro. An indentation specification is written like this: @example (declare (indent @var{indent-spec})) === modified file 'doc/lispref/variables.texi' --- doc/lispref/variables.texi 2012-02-07 06:34:52 +0000 +++ doc/lispref/variables.texi 2012-02-15 05:15:43 +0000 @@ -303,7 +303,7 @@ Under lexical binding rules, the value cell only holds the variable's global value, i.e.@: the value outside of any lexical -binding contruct. When a variable is lexically bound, the local value +binding construct. When a variable is lexically bound, the local value is determined by the lexical environment; the variable may have a local value if its symbol's value cell is unassigned. ------------------------------------------------------------ revno: 107288 committer: Chong Yidong branch nick: trunk timestamp: Wed 2012-02-15 12:00:34 +0800 message: Doc updates for defvar, defconst, and defcustom. * lisp/custom.el (defcustom): Doc fix; note use of defvar. * src/eval.c (Fdefvar, Fdefconst): Doc fix; note that the variable is marked as special. Also, starting docstrings with * is obsolete. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-15 03:15:26 +0000 +++ lisp/ChangeLog 2012-02-15 04:00:34 +0000 @@ -1,3 +1,7 @@ +2012-02-15 Chong Yidong + + * custom.el (defcustom): Doc fix; note use of defvar. + 2012-02-15 Glenn Morris * mail/smtpmail.el (smtpmail-smtp-user, smtpmail-stream-type): === modified file 'lisp/custom.el' --- lisp/custom.el 2012-02-06 12:48:07 +0000 +++ lisp/custom.el 2012-02-15 04:00:34 +0000 @@ -208,7 +208,11 @@ Customize can re-evaluate it later to get the standard value. DOC is the variable documentation. -The remaining arguments should have the form +This macro uses `defvar' as a subroutine, which also marks the +variable as \"special\", so that it is always dynamically bound +even when `lexical-binding' is t. + +The remaining arguments to `defcustom' should have the form [KEYWORD VALUE]... === modified file 'src/ChangeLog' --- src/ChangeLog 2012-02-13 20:39:46 +0000 +++ src/ChangeLog 2012-02-15 04:00:34 +0000 @@ -1,3 +1,8 @@ +2012-02-15 Chong Yidong + + * eval.c (Fdefvar, Fdefconst): Doc fix; note that the variable is + marked as special. Also, starting docstrings with * is obsolete. + 2012-02-13 Andreas Schwab * gnutls.c (emacs_gnutls_write): Fix last change. === modified file 'src/eval.c' --- src/eval.c 2012-01-25 05:48:11 +0000 +++ src/eval.c 2012-02-15 04:00:34 +0000 @@ -780,17 +780,15 @@ DEFUN ("defvar", Fdefvar, Sdefvar, 1, UNEVALLED, 0, doc: /* Define SYMBOL as a variable, and return SYMBOL. -You are not required to define a variable in order to use it, -but the definition can supply documentation and an initial value -in a way that tags can recognize. +You are not required to define a variable in order to use it, but +defining it lets you supply an initial value and documentation, which +can be referred to by the Emacs help facilities and other programming +tools. The `defvar' form also declares the variable as \"special\", +so that it is always dynamically bound even if `lexical-binding' is t. -INITVALUE is evaluated, and used to set SYMBOL, only if SYMBOL's value is void. -If SYMBOL is buffer-local, its default value is what is set; - buffer-local values are not affected. -INITVALUE and DOCSTRING are optional. -If DOCSTRING starts with *, this variable is identified as a user option. - This means that M-x set-variable recognizes it. - See also `user-variable-p'. +The optional argument INITVALUE is evaluated, and used to set SYMBOL, +only if SYMBOL's value is void. If SYMBOL is buffer-local, its +default value is what is set; buffer-local values are not affected. If INITVALUE is missing, SYMBOL's value is not set. If SYMBOL has a local binding, then this form affects the local @@ -799,6 +797,13 @@ `defcustom', you should always load that file _outside_ any bindings for these variables. \(`defconst' and `defcustom' behave similarly in this respect.) + +The optional argument DOCSTRING is a documentation string for the +variable. + +To define a user option, use `defcustom' instead of `defvar'. +The function `user-variable-p' also identifies a variable as a user +option if its DOCSTRING starts with *, but this behavior is obsolete. usage: (defvar SYMBOL &optional INITVALUE DOCSTRING) */) (Lisp_Object args) { @@ -873,15 +878,19 @@ DEFUN ("defconst", Fdefconst, Sdefconst, 2, UNEVALLED, 0, doc: /* Define SYMBOL as a constant variable. -The intent is that neither programs nor users should ever change this value. -Always sets the value of SYMBOL to the result of evalling INITVALUE. -If SYMBOL is buffer-local, its default value is what is set; - buffer-local values are not affected. -DOCSTRING is optional. - -If SYMBOL has a local binding, then this form sets the local binding's -value. However, you should normally not make local bindings for -variables defined with this form. +This declares that neither programs nor users should ever change the +value. This constancy is not actually enforced by Emacs Lisp, but +SYMBOL is marked as a special variable so that it is never lexically +bound. + +The `defconst' form always sets the value of SYMBOL to the result of +evalling INITVALUE. If SYMBOL is buffer-local, its default value is +what is set; buffer-local values are not affected. If SYMBOL has a +local binding, then this form sets the local binding's value. +However, you should normally not make local bindings for variables +defined with this form. + +The optional DOCSTRING specifies the variable's documentation string. usage: (defconst SYMBOL INITVALUE [DOCSTRING]) */) (Lisp_Object args) { ------------------------------------------------------------ revno: 107287 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-02-14 22:15:26 -0500 message: Try to document smtp changes * doc/emacs/sending.texi (Mail Sending): smtpmail-auth-credentials was removed. * doc/misc/smtpmail.texi (Emacs Speaks SMTP): General update for 24.1. (Encryption): New chapter, split out from previous. * lisp/mail/smtpmail.el (smtpmail-smtp-user, smtpmail-stream-type): Doc fixes. * etc/NEWS: Related edits. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-12 02:27:34 +0000 +++ doc/emacs/ChangeLog 2012-02-15 03:15:26 +0000 @@ -1,3 +1,7 @@ +2012-02-15 Glenn Morris + + * sending.texi (Mail Sending): smtpmail-auth-credentials was removed. + 2012-02-12 Glenn Morris * ack.texi (Acknowledgments): === modified file 'doc/emacs/sending.texi' --- doc/emacs/sending.texi 2012-01-19 07:21:25 +0000 +++ doc/emacs/sending.texi 2012-02-15 03:15:26 +0000 @@ -377,8 +377,8 @@ Send mail using the through an external mail host, such as your Internet service provider's outgoing SMTP mail server. If you have not told Emacs how to contact the SMTP server, it prompts for this -information, which is saved in the variables -@code{smtpmail-smtp-server} and @code{smtpmail-auth-credentials}. +information, which is saved in the @code{smtpmail-smtp-server} variable +and the file @file{~/.authinfo}. @xref{Top,,Emacs SMTP Library, smtpmail, Sending mail via SMTP}. @item sendmail-send-it === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-02-13 14:14:18 +0000 +++ doc/misc/ChangeLog 2012-02-15 03:15:26 +0000 @@ -1,3 +1,8 @@ +2012-02-15 Glenn Morris + + * smtpmail.texi (Emacs Speaks SMTP): General update for 24.1. + (Encryption): New chapter, split out from previous. + 2012-02-13 Lars Ingebrigtsen * gnus.texi (Customizing the IMAP Connection): Mention === modified file 'doc/misc/smtpmail.texi' --- doc/misc/smtpmail.texi 2012-01-19 07:21:25 +0000 +++ doc/misc/smtpmail.texi 2012-02-15 03:15:26 +0000 @@ -47,6 +47,7 @@ * How Mail Works:: Brief introduction to mail concepts. * Emacs Speaks SMTP:: How to use the SMTP library in Emacs. * Authentication:: Authenticating yourself to the server. +* Encryption:: Protecting your connection to the server. * Queued delivery:: Sending mail without an internet connection. * Server workarounds:: Mail servers with special requirements. * Debugging:: Tracking down problems. @@ -129,24 +130,37 @@ machine is often disconnected from the internet. Sending mail via SMTP requires configuring your mail user agent -(@pxref{Mail Methods,,,emacs}) to use the SMTP library. How to do -this should be described for each mail user agent; for the default -mail user agent the variable @code{send-mail-function} (@pxref{Mail -Sending,,,emacs}) is used; for the Message and Gnus user agents the -variable @code{message-send-mail-function} (@pxref{Mail -Variables,,,message}) is used. - -@example -;; If you use the default mail user agent. +(@pxref{Mail Methods,,,emacs}) to use the SMTP library. If you +have not configured anything, then in Emacs 24.1 and later the first +time you try to send a mail Emacs will ask how you want to send +mail. To use this library, answer @samp{smtp} when prompted. Emacs +then asks for the name of the SMTP server. + + If you prefer, or if you are using a non-standard mail user agent, +you can configure this yourself. The normal way to do this is to set +the variable @code{send-mail-function} (@pxref{Mail +Sending,,,emacs}) to the value you want to use. To use this library: + +@smallexample (setq send-mail-function 'smtpmail-send-it) -;; If you use Message or Gnus. -(setq message-send-mail-function 'smtpmail-send-it) -@end example +@end smallexample + +@noindent +The default value for this variable is @code{sendmail-query-once}, +which interactively asks how you want to send mail. + +Your mail user agent might use a different variable for this purpose. +It should inherit from @code{send-mail-function}, but if it does not, +or if you prefer, you can set that variable directly. Consult your +mail user agent's documentation for more details. For example, +(@pxref{Mail Variables,,,message}). Before using SMTP you must find out the hostname of the SMTP server -to use. Your system administrator should provide you with this -information, but often it is the same as the server you receive mail -from. +to use. Your system administrator or mail service provider should +supply this information. Often it is some variant of the server you +receive mail from. If your email address is +@samp{yourname@@example.com}, then the name of the SMTP server is +may be something like @samp{smtp.example.com}. @table @code @item smtpmail-smtp-server @@ -201,101 +215,114 @@ @node Authentication @chapter Authentication +@cindex password +@cindex user name +Most SMTP servers require clients to authenticate themselves before +they are allowed to send mail. Authentication usually involves +supplying a user name and password. + +If you have not configured anything, then the first time you try to +send mail via a server, Emacs (version 24.1 and later) prompts you +for the user name and password to use, and then offers to save the +information. By default, Emacs stores authentication information in +a file @file{~/.authinfo}. + +@cindex authinfo +The basic format of the @file{~/.authinfo} file is one line for each +set of credentials. Each line consists of pairs of variables and +values. A simple example would be: + +@smallexample +machine mail.example.org port 25 login myuser password mypassword +@end smallexample + +@noindent +This specifies that when using the SMTP server called @samp{mail.example.org} +on port 25, Emacs should send the user name @samp{myuser} and the +password @samp{mypassword}. Either or both of the login and password +fields may be absent, in which case Emacs prompts for the information +when you try to send mail. (This replaces the old +@code{smtpmail-auth-credentials} variable used prior to Emacs 24.1.) + +@vindex smtpmail-smtp-user + When the SMTP library connects to a host on a certain port, it +searches the @file{~/.authinfo} file for a matching entry. If an +entry is found, the authentication process is invoked and the +credentials are used. If the variable @code{smtpmail-smtp-user} is +set to a non-@code{nil} value, then only entries for that user are +considered. For more information on the @file{~/.authinfo} +file, @pxref{Top,,auth-source, auth, Emacs auth-source Library}. + @cindex SASL @cindex CRAM-MD5 +@cindex PLAIN @cindex LOGIN +The process by which the SMTP library authenticates you to the server +is known as ``Simple Authentication and Security Layer'' (SASL). +There are various SASL mechanisms, and this library supports three of +them: CRAM-MD5, PLAIN, and LOGIN. It tries each of them, in that order, +until one succeeds. The first uses a form of encryption to obscure +your password, while the other two do not. + + +@node Encryption +@chapter Encryption + @cindex STARTTLS @cindex TLS @cindex SSL -Many environments require SMTP clients to authenticate themselves -before they are allowed to route mail via a server. The two following -variables contains the authentication information needed for this. - -The first variable, @code{smtpmail-auth-credentials}, instructs the -SMTP library to use a SASL authentication step, currently only the -CRAM-MD5 and LOGIN mechanisms are supported and will be selected in -that order if the server support both. - -The second variable, @code{smtpmail-starttls-credentials}, instructs -the SMTP library to connect to the server using STARTTLS. This means -the protocol exchange may be integrity protected and confidential by -using the Transport Layer Security (TLS) protocol, and optionally also -authentication of the client and server. - -TLS is a security protocol that is also known as SSL, although -strictly speaking, SSL is an older variant of TLS. TLS is backwards -compatible with SSL. In most mundane situations, the two terms are -equivalent. - -The TLS feature uses the elisp package @file{starttls.el} (see it for -more information on customization), which in turn require that at -least one of the following external tools are installed: +For greater security, you can encrypt your connection to the SMTP +server. If this is to work, both Emacs and the server must support it. + +The SMTP library supports the ``Transport Layer Security'' (TLS), and +the older ``Secure Sockets Layer'' (SSL) encryption mechanisms. +It also supports STARTTLS, which is a variant of TLS in which the +initial connection to the server is made in plain text, requesting a +switch to an encrypted channel for the rest of the process. + +@vindex smtpmail-stream-type +The variable @code{smtpmail-stream-type} controls what form of +connection the SMTP library uses. The default value is @code{nil}, +which means to use a plain connection, but try to switch to a STARTTLS +encrypted connection if the server supports it. Other possible values +are: @code{starttls} - insist on STARTTLS; @code{ssl} - use TLS/SSL; +and @code{plain} - no encryption. + +Use of any form of TLS/SSL requires support in Emacs. You can either +use the built-in support (in Emacs 24.1 and later), or the +@file{starttls.el} Lisp library. The built-in support uses the GnuTLS +@footnote{@url{http://www.gnu.org/software/gnutls/}} library. +If your Emacs has GnuTLS support built-in, the function +@code{gnutls-available-p} is defined and returns non-@code{nil}. +Otherwise, you must use the @file{starttls.el} library (see that file for +more information on customization options, etc.). The Lisp library +requires one of the following external tools to be installed: @enumerate @item -The GnuTLS command line tool @samp{gnutls-cli}, you can get it from +The GnuTLS command line tool @samp{gnutls-cli}, which you can get from @url{http://www.gnu.org/software/gnutls/}. This is the recommended -tool, mainly because it can verify the server certificates. +tool, mainly because it can verify server certificates. @item -The @samp{starttls} external program, you can get it from +The @samp{starttls} external program, which you can get from @file{starttls-*.tar.gz} from @uref{ftp://ftp.opaopa.org/pub/elisp/}. @end enumerate -It is not uncommon to use both these mechanisms, e.g., to use STARTTLS -to achieve integrity and confidentiality and then use SASL for client -authentication. - -@table @code -@item smtpmail-auth-credentials -@vindex smtpmail-auth-credentials - The variable @code{smtpmail-auth-credentials} contains a list of -hostname, port, username and password tuples. When the SMTP library -connects to a host on a certain port, this variable is searched to -find a matching entry for that hostname and port. If an entry is -found, the authentication process is invoked and the credentials are -used. - -The hostname field follows the same format as -@code{smtpmail-smtp-server} (i.e., a string) and the port field the -same format as @code{smtpmail-smtp-service} (i.e., a string or an -integer). The username and password fields, which either can be -@code{nil} to indicate that the user is prompted for the value -interactively, should be strings with the username and password, -respectively, information that is normally provided by system -administrators. - -@item smtpmail-starttls-credentials -@vindex smtpmail-starttls-credentials - The variable @code{smtpmail-starttls-credentials} contains a list of -tuples with hostname, port, name of file containing client key, and -name of file containing client certificate. The processing is similar -to the previous variable. The client key and certificate may be -@code{nil} if you do not wish to use client authentication. -@end table - -The following example illustrates what you could put in -@file{~/.emacs} to enable both SASL authentication and STARTTLS. The -server name (@code{smtpmail-smtp-server}) is @var{hostname}, the -server port (@code{smtpmail-smtp-service}) is @var{port}, and the -username and password are @var{username} and @var{password} -respectively. - -@example -;; Authenticate using this username and password against my server. -(setq smtpmail-auth-credentials - '(("@var{hostname}" "@var{port}" "@var{username}" "@var{password}"))) - -;; Note that if @var{port} is an integer, you must not quote it as a -;; string. Normally @var{port} should be the integer 25, and the example -;; become: -(setq smtpmail-auth-credentials - '(("@var{hostname}" 25 "@var{username}" "@var{password}"))) - -;; Use STARTTLS without authentication against the server. -(setq smtpmail-starttls-credentials - '(("@var{hostname}" "@var{port}" nil nil))) -@end example +@cindex certificates +@cindex keys +The SMTP server may also request that you verify your identity by +sending a certificate and the associated encryption key to the server. +If you need to do this, you can use an @file{~/.authinfo} entry like this: + +@smallexample +machine mail.example.org port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert" +@end smallexample + +@noindent +(This replaces the old @code{smtpmail-starttls-credentials} variable used +prior to Emacs 24.1.) + @node Queued delivery @chapter Queued delivery === modified file 'etc/NEWS' --- etc/NEWS 2012-02-11 21:44:47 +0000 +++ etc/NEWS 2012-02-15 03:15:26 +0000 @@ -141,22 +141,22 @@ *** smtpmail -**** smtpmail now uses encrypted connections (via STARTTLS) if the -mail server supports them. It also uses the auth-source framework for -getting credentials. ++++ +**** smtpmail now uses encrypted connections (via STARTTLS) by default +if the mail server supports them. This uses either built-in GnuTLS +support, or the starttls.el library. Customize `smtpmail-stream-type' +to change this. ++++ **** The variable `smtpmail-auth-credentials' has been removed. -That variable used to have the default value "~/.authinfo", in which -case you won't see any difference. But if you changed it to be a list -of user names and passwords, that setting is now ignored; you will be -prompted for the user name and the password, which will then be saved -to ~/.authinfo. (To control where and how the credentials are stored, -see the auth-source manual. You may want to change the auth-source -preferences if you want to store the credentials encrypted, for -instance.) - -You can also manually copy the credentials to your ~/.authinfo file. -For example, if you had +By default, the information is now stored in the file ~/.authinfo. +This was the default value of smtpmail-auth-credentials. +If you had customized smtpmail-auth-credentials to a list of user +names and passwords, those settings will not be used. Your first +connection to the smtp server will prompt for the user name and password, +and then offer to save them to the ~/.authinfo file. Or you can +manually copy the credentials to your ~/.authinfo files. For example, +if you had (setq smtpmail-auth-credentials '(("mail.example.org" 25 "jim" "s!cret"))) @@ -165,6 +165,10 @@ machine mail.example.org port 25 login jim password s!cret +See the auth-source manual for more information, e.g. on encrypting +the credentials file. + ++++ **** The variable `smtpmail-starttls-credentials' has been removed. If you had that set, then you need to put === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-14 18:22:47 +0000 +++ lisp/ChangeLog 2012-02-15 03:15:26 +0000 @@ -1,3 +1,8 @@ +2012-02-15 Glenn Morris + + * mail/smtpmail.el (smtpmail-smtp-user, smtpmail-stream-type): + Doc fixes. + 2012-02-14 Glenn Morris * mail/smtpmail.el (smtpmail-query-smtp-server): Give it a doc. === modified file 'lisp/mail/smtpmail.el' --- lisp/mail/smtpmail.el 2012-02-14 18:22:47 +0000 +++ lisp/mail/smtpmail.el 2012-02-15 03:15:26 +0000 @@ -86,7 +86,8 @@ :group 'smtpmail) (defcustom smtpmail-smtp-user nil - "User name to use when looking up credentials." + "User name to use when looking up credentials in the authinfo file. +If non-nil, only consider credentials for the specified user." :version "24.1" :type '(choice (const nil) string) :group 'smtpmail) @@ -99,11 +100,10 @@ :group 'smtpmail) (defcustom smtpmail-stream-type nil - "Connection type SMTP connections. -This may be either nil (possibly upgraded to STARTTLS if -possible), or `starttls' (refuse to send if STARTTLS isn't -available), or `plain' (never use STARTTLS), or `ssl' (to use -TLS/SSL)." + "Type of SMTP connections to use. +This may be either nil (possibly upgraded to STARTTLS if possible), +or `starttls' (refuse to send if STARTTLS isn't available), or `plain' +\(never use STARTTLS), or `ssl' (to use TLS/SSL)." :version "24.1" :group 'smtpmail :type '(choice (const :tag "Possibly upgrade to STARTTLS" nil) ------------------------------------------------------------ revno: 107286 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Tue 2012-02-14 19:43:21 +0100 message: Kill jobs that we remove from the queue * url-queue.el (url-queue-kill-job): Refactored out code. (url-queue-remove-jobs-from-host): Use it to kill jobs that are in flight. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2012-02-14 13:18:05 +0000 +++ lisp/url/ChangeLog 2012-02-14 18:43:21 +0000 @@ -1,3 +1,9 @@ +2012-02-14 Lars Ingebrigtsen + + * url-queue.el (url-queue-kill-job): Refactored out code. + (url-queue-remove-jobs-from-host): Use it to kill jobs that are in + flight. + 2012-02-14 Teodor Zlatanov * url-future.el: Minor doc update. === modified file 'lisp/url/url-queue.el' --- lisp/url/url-queue.el 2012-02-10 17:22:09 +0000 +++ lisp/url/url-queue.el 2012-02-14 18:43:21 +0000 @@ -127,6 +127,7 @@ host) (push job jobs))) (dolist (job jobs) + (url-queue-kill-job job) (setq url-queue (delq job url-queue))))) (defun url-queue-start-retrieve (job) @@ -146,14 +147,17 @@ url-queue-timeout)) (push job dead-jobs))) (dolist (job dead-jobs) - (when (bufferp (url-queue-buffer job)) - (while (get-buffer-process (url-queue-buffer job)) - (ignore-errors - (delete-process (get-buffer-process (url-queue-buffer job))))) - (ignore-errors - (kill-buffer (url-queue-buffer job)))) + (url-queue-kill-job job) (setq url-queue (delq job url-queue))))) +(defun url-queue-kill-job (job) + (when (bufferp (url-queue-buffer job)) + (while (get-buffer-process (url-queue-buffer job)) + (ignore-errors + (delete-process (get-buffer-process (url-queue-buffer job))))) + (ignore-errors + (kill-buffer (url-queue-buffer job))))) + (provide 'url-queue) ;;; url-queue.el ends here ------------------------------------------------------------ revno: 107285 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-02-14 13:22:47 -0500 message: * lisp/mail/smtpmail.el (smtpmail-query-smtp-server): Give it a doc. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-14 15:43:07 +0000 +++ lisp/ChangeLog 2012-02-14 18:22:47 +0000 @@ -1,3 +1,7 @@ +2012-02-14 Glenn Morris + + * mail/smtpmail.el (smtpmail-query-smtp-server): Give it a doc. + 2012-02-14 Lars Ingebrigtsen * mail/smtpmail.el (smtpmail-query-smtp-server): Fix typo in the === modified file 'lisp/mail/smtpmail.el' --- lisp/mail/smtpmail.el 2012-02-14 15:43:07 +0000 +++ lisp/mail/smtpmail.el 2012-02-14 18:22:47 +0000 @@ -1,6 +1,6 @@ ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail -;; Copyright (C) 1995-1996, 2001-2012 Free Software Foundation, Inc. +;; Copyright (C) 1995-1996, 2001-2012 Free Software Foundation, Inc. ;; Author: Tomoji Kagatani ;; Maintainer: Simon Josefsson @@ -596,6 +596,12 @@ (mapconcat 'identity (cdr response) "\n")) (defun smtpmail-query-smtp-server () + "Query for an SMTP server and try to contact it. +If the contact succeeds, customizes and saves `smtpmail-smtp-server' +and `smtpmail-smtp-service'. This tries standard SMTP ports, and if +none works asks you to supply one. If you know that you need to use +a non-standard port, you can set `smtpmail-smtp-service' in advance. +Returns an error if the server cannot be contacted." (let ((server (read-string "Outgoing SMTP mail server: ")) (ports '(25 587)) stream port prompted) @@ -608,8 +614,7 @@ (open-network-stream "smtp" nil server port) (quit nil) (error nil)))) - ;; We've used up the list of default ports, so query the - ;; user. + ;; We've used up the list of default ports, so query the user. (when (and (not ports) (not prompted)) (push (read-number (format "Port number to use when contacting %s? " ------------------------------------------------------------ revno: 107284 committer: Chong Yidong branch nick: trunk timestamp: Wed 2012-02-15 00:41:16 +0800 message: Update Keymaps chapter of Lisp manual. * doc/emacs/keymaps.texi (Format of Keymaps): The CACHE component of keymaps was removed on 2009-09-10. Update lisp-mode-map example. (Inheritance and Keymaps): Minor clarification. (Searching Keymaps): Remove out-of-place enumeration. (Key Lookup): Remove unnecessary example (one was already given in Format of Keymaps). (Changing Key Bindings): Update suppress-keymap example. (Menu Bar, Tool Bar): Copyedits. (Tool Bar): Update tool-bar-map example. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2012-02-12 09:51:03 +0000 +++ admin/FOR-RELEASE 2012-02-14 16:41:16 +0000 @@ -204,7 +204,7 @@ index.texi internals.texi intro.texi cyd -keymaps.texi +keymaps.texi cyd lists.texi cyd loading.texi cyd locals.texi === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-02-12 09:51:03 +0000 +++ doc/lispref/ChangeLog 2012-02-14 16:41:16 +0000 @@ -1,3 +1,15 @@ +2012-02-14 Chong Yidong + + * keymaps.texi (Format of Keymaps): The CACHE component of keymaps + was removed on 2009-09-10. Update lisp-mode-map example. + (Inheritance and Keymaps): Minor clarification. + (Searching Keymaps): Remove out-of-place enumeration. + (Key Lookup): Remove unnecessary example (one was already given in + Format of Keymaps). + (Changing Key Bindings): Update suppress-keymap example. + (Menu Bar, Tool Bar): Copyedits. + (Tool Bar): Update tool-bar-map example. + 2012-02-12 Chong Yidong * debugging.texi (Debugger Commands): Continuing is now allowed === modified file 'doc/lispref/keymaps.texi' --- doc/lispref/keymaps.texi 2012-02-06 08:34:28 +0000 +++ doc/lispref/keymaps.texi 2012-02-14 16:41:16 +0000 @@ -173,13 +173,11 @@ which is always a character or a symbol. @xref{Classifying Events}. In this kind of binding, @var{binding} is a command. -@item (@var{type} @var{item-name} @r{[}@var{cache}@r{]} .@: @var{binding}) +@item (@var{type} @var{item-name} .@: @var{binding}) This specifies a binding which is also a simple menu item that -displays as @var{item-name} in the menu. @var{cache}, if present, -caches certain information for display in the menu. @xref{Simple Menu -Items}. +displays as @var{item-name} in the menu. @xref{Simple Menu Items}. -@item (@var{type} @var{item-name} @var{help-string} @r{[}@var{cache}@r{]} .@: @var{binding}) +@item (@var{type} @var{item-name} @var{help-string} .@: @var{binding}) This is a simple menu item with help string @var{help-string}. @item (@var{type} menu-item .@: @var{details}) @@ -234,8 +232,9 @@ @kbd{@key{ESC} @key{end}}. Here as an example is the local keymap for Lisp mode, a sparse -keymap. It defines bindings for @key{DEL} and @key{TAB}, plus @kbd{C-c -C-l}, @kbd{M-C-q}, and @kbd{M-C-x}. +keymap. It defines bindings for @key{DEL}, @kbd{C-c C-z}, +@kbd{C-M-q}, and @kbd{C-M-x} (the actual value also contains a menu +binding, which is omitted here for the sake of brevity). @example @group @@ -250,11 +249,8 @@ @end group @group (27 keymap - ;; @r{@kbd{M-C-x}, treated as @kbd{@key{ESC} C-x}} - (24 . lisp-send-defun) - keymap - ;; @r{@kbd{M-C-q}, treated as @kbd{@key{ESC} C-q}} - (17 . indent-sexp)) + ;; @r{@kbd{C-M-x}, treated as @kbd{@key{ESC} C-x}} + (24 . lisp-send-defun)) @end group @group ;; @r{This part is inherited from @code{lisp-mode-shared-map}.} @@ -264,9 +260,8 @@ @end group @group (27 keymap - ;; @r{@kbd{M-C-q}, treated as @kbd{@key{ESC} C-q}} - (17 . indent-sexp)) - (9 . lisp-indent-line)) + ;; @r{@kbd{C-M-q}, treated as @kbd{@key{ESC} C-q}} + (17 . indent-sexp))) @end group @end example @@ -441,10 +436,10 @@ @var{maps}, and optionally inheriting from a parent keymap @var{parent}. @var{maps} can be a single keymap or a list of more than one. When looking up a key in the resulting new map, Emacs -searches in each of the @var{maps}, and then in @var{parent}, stopping -at the first match. A @code{nil} binding in any one of @var{maps} -overrides any binding in @var{parent}, but not a non-@code{nil} binding -in any other of the @var{maps}. +searches in each of the @var{maps} in turn, and then in @var{parent}, +stopping at the first match. A @code{nil} binding in any one of +@var{maps} overrides any binding in @var{parent}, but it does not +override any non-@code{nil} binding in any other of the @var{maps}. @end defun @noindent For example, here is how Emacs sets the parent of @@ -762,35 +757,23 @@ @end lisp @noindent -The @var{find-in} and @var{find-in-any} are pseudo functions that -search in one keymap and in an alist of keymaps, respectively. -(Searching a single keymap for a binding is called @dfn{key lookup}; -see @ref{Key Lookup}.) If the key sequence starts with a mouse event, -or a symbolic prefix event followed by a mouse event, that event's -position is used instead of point and the current buffer. Mouse -events on an embedded string use non-@code{nil} text properties from -that string instead of the buffer. - -@enumerate -@item -The function finally found may be remapped -(@pxref{Remapping Commands}). - -@item -Characters that are bound to @code{self-insert-command} are translated -according to @code{translation-table-for-input} before insertion. - -@item -@code{current-active-maps} returns a list of the -currently active keymaps at point. - -@item -When a match is found (@pxref{Key Lookup}), if the binding in the +@var{find-in} and @var{find-in-any} are pseudo functions that search +in one keymap and in an alist of keymaps, respectively. (Searching a +single keymap for a binding is called @dfn{key lookup}; see @ref{Key +Lookup}.) If the key sequence starts with a mouse event, or a +symbolic prefix event followed by a mouse event, that event's position +is used instead of point and the current buffer. Mouse events on an +embedded string use non-@code{nil} text properties from that string +instead of the buffer. + + When a match is found (@pxref{Key Lookup}), if the binding in the keymap is a function, the search is over. However if the keymap entry is a symbol with a value or a string, Emacs replaces the input key sequences with the variable's value or the string, and restarts the search of the active keymaps. -@end enumerate + + The function finally found might also be remapped. @xref{Remapping +Commands}. @node Controlling Active Maps @section Controlling the Active Keymaps @@ -1088,21 +1071,9 @@ binding is not executable as a command. @end table - In short, a keymap entry may be a keymap, a command, a keyboard macro, -a symbol that leads to one of them, or an indirection or @code{nil}. -Here is an example of a sparse keymap with two characters bound to -commands and one bound to another keymap. This map is the normal value -of @code{emacs-lisp-mode-map}. Note that 9 is the code for @key{TAB}, -127 for @key{DEL}, 27 for @key{ESC}, 17 for @kbd{C-q} and 24 for -@kbd{C-x}. - -@example -@group -(keymap (9 . lisp-indent-line) - (127 . backward-delete-char-untabify) - (27 keymap (17 . indent-sexp) (24 . eval-defun))) -@end group -@end example + In short, a keymap entry may be a keymap, a command, a keyboard +macro, a symbol that leads to one of them, or an indirection or +@code{nil}. @node Functions for Key Lookup @section Functions for Key Lookup @@ -1472,23 +1443,21 @@ example, suppressing @code{global-map} would make it impossible to use most of Emacs. -Most often, @code{suppress-keymap} is used to initialize local -keymaps of modes such as Rmail and Dired where insertion of text is not -desirable and the buffer is read-only. Here is an example taken from -the file @file{emacs/lisp/dired.el}, showing how the local keymap for -Dired mode is set up: +This function can be used to initialize the local keymap of a major +mode for which insertion of text is not desirable. But usually such a +mode should be derived from @code{special-mode} (@pxref{Basic Major +Modes}); then its keymap will automatically inherit from +@code{special-mode-map}, which is already suppressed. Here is how +@code{special-mode-map} is defined: @smallexample @group -(setq dired-mode-map (make-keymap)) -(suppress-keymap dired-mode-map) -(define-key dired-mode-map "r" 'dired-rename-file) -(define-key dired-mode-map "\C-d" 'dired-flag-file-deleted) -(define-key dired-mode-map "d" 'dired-flag-file-deleted) -(define-key dired-mode-map "v" 'dired-view-file) -(define-key dired-mode-map "e" 'dired-find-file) -(define-key dired-mode-map "f" 'dired-find-file) -@dots{} +(defvar special-mode-map + (let ((map (make-sparse-keymap))) + (suppress-keymap map) + (define-key map "q" 'quit-window) + @dots{} + map)) @end group @end smallexample @end defun @@ -2064,12 +2033,10 @@ @noindent The @sc{car}, @var{item-string}, is the string to be displayed in the menu. It should be short---preferably one to three words. It should -describe the action of the command it corresponds to. Note that it is -not generally possible to display non-@acronym{ASCII} text in menus. It will -work for keyboard menus and will work to a large extent when Emacs is -built with the Gtk+ toolkit.@footnote{In this case, the text is first -encoded using the @code{utf-8} coding system and then rendered by the -toolkit as it sees fit.} +describe the action of the command it corresponds to. Note that not +all graphical toolkits can display non-@acronym{ASCII} text in menus +(it will work for keyboard menus and will work to a large extent with +the GTK+ toolkit). You can also supply a second string, called the help string, as follows: @@ -2418,18 +2385,6 @@ she should type the corresponding character---the one whose binding is that alternative. -@ignore -In a menu intended for keyboard use, each menu item must clearly -indicate what character to type. The best convention to use is to make -the character the first letter of the item string---that is something -users will understand without being told. We plan to change this; by -the time you read this manual, keyboard menus may explicitly name the -key for each alternative. -@end ignore - - This way of using menus in an Emacs-like editor was inspired by the -Hierarkey system. - @defvar menu-prompt-more-char This variable specifies the character to use to ask to see the next line of a menu. Its initial value is 32, the code @@ -2512,21 +2467,17 @@ @subsection The Menu Bar @cindex menu bar - Most window systems allow each frame to have a @dfn{menu bar}---a -permanently displayed menu stretching horizontally across the top of -the frame. (In order for a frame to display a menu bar, its -@code{menu-bar-lines} parameter must be greater than zero. -@xref{Layout Parameters}.) - - The items of the menu bar are the subcommands of the fake ``function -key'' @code{menu-bar}, as defined in the active keymaps. + On graphical displays, there is usually a @dfn{menu bar} at the top +of each frame. @xref{Menu Bars,,,emacs, The GNU Emacs Manual}. Menu +bar items are subcommands of the fake ``function key'' +@code{menu-bar}, as defined in the active keymaps. To add an item to the menu bar, invent a fake ``function key'' of your own (let's call it @var{key}), and make a binding for the key sequence @code{[menu-bar @var{key}]}. Most often, the binding is a menu keymap, so that pressing a button on the menu bar item leads to another menu. - When more than one active keymap defines the same fake function key + When more than one active keymap defines the same ``function key'' for the menu bar, the item appears just once. If the user clicks on that menu bar item, it brings up a single, combined menu containing all the subcommands of that item---the global subcommands, the local @@ -2541,11 +2492,6 @@ @example @group -(modify-frame-parameters (selected-frame) - '((menu-bar-lines . 2))) -@end group - -@group ;; @r{Make a menu keymap (with a prompt string)} ;; @r{and make it the menu bar item's definition.} (define-key global-map [menu-bar words] @@ -2618,20 +2564,17 @@ @subsection Tool bars @cindex tool bar - A @dfn{tool bar} is a row of icons at the top of a frame, that execute -commands when you click on them---in effect, a kind of graphical menu -bar. - - The frame parameter @code{tool-bar-lines} (X resource @samp{toolBar}) -controls how many lines' worth of height to reserve for the tool bar. A -zero value suppresses the tool bar. If the value is nonzero, and -@code{auto-resize-tool-bars} is non-@code{nil}, the tool bar expands and -contracts automatically as needed to hold the specified contents. - - If the value of @code{auto-resize-tool-bars} is @code{grow-only}, -the tool bar expands automatically, but does not contract automatically. -To contract the tool bar, the user has to redraw the frame by entering -@kbd{C-l}. + A @dfn{tool bar} is a row of clickable icons at the top of a frame, +just below the menu bar. @xref{Tool Bars,,,emacs, The GNU Emacs +Manual}. + + On each frame, the frame parameter @code{tool-bar-lines} controls +how many lines' worth of height to reserve for the tool bar. A zero +value suppresses the tool bar. If the value is nonzero, and +@code{auto-resize-tool-bars} is non-@code{nil}, the tool bar expands +and contracts automatically as needed to hold the specified contents. +If the value is @code{grow-only}, the tool bar expands automatically, +but does not contract automatically. The tool bar contents are controlled by a menu keymap attached to a fake ``function key'' called @code{tool-bar} (much like the way the menu @@ -2683,17 +2626,17 @@ image. The @code{:rtl} property specifies an alternative image to use for -right-to-left languages. Only the Gtk+ version of Emacs supports this +right-to-left languages. Only the GTK+ version of Emacs supports this at present. Like the menu bar, the tool bar can display separators (@pxref{Menu Separators}). Tool bar separators are vertical rather than -horizontal, though, and only a single style is supported. Separators -are represented in the tool bar keymap in the same way as for the -menu bar, i.e. using a @code{(menu-item "--"}) entry. The Gtk+ and -Nextstep tool bars render separators natively, otherwise Emacs selects -a separator image that is appropriate for the display. Note that tool -bar separators do not support any properties, such as @code{:visible}. +horizontal, though, and only a single style is supported. They are +represented in the tool bar keymap by @code{(menu-item "--")} entries; +properties like @code{:visible} are not supported for tool bar +separators. Separators are rendered natively in GTK+ and Nextstep +tool bars; in the other cases, they are rendered using an image of a +vertical line. The default tool bar is defined so that items specific to editing do not appear for major modes whose command symbol has a @code{mode-class} @@ -2706,18 +2649,20 @@ @defvar tool-bar-map By default, the global map binds @code{[tool-bar]} as follows: + @example (global-set-key [tool-bar] - '(menu-item "tool bar" ignore - :filter (lambda (ignore) tool-bar-map))) + `(menu-item ,(purecopy "tool bar") ignore + :filter tool-bar-make-keymap)) @end example + @noindent -Thus the tool bar map is derived dynamically from the value of variable -@code{tool-bar-map} and you should normally adjust the default (global) -tool bar by changing that map. Major modes may replace the global bar -completely by making @code{tool-bar-map} buffer-local and set to a -keymap containing only the desired items. Info mode provides an -example. +The function @code{tool-bar-make-keymap}, in turn, derives the actual +tool bar map dynamically from the value of the variable +@code{tool-bar-map}. Hence, you should normally adjust the default +(global) tool bar by changing that map. Some major modes, such as +Info mode, completely replace the global tool bar by making +@code{tool-bar-map} buffer-local and setting it to a different keymap. @end defvar There are two convenience functions for defining tool bar items, as ------------------------------------------------------------ revno: 107283 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Tue 2012-02-14 16:43:07 +0100 message: smtpmail initial prompting fixes (smtpmail-query-smtp-server): Prompt the user for a port number if we can't connect to any of the standard ports. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-14 15:31:49 +0000 +++ lisp/ChangeLog 2012-02-14 15:43:07 +0000 @@ -2,6 +2,8 @@ * mail/smtpmail.el (smtpmail-query-smtp-server): Fix typo in the way the ports list is computed. + (smtpmail-query-smtp-server): Prompt the user for a port number if + we can't connect to any of the standard ports (bug#10810). 2012-02-14 Teodor Zlatanov === modified file 'lisp/mail/smtpmail.el' --- lisp/mail/smtpmail.el 2012-02-14 15:31:49 +0000 +++ lisp/mail/smtpmail.el 2012-02-14 15:43:07 +0000 @@ -598,16 +598,24 @@ (defun smtpmail-query-smtp-server () (let ((server (read-string "Outgoing SMTP mail server: ")) (ports '(25 587)) - stream port) + stream port prompted) (when (and smtpmail-smtp-service (not (member smtpmail-smtp-service ports))) (push smtpmail-smtp-service ports)) (while (and (not smtpmail-smtp-server) (setq port (pop ports))) - (when (setq stream (condition-case () - (open-network-stream "smtp" nil server port) - (quit nil) - (error nil))) + (if (not (setq stream (condition-case () + (open-network-stream "smtp" nil server port) + (quit nil) + (error nil)))) + ;; We've used up the list of default ports, so query the + ;; user. + (when (and (not ports) + (not prompted)) + (push (read-number (format "Port number to use when contacting %s? " + server)) + ports) + (setq prompted t)) (customize-save-variable 'smtpmail-smtp-server server) (customize-save-variable 'smtpmail-smtp-service port) (delete-process stream))) ------------------------------------------------------------ revno: 107282 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Tue 2012-02-14 16:31:49 +0100 message: Respect smtpmail-smtp-service when doing a trial connection * mail/smtpmail.el (smtpmail-query-smtp-server): Fix typo in the way the ports list is computed. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-14 13:13:24 +0000 +++ lisp/ChangeLog 2012-02-14 15:31:49 +0000 @@ -1,3 +1,8 @@ +2012-02-14 Lars Ingebrigtsen + + * mail/smtpmail.el (smtpmail-query-smtp-server): Fix typo in the + way the ports list is computed. + 2012-02-14 Teodor Zlatanov * net/gnutls.el (gnutls-trustfiles): Add Cygwin location. === modified file 'lisp/mail/smtpmail.el' --- lisp/mail/smtpmail.el 2012-02-09 22:42:12 +0000 +++ lisp/mail/smtpmail.el 2012-02-14 15:31:49 +0000 @@ -597,11 +597,11 @@ (defun smtpmail-query-smtp-server () (let ((server (read-string "Outgoing SMTP mail server: ")) - (ports '("smtp" 587)) + (ports '(25 587)) stream port) - (when (and smtpmail-smtp-server - (not (member smtpmail-smtp-server ports))) - (push smtpmail-smtp-server ports)) + (when (and smtpmail-smtp-service + (not (member smtpmail-smtp-service ports))) + (push smtpmail-smtp-service ports)) (while (and (not smtpmail-smtp-server) (setq port (pop ports))) (when (setq stream (condition-case () ------------------------------------------------------------ revno: 107281 fixes bug(s): http://debbugs.gnu.org/10745 committer: Chong Yidong branch nick: trunk timestamp: Tue 2012-02-14 22:00:56 +0800 message: * lisp/org/org-footnote.el: Remove bogus defvar values. diff: === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2012-02-09 07:48:22 +0000 +++ lisp/org/ChangeLog 2012-02-14 14:00:56 +0000 @@ -1,3 +1,7 @@ +2012-02-14 Chong Yidong + + * org-footnote.el: Remove bogus defvar values (Bug#10745). + 2012-01-05 Eric Schulte * ob.el (org-babel-expand-noweb-references): Resurrect dropped === modified file 'lisp/org/org-footnote.el' --- lisp/org/org-footnote.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-footnote.el 2012-02-14 14:00:56 +0000 @@ -475,7 +475,7 @@ (org-footnote-create-definition label) (org-footnote-auto-adjust-maybe))))) -(defvar org-blank-before-new-entry nil) ; silence byte-compiler +(defvar org-blank-before-new-entry) ; silence byte-compiler (defun org-footnote-create-definition (label) "Start the definition of a footnote with label LABEL." (interactive "sLabel: ") @@ -595,8 +595,8 @@ (defvar org-footnote-insert-pos-for-preprocessor 'point-max "See `org-footnote-normalize'.") -(defvar org-export-footnotes-seen nil) ; silence byte-compiler -(defvar org-export-footnotes-data nil) ; silence byte-compiler +(defvar org-export-footnotes-seen) ; silence byte-compiler +(defvar org-export-footnotes-data) ; silence byte-compiler ;;;###autoload (defun org-footnote-normalize (&optional sort-only export-props) ------------------------------------------------------------ revno: 107280 committer: Ted Zlatanov branch nick: quickfixes timestamp: Tue 2012-02-14 08:18:05 -0500 message: * url-future.el: Minor doc update. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2012-02-14 02:14:43 +0000 +++ lisp/url/ChangeLog 2012-02-14 13:18:05 +0000 @@ -1,3 +1,7 @@ +2012-02-14 Teodor Zlatanov + + * url-future.el: Minor doc update. + 2012-02-14 Leo Liu * url-future.el: Fix last change. === modified file 'lisp/url/url-future.el' --- lisp/url/url-future.el 2012-02-14 02:14:43 +0000 +++ lisp/url/url-future.el 2012-02-14 13:18:05 +0000 @@ -36,7 +36,7 @@ ;; So, to get the value: ;; (when (url-future-completed-p future) (url-future-value future)) -;; See the ERT tests and the code for further details. +;; See `url-future-tests' and the code below for further details. ;;; Code: ------------------------------------------------------------ revno: 107279 committer: Ted Zlatanov branch nick: quickfixes timestamp: Tue 2012-02-14 08:13:24 -0500 message: (gnutls-trustfiles): Add Cygwin location. * net/gnutls.el (gnutls-trustfiles): Add Cygwin location. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-13 22:46:43 +0000 +++ lisp/ChangeLog 2012-02-14 13:13:24 +0000 @@ -1,3 +1,7 @@ +2012-02-14 Teodor Zlatanov + + * net/gnutls.el (gnutls-trustfiles): Add Cygwin location. + 2012-02-13 Glenn Morris * minibuffer.el (read-file-name): Doc fix. (Bug#10798) === modified file 'lisp/net/gnutls.el' --- lisp/net/gnutls.el 2012-02-13 21:48:14 +0000 +++ lisp/net/gnutls.el 2012-02-14 13:13:24 +0000 @@ -56,6 +56,7 @@ "/etc/ssl/certs/ca-certificates.crt" ; Debian, Ubuntu, Gentoo and Arch Linux "/etc/pki/tls/certs/ca-bundle.crt" ; Fedora and RHEL "/etc/ssl/ca-bundle.pem" ; Suse + "/usr/ssl/cert/ca-bundle.crt" ; Cygwin ) "List of CA bundle location filenames or a function returning said list. The files may be in PEM or DER format, as per the GnuTLS documentation. ------------------------------------------------------------ revno: 107278 committer: Leo Liu branch nick: trunk timestamp: Tue 2012-02-14 10:14:43 +0800 message: Remove unused require in url-future.el diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2012-02-13 18:45:36 +0000 +++ lisp/url/ChangeLog 2012-02-14 02:14:43 +0000 @@ -1,3 +1,7 @@ +2012-02-14 Leo Liu + + * url-future.el: Fix last change. + 2012-02-13 Teodor Zlatanov * url-future.el (url-future-test): Move to test/automated. === modified file 'lisp/url/url-future.el' --- lisp/url/url-future.el 2012-02-13 18:45:36 +0000 +++ lisp/url/url-future.el 2012-02-14 02:14:43 +0000 @@ -41,7 +41,6 @@ ;;; Code: (eval-when-compile (require 'cl)) -(eval-when-compile (require 'ert)) (defstruct url-future callback errorback status value)