Merge from emacs--rel--22

[gnu-emacs] / lisp / play / morse.el

diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index e9ff8552cc2ec461971e50df6b1c8ac09d1f680c..5197627d8fae2dc18323ff41de2ca2e9341fbdbb 100644 (file)
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -1,6 +1,7 @@
 ;;; morse.el --- convert text to morse code and back             -*- coding: utf-8 -*-
 
-;; Copyright (C) 1995, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Rick Farnbach <rick_farnbach@MENTORG.COM>
 ;; Keywords: games
@@ -9,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,12 +20,12 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
-;; Converts text to Morse code and back with M-x morese-region and
+;; Converts text to Morse code and back with M-x morse-region and
 ;; M-x unmorse-region (though Morse code is no longer official :-().
 
 ;;; Code:
@@ -79,6 +80,7 @@
                     ("9" . "----.")
                     ;; Non-ASCII
                     ("Ä" . ".-.-")
+                    ("Æ" . ".-.-")
                     ("Á" . ".--.-")
                     ("Å" . ".--.-")
                     ;; ligature character?? ("Ch" . "----")
@@ -86,7 +88,10 @@
                     ("É" . "..-..")
                     ("Ñ" . "--.--")
                     ("Ö" . "---.")
-                    ("Ü" . "..--"))
+                    ("Ø" . "---.")
+                    ("Ü" . "..--")
+                    ;; Recently standardized
+                    ("@" . ".--.-."))
   "Morse code character set.")
 
 ;;;###autoload
@@ -136,4 +141,5 @@
 
 (provide 'morse)
 
+;;; arch-tag: 3331e6c1-9a9e-453f-abfd-163a9c3f93a6
 ;;; morse.el ends here