Merge from origin/emacs-25

861022f * doc/misc/texinfo.tex: Revert unwanted copyright change.
46e47a5 ; * etc/refcards/ru-refcard.tex (cyear): Update via M-x set-copyright.
71ea138 * lisp/align.el (align): Simplify a lambda
5618a50 * lisp/align.el (align): Fix arg order in call to `align-region'
1f680db Fix compilation next-error in buffers with selective-display
d20a948 * nsm.el (nsm-check-protocol): Fix typo in the message.
1da116f Add SHA1 warnings for high network security settings
e48bacd ; * etc/NEWS: Typo fix.

6 files changed, 44 insertions, 18 deletions

diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 0f301a2a716..34fd353a9dc 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -5,7 +5,10 @@
 %
 \def\texinfoversion{2015-12-17.20}
 %
-% Copyright 1985-1986, 1988, 1990-2016 Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
+% Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
diff --git a/etc/NEWS b/etc/NEWS
index 49bb4a27c1f..0566ff2e834 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1377,8 +1377,8 @@ files (recursively) under a directory.
 
 +++
 ** New variable `inhibit-message', when bound to non-nil, inhibits
-`message' and related functions from displaying messages the Echo
-Area.  The output is still logged to the *Messages* buffer.
+`message' and related functions from displaying messages in the echo
+area.  The output is still logged to the *Messages* buffer.
 
 +++
 ** A new text property `inhibit-read-only' can be used in read-only
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index e27a3d244a7..273a79cdc73 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -22,7 +22,7 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \newcommand{\versionemacs}[0]{25} % version of Emacs this is for
-\newcommand{\cyear}[0]{2015}       % copyright year
+\newcommand{\cyear}[0]{2016}       % copyright year
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
   \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.
diff --git a/lisp/align.el b/lisp/align.el
index a7a98c28f12..7e439f3e073 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -888,15 +888,15 @@ on the format of these lists."
       (let ((sec-first end)
             (sec-last beg))
         (align-region beg end
-                      (or exclude-rules
-                          align-mode-exclude-rules-list
-                          align-exclude-rules-list) nil
                       separator
-                      (function
-                       (lambda (b e mode)
-                         (when (and mode (listp mode))
-                           (setq sec-first (min sec-first b)
-                                 sec-last  (max sec-last e))))))
+                      nil ; rules
+                      (or exclude-rules
+                          align-mode-exclude-rules-list
+                          align-exclude-rules-list)
+                      (lambda (b e mode)
+                        (when (consp mode)
+                          (setq sec-first (min sec-first b)
+                                sec-last  (max sec-last e)))))
         (if (< sec-first sec-last)
             (align-region sec-first sec-last 'entire
                           (or rules align-mode-rules-list align-rules-list)
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 31f2b32792f..ebdeeccc2c8 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -183,7 +183,9 @@ unencrypted."
 
 (defun nsm-check-protocol (process host port status settings)
   (let ((prime-bits (plist-get status :diffie-hellman-prime-bits))
-        (encryption (format "%s-%s-%s"
+        (signature-algorithm
+         (plist-get (plist-get status :certificate) :signature-algorithm))
+        (encryption (format "%s-%s-%s"
                             (plist-get status :key-exchange)
                             (plist-get status :cipher)
                             (plist-get status :mac)))
@@ -209,6 +211,15 @@ unencrypted."
              host port encryption)))
       (delete-process process)
       nil)
+     ((and (string-match "\\bSHA1\\b" signature-algorithm)
+           (not (memq :signature-sha1 (plist-get settings :conditions)))
+           (not
+            (nsm-query
+             host port status :signature-sha1
+             "The certificate used to verify the connection to %s:%s uses the SHA1 algorithm (%s), which is believed to be unsafe."
+             host port signature-algorithm)))
+      (delete-process process)
+      nil)
      ((and protocol
            (string-match "SSL" protocol)
            (not (memq :ssl (plist-get settings :conditions)))
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index e5609b8bc5b..b7ab408f744 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1125,6 +1125,16 @@ POS and RES.")
     (compilation-internal-error-properties
      file line end-line col end-col type fmt)))
 
+(defun compilation-beginning-of-line (&optional n)
+  "Like `beginning-of-line', but accounts for lines hidden by `selective-display'."
+  (if (or (not (eq selective-display t))
+          (null n)
+          (= n 1))
+      (beginning-of-line n)
+    (re-search-forward "[\n\r]" nil 'end (1- n))
+    (if (< n 0)
+        (beginning-of-line))))
+
 (defun compilation-move-to-column (col screen)
   "Go to column COL on the current line.
 If SCREEN is non-nil, columns are screen columns, otherwise, they are
@@ -1183,13 +1193,15 @@ FMTS is a list of format specs for transforming the file name.
             (goto-char (marker-position marker))
             ;; Set end-marker if appropriate and go to line.
             (if (not (or end-col end-line))
-                (beginning-of-line (- line marker-line -1))
-              (beginning-of-line (- (or end-line line) marker-line -1))
+                (compilation-beginning-of-line (- line marker-line -1))
+              (compilation-beginning-of-line (- (or end-line line)
+                                                marker-line -1))
               (if (or (null end-col) (< end-col 0))
                   (end-of-line)
                 (compilation-move-to-column end-col screen-columns))
               (setq end-marker (point-marker))
-              (when end-line (beginning-of-line (- line end-line -1))))
+              (when end-line
+                (compilation-beginning-of-line (- line end-line -1))))
             (if col
                 (compilation-move-to-column col screen-columns)
               (forward-to-indentation 0))
@@ -2469,7 +2481,7 @@ This is the value of `next-error-function' in Compilation buffers."
             ;; Treat file's found lines in forward order, 1 by 1.
             (dolist (line (reverse (cddr (compilation--loc->file-struct loc))))
               (when (car line)          ; else this is a filename w/o a line#
-                (beginning-of-line (- (car line) last -1))
+                (compilation-beginning-of-line (- (car line) last -1))
                 (setq last (car line)))
               ;; Treat line's found columns and store/update a marker for each.
               (dolist (col (cdr line))
@@ -2541,7 +2553,7 @@ displays at the top of the window; there is no arrow."
   (if (integerp compilation-context-lines)
       (set-window-start w (save-excursion
                             (goto-char mk)
-                            (beginning-of-line
+                            (compilation-beginning-of-line
                              (- 1 compilation-context-lines))
                             (point)))
     ;; If there is no left fringe.