diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/play/morse.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/play/morse.el')
-rw-r--r-- | lisp/play/morse.el | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/lisp/play/morse.el b/lisp/play/morse.el index 8e09c225059..bfb25ba1d56 100644 --- a/lisp/play/morse.el +++ b/lisp/play/morse.el @@ -79,17 +79,16 @@ ("8" . "---..") ("9" . "----.") ;; Non-ASCII - ("Ä" . ".-.-") - ("Æ" . ".-.-") - ("Á" . ".--.-") - ("Å" . ".--.-") - ;; ligature character?? ("Ch" . "----") - ("ß" . ".../...") - ("É" . "..-..") - ("Ñ" . "--.--") - ("Ö" . "---.") - ("Ø" . "---.") - ("Ü" . "..--") + ("ä" . ".-.-") + ("æ" . ".-.-") + ("á" . ".--.-") + ("å" . ".--.-") + ("ß" . ".../...") ; also ...--.. + ("é" . "..-..") + ("ñ" . "--.--") + ("ö" . "---.") + ("ø" . "---.") + ("ü" . "..--") ;; Recently standardized ("@" . ".--.-.")) "Morse code character set.") @@ -146,7 +145,7 @@ "NATO phonetic alphabet. See “International Code of Signals” (INTERCO), United States Edition, 1969 Edition (Revised 2003) available from National -Geospatial-Intelligence Agency at URL `http://www.nga.mil/'") +Geospatial-Intelligence Agency at URL `https://www.nga.mil/'") ;;;###autoload (defun morse-region (beg end) @@ -165,7 +164,7 @@ Geospatial-Intelligence Agency at URL `http://www.nga.mil/'") (setq sep "")) ((setq morse (assoc str morse-code)) (delete-char 1) - (insert sep (cdr morse)) + (insert-before-markers sep (cdr morse)) (setq sep "/")) (t (forward-char 1) @@ -211,7 +210,7 @@ Geospatial-Intelligence Agency at URL `http://www.nga.mil/'") (setq sep "")) ((setq nato (assoc str nato-alphabet)) (delete-char 1) - (insert sep (cdr nato)) + (insert-before-markers sep (cdr nato)) (setq sep "-")) (t (forward-char 1) |