(shr-insert): Also remove soft hypens from non-folded text.

[gnu-emacs] / lisp / mail / mailalias.el

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 4d9b24e0043d731d921a381362d47460b98ad1dd..48329167bf1279a5ea456110612b95ebd024d8b1 100644 (file)
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -1,9 +1,9 @@
 ;;; mailalias.el --- expand and complete mailing address aliases -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985, 1987, 1995-1997, 2001-2013 Free Software
+;; Copyright (C) 1985, 1987, 1995-1997, 2001-2015 Free Software
 ;; Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.