(texinfo-format-scan): Make @- vanish; don't insert -.

(texinfo-format-soft-hyphen): New function.

1 files changed, 7 insertions, 2 deletions

diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 6c770caec27..e7b8b5562ce 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -641,7 +641,7 @@ lower types.")
   ;; Scan for @-commands.
   (goto-char (point-min))
   (while (search-forward "@" nil t)
-    (if (looking-at "[@{}^'` *\"?!-]")
+    (if (looking-at "[@{}^'` *\"?!]")
         ;; Handle a few special @-followed-by-one-char commands.
         (if (= (following-char) ?*)
             (progn
@@ -1054,7 +1054,8 @@ lower types.")
     (insert ?\n)))
 
 
-;;; Space controlling commands:  @. and @:   
+;;; Space controlling commands:  @. and @:, and the soft hyphen.
+
 (put '\. 'texinfo-format 'texinfo-format-\.)
 (defun texinfo-format-\. ()
   (texinfo-discard-command)
@@ -1064,6 +1065,10 @@ lower types.")
 (defun texinfo-format-\: ()
   (texinfo-discard-command))
 
+(put '\- 'texinfo-format 'texinfo-format-soft-hyphen)
+(defun texinfo-format-soft-hyphen ()
+  (texinfo-discard-command))
+
 
 ;;; @center, @sp, and @br