Merge from origin/emacs-25

[gnu-emacs] / lisp / international / iso-cvt.el

diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index 61db03d9b76ebf4c8e40b1ed711f60cb369f943b..cad8bc5639f7e75bf5bb4d506f3e33d58a5f73a1 100644 (file)
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -1,7 +1,7 @@
 ;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: utf-8 -*-
 ;; This file was formerly called gm-lingo.el.
 
-;; Copyright (C) 1993-1998, 2000-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1998, 2000-2016 Free Software Foundation, Inc.
 
 ;; Author: Michael Gschwind <mike@vlsivie.tuwien.ac.at>
 ;; Keywords: tex, iso, latin, i18n
@@ -46,7 +46,7 @@
 (defvar iso-spanish-trans-tab
   '(
     ("~n" "ñ")
-    ("\([a-zA-Z]\)#" "\\1ñ")
+    ("([a-zA-Z])#" "\\1ñ")
     ("~N" "Ñ")
     ("\\([-a-zA-Z\"`]\\)\"u" "\\1ü")
     ("\\([-a-zA-Z\"`]\\)\"U" "\\1Ü")