diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7a922e002d7613acc51531a9242acf65abd8698a..d82391d691a6d03f5c2f0305e1f0b4698d705520 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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). diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9d719136cc15a7d50638946575d64818c7c713f7..2e0cc11279ac1d7acf839fc7745fedea1a1be9bd 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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 diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index fd441c46d175beb1ce9c211c6c693e1d0296b361..bb8c719a4fd5916a79d5f253a73a2fcdf22837cf 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -7214,6 +7214,7 @@ If FORCE (the prefix), also save the .newsrc file(s)." (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 @@ If FORCE (the prefix), also save the .newsrc file(s)." (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 diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 17fc3f3fe81e5775deb9388de765e58243cf5535..0be6a17d50e3c2a8dcd657ca0006f99d4e43f1a5 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -806,7 +806,7 @@ ready to be added to the list of search results." ;; 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 @@ ready to be added to the list of search results." "[/\\]" "." 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 @@ Windows NT 4.0." ;; 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 @@ Tested with Namazu 2.0.6 on a GNU/Linux system." ;; (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 @@ actually)." (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) diff --git a/lisp/isearch.el b/lisp/isearch.el index 6eab3dbcbc4ccaaf0ea2cb7bd5c37deb7c549721..7f54067f9aa5787fefa40cb9911a259388dd2a3c 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1920,6 +1920,7 @@ Isearch mode." (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 @@ Isearch mode." (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 mode." 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 mode." (isearch-edit-string)) (search-exit-option (let (window) + (setq prefix-arg arg) (isearch-unread-key-sequence keylist) (setq main-event (car unread-command-events)) diff --git a/src/ChangeLog b/src/ChangeLog index 88065dd3231de49e8960d9b22856c0068218a1db..e1bdfedbd31454ca0969a9ba5e93dbabd026e409 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,4 @@ -2011-09-05 Paul Eggert +2011-09-06 Paul Eggert * fileio.c: Fix bugs with large file offsets (Bug#9428). The previous code assumed that file offsets (off_t values) fit in