diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:30:33 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:30:33 -0700 |
| commit | 2393085c9ac30ac7378a39ee77760dfdecd4b509 (patch) | |
| tree | 233f1e457cff8a131c2acf5ba9c947f820e24a5a /lisp | |
| parent | 7f55d4251806e4712762bef0a3ed41a53f850a58 (diff) | |
| parent | ad89f85067d068494009948e76f89c902f043513 (diff) | |
| download | emacs-2393085c9ac30ac7378a39ee77760dfdecd4b509.tar.gz | |
Merge from origin/emacs-24
ad89f85 Another minor improvement in ELisp manual (Bug#20168)
5e2951b Improve docs of 'posn-actual-col-row' (Bug#20169)
1291ce1 Minor documentation fix in ELisp manual (Bug#20174)
33e2236 * display.texi (Useless Whitespace): Fix thinko.
ff3878d * configure.ac: Fix jpeg version check to work with gcc >= 5.
90b46f5 Work for the case nnmail-expiry-target is an nnmh group (bug#20170)
e7f92aa authors.el small additions
0bfe915 * etc/PROBLEMS: Add entry about dir-locals and some auto-mounters.
c3c4b75 Fixes: debbugs:18939
Conflicts:
ChangeLog
doc/lispref/ChangeLog
etc/PROBLEMS
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/simple.el
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/nnmh.el | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 3 |
4 files changed, 19 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 712bd73dba8..248f24d6490 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2015-03-23 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/authors.el (authors-aliases) + (authors-obsolete-files-regexps): Additions. + +2015-03-23 Jan Djärv <jan.h.d@swipnet.se> + + * simple.el (deactivate-mark): Only modify PRIMARY if we own + PRIMARY (Bug#18939). + 2015-03-23 Martin Rudalics <rudalics@gmx.at> * emacs-lisp/debug.el (debug): Don't try using "previous" window diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 762e3e7e0d0..4903796a7ff 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Ben Bacarisse <ben.lists@bsb.me.uk> (tiny change) + + * nnmh.el (nnmh-request-expire-articles): + Work for the case nnmail-expiry-target is an nnmh group (bug#20170). + 2015-03-21 Eric Abrahamsen <eric@ericabrahamsen.net> * registry.el (registry-lookup-secondary, registry-full) diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el index 9be0c14884e..04270a554cf 100644 --- a/lisp/gnus/nnmh.el +++ b/lisp/gnus/nnmh.el @@ -259,12 +259,12 @@ as unread by Gnus.") &optional server force) (nnmh-possibly-change-directory newsgroup server) (let ((is-old t) + (dir nnmh-current-directory) article rest mod-time) (nnheader-init-server-buffer) (while (and articles is-old) - (setq article (concat nnmh-current-directory - (int-to-string (car articles)))) + (setq article (concat dir (int-to-string (car articles)))) (when (setq mod-time (nth 5 (file-attributes article))) (if (and (nnmh-deletable-article-p newsgroup (car articles)) (setq is-old diff --git a/lisp/simple.el b/lisp/simple.el index f7f35564f35..51856070437 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4807,7 +4807,8 @@ run `deactivate-mark-hook'." ;; the region prior to the last command modifying the buffer. ;; Set the selection to that, or to the current region. (cond (saved-region-selection - (gui-set-selection 'PRIMARY saved-region-selection) + (if (gui-call gui-selection-owner-p 'PRIMARY) + (gui-set-selection 'PRIMARY saved-region-selection)) (setq saved-region-selection nil)) ;; If another program has acquired the selection, region ;; deactivation should not clobber it (Bug#11772). |