Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-306

2 files changed, 4 insertions, 19 deletions

diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index ab8611424db..9b52b1dcbbd 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -286,22 +286,6 @@
 
 (defconst feedmail-patch-level "8")
 
-
-;; from <URL:http://www.dina.kvl.dk/~abraham/custom/>:
-;; If you write software that must work without the new custom, you
-;; can use this hack stolen from w3-cus.el:
-(eval-and-compile
- (condition-case ()
-     (require 'custom)
-   (error nil))
- (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
-     nil ;; We've got what we needed
-     ;; We have the old custom-library, hack around it!
-     (defmacro defgroup (&rest args)
-       nil)
-     (defmacro defcustom (var value doc &rest args)
-       `(defvar ,var ,value ,doc))))
-
 (eval-when-compile (require 'smtpmail))
 (autoload 'mail-do-fcc "sendmail")
 
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index b94f3bc8297..a3a9cfc8058 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -327,7 +327,8 @@ Conversion is done based upon the current selected style."
 (defun Footnote-current-regexp ()
   "Return the regexp of the index of the current style."
   (concat (nth 2 (or (assq footnote-style footnote-style-alist)
-                     (nth 0 footnote-style-alist))) "*"))
+                     (nth 0 footnote-style-alist)))
+          "*"))
 
 (defun Footnote-refresh-footnotes (&optional index-regexp)
   "Redraw all footnotes.
@@ -345,7 +346,7 @@ styles."
           (search-backward footnote-start-tag nil t)
           (when (looking-at (concat
                              (regexp-quote footnote-start-tag)
-                             "\\(" index-regexp "\\)"
+                             "\\(" index-regexp "+\\)"
                              (regexp-quote footnote-end-tag)))
             (replace-match (concat
                             footnote-start-tag
@@ -361,7 +362,7 @@ styles."
         (goto-char (cdr alist))
         (when (looking-at (concat
                            (regexp-quote footnote-start-tag)
-                           "\\(" index-regexp "\\)"
+                           "\\(" index-regexp "+\\)"
                            (regexp-quote footnote-end-tag)))
           (replace-match (concat
                           footnote-start-tag