[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2393085 6/6: Merge from origin/emacs-24
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 2393085 6/6: Merge from origin/emacs-24 |
Date: |
Mon, 23 Mar 2015 17:34:04 +0000 |
branch: master
commit 2393085c9ac30ac7378a39ee77760dfdecd4b509
Merge: 7f55d42 ad89f85
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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
---
ChangeLog | 4 ++++
admin/authors.el | 2 ++
configure.ac | 18 +++++++++++-------
doc/emacs/display.texi | 2 +-
doc/lispref/ChangeLog | 8 ++++++++
doc/lispref/commands.texi | 15 +++++++++++----
etc/PROBLEMS | 26 ++++++++++++++++++++++++--
lisp/ChangeLog | 10 ++++++++++
lisp/gnus/ChangeLog | 5 +++++
lisp/gnus/nnmh.el | 4 ++--
lisp/simple.el | 3 ++-
11 files changed, 80 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c155708..a489ab9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-23 Andreas Schwab <address@hidden>
+
+ * configure.ac: Fix jpeg version check to work with gcc >= 5.
+
2015-03-21 Samer Masterson <address@hidden>
* CONTRIBUTE (Test your changes.): New section.
diff --git a/admin/authors.el b/admin/authors.el
index d214ff2..1e4af9b 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -86,6 +86,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")
@@ -243,6 +244,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\\'"
diff --git a/configure.ac b/configure.ac
index 40c8d2b..bed94fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3197,10 +3197,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 <jpeglib.h>
- version=JPEG_LIB_VERSION
-],
+ AC_EGREP_CPP([version 6b or later],
+ [#include <jpeglib.h>
+ #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])
@@ -3216,10 +3218,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 <jpeglib.h>
- 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])
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 083bb2e..53bea52 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1201,7 +1201,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
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ff1f814..a546306 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-23 Eli Zaretskii <address@hidden>
+
+ * commands.texi (Event Input Misc): Fix incorrect usage of @code.
+ (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-23 Daiki Ueno <address@hidden>
* processes.texi (Asynchronous Processes): Mention `make-process'.
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index b81d0f8..5e986de 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -2085,7 +2085,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
address@hidden does not include actual position values.
address@hidden does not include actual position values; in that case
address@hidden 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
@@ -2107,8 +2113,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
@@ -2811,7 +2818,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 @address@hidden(t . @var{event})}}
forces @var{event} to be added to the current command's key sequence.
@end defvar
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 2ab85b3..87d3ec8 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.
@@ -458,6 +457,29 @@ problem by adding this to your .cshrc file:
endif
endif
+*** Emacs startup on GNU/Linux systems (and possibly other systems) is slow.
+
+This can happen if the system is misconfigured and Emacs can't get the
+full qualified domain name, FQDN. You should have your FQDN in the
+/etc/hosts file, something like this:
+
+127.0.0.1 localhost
+129.187.137.82 nuc04.t30.physik.tu-muenchen.de nuc04
+
+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
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 712bd73..248f24d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2015-03-23 Glenn Morris <address@hidden>
+
+ * emacs-lisp/authors.el (authors-aliases)
+ (authors-obsolete-files-regexps): Additions.
+
+2015-03-23 Jan Djärv <address@hidden>
+
+ * simple.el (deactivate-mark): Only modify PRIMARY if we own
+ PRIMARY (Bug#18939).
+
2015-03-23 Martin Rudalics <address@hidden>
* emacs-lisp/debug.el (debug): Don't try using "previous" window
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 762e3e7..4903796 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-23 Ben Bacarisse <address@hidden> (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 <address@hidden>
* registry.el (registry-lookup-secondary, registry-full)
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index 9be0c14..04270a5 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 f7f3556..5185607 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).
- [Emacs-diffs] master updated (a50c95d -> 2393085), Paul Eggert, 2015/03/23
- [Emacs-diffs] master bfed046 1/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23
- [Emacs-diffs] master a660037 4/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23
- [Emacs-diffs] master 7f55d42 5/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23
- [Emacs-diffs] master 2393085 6/6: Merge from origin/emacs-24,
Paul Eggert <=
- [Emacs-diffs] master 325c554 2/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23
- [Emacs-diffs] master 821b600 3/6: Merge from origin/emacs-24, Paul Eggert, 2015/03/23