Now on revision 106207. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106207 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-10-27 06:22:00 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/emacs-lisp/cl-loaddefs.el' --- lisp/emacs-lisp/cl-loaddefs.el 2011-08-26 10:07:06 +0000 +++ lisp/emacs-lisp/cl-loaddefs.el 2011-10-27 10:22:00 +0000 @@ -10,7 +10,7 @@ ;;;;;; ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p ;;;;;; cl-map-overlays cl-map-intervals cl-map-keymap-recursively ;;;;;; notevery notany every some mapcon mapcan mapl maplist map -;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "26339d9571f9485bf34fa6d2ae38fc84") +;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "15a5e127e1c9c9c3d1f398963b66cde7") ;;; Generated autoloads from cl-extra.el (autoload 'coerce "cl-extra" "\ @@ -28,7 +28,7 @@ \(fn X Y)" nil nil) (autoload 'cl-mapcar-many "cl-extra" "\ -Not documented + \(fn CL-FUNC CL-SEQS)" nil nil) @@ -84,27 +84,27 @@ (defalias 'cl-map-keymap 'map-keymap) (autoload 'cl-map-keymap-recursively "cl-extra" "\ -Not documented + \(fn CL-FUNC-REC CL-MAP &optional CL-BASE)" nil nil) (autoload 'cl-map-intervals "cl-extra" "\ -Not documented + \(fn CL-FUNC &optional CL-WHAT CL-PROP CL-START CL-END)" nil nil) (autoload 'cl-map-overlays "cl-extra" "\ -Not documented + \(fn CL-FUNC &optional CL-BUFFER CL-START CL-END CL-ARG)" nil nil) (autoload 'cl-set-frame-visible-p "cl-extra" "\ -Not documented + \(fn FRAME VAL)" nil nil) (autoload 'cl-progv-before "cl-extra" "\ -Not documented + \(fn SYMS VALUES)" nil nil) @@ -180,7 +180,11 @@ \(fn OBJECT)" nil nil) (autoload 'cl-float-limits "cl-extra" "\ -Not documented +Initialize the Common Lisp floating-point parameters. +This sets the values of: `most-positive-float', `most-negative-float', +`least-positive-float', `least-negative-float', `float-epsilon', +`float-negative-epsilon', `least-positive-normalized-float', and +`least-negative-normalized-float'. \(fn)" nil nil) @@ -228,12 +232,12 @@ \(fn PROPLIST PROPNAME &optional DEFAULT)" nil nil) (autoload 'cl-set-getf "cl-extra" "\ -Not documented + \(fn PLIST TAG VAL)" nil nil) (autoload 'cl-do-remf "cl-extra" "\ -Not documented + \(fn PLIST TAG)" nil nil) @@ -267,7 +271,7 @@ \(fn FORM &optional ENV)" nil nil) (autoload 'cl-prettyexpand "cl-extra" "\ -Not documented + \(fn FORM &optional FULL)" nil nil) ------------------------------------------------------------ revno: 106206 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-10-27 16:07:28 +0800 message: More gnutls memory fixes. * src/gnutls.c (emacs_gnutls_deinit): Deinit the gnutls_state if it is non-NULL, regardless of GNUTLS_INITSTAGE. (Fgnutls_boot): Cleanups. Call emacs_gnutls_deinit if we signal an error. Set process slots as soon as we allocate them. * src/gnutls.h (GNUTLS_LOG, GNUTLS_LOG2): Fix macros. * src/process.c (make_process): Set gnutls_state to NULL. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-27 06:07:09 +0000 +++ src/ChangeLog 2011-10-27 08:07:28 +0000 @@ -1,5 +1,16 @@ 2011-10-27 Chong Yidong + * process.c (make_process): Set gnutls_state to NULL. + + * gnutls.c (emacs_gnutls_deinit): Deinit the gnutls_state if it is + non-NULL, regardless of GNUTLS_INITSTAGE. + (Fgnutls_boot): Cleanups. Call emacs_gnutls_deinit if we signal + an error. Set process slots as soon as we allocate them. + + * gnutls.h (GNUTLS_LOG, GNUTLS_LOG2): Fix macros. + +2011-10-27 Chong Yidong + * gnutls.c (emacs_gnutls_deinit): New function. Deallocate credentials structures as well as calling gnutls_deinit. (Fgnutls_deinit, Fgnutls_boot): Use it. === modified file 'src/gnutls.c' --- src/gnutls.c 2011-10-27 06:07:09 +0000 +++ src/gnutls.c 2011-10-27 08:07:28 +0000 @@ -490,10 +490,12 @@ XPROCESS (proc)->gnutls_anon_cred = NULL; } - if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_INIT) + if (XPROCESS (proc)->gnutls_state) { fn_gnutls_deinit (XPROCESS (proc)->gnutls_state); - GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT - 1; + XPROCESS (proc)->gnutls_state = NULL; + if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_INIT) + GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT - 1; } XPROCESS (proc)->gnutls_p = 0; @@ -647,7 +649,7 @@ DEFUN ("gnutls-boot", Fgnutls_boot, Sgnutls_boot, 3, 3, 0, doc: /* Initialize GnuTLS client for process PROC with TYPE+PROPLIST. -Currently only client mode is supported. Returns a success/failure +Currently only client mode is supported. Return a success/failure value you can check with `gnutls-errorp'. TYPE is a symbol, either `gnutls-anon' or `gnutls-x509pki'. @@ -698,23 +700,13 @@ (Lisp_Object proc, Lisp_Object type, Lisp_Object proplist) { int ret = GNUTLS_E_SUCCESS; - int max_log_level = 0; - /* TODO: GNUTLS_X509_FMT_DER is also an option. */ - int file_format = GNUTLS_X509_FMT_PEM; - - unsigned int gnutls_verify_flags = GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT; - gnutls_x509_crt_t gnutls_verify_cert; - unsigned int gnutls_verify_cert_list_size; - const gnutls_datum_t *gnutls_verify_cert_list; - gnutls_session_t state; - gnutls_certificate_credentials_t x509_cred; - gnutls_anon_client_credentials_t anon_cred; + gnutls_certificate_credentials_t x509_cred = NULL; + gnutls_anon_client_credentials_t anon_cred = NULL; Lisp_Object global_init; char const *priority_string_ptr = "NORMAL"; /* default priority string. */ - Lisp_Object tail; unsigned int peer_verification; char* c_hostname; @@ -726,7 +718,6 @@ /* Lisp_Object callbacks; */ Lisp_Object loglevel; Lisp_Object hostname; - Lisp_Object verify_flags; /* Lisp_Object verify_error; */ Lisp_Object verify_hostname_error; Lisp_Object prime_bits; @@ -741,21 +732,23 @@ return gnutls_make_error (GNUTLS_EMACS_ERROR_NOT_LOADED); } + if (!EQ (type, Qgnutls_x509pki) && !EQ (type, Qgnutls_anon)) + { + error ("Invalid GnuTLS credential type"); + return gnutls_make_error (GNUTLS_EMACS_ERROR_INVALID_TYPE); + } + hostname = Fplist_get (proplist, QCgnutls_bootprop_hostname); priority_string = Fplist_get (proplist, QCgnutls_bootprop_priority); trustfiles = Fplist_get (proplist, QCgnutls_bootprop_trustfiles); keylist = Fplist_get (proplist, QCgnutls_bootprop_keylist); crlfiles = Fplist_get (proplist, QCgnutls_bootprop_crlfiles); - /* callbacks = Fplist_get (proplist, QCgnutls_bootprop_callbacks); */ loglevel = Fplist_get (proplist, QCgnutls_bootprop_loglevel); - verify_flags = Fplist_get (proplist, QCgnutls_bootprop_verify_flags); - /* verify_error = Fplist_get (proplist, QCgnutls_bootprop_verify_error); */ verify_hostname_error = Fplist_get (proplist, QCgnutls_bootprop_verify_hostname_error); prime_bits = Fplist_get (proplist, QCgnutls_bootprop_min_prime_bits); if (!STRINGP (hostname)) error ("gnutls-boot: invalid :hostname parameter"); - c_hostname = SSDATA (hostname); if (NUMBERP (loglevel)) @@ -777,53 +770,50 @@ /* Mark PROC as a GnuTLS process. */ XPROCESS (proc)->gnutls_p = 1; + XPROCESS (proc)->gnutls_state = NULL; XPROCESS (proc)->gnutls_x509_cred = NULL; XPROCESS (proc)->gnutls_anon_cred = NULL; + XPROCESS (proc)->gnutls_cred_type = type; GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_EMPTY; GNUTLS_LOG (1, max_log_level, "allocating credentials"); if (EQ (type, Qgnutls_x509pki)) { + Lisp_Object verify_flags; + unsigned int gnutls_verify_flags = GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT; + GNUTLS_LOG (2, max_log_level, "allocating x509 credentials"); - x509_cred = XPROCESS (proc)->gnutls_x509_cred; fn_gnutls_certificate_allocate_credentials (&x509_cred); + XPROCESS (proc)->gnutls_x509_cred = x509_cred; + verify_flags = Fplist_get (proplist, QCgnutls_bootprop_verify_flags); if (NUMBERP (verify_flags)) { gnutls_verify_flags = XINT (verify_flags); GNUTLS_LOG (2, max_log_level, "setting verification flags"); } else if (NILP (verify_flags)) - { - /* The default is already GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT. */ - GNUTLS_LOG (2, max_log_level, "using default verification flags"); - } + GNUTLS_LOG (2, max_log_level, "using default verification flags"); else - { - /* The default is already GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT. */ - GNUTLS_LOG (2, max_log_level, "ignoring invalid verify-flags"); - } + GNUTLS_LOG (2, max_log_level, "ignoring invalid verify-flags"); + fn_gnutls_certificate_set_verify_flags (x509_cred, gnutls_verify_flags); } - else if (EQ (type, Qgnutls_anon)) + else /* Qgnutls_anon: */ { GNUTLS_LOG (2, max_log_level, "allocating anon credentials"); - anon_cred = XPROCESS (proc)->gnutls_anon_cred; fn_gnutls_anon_allocate_client_credentials (&anon_cred); - } - else - { - error ("unknown credential type"); - ret = GNUTLS_EMACS_ERROR_INVALID_TYPE; - } - - if (ret < GNUTLS_E_SUCCESS) - return gnutls_make_error (ret); + XPROCESS (proc)->gnutls_anon_cred = anon_cred; + } GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_ALLOC; if (EQ (type, Qgnutls_x509pki)) { + /* TODO: GNUTLS_X509_FMT_DER is also an option. */ + int file_format = GNUTLS_X509_FMT_PEM; + Lisp_Object tail; + for (tail = trustfiles; !NILP (tail); tail = Fcdr (tail)) { Lisp_Object trustfile = Fcar (tail); @@ -841,8 +831,8 @@ } else { - error ("Sorry, GnuTLS can't use non-string trustfile %s", - SDATA (trustfile)); + emacs_gnutls_deinit (proc); + error ("Invalid trustfile"); } } @@ -854,17 +844,15 @@ GNUTLS_LOG2 (1, max_log_level, "setting the CRL file: ", SSDATA (crlfile)); ret = fn_gnutls_certificate_set_x509_crl_file - (x509_cred, - SSDATA (crlfile), - file_format); + (x509_cred, SSDATA (crlfile), file_format); if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); } else { - error ("Sorry, GnuTLS can't use non-string CRL file %s", - SDATA (crlfile)); + emacs_gnutls_deinit (proc); + error ("Invalid CRL file"); } } @@ -879,45 +867,31 @@ GNUTLS_LOG2 (1, max_log_level, "setting the client cert file: ", SSDATA (certfile)); ret = fn_gnutls_certificate_set_x509_key_file - (x509_cred, - SSDATA (certfile), - SSDATA (keyfile), - file_format); + (x509_cred, SSDATA (certfile), SSDATA (keyfile), file_format); if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); } else { - if (STRINGP (keyfile)) - error ("Sorry, GnuTLS can't use non-string client cert file %s", - SDATA (certfile)); - else - error ("Sorry, GnuTLS can't use non-string client key file %s", - SDATA (keyfile)); + emacs_gnutls_deinit (proc); + error (STRINGP (keyfile) ? "Invalid client cert file" + : "Invalid client key file"); } } } GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_FILES; - GNUTLS_LOG (1, max_log_level, "gnutls callbacks"); - GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CALLBACKS; -#ifdef HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY -#else -#endif + /* Call gnutls_init here: */ GNUTLS_LOG (1, max_log_level, "gnutls_init"); - ret = fn_gnutls_init (&state, GNUTLS_CLIENT); - - if (ret < GNUTLS_E_SUCCESS) - return gnutls_make_error (ret); - XPROCESS (proc)->gnutls_state = state; - + if (ret < GNUTLS_E_SUCCESS) + return gnutls_make_error (ret); GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT; if (STRINGP (priority_string)) @@ -933,46 +907,25 @@ } GNUTLS_LOG (1, max_log_level, "setting the priority string"); - ret = fn_gnutls_priority_set_direct (state, priority_string_ptr, NULL); - if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_PRIORITY; - if (!EQ (prime_bits, Qnil)) - { - fn_gnutls_dh_set_prime_bits (state, XUINT (prime_bits)); - } - - if (EQ (type, Qgnutls_x509pki)) - { - ret = fn_gnutls_credentials_set (state, GNUTLS_CRD_CERTIFICATE, x509_cred); - } - else if (EQ (type, Qgnutls_anon)) - { - ret = fn_gnutls_credentials_set (state, GNUTLS_CRD_ANON, anon_cred); - } - else - { - error ("unknown credential type"); - ret = GNUTLS_EMACS_ERROR_INVALID_TYPE; - } - + if (INTEGERP (prime_bits)) + fn_gnutls_dh_set_prime_bits (state, XUINT (prime_bits)); + + ret = EQ (type, Qgnutls_x509pki) + ? fn_gnutls_credentials_set (state, GNUTLS_CRD_CERTIFICATE, x509_cred) + : fn_gnutls_credentials_set (state, GNUTLS_CRD_ANON, anon_cred); if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); - XPROCESS (proc)->gnutls_anon_cred = anon_cred; - XPROCESS (proc)->gnutls_x509_cred = x509_cred; - XPROCESS (proc)->gnutls_cred_type = type; - GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET; - ret = emacs_gnutls_handshake (XPROCESS (proc)); - if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); @@ -983,69 +936,71 @@ gnutls_x509_crt_check_hostname() against :hostname. */ ret = fn_gnutls_certificate_verify_peers2 (state, &peer_verification); - if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); if (XINT (loglevel) > 0 && peer_verification & GNUTLS_CERT_INVALID) - message ("%s certificate could not be verified.", - c_hostname); - - if (peer_verification & GNUTLS_CERT_REVOKED) - GNUTLS_LOG2 (1, max_log_level, "certificate was revoked (CRL):", - c_hostname); - - if (peer_verification & GNUTLS_CERT_SIGNER_NOT_FOUND) - GNUTLS_LOG2 (1, max_log_level, "certificate signer was not found:", - c_hostname); - - if (peer_verification & GNUTLS_CERT_SIGNER_NOT_CA) - GNUTLS_LOG2 (1, max_log_level, "certificate signer is not a CA:", - c_hostname); - - if (peer_verification & GNUTLS_CERT_INSECURE_ALGORITHM) - GNUTLS_LOG2 (1, max_log_level, - "certificate was signed with an insecure algorithm:", - c_hostname); - - if (peer_verification & GNUTLS_CERT_NOT_ACTIVATED) - GNUTLS_LOG2 (1, max_log_level, "certificate is not yet activated:", - c_hostname); - - if (peer_verification & GNUTLS_CERT_EXPIRED) - GNUTLS_LOG2 (1, max_log_level, "certificate has expired:", - c_hostname); - - if (peer_verification != 0) - { - if (NILP (verify_hostname_error)) - { - GNUTLS_LOG2 (1, max_log_level, "certificate validation failed:", - c_hostname); - } - else - { - error ("Certificate validation failed %s, verification code %d", - c_hostname, peer_verification); - } - } + message ("%s certificate could not be verified.", c_hostname); + + if (peer_verification & GNUTLS_CERT_REVOKED) + GNUTLS_LOG2 (1, max_log_level, "certificate was revoked (CRL):", + c_hostname); + + if (peer_verification & GNUTLS_CERT_SIGNER_NOT_FOUND) + GNUTLS_LOG2 (1, max_log_level, "certificate signer was not found:", + c_hostname); + + if (peer_verification & GNUTLS_CERT_SIGNER_NOT_CA) + GNUTLS_LOG2 (1, max_log_level, "certificate signer is not a CA:", + c_hostname); + + if (peer_verification & GNUTLS_CERT_INSECURE_ALGORITHM) + GNUTLS_LOG2 (1, max_log_level, + "certificate was signed with an insecure algorithm:", + c_hostname); + + if (peer_verification & GNUTLS_CERT_NOT_ACTIVATED) + GNUTLS_LOG2 (1, max_log_level, "certificate is not yet activated:", + c_hostname); + + if (peer_verification & GNUTLS_CERT_EXPIRED) + GNUTLS_LOG2 (1, max_log_level, "certificate has expired:", + c_hostname); + + if (peer_verification != 0) + { + if (NILP (verify_hostname_error)) + GNUTLS_LOG2 (1, max_log_level, "certificate validation failed:", + c_hostname); + else + { + emacs_gnutls_deinit (proc); + error ("Certificate validation failed %s, verification code %d", + c_hostname, peer_verification); + } + } /* Up to here the process is the same for X.509 certificates and OpenPGP keys. From now on X.509 certificates are assumed. This can be easily extended to work with openpgp keys as well. */ if (fn_gnutls_certificate_type_get (state) == GNUTLS_CRT_X509) { + gnutls_x509_crt_t gnutls_verify_cert; + const gnutls_datum_t *gnutls_verify_cert_list; + unsigned int gnutls_verify_cert_list_size; + ret = fn_gnutls_x509_crt_init (&gnutls_verify_cert); - if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); gnutls_verify_cert_list = fn_gnutls_certificate_get_peers (state, &gnutls_verify_cert_list_size); - if (NULL == gnutls_verify_cert_list) + if (gnutls_verify_cert_list == NULL) { - error ("No x509 certificate was found!\n"); + fn_gnutls_x509_crt_deinit (gnutls_verify_cert); + emacs_gnutls_deinit (proc); + error ("No x509 certificate was found\n"); } /* We only check the first certificate in the given chain. */ @@ -1062,18 +1017,15 @@ if (!fn_gnutls_x509_crt_check_hostname (gnutls_verify_cert, c_hostname)) { if (NILP (verify_hostname_error)) - { - GNUTLS_LOG2 (1, max_log_level, "x509 certificate does not match:", - c_hostname); - } + GNUTLS_LOG2 (1, max_log_level, "x509 certificate does not match:", + c_hostname); else { fn_gnutls_x509_crt_deinit (gnutls_verify_cert); - error ("The x509 certificate does not match \"%s\"", - c_hostname); + emacs_gnutls_deinit (proc); + error ("The x509 certificate does not match \"%s\"", c_hostname); } } - fn_gnutls_x509_crt_deinit (gnutls_verify_cert); } === modified file 'src/gnutls.h' --- src/gnutls.h 2011-10-27 06:07:09 +0000 +++ src/gnutls.h 2011-10-27 08:07:28 +0000 @@ -49,9 +49,9 @@ #define GNUTLS_PROCESS_USABLE(proc) (GNUTLS_INITSTAGE(proc) >= GNUTLS_STAGE_READY) -#define GNUTLS_LOG(level, max, string) if (level <= max) { gnutls_log_function (level, "(Emacs) " string); } +#define GNUTLS_LOG(level, max, string) do { if (level <= max) { gnutls_log_function (level, "(Emacs) " string); } } while (0) -#define GNUTLS_LOG2(level, max, string, extra) if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } +#define GNUTLS_LOG2(level, max, string, extra) do { if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } } while (0) extern EMACS_INT emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, EMACS_INT nbyte); === modified file 'src/process.c' --- src/process.c 2011-10-27 06:07:09 +0000 +++ src/process.c 2011-10-27 08:07:28 +0000 @@ -642,6 +642,7 @@ p->gnutls_initstage = GNUTLS_STAGE_EMPTY; p->gnutls_log_level = 0; p->gnutls_p = 0; + p->gnutls_state = NULL; p->gnutls_x509_cred = NULL; p->gnutls_anon_cred = NULL; #endif ------------------------------------------------------------ revno: 106205 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-10-27 00:21:00 -0700 message: Add doc-strings to some cl float parameters. * lisp/emacs-lisp/cl-extra.el (cl-float-limits): Add doc string. * lisp/emacs-lisp/cl.el (most-positive-float, most-negative-float) (least-positive-float, least-negative-float) (least-positive-normalized-float, least-negative-normalized-float) (float-epsilon, float-negative-epsilon): Add doc-strings, based on those in cl.texi. * lisp/emacs-lisp/cl-extra.el (most-positive-float, most-negative-float) (least-positive-float, least-negative-float) (least-positive-normalized-float, least-negative-normalized-float) (float-epsilon, float-negative-epsilon): Remove unnecessary declarations. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-27 06:38:32 +0000 +++ lisp/ChangeLog 2011-10-27 07:21:00 +0000 @@ -1,5 +1,18 @@ 2011-10-27 Glenn Morris + * emacs-lisp/cl-extra.el (most-positive-float, most-negative-float) + (least-positive-float, least-negative-float) + (least-positive-normalized-float, least-negative-normalized-float) + (float-epsilon, float-negative-epsilon): + Remove unnecessary declarations. + + * emacs-lisp/cl-extra.el (cl-float-limits): Add doc string. + * emacs-lisp/cl.el (most-positive-float, most-negative-float) + (least-positive-float, least-negative-float) + (least-positive-normalized-float, least-negative-normalized-float) + (float-epsilon, float-negative-epsilon): Add doc-strings, + based on those in cl.texi. + * files.el (set-visited-file-name): If the major-mode changed, reload the local variables. (Bug#9796) === modified file 'lisp/emacs-lisp/cl-extra.el' --- lisp/emacs-lisp/cl-extra.el 2011-02-25 03:27:45 +0000 +++ lisp/emacs-lisp/cl-extra.el 2011-10-27 07:21:00 +0000 @@ -480,17 +480,13 @@ (and (numberp res) (/= res (/ res 2)) res)) (arith-error nil))) -(defvar most-positive-float) -(defvar most-negative-float) -(defvar least-positive-float) -(defvar least-negative-float) -(defvar least-positive-normalized-float) -(defvar least-negative-normalized-float) -(defvar float-epsilon) -(defvar float-negative-epsilon) - ;;;###autoload (defun cl-float-limits () + "Initialize the Common Lisp floating-point parameters. +This sets the values of: `most-positive-float', `most-negative-float', +`least-positive-float', `least-negative-float', `float-epsilon', +`float-negative-epsilon', `least-positive-normalized-float', and +`least-negative-normalized-float'." (or most-positive-float (not (numberp '2e1)) (let ((x '2e0) y z) ;; Find maximum exponent (first two loops are optimizations) === modified file 'lisp/emacs-lisp/cl.el' --- lisp/emacs-lisp/cl.el 2011-04-01 15:16:50 +0000 +++ lisp/emacs-lisp/cl.el 2011-10-27 07:21:00 +0000 @@ -333,15 +333,51 @@ (defvar *random-state* (vector 'cl-random-state-tag -1 30 (cl-random-time))) -;; The following are actually set by cl-float-limits. -(defconst most-positive-float nil) -(defconst most-negative-float nil) -(defconst least-positive-float nil) -(defconst least-negative-float nil) -(defconst least-positive-normalized-float nil) -(defconst least-negative-normalized-float nil) -(defconst float-epsilon nil) -(defconst float-negative-epsilon nil) +(defconst most-positive-float nil + "The largest value that a Lisp float can hold. +If your system supports infinities, this is the largest finite value. +For IEEE machines, this is approximately 1.79e+308. +Call `cl-float-limits' to set this.") + +(defconst most-negative-float nil + "The largest negative value that a Lisp float can hold. +This is simply -`most-negative-float'. +Call `cl-float-limits' to set this.") + +(defconst least-positive-float nil + "The smallest value greater than zero that a Lisp float can hold. +For IEEE machines, it is about 4.94e-324 if denormals are supported, +or 2.22e-308 if they are not. +Call `cl-float-limits' to set this.") + +(defconst least-negative-float nil + "The smallest value less than zero that a Lisp float can hold. +This is simply -`least-positive-float'. +Call `cl-float-limits' to set this.") + +(defconst least-positive-normalized-float nil + "The smallest normalized Lisp float greater than zero. +This is the smallest value for which IEEE denormalization does not lose +precision. For IEEE machines, this value is about 2.22e-308. +For machines that do not support the concept of denormalization +and gradual underflow, this constant equals `least-positive-float'. +Call `cl-float-limits' to set this.") + +(defconst least-negative-normalized-float nil + "The smallest normalized Lisp float less than zero. +This is simply -`least-positive-normalized-float'. +Call `cl-float-limits' to set this.") + +(defconst float-epsilon nil + "The smallest positive float that adds to 1.0 to give a distinct value. +Adding a number less than this to 1.0 returns 1.0 due to roundoff. +For IEEE machines, epsilon is about 2.22e-16. +Call `cl-float-limits' to set this.") + +(defconst float-negative-epsilon nil + "The smallest positive float that subtracts from 1.0 to give a distinct value. +For IEEE machines, it is about 1.11e-16. +Call `cl-float-limits' to set this.") ;;; Sequence functions. ------------------------------------------------------------ revno: 106204 fixes bug(s): http://debbugs.gnu.org/9796 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-26 23:38:32 -0700 message: Make set-visited-file-name reload local variables if needed. * lisp/files.el (set-visited-file-name): If the major-mode changed, reload the local variables. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-27 03:01:40 +0000 +++ lisp/ChangeLog 2011-10-27 06:38:32 +0000 @@ -1,3 +1,8 @@ +2011-10-27 Glenn Morris + + * files.el (set-visited-file-name): If the major-mode changed, + reload the local variables. (Bug#9796) + 2011-10-27 Chong Yidong * subr.el (change-major-mode-after-body-hook): New hook. === modified file 'lisp/files.el' --- lisp/files.el 2011-10-23 03:38:23 +0000 +++ lisp/files.el 2011-10-27 06:38:32 +0000 @@ -3682,7 +3682,11 @@ (get major-mode 'mode-class) ;; Don't change the mode if the local variable list specifies it. (hack-local-variables t) - (set-auto-mode t)) + ;; TODO consider making normal-mode handle this case. + (let ((old major-mode)) + (set-auto-mode t) + (or (eq old major-mode) + (hack-local-variables)))) (error nil))) (defun write-file (filename &optional confirm) ------------------------------------------------------------ revno: 106203 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-10-27 14:07:09 +0800 message: Fix a memory leak in the built-in GnuTLS support. * src/gnutls.c (emacs_gnutls_deinit): New function. Deallocate credentials structures as well as calling gnutls_deinit. (Fgnutls_deinit, Fgnutls_boot): Use it. * src/process.c (make_process): Initialize GnuTLS credentials to NULL. (deactivate_process): Call emacs_gnutls_deinit. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-27 00:59:21 +0000 +++ src/ChangeLog 2011-10-27 06:07:09 +0000 @@ -1,3 +1,12 @@ +2011-10-27 Chong Yidong + + * gnutls.c (emacs_gnutls_deinit): New function. Deallocate + credentials structures as well as calling gnutls_deinit. + (Fgnutls_deinit, Fgnutls_boot): Use it. + + * process.c (make_process): Initialize GnuTLS credentials to NULL. + (deactivate_process): Call emacs_gnutls_deinit. + 2011-10-27 Juanma Barranquero * image.c (x_create_x_image_and_pixmap): === modified file 'src/gnutls.c' --- src/gnutls.c 2011-08-14 09:08:02 +0000 +++ src/gnutls.c 2011-10-27 06:07:09 +0000 @@ -464,6 +464,42 @@ return make_number (err); } +Lisp_Object +emacs_gnutls_deinit (Lisp_Object proc) +{ + int log_level; + + CHECK_PROCESS (proc); + + if (XPROCESS (proc)->gnutls_p == 0) + return Qnil; + + log_level = XPROCESS (proc)->gnutls_log_level; + + if (XPROCESS (proc)->gnutls_x509_cred) + { + GNUTLS_LOG (2, log_level, "Deallocating x509 credentials"); + fn_gnutls_certificate_free_credentials (XPROCESS (proc)->gnutls_x509_cred); + XPROCESS (proc)->gnutls_x509_cred = NULL; + } + + if (XPROCESS (proc)->gnutls_anon_cred) + { + GNUTLS_LOG (2, log_level, "Deallocating anon credentials"); + fn_gnutls_anon_free_client_credentials (XPROCESS (proc)->gnutls_anon_cred); + XPROCESS (proc)->gnutls_anon_cred = NULL; + } + + if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_INIT) + { + fn_gnutls_deinit (XPROCESS (proc)->gnutls_state); + GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT - 1; + } + + XPROCESS (proc)->gnutls_p = 0; + return Qt; +} + DEFUN ("gnutls-get-initstage", Fgnutls_get_initstage, Sgnutls_get_initstage, 1, 1, 0, doc: /* Return the GnuTLS init stage of process PROC. See also `gnutls-boot'. */) @@ -551,18 +587,7 @@ See also `gnutls-init'. */) (Lisp_Object proc) { - gnutls_session_t state; - - CHECK_PROCESS (proc); - state = XPROCESS (proc)->gnutls_state; - - if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_INIT) - { - fn_gnutls_deinit (state); - GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT - 1; - } - - return Qt; + return emacs_gnutls_deinit (proc); } DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, @@ -733,9 +758,6 @@ c_hostname = SSDATA (hostname); - state = XPROCESS (proc)->gnutls_state; - XPROCESS (proc)->gnutls_p = 1; - if (NUMBERP (loglevel)) { fn_gnutls_global_set_log_function (gnutls_log_function); @@ -749,40 +771,17 @@ if (! NILP (Fgnutls_errorp (global_init))) return global_init; - /* deinit and free resources. */ - if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_CRED_ALLOC) - { - GNUTLS_LOG (1, max_log_level, "deallocating credentials"); - - if (EQ (type, Qgnutls_x509pki)) - { - GNUTLS_LOG (2, max_log_level, "deallocating x509 credentials"); - x509_cred = XPROCESS (proc)->gnutls_x509_cred; - fn_gnutls_certificate_free_credentials (x509_cred); - } - else if (EQ (type, Qgnutls_anon)) - { - GNUTLS_LOG (2, max_log_level, "deallocating anon credentials"); - anon_cred = XPROCESS (proc)->gnutls_anon_cred; - fn_gnutls_anon_free_client_credentials (anon_cred); - } - else - { - error ("unknown credential type"); - ret = GNUTLS_EMACS_ERROR_INVALID_TYPE; - } - - if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_INIT) - { - GNUTLS_LOG (1, max_log_level, "deallocating x509 credentials"); - Fgnutls_deinit (proc); - } - } - + /* Before allocating new credentials, deallocate any credentials + that PROC might already have. */ + emacs_gnutls_deinit (proc); + + /* Mark PROC as a GnuTLS process. */ + XPROCESS (proc)->gnutls_p = 1; + XPROCESS (proc)->gnutls_x509_cred = NULL; + XPROCESS (proc)->gnutls_anon_cred = NULL; GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_EMPTY; GNUTLS_LOG (1, max_log_level, "allocating credentials"); - if (EQ (type, Qgnutls_x509pki)) { GNUTLS_LOG (2, max_log_level, "allocating x509 credentials"); === modified file 'src/gnutls.h' --- src/gnutls.h 2011-05-04 23:56:09 +0000 +++ src/gnutls.h 2011-10-27 06:07:09 +0000 @@ -60,6 +60,7 @@ extern int emacs_gnutls_record_check_pending (gnutls_session_t state); extern void emacs_gnutls_transport_set_errno (gnutls_session_t state, int err); +extern Lisp_Object emacs_gnutls_deinit (Lisp_Object); extern void syms_of_gnutls (void); === modified file 'src/process.c' --- src/process.c 2011-09-09 01:06:52 +0000 +++ src/process.c 2011-10-27 06:07:09 +0000 @@ -642,6 +642,8 @@ p->gnutls_initstage = GNUTLS_STAGE_EMPTY; p->gnutls_log_level = 0; p->gnutls_p = 0; + p->gnutls_x509_cred = NULL; + p->gnutls_anon_cred = NULL; #endif /* If name is already in use, modify it until it is unused. */ @@ -3867,6 +3869,11 @@ register int inchannel, outchannel; register struct Lisp_Process *p = XPROCESS (proc); +#ifdef HAVE_GNUTLS + /* Delete GnuTLS structures in PROC, if any. */ + emacs_gnutls_deinit (proc); +#endif /* HAVE_GNUTLS */ + inchannel = p->infd; outchannel = p->outfd; ------------------------------------------------------------ revno: 106202 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-10-27 11:01:40 +0800 message: Replace fundamental-mode-hook with change-major-mode-after-body-hook. * lisp/simple.el (fundamental-mode): * lisp/emacs-lisp/derived.el (define-derived-mode): Revert 2010-04-28 change introducing fundamental-mode-hook. * lisp/subr.el (change-major-mode-after-body-hook): New hook. (run-mode-hooks): Run it. * lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Use change-major-mode-before-body-hook. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-10-26 13:42:33 +0000 +++ etc/NEWS 2011-10-27 03:01:40 +0000 @@ -1218,15 +1218,22 @@ ** frame-local variables cannot be let-bound any more. +** Major and minor mode changes +++ -** prog-mode is a new major-mode meant to be the parent of programming mode. -The prog-mode-hook it defines can be used to enable features for -programming modes. For example: -(add-hook 'prog-mode-hook 'flyspell-prog-mode) -enables on the fly spell checking for comments and strings for -programming modes. - -** define-minor-mode accepts a new keyword :variable. +*** `prog-mode' is a new major mode from which programming modes +should be derived. + +**** `prog-mode-hook' can be used to enable features for programming +modes, e.g. (add-hook 'prog-mode-hook 'flyspell-prog-mode) to enable +on-the-fly spell checking for comments and strings. + +*** New hook `change-major-mode-after-body-hook', run by +`run-mode-hooks' just before any other mode hooks. + +*** Enabled globalized minor modes can be disabled in specific modes, +by running (FOO-mode-hook 0) via a mode hook. + +*** `define-minor-mode' accepts a new keyword :variable. +++ ** `delete-file' and `delete-directory' now accept optional arg TRASH. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-26 14:07:31 +0000 +++ lisp/ChangeLog 2011-10-27 03:01:40 +0000 @@ -1,3 +1,15 @@ +2011-10-27 Chong Yidong + + * subr.el (change-major-mode-after-body-hook): New hook. + (run-mode-hooks): Run it. + + * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Use + change-major-mode-before-body-hook. + + * simple.el (fundamental-mode): + * emacs-lisp/derived.el (define-derived-mode): Revert 2010-04-28 + change introducing fundamental-mode-hook. + 2011-10-26 Juanma Barranquero * term/w32-win.el (w32-default-color-map): Declare obsolete. (Bug#9785) === modified file 'lisp/emacs-lisp/derived.el' --- lisp/emacs-lisp/derived.el 2011-08-25 05:37:55 +0000 +++ lisp/emacs-lisp/derived.el 2011-10-27 03:01:40 +0000 @@ -230,7 +230,7 @@ ; Run the parent. (delay-mode-hooks - (,(or parent 'fundamental-mode)) + (,(or parent 'kill-all-local-variables)) ; Identify the child mode. (setq major-mode (quote ,child)) (setq mode-name ,name) === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2011-10-24 17:37:03 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2011-10-27 03:01:40 +0000 @@ -368,11 +368,13 @@ (progn (add-hook 'after-change-major-mode-hook ',MODE-enable-in-buffers) - (add-hook 'fundamental-mode-hook ',MODE-enable-in-buffers) + (add-hook 'change-major-mode-after-body-hook + ',MODE-enable-in-buffers) (add-hook 'find-file-hook ',MODE-check-buffers) (add-hook 'change-major-mode-hook ',MODE-cmhh)) (remove-hook 'after-change-major-mode-hook ',MODE-enable-in-buffers) - (remove-hook 'fundamental-mode-hook ',MODE-enable-in-buffers) + (remove-hook 'change-major-mode-after-body-hook + ',MODE-enable-in-buffers) (remove-hook 'find-file-hook ',MODE-check-buffers) (remove-hook 'change-major-mode-hook ',MODE-cmhh)) === modified file 'lisp/simple.el' --- lisp/simple.el 2011-10-19 12:54:24 +0000 +++ lisp/simple.el 2011-10-27 03:01:40 +0000 @@ -349,7 +349,8 @@ Other major modes are defined by comparison with this one." (interactive) (kill-all-local-variables) - (run-mode-hooks 'fundamental-mode-hook)) + (unless delay-mode-hooks + (run-hooks 'after-change-major-mode-hook))) ;; Special major modes to view specially formatted data rather than files. === modified file 'lisp/subr.el' --- lisp/subr.el 2011-10-26 00:44:06 +0000 +++ lisp/subr.el 2011-10-27 03:01:40 +0000 @@ -1530,6 +1530,9 @@ (make-variable-buffer-local 'delayed-mode-hooks) (put 'delay-mode-hooks 'permanent-local t) +(defvar change-major-mode-after-body-hook nil + "Normal hook run in major mode functions, before the mode hooks.") + (defvar after-change-major-mode-hook nil "Normal hook run at the very end of major mode functions.") @@ -1546,7 +1549,7 @@ ;; Normal case, just run the hook as before plus any delayed hooks. (setq hooks (nconc (nreverse delayed-mode-hooks) hooks)) (setq delayed-mode-hooks nil) - (apply 'run-hooks hooks) + (apply 'run-hooks (cons 'change-major-mode-after-body-hook hooks)) (run-hooks 'after-change-major-mode-hook))) (defmacro delay-mode-hooks (&rest body) ------------------------------------------------------------ revno: 106201 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2011-10-27 02:59:21 +0200 message: src/image.c, src/w32*.c, lib-src/emacsclient.c: Silence warnings under -Wall. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-09-07 07:28:05 +0000 +++ lib-src/ChangeLog 2011-10-27 00:59:21 +0000 @@ -1,3 +1,7 @@ +2011-10-27 Juanma Barranquero + + * emacsclient.c (w32_getenv): Silence compiler warnings. + 2011-09-07 Glenn Morris * etags.c (Fortran_functions): Handle "elemental" functions. === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2011-08-28 23:52:34 +0000 +++ lib-src/emacsclient.c 2011-10-27 00:59:21 +0000 @@ -359,7 +359,7 @@ char *value; DWORD dwType; - if (value = getenv (envvar)) + if ((value = getenv (envvar))) /* Found in the environment. strdup it, because values returned by getenv cannot be free'd. */ return xstrdup (value); @@ -382,7 +382,7 @@ { DWORD size; - if (size = ExpandEnvironmentStrings (value, NULL, 0)) + if ((size = ExpandEnvironmentStrings (value, NULL, 0))) { char *buffer = (char *) xmalloc (size); if (ExpandEnvironmentStrings (value, buffer, size)) === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-26 14:07:31 +0000 +++ src/ChangeLog 2011-10-27 00:59:21 +0000 @@ -1,3 +1,10 @@ +2011-10-27 Juanma Barranquero + + * image.c (x_create_x_image_and_pixmap): + * w32.c (sys_rename, w32_delayed_load): + * w32font.c (fill_in_logfont): + * w32reg.c (x_get_string_resource): Silence compiler warnings. + 2011-10-26 Juanma Barranquero * w32fns.c (w32_default_color_map): New function, === modified file 'src/image.c' --- src/image.c 2011-09-16 10:25:39 +0000 +++ src/image.c 2011-10-27 00:59:21 +0000 @@ -2015,7 +2015,7 @@ /* Bitmaps with a depth less than 16 need a palette. */ /* BITMAPINFO structure already contains the first RGBQUAD. */ if (depth < 16) - palette_colors = 1 << depth - 1; + palette_colors = 1 << (depth - 1); *ximg = xmalloc (sizeof (XImage) + palette_colors * sizeof (RGBQUAD)); === modified file 'src/w32.c' --- src/w32.c 2011-09-09 01:06:52 +0000 +++ src/w32.c 2011-10-27 00:59:21 +0000 @@ -2892,12 +2892,12 @@ int i = 0; oldname = map_w32_filename (oldname, NULL); - if (o = strrchr (oldname, '\\')) + if ((o = strrchr (oldname, '\\'))) o++; else o = (char *) oldname; - if (p = strrchr (temp, '\\')) + if ((p = strrchr (temp, '\\'))) p++; else p = temp; @@ -5756,7 +5756,7 @@ for (dlls = XCDR (dlls); CONSP (dlls); dlls = XCDR (dlls)) { CHECK_STRING_CAR (dlls); - if (library_dll = LoadLibrary (SDATA (XCAR (dlls)))) + if ((library_dll = LoadLibrary (SDATA (XCAR (dlls))))) { found = XCAR (dlls); break; === modified file 'src/w32font.c' --- src/w32font.c 2011-05-12 07:07:06 +0000 +++ src/w32font.c 2011-10-27 00:59:21 +0000 @@ -1916,10 +1916,10 @@ int spacing = XINT (tmp); if (spacing < FONT_SPACING_MONO) logfont->lfPitchAndFamily - = logfont->lfPitchAndFamily & 0xF0 | VARIABLE_PITCH; + = (logfont->lfPitchAndFamily & 0xF0) | VARIABLE_PITCH; else logfont->lfPitchAndFamily - = logfont->lfPitchAndFamily & 0xF0 | FIXED_PITCH; + = (logfont->lfPitchAndFamily & 0xF0) | FIXED_PITCH; } /* Process EXTRA info. */ === modified file 'src/w32reg.c' --- src/w32reg.c 2011-01-25 04:08:28 +0000 +++ src/w32reg.c 2011-10-27 00:59:21 +0000 @@ -147,9 +147,9 @@ { char *resource; - if (resource = w32_get_rdb_resource (rdb, name)) + if ((resource = w32_get_rdb_resource (rdb, name))) return resource; - if (resource = w32_get_rdb_resource (rdb, class)) + if ((resource = w32_get_rdb_resource (rdb, class))) return resource; } @@ -157,6 +157,5 @@ /* --quick was passed, so this is a no-op. */ return NULL; - return (w32_get_string_resource (name, class, REG_SZ)); + return w32_get_string_resource (name, class, REG_SZ); } - ------------------------------------------------------------ revno: 106200 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9158 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2011-10-26 13:27:51 -0400 message: * lisp/gnus/message.el: Don't insert TAB in headers with completion. (message-completion-function): Don't fallback on message-tab-body-function when message-completion-alist fails to find a completion. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-26 09:25:34 +0000 +++ lisp/gnus/ChangeLog 2011-10-26 17:27:51 +0000 @@ -1,3 +1,9 @@ +2011-10-26 Stefan Monnier + + * message.el (message-completion-function): Make sure + message-tab-body-function is not attempted if one of + message-completion-alist fails to find a completion (bug#9158). + 2011-10-26 Daiki Ueno * mml.el (mml-quote-region): Quote <#secure> tag. @@ -7,7 +13,7 @@ * gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24, calling a minor mode from Lisp with nil arg enables it, so we have to - make the working a bit ambiguous here). + make the wording a bit ambiguous here). 2011-10-18 Teodor Zlatanov === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-10-11 05:51:09 +0000 +++ lisp/gnus/message.el 2011-10-26 17:27:51 +0000 @@ -7888,7 +7888,11 @@ (let ((mail-abbrev-mode-regexp (caar alist))) (not (mail-abbrev-in-expansion-header-p)))) (setq alist (cdr alist))) - (cdar alist))) + (when (cdar alist) + (lexical-let ((fun (cdar alist))) + ;; Even if completion fails, return a non-nil value, so as to avoid + ;; falling back to message-tab-body-function. + (lambda () (funcall fun) 'completion-attempted))))) (eval-and-compile (condition-case nil ------------------------------------------------------------ revno: 106199 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-10-26 16:07:31 +0200 message: Fix typos. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-25 07:25:45 +0000 +++ doc/emacs/ChangeLog 2011-10-26 14:07:31 +0000 @@ -1,3 +1,7 @@ +2011-10-26 Juanma Barranquero + + * emacs.texi (Top): Fix typo. + 2011-10-25 Glenn Morris * abbrevs.texi (Saving Abbrevs): === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2011-10-24 02:01:54 +0000 +++ doc/emacs/emacs.texi 2011-10-26 14:07:31 +0000 @@ -295,7 +295,7 @@ * Package Keywords:: Finding Lisp libraries by keywords (topics). * Language Help:: Help relating to international language support. * Misc Help:: Other help commands. -* Help Files:: Commands to display auxilliary help files. +* Help Files:: Commands to display auxiliary help files. * Help Echo:: Help on active text and tooltips (`balloon help'). The Mark and the Region === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-26 13:42:33 +0000 +++ lisp/ChangeLog 2011-10-26 14:07:31 +0000 @@ -1,6 +1,6 @@ 2011-10-26 Juanma Barranquero - * term/w32-win.el (w32-default-color-map): Declare obsolete. + * term/w32-win.el (w32-default-color-map): Declare obsolete. (Bug#9785) 2011-10-26 Michael Albinus === modified file 'lisp/international/mule-conf.el' --- lisp/international/mule-conf.el 2011-02-01 21:37:12 +0000 +++ lisp/international/mule-conf.el 2011-10-26 14:07:31 +0000 @@ -708,7 +708,7 @@ (define-charset-alias 'cp866u 'cp1125) ;; Fixme: C.f. iconv, http://czyborra.com/charsets/codepages.html -;; shows this as not ASCII comptaible, with various graphics in +;; shows this as not ASCII compatible, with various graphics in ;; 0x01-0x1F. (define-charset 'cp437 "CP437 (MS-DOS United States, Australia, New Zealand, South Africa)" === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-09-27 16:46:17 +0000 +++ lisp/org/ChangeLog 2011-10-26 14:07:31 +0000 @@ -1871,7 +1871,7 @@ * org-list.el (org-list-separating-blank-lines-number): Fix confusion between point and item beginning. Now, if no - information is avalaible, truly follow user preference when it + information is available, truly follow user preference when it inserts blank lines manually. (org-list-insert-item): Send correct argument to the preceding function. === modified file 'lisp/textmodes/reftex.el' --- lisp/textmodes/reftex.el 2011-10-20 00:26:14 +0000 +++ lisp/textmodes/reftex.el 2011-10-26 14:07:31 +0000 @@ -1522,7 +1522,7 @@ ;;; (while all ;;; (when (and (eq (car (car all)) 'bof) ;;; (not (file-regular-p (nth 1 (car all))))) -;;; (message "File %s in saved parse info not avalable" (cdr (car all))) +;;; (message "File %s in saved parse info not available" (cdr (car all))) ;;; (error "File not found")) ;;; (setq all (cdr all)))) ) === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-26 13:42:33 +0000 +++ src/ChangeLog 2011-10-26 14:07:31 +0000 @@ -2,7 +2,7 @@ * w32fns.c (w32_default_color_map): New function, extracted from Fw32_default_color_map. - (Fw32_default_color_map, Fx_open_connection): Use it. + (Fw32_default_color_map, Fx_open_connection): Use it. (Bug#9785) 2011-10-25 Paul Eggert ------------------------------------------------------------ revno: 106198 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-10-26 15:42:33 +0200 message: * lisp/term/w32-win.el (w32-default-color-map): Declare obsolete. * src/w32fns.c (w32_default_color_map): New function, extracted from Fw32_default_color_map. (Fw32_default_color_map, Fx_open_connection): Use it. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-10-26 00:44:06 +0000 +++ etc/NEWS 2011-10-26 13:42:33 +0000 @@ -1351,6 +1351,8 @@ ** New make target `dist' to create binary distribution for MS Windows. +** Function `w32-default-color-map' is now obsolete. + ** On Nextstep/OSX, the menu bar can be hidden by customizing ns-auto-hide-menu-bar. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-26 08:42:22 +0000 +++ lisp/ChangeLog 2011-10-26 13:42:33 +0000 @@ -1,3 +1,7 @@ +2011-10-26 Juanma Barranquero + + * term/w32-win.el (w32-default-color-map): Declare obsolete. + 2011-10-26 Michael Albinus * ido.el (ido-file-name-all-completions-1): Do not require === modified file 'lisp/term/w32-win.el' --- lisp/term/w32-win.el 2011-05-04 14:03:16 +0000 +++ lisp/term/w32-win.el 2011-10-26 13:42:33 +0000 @@ -85,6 +85,7 @@ (define-obsolete-function-alias 'w32-select-font 'x-select-font "23.1") (defvar w32-color-map) ;; defined in w32fns.c +(make-obsolete 'w32-default-color-map nil "24.1") (declare-function w32-send-sys-command "w32fns.c") (declare-function set-message-beep "w32console.c") === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-25 16:36:20 +0000 +++ src/ChangeLog 2011-10-26 13:42:33 +0000 @@ -1,3 +1,9 @@ +2011-10-26 Juanma Barranquero + + * w32fns.c (w32_default_color_map): New function, + extracted from Fw32_default_color_map. + (Fw32_default_color_map, Fx_open_connection): Use it. + 2011-10-25 Paul Eggert * dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2). === modified file 'src/w32fns.c' --- src/w32fns.c 2011-07-08 12:46:17 +0000 +++ src/w32fns.c 2011-10-26 13:42:33 +0000 @@ -635,9 +635,8 @@ {"LightGreen" , PALETTERGB (144,238,144)}, }; -DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color_map, - 0, 0, 0, doc: /* Return the default color map. */) - (void) +static Lisp_Object +w32_default_color_map (void) { int i; colormap_t *pc = w32_color_map; @@ -658,6 +657,13 @@ return (cmap); } +DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color_map, + 0, 0, 0, doc: /* Return the default color map. */) + (void) +{ + return w32_default_color_map (); +} + static Lisp_Object w32_color_map_lookup (char *colorname) { @@ -683,7 +689,6 @@ QUIT; } - UNBLOCK_INPUT; return ret; @@ -4768,7 +4773,7 @@ UNGCPRO; } if (NILP (Vw32_color_map)) - Vw32_color_map = Fw32_default_color_map (); + Vw32_color_map = w32_default_color_map (); /* Merge in system logical colors. */ add_system_logical_colors_to_map (&Vw32_color_map); ------------------------------------------------------------ revno: 106197 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-26 06:19:17 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-10-24 10:18:38 +0000 +++ autogen/configure 2011-10-26 10:19:17 +0000 @@ -9360,7 +9360,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using GNU Make" >&5 $as_echo_n "checking whether we are using GNU Make... " >&6; } HAVE_GNU_MAKE=no - testval=`make --version 2>/dev/null | grep 'GNU Make'` + testval=`${MAKE-make} --version 2>/dev/null | grep 'GNU Make'` if test "x$testval" != x; then HAVE_GNU_MAKE=yes else @@ -22445,14 +22445,14 @@ if test "$HAVE_NS" = "yes"; then echo - echo "You must run \"make install\" in order to test the built application. + echo "You must run \"${MAKE-make} install\" in order to test the built application. The installed application will go to nextstep/Emacs.app and can be run or moved from there." if test "$EN_NS_SELF_CONTAINED" = "yes"; then echo "The application will be fully self-contained." else echo "The lisp resources for the application will be installed under ${prefix}. -You may need to run \"make install\" with sudo. The application will fail +You may need to run \"${MAKE-make} install\" with sudo. The application will fail to run if these resources are not installed." fi echo