From c3c4b758c6d3e33d7fa7621ba4a50ec75c121247 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sun, 22 Mar 2015 19:31:46 +0100 Subject: [PATCH 1/9] 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(-) 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). From 0bfe915be7e31f556624f3f9bcae93a2d33e69a6 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 22 Mar 2015 17:10:10 -0700 Subject: [PATCH 2/9] * etc/PROBLEMS: Add entry about dir-locals and some auto-mounters. --- etc/PROBLEMS | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index c701ec4c8a6..8e5505ea74e 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1,7 +1,6 @@ Known Problems with GNU Emacs -Copyright (C) 1987-1989, 1993-1999, 2001-2015 Free Software Foundation, -Inc. +Copyright (C) 1987-1989, 1993-1999, 2001-2015 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -469,6 +468,18 @@ full qualified domain name, FQDN. You should have your FQDN in the The way to set this up may vary on non-GNU systems. +*** Visiting files in some auto-mounted directories causes Emacs to print +`Error reading dir-locals: (file-error "Read error" "is a directory" ...' + +This can happen if the auto-mounter mistakenly reports that +.dir-locals.el exists and is a directory. There is nothing Emacs can +do about this, but you can avoid the issue by adding a suitable entry +to the variable `locate-dominating-stop-dir-regexp'. For example, if +the problem relates to "/smb/.dir-locals.el", set that variable +to a new value where you replace "net\\|afs" with "net\\|afs\\|smb". +(The default value already matches common auto-mount prefixes.) +See http://lists.gnu.org/archive/html/help-gnu-emacs/2015-02/msg00461.html . + *** Attempting to visit remote files via ange-ftp fails. If the error message is "ange-ftp-file-modtime: Specified time is not From e7f92aa3d3fb7d5cf88eef374eaeba4dc6b8984f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 22 Mar 2015 17:33:49 -0700 Subject: [PATCH 3/9] 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(+) 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\\'" From 90b46f5b54b8eda06e2c5bcd13d9c6475afe767b Mon Sep 17 00:00:00 2001 From: Ben Bacarisse Date: Mon, 23 Mar 2015 08:02:01 +0000 Subject: [PATCH 4/9] 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(-) 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 From ff3878d749591ebf78da532ec1eb6fa00cb5757d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 23 Mar 2015 11:55:24 +0100 Subject: [PATCH 5/9] * configure.ac: Fix jpeg version check to work with gcc >= 5. --- ChangeLog | 4 ++++ configure.ac | 18 +++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4abd9d6e047..b578d0867b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Andreas Schwab + + * configure.ac: Fix jpeg version check to work with gcc >= 5. + 2015-01-20 Eli Zaretskii * configure.ac (HAVE_W32): Abort with error message if diff --git a/configure.ac b/configure.ac index 209bae9eef9..dd1ab324688 100644 --- a/configure.ac +++ b/configure.ac @@ -3075,10 +3075,12 @@ if test "${opsys}" = "mingw32"; then AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl if test "${HAVE_JPEG}" = "yes"; then AC_DEFINE(HAVE_JPEG) - AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])], - [#include - version=JPEG_LIB_VERSION -], + AC_EGREP_CPP([version 6b or later], + [#include + #if JPEG_LIB_VERSION >= 62 + version 6b or later + #endif + ], [AC_DEFINE(HAVE_JPEG)], [AC_MSG_WARN([libjpeg found, but not version 6b or later]) HAVE_JPEG=no]) @@ -3094,10 +3096,12 @@ elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl if test "${HAVE_JPEG}" = "yes"; then AC_DEFINE(HAVE_JPEG) - AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])], + AC_EGREP_CPP([version 6b or later], [#include - version=JPEG_LIB_VERSION -], + #if JPEG_LIB_VERSION >= 62 + version 6b or later + #endif + ], [AC_DEFINE(HAVE_JPEG)], [AC_MSG_WARN([libjpeg found, but not version 6b or later]) HAVE_JPEG=no]) From 33e2236f8f3e4f8dcace1cf0bed46ea6f2c7a925 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 23 Mar 2015 09:12:52 -0400 Subject: [PATCH 6/9] * display.texi (Useless Whitespace): Fix thinko. Reported by Fabio Pesari. --- doc/emacs/display.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 4046d696b66..5d5fbb05fcf 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1188,7 +1188,7 @@ Highlight space and non-breaking space characters. @item lines @vindex whitespace-line-column -Highlight lines longer than 80 lines. To change the column limit, +Highlight lines longer than 80 columns. To change the column limit, customize the variable @code{whitespace-line-column}. @item newline From 1291ce180ee0a8e8fcbc57975b55968f9e7162bc Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 23 Mar 2015 18:23:47 +0200 Subject: [PATCH 7/9] Minor documentation fix in ELisp manual (Bug#20174) doc/lispref/commands.texi (Event Input Misc): Fix incorrect usage of @code. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/commands.texi | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 319386d9f6c..1dae36ade34 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Eli Zaretskii + + * commands.texi (Event Input Misc): Fix incorrect usage of @code. + (Bug#20174) + 2015-03-14 Eli Zaretskii * minibuf.texi (Basic Completion): Fix a typo. (Bug#20108) diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 5ea1a48b262..4b69ed32709 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -2807,7 +2807,7 @@ most recently unread will be reread first. Events read from this list are not normally added to the current command's key sequence (as returned by, e.g., @code{this-command-keys}), as the events will already have been added once as they were read for -the first time. An element of the form @code{(@code{t} . @var{event})} +the first time. An element of the form @w{@code{(t . @var{event})}} forces @var{event} to be added to the current command's key sequence. @end defvar From 5e2951be4ac50da48bb82e74db87930e9d9d127d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 23 Mar 2015 18:35:03 +0200 Subject: [PATCH 8/9] Improve docs of 'posn-actual-col-row' (Bug#20169) doc/lispref/commands.texi (Accessing Mouse): Expand documentation of 'posn-actual-col-row'. --- doc/lispref/ChangeLog | 2 ++ doc/lispref/commands.texi | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 1dae36ade34..970d16322b3 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -2,6 +2,8 @@ * commands.texi (Event Input Misc): Fix incorrect usage of @code. (Bug#20174) + (Accessing Mouse): Expand documentation of 'posn-actual-col-row'. + (Bug#20169) 2015-03-14 Eli Zaretskii diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 4b69ed32709..6cb032c2635 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -2081,7 +2081,13 @@ Return the actual row and column in @var{position}, as a cons cell @code{(@var{col} . @var{row})}. The values are the actual row and column numbers in the window given by @var{position}. @xref{Click Events}, for details. The function returns @code{nil} if -@var{position} does not include actual position values. +@var{position} does not include actual position values; in that case +@code{posn-col-row} can be used to get approximate values. + +Note that this function doesn't account for the visual width of +characters on display, like the number of visual columns taken by a +tab character or an image. If you need the coordinates in canonical +character units, use @code{posn-col-row} instead. @end defun @defun posn-string position From ad89f85067d068494009948e76f89c902f043513 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 23 Mar 2015 18:39:38 +0200 Subject: [PATCH 9/9] Another minor improvement in ELisp manual (Bug#20168) doc/lispref/commands.texi (Accessing Mouse): More accurate description of 'posn-object-x-y'. --- doc/lispref/ChangeLog | 1 + doc/lispref/commands.texi | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 970d16322b3..a0a2b2b4d05 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -4,6 +4,7 @@ (Bug#20174) (Accessing Mouse): Expand documentation of 'posn-actual-col-row'. (Bug#20169) + More accurate description of 'posn-object-x-y'. (Bug#20168) 2015-03-14 Eli Zaretskii diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 6cb032c2635..b565909085e 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -2109,8 +2109,9 @@ Return the image or string object in @var{position}, either @defun posn-object-x-y position Return the pixel-based x and y coordinates relative to the upper left corner of the object in @var{position} as a cons cell @code{(@var{dx} -. @var{dy})}. If the @var{position} is a buffer position, return the -relative position in the character at that position. +. @var{dy})}. If the @var{position} is on buffer text, return the +relative position of the buffer-text character closest to that +position. @end defun @defun posn-object-width-height position