Now on revision 105247. ------------------------------------------------------------ revno: 105247 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-07-15 19:59:25 -0400 message: * lisp/subr.el (read-char-choice): Respect help-form. (Bug#9001) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 22:53:39 +0000 +++ lisp/ChangeLog 2011-07-15 23:59:25 +0000 @@ -1,6 +1,7 @@ 2011-07-15 Glenn Morris * subr.el (read-char-choice): Allow quitting. (Bug#9001) + Respect help-form. 2011-07-09 Lawrence Mitchell === modified file 'lisp/subr.el' --- lisp/subr.el 2011-07-15 22:53:39 +0000 +++ lisp/subr.el 2011-07-15 23:59:25 +0000 @@ -2145,25 +2145,34 @@ keyboard-quit events while waiting for a valid input." (unless (consp chars) (error "Called `read-char-choice' without valid char choices")) - (let (char done) + (let (char done show-help (helpbuf " *Char Help*")) (let ((cursor-in-echo-area t) (executing-kbd-macro executing-kbd-macro)) - (while (not done) - (unless (get-text-property 0 'face prompt) - (setq prompt (propertize prompt 'face 'minibuffer-prompt))) - (setq char (let ((inhibit-quit inhibit-keyboard-quit)) - (read-key prompt))) - (cond - ((not (numberp char))) - ((memq char chars) - (setq done t)) - ((and executing-kbd-macro (= char -1)) - ;; read-event returns -1 if we are in a kbd macro and - ;; there are no more events in the macro. Attempt to - ;; get an event interactively. - (setq executing-kbd-macro nil)) - ((and (not inhibit-keyboard-quit) (eq char ?\C-g)) - (keyboard-quit))))) + (save-window-excursion ; in case we call help-form-show + (while (not done) + (unless (get-text-property 0 'face prompt) + (setq prompt (propertize prompt 'face 'minibuffer-prompt))) + (setq char (let ((inhibit-quit inhibit-keyboard-quit)) + (read-key prompt))) + (and show-help (buffer-live-p helpbuf) + (kill-buffer helpbuf)) + (cond + ((not (numberp char))) + ;; If caller has set help-form, that's enough. + ;; They don't explicitly have to add help-char to chars. + ((and help-form + (eq char help-char) + (setq show-help t) + (help-form-show))) + ((memq char chars) + (setq done t)) + ((and executing-kbd-macro (= char -1)) + ;; read-event returns -1 if we are in a kbd macro and + ;; there are no more events in the macro. Attempt to + ;; get an event interactively. + (setq executing-kbd-macro nil)) + ((and (not inhibit-keyboard-quit) (eq char ?\C-g)) + (keyboard-quit)))))) ;; Display the question with the answer. But without cursor-in-echo-area. (message "%s%s" prompt (char-to-string char)) char)) ------------------------------------------------------------ revno: 105246 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2011-07-15 23:16:19 +0000 message: Merge changes made in Gnus trunk. gnus.el (debbugs-gnu): Renamed from debbugs-emacs. message.el (message-reply): Work around mysterious bug where `message-mode' seems to overwrite the locally bound `subject' variable. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-07-14 22:20:24 +0000 +++ lisp/gnus/ChangeLog 2011-07-15 23:16:19 +0000 @@ -1,3 +1,10 @@ +2011-07-15 Lars Magne Ingebrigtsen + + * gnus.el (debbugs-gnu): Renamed from debbugs-emacs. + + * message.el (message-reply): Work around mysterious bug where + `message-mode' seems to overwrite the locally bound `subject' variable. + 2011-07-14 Andrew Cohen * nnimap.el (nnimap-request-thread): Ensure search is performed in === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2011-07-05 23:06:11 +0000 +++ lisp/gnus/gnus.el 2011-07-15 23:16:19 +0000 @@ -4381,12 +4381,11 @@ (gnus-1 arg dont-connect slave) (gnus-final-warning))) -(autoload 'debbugs-emacs "debbugs-gnu") +(autoload 'debbugs-gnu "debbugs-gnu") (defun gnus-list-debbugs () "List all open Gnus bug reports." (interactive) - (debbugs-emacs '("important" "normal" "minor" "wishlist") - "gnus")) + (debbugs-gnu nil "gnus")) ;; Allow redefinition of Gnus functions. === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-07-05 09:51:56 +0000 +++ lisp/gnus/message.el 2011-07-15 23:16:19 +0000 @@ -6878,20 +6878,19 @@ (unless follow-to (setq follow-to (message-get-reply-headers wide to-address)))) - (unless (message-mail-user-agent) - (message-pop-to-buffer - (message-buffer-name - (if wide "wide reply" "reply") from - (if wide to-address nil)) - switch-function)) - - (setq message-reply-headers - (vector 0 subject from date message-id references 0 0 "")) - - (message-setup - `((Subject . ,subject) - ,@follow-to) - cur))) + (let ((headers + `((Subject . ,subject) + ,@follow-to))) + (unless (message-mail-user-agent) + (message-pop-to-buffer + (message-buffer-name + (if wide "wide reply" "reply") from + (if wide to-address nil)) + switch-function)) + (setq message-reply-headers + (vector 0 (cdr (assq 'Subject headers)) + from date message-id references 0 0 "")) + (message-setup headers cur)))) ;;;###autoload (defun message-wide-reply (&optional to-address) ------------------------------------------------------------ revno: 105245 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-07-15 18:53:39 -0400 message: * lisp/subr.el (read-char-choice): Allow quitting. (Bug#9001) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 17:41:24 +0000 +++ lisp/ChangeLog 2011-07-15 22:53:39 +0000 @@ -1,3 +1,7 @@ +2011-07-15 Glenn Morris + + * subr.el (read-char-choice): Allow quitting. (Bug#9001) + 2011-07-09 Lawrence Mitchell * net/gnutls.el (gnutls-min-prime-bits): New variable. === modified file 'lisp/subr.el' --- lisp/subr.el 2011-07-14 06:50:21 +0000 +++ lisp/subr.el 2011-07-15 22:53:39 +0000 @@ -2161,7 +2161,9 @@ ;; read-event returns -1 if we are in a kbd macro and ;; there are no more events in the macro. Attempt to ;; get an event interactively. - (setq executing-kbd-macro nil))))) + (setq executing-kbd-macro nil)) + ((and (not inhibit-keyboard-quit) (eq char ?\C-g)) + (keyboard-quit))))) ;; Display the question with the answer. But without cursor-in-echo-area. (message "%s%s" prompt (char-to-string char)) char)) ------------------------------------------------------------ revno: 105244 committer: Andreas Schwab branch nick: emacs timestamp: Fri 2011-07-15 20:43:23 +0200 message: * doc/lispref/help.texi (Keys in Documentation): Revert last change. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-15 14:31:14 +0000 +++ doc/lispref/ChangeLog 2011-07-15 18:43:23 +0000 @@ -1,3 +1,7 @@ +2011-07-15 Andreas Schwab + + * help.texi (Keys in Documentation): Revert last change. + 2011-07-15 Lars Magne Ingebrigtsen * help.texi (Keys in Documentation): Clarify that \= only quotes === modified file 'doc/lispref/help.texi' --- doc/lispref/help.texi 2011-07-15 14:31:14 +0000 +++ doc/lispref/help.texi 2011-07-15 18:43:23 +0000 @@ -324,8 +324,9 @@ @samp{\[@var{command}]} sequences in this documentation string. @item \= -quotes the following character and is discarded; thus, @samp{\=\} puts -@samp{\} into the output. +quotes the following character and is discarded; thus, @samp{\=\[} puts +@samp{\[} into the output, and @samp{\=\=} puts @samp{\=} into the +output. @end table @strong{Please note:} Each @samp{\} must be doubled when written in a ------------------------------------------------------------ revno: 105243 author: Lawrence Mitchell committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 19:41:24 +0200 message: Allow controlling how many prime bits to use during TLS negotiation diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 17:25:02 +0000 +++ lisp/ChangeLog 2011-07-15 17:41:24 +0000 @@ -1,3 +1,8 @@ +2011-07-09 Lawrence Mitchell + + * net/gnutls.el (gnutls-min-prime-bits): New variable. + (gnutls-negotiate): Use it. + 2011-07-15 Lars Magne Ingebrigtsen * net/gnutls.el (gnutls-negotiate): Upcase === modified file 'lisp/net/gnutls.el' --- lisp/net/gnutls.el 2011-07-15 17:25:02 +0000 +++ lisp/net/gnutls.el 2011-07-15 17:41:24 +0000 @@ -54,6 +54,19 @@ :type '(choice (const nil) string)) +;;;###autoload +(defcustom gnutls-min-prime-bits nil + "The minimum number of bits to be used in Diffie-Hellman key exchange. + +This sets the minimum accepted size of the key to be used in a +client-server handshake. If the server sends a prime with fewer than +the specified number of bits the handshake will fail. + +A value of nil says to use the default gnutls value." + :type '(choice (const :tag "Use default value" nil) + (integer :tag "Number of bits" 512)) + :group 'gnutls) + (defun open-gnutls-stream (name buffer host service) "Open a SSL/TLS connection for a service to a host. Returns a subprocess-object to represent the connection. @@ -97,8 +110,8 @@ (defun* gnutls-negotiate (&rest spec &key process type hostname priority-string - trustfiles crlfiles keylist verify-flags - verify-error verify-hostname-error + trustfiles crlfiles keylist min-prime-bits + verify-flags verify-error verify-hostname-error &allow-other-keys) "Negotiate a SSL/TLS connection. Returns proc. Signals gnutls-error. @@ -111,6 +124,9 @@ TRUSTFILES is a list of CA bundles. CRLFILES is a list of CRL files. KEYLIST is an alist of (client key file, client cert file) pairs. +MIN-PRIME-BITS is the minimum acceptable size of Diffie-Hellman keys +\(see `gnutls-min-prime-bits' for more information). Use nil for the +default. When VERIFY-HOSTNAME-ERROR is not nil, an error will be raised when the hostname does not match the presented certificate's host @@ -155,9 +171,11 @@ (if gnutls-algorithm-priority (upcase gnutls-algorithm-priority) "NORMAL"))))) + (min-prime-bits (or min-prime-bits gnutls-min-prime-bits)) (params `(:priority ,priority-string :hostname ,hostname :loglevel ,gnutls-log-level + :min-prime-bits ,min-prime-bits :trustfiles ,trustfiles :crlfiles ,crlfiles :keylist ,keylist === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-15 15:31:36 +0000 +++ src/ChangeLog 2011-07-15 17:41:24 +0000 @@ -1,3 +1,8 @@ +2011-07-09 Lawrence Mitchell + + * gnutls.c (Qgnutls_bootprop_min_prime_bits): New variable. + (Fgnutls_boot): Use it. + 2011-07-15 Andreas Schwab * doc.c (Fsubstitute_command_keys): Revert last change. === modified file 'src/gnutls.c' --- src/gnutls.c 2011-07-13 20:33:44 +0000 +++ src/gnutls.c 2011-07-15 17:41:24 +0000 @@ -50,6 +50,7 @@ static Lisp_Object Qgnutls_bootprop_callbacks; static Lisp_Object Qgnutls_bootprop_loglevel; static Lisp_Object Qgnutls_bootprop_hostname; +static Lisp_Object Qgnutls_bootprop_min_prime_bits; static Lisp_Object Qgnutls_bootprop_verify_flags; static Lisp_Object Qgnutls_bootprop_verify_hostname_error; @@ -105,6 +106,8 @@ DEF_GNUTLS_FN (int, gnutls_credentials_set, (gnutls_session_t, gnutls_credentials_type_t, void *)); DEF_GNUTLS_FN (void, gnutls_deinit, (gnutls_session_t)); +DEF_GNUTLS_FN (void, gnutls_dh_set_prime_bits, + (gnutls_session_t, unsigned int)); DEF_GNUTLS_FN (int, gnutls_error_is_fatal, (int)); DEF_GNUTLS_FN (int, gnutls_global_init, (void)); DEF_GNUTLS_FN (void, gnutls_global_set_log_function, (gnutls_log_func)); @@ -169,6 +172,7 @@ LOAD_GNUTLS_FN (library, gnutls_certificate_verify_peers2); LOAD_GNUTLS_FN (library, gnutls_credentials_set); LOAD_GNUTLS_FN (library, gnutls_deinit); + LOAD_GNUTLS_FN (library, gnutls_dh_set_prime_bits); LOAD_GNUTLS_FN (library, gnutls_error_is_fatal); LOAD_GNUTLS_FN (library, gnutls_global_init); LOAD_GNUTLS_FN (library, gnutls_global_set_log_function); @@ -218,6 +222,7 @@ #define fn_gnutls_certificate_verify_peers2 gnutls_certificate_verify_peers2 #define fn_gnutls_credentials_set gnutls_credentials_set #define fn_gnutls_deinit gnutls_deinit +#define fn_gnutls_dh_set_prime_bits gnutls_dh_set_prime_bits #define fn_gnutls_error_is_fatal gnutls_error_is_fatal #define fn_gnutls_global_init gnutls_global_init #define fn_gnutls_global_set_log_function gnutls_global_set_log_function @@ -646,6 +651,9 @@ :verify-hostname-error, if non-nil, makes a hostname mismatch an error. Otherwise it will be just a warning. +:min-prime-bits is the minimum accepted number of bits the client will +accept in Diffie-Hellman key exchange. + The debug level will be set for this process AND globally for GnuTLS. So if you set it higher or lower at any point, it affects global debugging. @@ -698,6 +706,7 @@ Lisp_Object verify_flags; /* Lisp_Object verify_error; */ Lisp_Object verify_hostname_error; + Lisp_Object prime_bits; CHECK_PROCESS (proc); CHECK_SYMBOL (type); @@ -719,6 +728,7 @@ verify_flags = Fplist_get (proplist, Qgnutls_bootprop_verify_flags); /* verify_error = Fplist_get (proplist, Qgnutls_bootprop_verify_error); */ verify_hostname_error = Fplist_get (proplist, Qgnutls_bootprop_verify_hostname_error); + prime_bits = Fplist_get (proplist, Qgnutls_bootprop_min_prime_bits); if (!STRINGP (hostname)) error ("gnutls-boot: invalid :hostname parameter"); @@ -936,6 +946,11 @@ 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); @@ -1114,6 +1129,7 @@ DEFSYM (Qgnutls_bootprop_crlfiles, ":crlfiles"); DEFSYM (Qgnutls_bootprop_callbacks, ":callbacks"); DEFSYM (Qgnutls_bootprop_callbacks_verify, "verify"); + DEFSYM (Qgnutls_bootprop_min_prime_bits, ":min-prime-bits"); DEFSYM (Qgnutls_bootprop_loglevel, ":loglevel"); DEFSYM (Qgnutls_bootprop_verify_flags, ":verify-flags"); DEFSYM (Qgnutls_bootprop_verify_hostname_error, ":verify-hostname-error"); ------------------------------------------------------------ revno: 105242 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 19:25:02 +0200 message: * net/gnutls.el (gnutls-negotiate): Upcase `gnutls-algorithm-priority'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 17:21:57 +0000 +++ lisp/ChangeLog 2011-07-15 17:25:02 +0000 @@ -1,3 +1,8 @@ +2011-07-15 Lars Magne Ingebrigtsen + + * net/gnutls.el (gnutls-negotiate): Upcase + `gnutls-algorithm-priority'. + 2011-07-15 Glenn Morris * jka-compr.el (jka-compr-verbose): Move from here... === modified file 'lisp/net/gnutls.el' --- lisp/net/gnutls.el 2011-07-15 17:21:57 +0000 +++ lisp/net/gnutls.el 2011-07-15 17:25:02 +0000 @@ -152,7 +152,9 @@ ((eq type 'gnutls-anon) "NORMAL:+ANON-DH:!ARCFOUR-128") ((eq type 'gnutls-x509pki) - (or gnutls-algorithm-priority "NORMAL"))))) + (if gnutls-algorithm-priority + (upcase gnutls-algorithm-priority) + "NORMAL"))))) (params `(:priority ,priority-string :hostname ,hostname :loglevel ,gnutls-log-level ------------------------------------------------------------ revno: 105241 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 19:21:57 +0200 message: Add a variable to customize the gnutls priority diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 17:18:53 +0000 +++ lisp/ChangeLog 2011-07-15 17:21:57 +0000 @@ -7,6 +7,9 @@ 2011-07-15 Lars Magne Ingebrigtsen + * net/gnutls.el (gnutls-algorithm-priority): New variable. + (gnutls-negotiate): Use it. + * emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node. * info.el (Info-beginning-of-buffer): New command. === modified file 'lisp/emacs-lisp/cl-loaddefs.el' --- lisp/emacs-lisp/cl-loaddefs.el 2011-07-15 13:55:00 +0000 +++ lisp/emacs-lisp/cl-loaddefs.el 2011-07-15 17:21:57 +0000 @@ -282,7 +282,7 @@ ;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist ;;;;;; do* do loop return-from return block etypecase typecase ecase ;;;;;; case load-time-value eval-when destructuring-bind function* -;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "dd99db1e96dff411cc5d484a639a1330") +;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "2261724608e3223036b863d214f7dc0c") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ @@ -541,12 +541,13 @@ \(fn TYPE FORM)" nil (quote macro)) (autoload 'declare "cl-macs" "\ -Declare something about SPECS while compiling. +Declare SPECS about the current function while compiling. For instance (declare (warn 0)) -will turn off byte-compile warnings. +will turn off byte-compile warnings in the function. +See Info node `(cl)Declarations' for details. \(fn &rest SPECS)" nil (quote macro)) === modified file 'lisp/net/gnutls.el' --- lisp/net/gnutls.el 2011-05-04 01:44:58 +0000 +++ lisp/net/gnutls.el 2011-07-15 17:21:57 +0000 @@ -47,6 +47,13 @@ :type 'integer :group 'gnutls) +(defcustom gnutls-algorithm-priority nil + "If non-nil, this should be a TLS priority string. +For instance, if you want to skip the \"dhe-rsa\" algorithm, +set this variable to \"normal:-dhe-rsa\"." + :type '(choice (const nil) + string)) + (defun open-gnutls-stream (name buffer host service) "Open a SSL/TLS connection for a service to a host. Returns a subprocess-object to represent the connection. @@ -145,7 +152,7 @@ ((eq type 'gnutls-anon) "NORMAL:+ANON-DH:!ARCFOUR-128") ((eq type 'gnutls-x509pki) - "NORMAL")))) + (or gnutls-algorithm-priority "NORMAL"))))) (params `(:priority ,priority-string :hostname ,hostname :loglevel ,gnutls-log-level ------------------------------------------------------------ revno: 105240 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-07-15 13:18:53 -0400 message: Rework previous change. * lisp/jka-compr.el (jka-compr-verbose): Move from here... * lisp/jka-cmpr-hook.el (jka-compr-verbose): ... to here. (Bug#9090) Add missing :version tag. * lisp/info.el: No need to require jka-compr when compiling. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 17:04:12 +0000 +++ lisp/ChangeLog 2011-07-15 17:18:53 +0000 @@ -1,6 +1,9 @@ 2011-07-15 Glenn Morris - * info.el (info-insert-file-contents): Require jka-compr. (Bug#9090) + * jka-compr.el (jka-compr-verbose): Move from here... + * jka-cmpr-hook.el (jka-compr-verbose): ... to here. (Bug#9090) + Add missing :version tag. + * info.el: No need to require jka-compr when compiling. 2011-07-15 Lars Magne Ingebrigtsen === modified file 'lisp/info.el' --- lisp/info.el 2011-07-15 17:04:12 +0000 +++ lisp/info.el 2011-07-15 17:18:53 +0000 @@ -463,7 +463,6 @@ (defun info-insert-file-contents (filename &optional visit) "Insert the contents of an Info file in the current buffer. Do the right thing if the file has been compressed or zipped." - (require 'jka-compr) ; bug #9090 (let* ((tail Info-suffix-list) (jka-compr-verbose nil) (lfn (if (fboundp 'msdos-long-file-names) === modified file 'lisp/jka-cmpr-hook.el' --- lisp/jka-cmpr-hook.el 2011-07-14 01:09:00 +0000 +++ lisp/jka-cmpr-hook.el 2011-07-15 17:18:53 +0000 @@ -39,6 +39,12 @@ "jka-compr customization." :group 'compression) +(defcustom jka-compr-verbose t + "If non-nil, output messages whenever compressing or uncompressing files." + :version "24.1" + :type 'boolean + :group 'jka-compr) + ;; List of all the elements we actually added to file-coding-system-alist. (defvar jka-compr-added-to-file-coding-system-alist nil) === modified file 'lisp/jka-compr.el' --- lisp/jka-compr.el 2011-07-13 13:25:29 +0000 +++ lisp/jka-compr.el 2011-07-15 17:18:53 +0000 @@ -97,11 +97,6 @@ :type 'string :group 'jka-compr) -(defcustom jka-compr-verbose t - "If non-nil, output messages whenever compressing or uncompressing files." - :type 'boolean - :group 'jka-compr) - (defvar jka-compr-use-shell (not (memq system-type '(ms-dos windows-nt)))) ------------------------------------------------------------ revno: 105239 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-07-15 13:04:12 -0400 message: * lisp/info.el (info-insert-file-contents): Require jka-compr. (Bug#9090) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 16:01:18 +0000 +++ lisp/ChangeLog 2011-07-15 17:04:12 +0000 @@ -1,3 +1,7 @@ +2011-07-15 Glenn Morris + + * info.el (info-insert-file-contents): Require jka-compr. (Bug#9090) + 2011-07-15 Lars Magne Ingebrigtsen * emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node. === modified file 'lisp/info.el' --- lisp/info.el 2011-07-15 15:14:46 +0000 +++ lisp/info.el 2011-07-15 17:04:12 +0000 @@ -32,7 +32,7 @@ ;;; Code: -(eval-when-compile (require 'jka-compr) (require 'cl)) +(eval-when-compile (require 'cl)) (defgroup info nil "Info subsystem." @@ -463,6 +463,7 @@ (defun info-insert-file-contents (filename &optional visit) "Insert the contents of an Info file in the current buffer. Do the right thing if the file has been compressed or zipped." + (require 'jka-compr) ; bug #9090 (let* ((tail Info-suffix-list) (jka-compr-verbose nil) (lfn (if (fboundp 'msdos-long-file-names) ------------------------------------------------------------ revno: 105238 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 18:01:18 +0200 message: * emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 15:14:46 +0000 +++ lisp/ChangeLog 2011-07-15 16:01:18 +0000 @@ -1,5 +1,7 @@ 2011-07-15 Lars Magne Ingebrigtsen + * emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node. + * info.el (Info-beginning-of-buffer): New command. (Info-mode-map): Use it instead of `beginning-of-buffer' to allow announcing `b' as the key (bug#8325). === modified file 'lisp/emacs-lisp/cl-macs.el' --- lisp/emacs-lisp/cl-macs.el 2011-07-15 14:59:42 +0000 +++ lisp/emacs-lisp/cl-macs.el 2011-07-15 16:01:18 +0000 @@ -1606,7 +1606,8 @@ \(declare (warn 0)) -will turn off byte-compile warnings in the function." +will turn off byte-compile warnings in the function. +See Info node `(cl)Declarations' for details." (if (cl-compiling-file) (while specs (if (listp cl-declare-stack) (push (car specs) cl-declare-stack)) ------------------------------------------------------------ revno: 105237 fixes bug(s): http://debbugs.gnu.org/8904 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 17:46:28 +0200 message: * help.texi (Misc Help): Mention `describe-prefix-bindings' explicitly. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-14 18:37:53 +0000 +++ doc/emacs/ChangeLog 2011-07-15 15:46:28 +0000 @@ -1,3 +1,8 @@ +2011-07-15 Lars Magne Ingebrigtsen + + * help.texi (Misc Help): Mention `describe-prefix-bindings' + explicitly (bug#8904). + 2011-07-14 Lars Magne Ingebrigtsen * trouble.texi (Checklist): Use an `M-x' example instead of an === modified file 'doc/emacs/help.texi' --- doc/emacs/help.texi 2011-07-10 03:11:47 +0000 +++ doc/emacs/help.texi 2011-07-15 15:46:28 +0000 @@ -589,11 +589,13 @@ character's syntax (@pxref{Syntax Tables,, Syntax Tables, elisp, The Emacs Lisp Reference Manual}). +@findex describe-prefix-bindings You can get a list of subcommands for a particular prefix key by -typing @kbd{C-h} after the prefix key. (There are a few prefix keys -for which this does not work---those that provide their own bindings -for @kbd{C-h}. One of these is @key{ESC}, because @kbd{@key{ESC} C-h} -is actually @kbd{C-M-h}, which marks a defun.) +typing @kbd{C-h} (@code{describe-prefix-bindings}) after the prefix +key. (There are a few prefix keys for which this does not +work---those that provide their own bindings for @kbd{C-h}. One of +these is @key{ESC}, because @kbd{@key{ESC} C-h} is actually +@kbd{C-M-h}, which marks a defun.) @node Help Files @section Help Files ------------------------------------------------------------ revno: 105236 committer: Andreas Schwab branch nick: emacs timestamp: Fri 2011-07-15 17:31:36 +0200 message: * src/doc.c (Fsubstitute_command_keys): Revert last change. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-15 14:31:14 +0000 +++ src/ChangeLog 2011-07-15 15:31:36 +0000 @@ -1,3 +1,7 @@ +2011-07-15 Andreas Schwab + + * doc.c (Fsubstitute_command_keys): Revert last change. + 2011-07-15 Lars Magne Ingebrigtsen * doc.c (Fsubstitute_command_keys): Clarify that \= really only === modified file 'src/doc.c' --- src/doc.c 2011-07-15 14:31:14 +0000 +++ src/doc.c 2011-07-15 15:31:36 +0000 @@ -702,8 +702,8 @@ \(made by `describe-bindings') of the value of MAPVAR, taken as a keymap. Substrings of the form \\=\\ specify to use the value of MAPVAR as the keymap for future \\=\\[COMMAND] substrings. -\\=\\= quotes the following character and is discarded. -In particular, \\=\\=\\ puts \\ into the output. +\\=\\= quotes the following character and is discarded; +thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output. Returns original STRING if no substitutions were made. Otherwise, a new string, without any text properties, is returned. */) ------------------------------------------------------------ revno: 105235 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 17:14:46 +0200 message: (Info-mode-menu): Use `Info-beginning-of-buffer' for consistency. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 15:13:00 +0000 +++ lisp/ChangeLog 2011-07-15 15:14:46 +0000 @@ -3,6 +3,7 @@ * info.el (Info-beginning-of-buffer): New command. (Info-mode-map): Use it instead of `beginning-of-buffer' to allow announcing `b' as the key (bug#8325). + (Info-mode-menu): Use `Info-beginning-of-buffer' for consistency. * emacs-lisp/cl-macs.el (declare): Doc string fix-up. === modified file 'lisp/info.el' --- lisp/info.el 2011-07-15 15:13:00 +0000 +++ lisp/info.el 2011-07-15 15:14:46 +0000 @@ -3731,7 +3731,7 @@ :help "Go backward one node, considering all as a sequence"] ["Forward" Info-forward-node :help "Go forward one node, considering all as a sequence"] - ["Beginning" beginning-of-buffer + ["Beginning" Info-beginning-of-buffer :help "Go to beginning of this node"] ["Top" Info-top-node :help "Go to top node of file"] ------------------------------------------------------------ revno: 105234 fixes bug(s): http://debbugs.gnu.org/8325 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 17:13:00 +0200 message: Add new command `Info-beginning-of-buffer' to allow announcing `b' * info.el (Info-beginning-of-buffer): New command. (Info-mode-map): Use it instead of `beginning-of-buffer' to allow announcing `b' as the key (bug#8325). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 14:59:42 +0000 +++ lisp/ChangeLog 2011-07-15 15:13:00 +0000 @@ -1,5 +1,9 @@ 2011-07-15 Lars Magne Ingebrigtsen + * info.el (Info-beginning-of-buffer): New command. + (Info-mode-map): Use it instead of `beginning-of-buffer' to allow + announcing `b' as the key (bug#8325). + * emacs-lisp/cl-macs.el (declare): Doc string fix-up. * international/mule-cmds.el === modified file 'lisp/info.el' --- lisp/info.el 2011-07-13 13:35:02 +0000 +++ lisp/info.el 2011-07-15 15:13:00 +0000 @@ -2789,6 +2789,11 @@ (goto-char (point-max))))) (t (error "No previous nodes")))) +(defun Info-beginning-of-buffer () + "Go to the beginnning of the buffer." + (interactive) + (goto-char (point-min))) + (defun Info-scroll-up () "Scroll one screenful forward in Info, considering all nodes as one sequence. Once you scroll far enough in a node that its menu appears on the screen @@ -3650,7 +3655,7 @@ (defvar Info-mode-map (let ((map (make-keymap))) (suppress-keymap map) - (define-key map "." 'beginning-of-buffer) + (define-key map "." 'Info-beginning-of-buffer) (define-key map " " 'Info-scroll-up) (define-key map "\C-m" 'Info-follow-nearest-node) (define-key map "\t" 'Info-next-reference) @@ -3671,7 +3676,8 @@ (define-key map "[" 'Info-backward-node) (define-key map "<" 'Info-top-node) (define-key map ">" 'Info-final-node) - (define-key map "b" 'beginning-of-buffer) + (define-key map "b" 'Info-beginning-of-buffer) + (put 'Info-beginning-of-buffer :advertised-binding "b") (define-key map "d" 'Info-directory) (define-key map "e" 'Info-edit) (define-key map "f" 'Info-follow-reference) @@ -3931,7 +3937,7 @@ \\[Info-scroll-down] Normally, scroll backward. If the beginning of the buffer is already visible, try to go to the previous menu entry, or up if there is none. -\\[beginning-of-buffer] Go to beginning of node. +\\[Info-beginning-of-buffer] Go to beginning of node. Advanced commands: \\[Info-search] Search through this Info file for specified regexp, ------------------------------------------------------------ revno: 105233 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 16:59:42 +0200 message: * emacs-lisp/cl-macs.el (declare): Doc string fix-up. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 14:24:09 +0000 +++ lisp/ChangeLog 2011-07-15 14:59:42 +0000 @@ -1,5 +1,7 @@ 2011-07-15 Lars Magne Ingebrigtsen + * emacs-lisp/cl-macs.el (declare): Doc string fix-up. + * international/mule-cmds.el (describe-specified-language-support): Make the error message clearer (bug#8905). === modified file 'lisp/emacs-lisp/cl-macs.el' --- lisp/emacs-lisp/cl-macs.el 2011-07-15 13:46:52 +0000 +++ lisp/emacs-lisp/cl-macs.el 2011-07-15 14:59:42 +0000 @@ -1601,12 +1601,12 @@ ;;;###autoload (defmacro declare (&rest specs) - "Declare something about SPECS while compiling. + "Declare SPECS about the current function while compiling. For instance \(declare (warn 0)) -will turn off byte-compile warnings." +will turn off byte-compile warnings in the function." (if (cl-compiling-file) (while specs (if (listp cl-declare-stack) (push (car specs) cl-declare-stack)) ------------------------------------------------------------ revno: 105232 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 16:31:14 +0200 message: Clarify that \= only quotes the next character diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-15 13:16:11 +0000 +++ doc/lispref/ChangeLog 2011-07-15 14:31:14 +0000 @@ -1,5 +1,9 @@ 2011-07-15 Lars Magne Ingebrigtsen + * help.texi (Keys in Documentation): Clarify that \= only quotes + the next character, and doesn't affect longer sequences in + particular (bug#8935). + * debugging.texi (Using Debugger): Mention @code{eval-expression-debug-on-error} (bug#8549). === modified file 'doc/lispref/help.texi' --- doc/lispref/help.texi 2011-07-14 00:02:09 +0000 +++ doc/lispref/help.texi 2011-07-15 14:31:14 +0000 @@ -324,9 +324,8 @@ @samp{\[@var{command}]} sequences in this documentation string. @item \= -quotes the following character and is discarded; thus, @samp{\=\[} puts -@samp{\[} into the output, and @samp{\=\=} puts @samp{\=} into the -output. +quotes the following character and is discarded; thus, @samp{\=\} puts +@samp{\} into the output. @end table @strong{Please note:} Each @samp{\} must be doubled when written in a === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-15 12:57:20 +0000 +++ src/ChangeLog 2011-07-15 14:31:14 +0000 @@ -1,5 +1,9 @@ 2011-07-15 Lars Magne Ingebrigtsen + * doc.c (Fsubstitute_command_keys): Clarify that \= really only + quotes the next character, and doesn't affect other longer + sequences (bug#8935). + * lread.c (syms_of_lread): Clarify that is isn't only `eval-buffer' and `eval-defun' that's affected by `lexical-binding' (bug#8460). === modified file 'src/doc.c' --- src/doc.c 2011-06-24 21:25:22 +0000 +++ src/doc.c 2011-07-15 14:31:14 +0000 @@ -702,8 +702,8 @@ \(made by `describe-bindings') of the value of MAPVAR, taken as a keymap. Substrings of the form \\=\\ specify to use the value of MAPVAR as the keymap for future \\=\\[COMMAND] substrings. -\\=\\= quotes the following character and is discarded; -thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output. +\\=\\= quotes the following character and is discarded. +In particular, \\=\\=\\ puts \\ into the output. Returns original STRING if no substitutions were made. Otherwise, a new string, without any text properties, is returned. */) ------------------------------------------------------------ revno: 105231 fixes bug(s): http://debbugs.gnu.org/8905 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 16:24:09 +0200 message: Error message fix in `describe-specified-language-support' * international/mule-cmds.el (describe-specified-language-support): Make the error message clearer (bug#8905). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 13:46:52 +0000 +++ lisp/ChangeLog 2011-07-15 14:24:09 +0000 @@ -1,5 +1,9 @@ 2011-07-15 Lars Magne Ingebrigtsen + * international/mule-cmds.el + (describe-specified-language-support): Make the error message + clearer (bug#8905). + * emacs-lisp/cl-macs.el (declare): Add a doc string (bug#8690). * isearch.el (isearch-barrier): Add a doc string, since it's === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2011-07-13 14:34:10 +0000 +++ lisp/international/mule-cmds.el 2011-07-15 14:24:09 +0000 @@ -2059,7 +2059,7 @@ (or (not (eq last-command-event 'Default)) (setq last-command-event 'English)) (setq language-name (symbol-name last-command-event)))) - (error "Bogus calling sequence")) + (error "This command should only be called from the menu bar")) (describe-language-environment language-name))) (defun describe-language-environment (language-name) ------------------------------------------------------------ revno: 105230 fixes bug(s): http://debbugs.gnu.org/8715 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 15:59:53 +0200 message: Use /dev/null instead of the Windows "nul" in flymake example diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-07-14 14:10:51 +0000 +++ doc/misc/ChangeLog 2011-07-15 13:59:53 +0000 @@ -1,3 +1,8 @@ +2011-07-15 Lars Magne Ingebrigtsen + + * flymake.texi (Example -- Configuring a tool called via make): + Use /dev/null instead of the Windows "nul" (bug#8715). + 2011-07-14 Lars Magne Ingebrigtsen * widget.texi (Setting Up the Buffer): Remove mention of the === modified file 'doc/misc/flymake.texi' --- doc/misc/flymake.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/flymake.texi 2011-07-15 13:59:53 +0000 @@ -483,7 +483,7 @@ @verbatim check-syntax: - gcc -o nul -S ${CHK_SOURCES} + gcc -o /dev/null -S ${CHK_SOURCES} @end verbatim The format of error messages reported by @code{gcc} is already ------------------------------------------------------------ revno: 105229 fixes bug(s): http://debbugs.gnu.org/8690 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 15:55:00 +0200 message: Minor grammer fixes for syntax.el. diff: === modified file 'lisp/emacs-lisp/cl-loaddefs.el' --- lisp/emacs-lisp/cl-loaddefs.el 2011-06-02 10:21:27 +0000 +++ lisp/emacs-lisp/cl-loaddefs.el 2011-07-15 13:55:00 +0000 @@ -282,7 +282,7 @@ ;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist ;;;;;; do* do loop return-from return block etypecase typecase ecase ;;;;;; case load-time-value eval-when destructuring-bind function* -;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "9f551dc739a39b3c8b420fbd1ab71879") +;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "dd99db1e96dff411cc5d484a639a1330") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ @@ -541,7 +541,12 @@ \(fn TYPE FORM)" nil (quote macro)) (autoload 'declare "cl-macs" "\ - +Declare something about SPECS while compiling. +For instance + + (declare (warn 0)) + +will turn off byte-compile warnings. \(fn &rest SPECS)" nil (quote macro)) === modified file 'lisp/emacs-lisp/syntax.el' --- lisp/emacs-lisp/syntax.el 2011-06-20 03:36:16 +0000 +++ lisp/emacs-lisp/syntax.el 2011-07-15 13:55:00 +0000 @@ -100,7 +100,7 @@ (cons beg end)) (defvar syntax-propertize--done -1 - "Position upto which syntax-table properties have been set.") + "Position up to which syntax-table properties have been set.") (make-variable-buffer-local 'syntax-propertize--done) (defun syntax-propertize--shift-groups (re n) @@ -283,7 +283,7 @@ (setq keywords font-lock-syntactic-keywords)))))) (defun syntax-propertize (pos) - "Ensure that syntax-table properties are set upto POS." + "Ensure that syntax-table properties are set until POS." (when (and syntax-propertize-function (< syntax-propertize--done pos)) ;; (message "Needs to syntax-propertize from %s to %s" ------------------------------------------------------------ revno: 105228 fixes bug(s): http://debbugs.gnu.org/8690 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 15:46:52 +0200 message: * emacs-lisp/cl-macs.el (declare): Add a doc string (bug#8690). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 13:33:07 +0000 +++ lisp/ChangeLog 2011-07-15 13:46:52 +0000 @@ -1,5 +1,7 @@ 2011-07-15 Lars Magne Ingebrigtsen + * emacs-lisp/cl-macs.el (declare): Add a doc string (bug#8690). + * isearch.el (isearch-barrier): Add a doc string, since it's mentioned in a function doc string (bug#8678). === modified file 'lisp/emacs-lisp/cl-macs.el' --- lisp/emacs-lisp/cl-macs.el 2011-06-01 14:19:45 +0000 +++ lisp/emacs-lisp/cl-macs.el 2011-07-15 13:46:52 +0000 @@ -1601,6 +1601,12 @@ ;;;###autoload (defmacro declare (&rest specs) + "Declare something about SPECS while compiling. +For instance + + \(declare (warn 0)) + +will turn off byte-compile warnings." (if (cl-compiling-file) (while specs (if (listp cl-declare-stack) (push (car specs) cl-declare-stack)) ------------------------------------------------------------ revno: 105227 fixes bug(s): http://debbugs.gnu.org/8678 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 15:33:07 +0200 message: Doc fix. * isearch.el (isearch-barrier): Add a doc string, since it's mentioned in a function doc string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-15 07:12:09 +0000 +++ lisp/ChangeLog 2011-07-15 13:33:07 +0000 @@ -1,3 +1,8 @@ +2011-07-15 Lars Magne Ingebrigtsen + + * isearch.el (isearch-barrier): Add a doc string, since it's + mentioned in a function doc string (bug#8678). + 2011-07-15 Martin Rudalics * window.el (switch-to-buffer): Call pop-to-buffer with normalized === modified file 'lisp/isearch.el' --- lisp/isearch.el 2011-07-04 12:15:16 +0000 +++ lisp/isearch.el 2011-07-15 13:33:07 +0000 @@ -549,7 +549,8 @@ (defvar isearch-error nil) ; Error message for failed search. (defvar isearch-other-end nil) ; Start (end) of match if forward (backward). (defvar isearch-wrapped nil) ; Searching restarted from the top (bottom). -(defvar isearch-barrier 0) +(defvar isearch-barrier 0 + "Recorded minimum/maximal point for the current search.") (defvar isearch-just-started nil) (defvar isearch-start-hscroll 0) ; hscroll when starting the search. ------------------------------------------------------------ revno: 105226 fixes bug(s): http://debbugs.gnu.org/8549 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 15:16:11 +0200 message: (Using Debugger): Mention @code{eval-expression-debug-on-error} diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-14 17:28:42 +0000 +++ doc/lispref/ChangeLog 2011-07-15 13:16:11 +0000 @@ -1,3 +1,8 @@ +2011-07-15 Lars Magne Ingebrigtsen + + * debugging.texi (Using Debugger): Mention + @code{eval-expression-debug-on-error} (bug#8549). + 2011-07-14 Eli Zaretskii * display.texi (Other Display Specs): Document that `left-fringe' === modified file 'doc/lispref/debugging.texi' --- doc/lispref/debugging.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/debugging.texi 2011-07-15 13:16:11 +0000 @@ -306,6 +306,16 @@ the debugger gets out of the recursive edit and kills the backtrace buffer. + When the debugger has been entered, the @code{debug-on-error} +variable is temporarily set according to +@code{eval-expression-debug-on-error}. If the latter variable is +non-@code{nil}, @code{debug-on-error} will temporarily be set to +@code{t}. This means that any further errors that occur while doing a +debugging session will (by default) trigger another backtrace. If +this is not want you want, you can either set +@code{eval-expression-debug-on-error} to @code{nil}, or set +@code{debug-on-error} to @code{nil} in @code{debugger-mode-hook}. + @cindex current stack frame The backtrace buffer shows you the functions that are executing and their argument values. It also allows you to specify a stack frame by ------------------------------------------------------------ revno: 105225 fixes bug(s): http://debbugs.gnu.org/8460 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2011-07-15 14:57:20 +0200 message: `lexical-binding' doc clarification * lread.c (syms_of_lread): Clarify that is isn't only `eval-buffer' and `eval-defun' that's affected by `lexical-binding'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-15 10:50:03 +0000 +++ src/ChangeLog 2011-07-15 12:57:20 +0000 @@ -1,3 +1,9 @@ +2011-07-15 Lars Magne Ingebrigtsen + + * lread.c (syms_of_lread): Clarify that is isn't only + `eval-buffer' and `eval-defun' that's affected by + `lexical-binding' (bug#8460). + 2011-07-15 Eli Zaretskii * xdisp.c (move_it_in_display_line_to): Fix vertical motion with === modified file 'src/lread.c' --- src/lread.c 2011-07-10 08:20:10 +0000 +++ src/lread.c 2011-07-15 12:57:20 +0000 @@ -4510,9 +4510,11 @@ staticpro (&Qlexical_binding); DEFVAR_LISP ("lexical-binding", Vlexical_binding, doc: /* If non-nil, use lexical binding when evaluating code. -This only applies to code evaluated by `eval-buffer' and `eval-region'. -This variable is automatically set from the file variables of an interpreted - Lisp file read using `load'. */); +This applies to code evaluated by `eval-buffer' and `eval-region' and +other commands that call these functions, like `eval-defun' and +the like. +This variable is automatically set from the file variables of an +interpreted Lisp file read using `load'. */); Fmake_variable_buffer_local (Qlexical_binding); DEFVAR_LISP ("eval-buffer-list", Veval_buffer_list,