Merge from origin/emacs-25

9fb185a shr-tag-video bug fix
6300655 Minor fixes in tramp-tests.el
50575b1 Ensure redisplay when 'truncate-lines' is set
0d9e80d Fix a doc string of 'transient-mark-mode'
0000ae5 MS-Windows followup to latest gnulib update
4bc5e02 Spelling fix
f1093f7 Do secure signed Bcc handling

diff --git a/lisp/frame.el b/lisp/frame.el
index 04dd4abdf039203cb6b2f7127d7dd09bf39e8b0e..09738d1e2ed4d9c123d27fa96f3ea53b671b3781 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2239,6 +2239,7 @@ See also `toggle-frame-maximized'."
         overline-margin
         line-prefix
         wrap-prefix
+        truncate-lines
         bidi-paragraph-direction
         bidi-display-reordering))
 

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7be2ff900d4e11d0ea30f57b1f71d72e71e4f8c4..51dcc1a909fbb0bde63feb6afcdfee1fe5e58343 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4227,6 +4227,8 @@ Instead, just auto-save the buffer and then bury it."
   (if message-return-action
       (apply (car message-return-action) (cdr message-return-action))))
 
+(autoload 'mml-secure-bcc-is-safe "mml-sec")
+
 (defun message-send (&optional arg)
   "Send the message in the current buffer.
 If `message-interactive' is non-nil, wait for success indication or
@@ -4241,6 +4243,7 @@ It should typically alter the sending method in some way or other."
   (let ((inhibit-read-only t))
     (put-text-property (point-min) (point-max) 'read-only nil))
   (message-fix-before-sending)
+  (mml-secure-bcc-is-safe)
   (run-hooks 'message-send-hook)
   (when message-confirm-send
     (or (y-or-n-p "Send message? ")

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index d24f0d37539eec14c85803ea5b90300b8566e4c3..2511d673e7e558f36e3aa05781f3e9ac839723ea 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1378,7 +1378,7 @@ The preference is a float determined from `shr-prefer-media-type'."
         (start (point)))
     (unless url
       (setq url (car (shr--extract-best-source dom))))
-    (if image
+    (if (> (length image) 0)
         (shr-tag-img nil image)
       (shr-insert " [video] "))
     (shr-urlify start (shr-expand-url url))))

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 26471b0df3f9dde47f021912a1b4bc82370fbb53..ae5ec61520dd28f0708b10db7523355e5f3a46cd 100644 (file)
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -21,7 +21,7 @@
 
 ;; NOTE: The xref API is still experimental and can change in major,
 ;; backward-incompatible ways.  Everyone is encouraged to try it, and
-;; report to us any problems or use cases we hadn't anticiated, by
+;; report to us any problems or use cases we hadn't anticipated, by
 ;; sending an email to emacs-devel, or `M-x report-emacs-bug'.
 ;;
 ;; This file provides a somewhat generic infrastructure for cross

diff --git a/nt/gnulib.mk b/nt/gnulib.mk
index 7c9cc199468774bdefa230d4936c1a23fd84ee7b..6884bf9f077a6dad72bb578c00916b66fdcbf558 100644 (file)
--- a/nt/gnulib.mk
+++ b/nt/gnulib.mk
@@ -453,6 +453,13 @@ EXTRA_libgnu_a_SOURCES += group-member.c
 
 ## end   gnulib module group-member
 
+## begin gnulib module ignore-value
+
+
+EXTRA_DIST += ignore-value.h
+
+## end   gnulib module ignore-value
+
 ## begin gnulib module intprops
 
 

diff --git a/src/buffer.c b/src/buffer.c
index c07b2dc021e2dc5a619e93bb784914c003720a02..51c36de0c6bcca92f51910d60ba4286c05d8fa98 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6201,7 +6201,7 @@ all windows or just the selected window.
 
 Lisp programs may give this variable certain special values:
 
-- A value of `lambda' enables Transient Mark mode temporarily.
+- A value of \\='lambda (literally) enables Transient Mark mode temporarily.
   It is disabled again after any subsequent action that would
   normally deactivate the mark (e.g. buffer modification).
 

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 5938ada8486283092a99dea2dd3cec4a1e0cf760..f07258476993d476915a02ba85a6c906549e2d8e 100644 (file)
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -1424,6 +1424,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
            (should-not (get-buffer-window (current-buffer) t))
 
            ;; Second run. The output must be appended.
+           (goto-char (point-max))
            (should (zerop (process-file "ls" nil t t fnnd)))
            ;; `ls' could produce colorized output.
            (goto-char (point-min))
@@ -1652,8 +1653,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
              (error
               (vc-register
                nil (list (car vc-handled-backends)
-                         (list (file-name-nondirectory tmp-name2)))))))
-         (should (vc-registered tmp-name2)))
+                         (list (file-name-nondirectory tmp-name2))))))
+           (should (vc-registered (file-name-nondirectory tmp-name2)))))
 
       ;; Cleanup.
       (ignore-errors (delete-directory tmp-name1 'recursive)))))