Merge from origin/emacs-25

604f656 * test/automated/viper-tests.el (viper-test-undo-kmacro): Del...
20eb531 * lisp/mail/footnote.el (footnote-mode): Fix doc typo.
a7a2244 * doc/misc/smtpmail.texi (Encryption): Fix 2012-12-22 typo.
07bd972 * lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): Fix...

diff --combined lisp/emacs-lisp/lisp-mode.el
index 4f3af2a7d7f6985cd2ab0c801205cc8a1f324643,cfec05cd01db89293883948531c1407226e5eaa3..a277d7a6680a53f82925be1b98b7e8bd975c33b1
--- 1/lisp/emacs-lisp/lisp-mode.el
--- 2/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@@ -58,7 -58,7 +58,7 @@@
        (setq i (1+ i)))
      (modify-syntax-entry ?\s "    " table)
      ;; Non-break space acts as whitespace.
-     (modify-syntax-entry ?\x8a0 "    " table)
+     (modify-syntax-entry ?\xa0 "    " table)
      (modify-syntax-entry ?\t "    " table)
      (modify-syntax-entry ?\f "    " table)
      (modify-syntax-entry ?\n ">   " table)
@@@ -168,8 -168,6 +168,8 @@@
  (defvar lisp-doc-string-elt-property 'doc-string-elt
    "The symbol property that holds the docstring position info.")
  
 +(defconst lisp-prettify-symbols-alist '(("lambda"  . ?λ))
 +  "Alist of symbol/\"pretty\" characters to be displayed.")
  
  ;;;; Font-lock support.
  
@@@ -596,7 -594,7 +596,7 @@@ font-lock keywords will not be case sen
            (font-lock-extra-managed-props help-echo)
          (font-lock-syntactic-face-function
           . lisp-font-lock-syntactic-face-function)))
 -  (setq-local prettify-symbols-alist lisp--prettify-symbols-alist)
 +  (setq-local prettify-symbols-alist lisp-prettify-symbols-alist)
    (setq-local electric-pair-skip-whitespace 'chomp)
    (setq-local electric-pair-open-newline-between-pairs nil))
  
@@@ -657,6 -655,9 +657,6 @@@
    :type 'hook
    :group 'lisp)
  
 -(defconst lisp--prettify-symbols-alist
 -  '(("lambda"  . ?λ)))
 -
  ;;; Generic Lisp mode.
  
  (defvar lisp-mode-map
@@@ -1216,15 -1217,8 +1216,15 @@@ and initial semicolons.
        ;;
        ;; The `fill-column' is temporarily bound to
        ;; `emacs-lisp-docstring-fill-column' if that value is an integer.
 -      (let ((paragraph-start (concat paragraph-start
 -                                   "\\|\\s-*\\([(;:\"]\\|`(\\|#'(\\)"))
 +      (let ((paragraph-start
 +             (concat paragraph-start
 +                     (format "\\|\\s-*\\([(;%s\"]\\|`(\\|#'(\\)"
 +                             ;; If we're inside a string (like the doc
 +                             ;; string), don't consider a colon to be
 +                             ;; a paragraph-start character.
 +                             (if (nth 3 (syntax-ppss))
 +                                 ""
 +                               ":"))))
            (paragraph-separate
             (concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
              (fill-column (if (and (integerp emacs-lisp-docstring-fill-column)

diff --combined test/lisp/emulation/viper-tests.el
index e2c39b3c3de1ca8104537973925f558e1495f8ba,074dd637538655083f0b852a042661f7bd61b9e9..074dd637538655083f0b852a042661f7bd61b9e9
--- 1/test/lisp/emulation/viper-tests.el
--- 2/test/automated/viper-tests.el
+++ b/test/lisp/emulation/viper-tests.el
@@@ -65,6 -65,7 +65,7 @@@ after itself, although it will leave a 
              rtn))
        ;; Switch everything off and restore the buffer.
        (toggle-viper-mode)
+       (delete-file viper-custom-file-name)
        (switch-to-buffer before-buffer))))
  
  (ert-deftest viper-test-go ()