Now on revision 105664. ------------------------------------------------------------ revno: 105664 committer: Alan Mackenzie branch nick: trunk timestamp: Tue 2011-09-06 01:01:46 +0000 message: isearch.el (isearch-other-meta-char): Wherever a key list is unread, "unread" the prefix arg, too. This fixes bug #8901. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-05 09:55:11 +0000 +++ lisp/ChangeLog 2011-09-06 01:01:46 +0000 @@ -1,3 +1,8 @@ +2011-09-06 Alan Mackenzie + + * isearch.el (isearch-other-meta-char): Wherever a key list is + unread, "unread" the prefix arg, too. This fixes bug #8901. + 2011-09-05 Oleksandr Gavenko (tiny change) * progmodes/grep.el (rgrep): Add "-type d" (bug#9414). === modified file 'lisp/isearch.el' --- lisp/isearch.el 2011-08-29 20:22:44 +0000 +++ lisp/isearch.el 2011-09-06 01:01:46 +0000 @@ -1920,6 +1920,7 @@ (if (lookup-key global-map key) (progn (isearch-done) + (setq prefix-arg arg) (apply 'isearch-unread keylist)) (setq keylist (listify-key-sequence (lookup-key local-function-key-map key))) @@ -1935,6 +1936,7 @@ (setq keylist (cdr keylist))) ;; As the remaining keys in KEYLIST can't be handled ;; here, we must reread them. + (setq prefix-arg arg) (apply 'isearch-unread keylist) (setq keylist nil))))) ( @@ -1957,8 +1959,10 @@ isearch-other-control-char))))) (setcar keylist (- main-event (- ?\C-\S-a ?\C-a))) (cancel-kbd-macro-events) + (setq prefix-arg arg) (apply 'isearch-unread keylist)) ((eq search-exit-option 'edit) + (setq prefix-arg arg) (apply 'isearch-unread keylist) (isearch-edit-string)) ;; Handle a scrolling function. @@ -1987,6 +1991,7 @@ (isearch-edit-string)) (search-exit-option (let (window) + (setq prefix-arg arg) (isearch-unread-key-sequence keylist) (setq main-event (car unread-command-events)) ------------------------------------------------------------ revno: 105663 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-09-05 22:07:34 +0000 message: Merge changes made in Gnus trunk. gnus-sum.el (gnus-summary-exit): Ensure we kill the proper original-article-buffer. nnir.el (nnir-compose-result): Fix matching of server type. (nnir-run-swish++): Ditto. (nnir-run-namazu): Ditto. (nnir-run-notmuch): Ditto. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-09-04 22:17:09 +0000 +++ lisp/gnus/ChangeLog 2011-09-05 22:07:34 +0000 @@ -1,3 +1,15 @@ +2011-09-05 Andrew Cohen + + * gnus-sum.el (gnus-summary-exit): Ensure we kill the proper + original-article-buffer. + +2011-09-05 Kan-Ru Chen + + * nnir.el (nnir-compose-result): Fix matching of server type. + (nnir-run-swish++): Ditto. + (nnir-run-namazu): Ditto. + (nnir-run-notmuch): Ditto. + 2011-09-04 Lars Magne Ingebrigtsen * gnus.el (gnus-home-directory): Add warning about setting in .gnus.el === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-09-01 13:25:09 +0000 +++ lisp/gnus/gnus-sum.el 2011-09-05 22:07:34 +0000 @@ -7214,6 +7214,7 @@ (quit-config (gnus-group-quit-config gnus-newsgroup-name)) (gnus-group-is-exiting-p t) (article-buffer gnus-article-buffer) + (original-article-buffer gnus-original-article-buffer) (mode major-mode) (group-point nil) (buf (current-buffer)) @@ -7290,7 +7291,7 @@ (unless (eq major-mode 'gnus-sticky-article-mode) (gnus-kill-buffer article-buffer) (setq gnus-article-current nil)))) - (gnus-kill-buffer gnus-original-article-buffer)) + (gnus-kill-buffer original-article-buffer)) ;; Clear the current group name. (unless quit-config === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2011-08-04 00:58:07 +0000 +++ lisp/gnus/nnir.el 2011-09-05 22:07:34 +0000 @@ -806,7 +806,7 @@ ;; remove trailing slash and, for nnmaildir, cur/new/tmp (setq dirnam (substring dirnam 0 - (if (string= (gnus-group-server server) "nnmaildir") + (if (string-match "^nnmaildir:" (gnus-group-server server)) -5 -1))) ;; Set group to dirnam without any leading dots or slashes, @@ -816,7 +816,7 @@ "[/\\]" "." t))) (vector (gnus-group-full-name group server) - (if (string= (gnus-group-server server) "nnmaildir") + (if (string-match "^nnmaildir:" (gnus-group-server server)) (nnmaildir-base-name-to-article-number (substring article 0 (string-match ":" article)) group nil) @@ -1073,7 +1073,8 @@ ;; is sufficient. Note that we can't only use the value of ;; nnml-use-compressed-files because old articles might have been ;; saved with a different value. - (article-pattern (if (string= (gnus-group-server server) "nnmaildir") + (article-pattern (if (string-match "^nnmaildir:" + (gnus-group-server server)) ":[0-9]+" "^[0-9]+\\(\\.[a-z0-9]+\\)?$")) score artno dirnam filenam) @@ -1315,7 +1316,8 @@ ;; (when group ;; (error "The Namazu backend cannot search specific groups")) (save-excursion - (let ((article-pattern (if (string= (gnus-group-server server) "nnmaildir") + (let ((article-pattern (if (string-match "^nnmaildir:" + (gnus-group-server server)) ":[0-9]+" "^[0-9]+$")) artlist @@ -1388,7 +1390,8 @@ (groupspec (cdr (assq 'group query))) (prefix (nnir-read-server-parm 'nnir-notmuch-remove-prefix server)) artlist - (article-pattern (if (string= (gnus-group-server server) "nnmaildir") + (article-pattern (if (string-match "^nnmaildir:" + (gnus-group-server server)) ":[0-9]+" "^[0-9]+$")) artno dirnam filenam) ------------------------------------------------------------ revno: 105662 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-09-05 06:18:36 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/config.in' --- autogen/config.in 2011-08-14 10:19:49 +0000 +++ autogen/config.in 2011-09-05 10:18:36 +0000 @@ -672,6 +672,9 @@ /* Define to 1 if the system has the type `sigset_t'. */ #undef HAVE_SIGSET_T +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + /* Define to 1 if you have sound support. */ #undef HAVE_SOUND === modified file 'autogen/configure' --- autogen/configure 2011-08-31 10:18:35 +0000 +++ autogen/configure 2011-09-05 10:18:36 +0000 @@ -15312,6 +15312,18 @@ fi +for ac_func in snprintf +do : + ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" +if test "x$ac_cv_func_snprintf" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SNPRINTF 1 +_ACEOF + +fi +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; } if test "${emacs_cv_langinfo_codeset+set}" = set; then :