From: Eli Zaretskii Date: Thu, 22 Feb 2001 13:30:58 +0000 (+0000) Subject: (texinfo-format-scan): Signal an error if X-Git-Tag: emacs-pretest-21.0.99~217 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9238a8df8abebef090aeb0ed9a76e0c7de5704bc;p=emacs.git (texinfo-format-scan): Signal an error if @ follows an accent command such as @'. Support optional braces in commands that insert accents, like makeinfo does. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cb469756610..dd927559b4d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2001-02-22 Eli Zaretskii + + * textmodes/texinfmt.el (texinfo-format-scan): Signal an error if + @ follows an accent command such as @'. Support optional braces + in commands that insert accents, like makeinfo does. + 2001-02-22 Gerd Moellmann * startup.el (fancy-splash-text): Add a line for ordering diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 822631e039b..0441602b3a7 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -868,7 +868,23 @@ lower types.") ;; Otherwise: the other characters are simply quoted. Delete the @. (t (delete-char -1) - (forward-char 1))) + ;; Be compatible with makeinfo: if @' and its ild are + ;; followed by a @ without a brace, barf. + (if (looking-at "[\"'^`~=]") + (progn + (if (= (char-after (1+ (point))) ?@) + (error "Use braces to give a command as an argument to @%c" + (following-char))) + (forward-char 1) + ;; @' etc. can optionally accept their argument in + ;; braces (makeinfo supports that). + (when (looking-at "{") + (let ((start (point))) + (forward-list 1) + (delete-char -1) + (goto-char start) + (delete-char 1)))) + (forward-char 1)))) ;; @ is followed by a command-word; find the end of the word. (setq texinfo-command-start (1- (point))) (if (= (char-syntax (following-char)) ?w)