From c3c4b758c6d3e33d7fa7621ba4a50ec75c121247 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sun, 22 Mar 2015 19:31:46 +0100 Subject: Fixes: debbugs:18939 * simple.el (deactivate-mark): Only modify PRIMARY if we own PRIMARY. --- lisp/ChangeLog | 5 +++++ lisp/simple.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8f888e37b06..7c7c66d24d6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-22 Jan Djärv + + * simple.el (deactivate-mark): Only modify PRIMARY if we own + PRIMARY (Bug#18939). + 2015-03-22 Martin Rudalics * emacs-lisp/debug.el (debug): Don't try using "previous" window diff --git a/lisp/simple.el b/lisp/simple.el index ae07f6237ce..5e5cd877e9b 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4420,7 +4420,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 - (x-set-selection 'PRIMARY saved-region-selection) + (if (x-selection-owner-p 'PRIMARY) + (x-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). -- cgit v1.2.1 From e7f92aa3d3fb7d5cf88eef374eaeba4dc6b8984f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 22 Mar 2015 17:33:49 -0700 Subject: authors.el small additions * lisp/emacs-lisp/authors.el (authors-aliases) (authors-obsolete-files-regexps): Additions. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/authors.el | 2 ++ 2 files changed, 7 insertions(+) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c7c66d24d6..40f1e9ff279 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Glenn Morris + + * emacs-lisp/authors.el (authors-aliases) + (authors-obsolete-files-regexps): Additions. + 2015-03-22 Jan Djärv * simple.el (deactivate-mark): Only modify PRIMARY if we own diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index b44f7aa7146..7d6169d9029 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -85,6 +85,7 @@ files.") ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen") ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard") ("Johan Bockgård" "Johan Bockgard") + ("John F. Carr" "John F Carr") ("John J Foerch" "John Foerch") ("John W. Eaton" "John Eaton") ("Jonathan I. Kamens" "Jonathan Kamens") @@ -242,6 +243,7 @@ If REALNAME is nil, ignore that author.") '(".*loaddefs.el$" ; not obsolete, but auto-generated "\\.\\(bzr\\|cvs\\|git\\)ignore$" ; obsolete or uninteresting "\\.arch-inventory$" + "ChangeLog\\(\\.[0-9]+\\)?\\'" "automated/data/" ; not interesting ;; TODO lib/? Matches other things? "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'" -- cgit v1.2.1 From 90b46f5b54b8eda06e2c5bcd13d9c6475afe767b Mon Sep 17 00:00:00 2001 From: Ben Bacarisse Date: Mon, 23 Mar 2015 08:02:01 +0000 Subject: lisp/gnus/nnmh.el (nnmh-request-expire-articles): Work for the case nnmail-expiry-target is an nnmh group (bug#20170) --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nnmh.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 592f34d6fbf..1c8dff615d8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Ben Bacarisse (tiny change) + + * nnmh.el (nnmh-request-expire-articles): + Work for the case nnmail-expiry-target is an nnmh group (bug#20170). + 2015-01-29 Lars Ingebrigtsen * message.el (message-smtpmail-send-it): Remove the mail header 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 -- cgit v1.2.1