diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/frame.el | 1 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 3 | ||||
| -rw-r--r-- | lisp/net/shr.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/xref.el | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 04dd4abdf03..09738d1e2ed 100644 --- 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 7be2ff900d4..51dcc1a909f 100644 --- 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 d24f0d37539..2511d673e7e 100644 --- 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 26471b0df3f..ae5ec61520d 100644 --- 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 |