procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk.

Browse source
This commit is contained in:
Paul Eggert 2011-09-06 08:27:16 -07:00
commit b2db44d9c6
6 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-09-06 Alan Mackenzie <acm@muc.de>
* 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 <gavenkoa@gmail.com> (tiny change)
* progmodes/grep.el (rgrep): Add "-type d" (bug#9414).

12
lisp/gnus/ChangeLog
View file

@ -1,3 +1,15 @@
2011-09-05 Andrew Cohen <cohen@andy.bu.edu>
* gnus-sum.el (gnus-summary-exit): Ensure we kill the proper
original-article-buffer.
2011-09-05 Kan-Ru Chen <kanru@kanru.info>
* 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 <larsi@gnus.org>
* gnus.el (gnus-home-directory): Add warning about setting in .gnus.el

3
lisp/gnus/gnus-sum.el
View file

@ -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

13
lisp/gnus/nnir.el
View file

@ -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)

5
lisp/isearch.el
View file

@ -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))

2
src/ChangeLog
View file

@ -1,4 +1,4 @@
2011-09-05 Paul Eggert <eggert@cs.ucla.edu>
2011-09-06 Paul Eggert <eggert@cs.ucla.edu>
* fileio.c: Fix bugs with large file offsets (Bug#9428).
The previous code assumed that file offsets (off_t values) fit in