diff options
| author | Miles Bader <miles@gnu.org> | 2005-02-02 01:54:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-02-02 01:54:00 +0000 |
| commit | f3d3402885646e6fa79f1ad59fb8a1f9017851d7 (patch) | |
| tree | 0d381cd0e2eb41edd55d4473bcaaab4053e69468 /lisp/calc/calc-embed.el | |
| parent | 0d2e792ea9c1a983937e016f7f97cc64f2013603 (diff) | |
| parent | f2433a30c5c6fa307ae1358c15e65e484989e5b4 (diff) | |
| download | emacs-f3d3402885646e6fa79f1ad59fb8a1f9017851d7.tar.gz emacs-f3d3402885646e6fa79f1ad59fb8a1f9017851d7.tar.bz2 emacs-f3d3402885646e6fa79f1ad59fb8a1f9017851d7.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-10
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-59
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-68
Update from CVS
Diffstat (limited to 'lisp/calc/calc-embed.el')
| -rw-r--r-- | lisp/calc/calc-embed.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index db1acfcb145..4c6311c9a5b 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -48,11 +48,11 @@ (defvar calc-embedded-some-active nil) (make-variable-buffer-local 'calc-embedded-some-active) -(defvar calc-embedded-open-formula "\\`\\|^\n\\|\\$\\$?\\|\\\\\\[\\|^\\\\begin.*\n\\|^@.*\n\\|^\\.EQ.*\n\\|\\\\(\\|^%\n\\|^\\.\\\\\"\n" +(defvar calc-embedded-open-formula "\\`\\|^\n\\|\\$\\$?\\|\\\\\\[\\|^\\\\begin[^{].*\n\\|^\\\\begin{.*[^x]}.*\n\\|^@.*\n\\|^\\.EQ.*\n\\|\\\\(\\|^%\n\\|^\\.\\\\\"\n" "*A regular expression for the opening delimiter of a formula used by calc-embedded.") -(defvar calc-embedded-close-formula "\\'\\|\n$\\|\\$\\$?\\|\\\\]\\|^\\\\end.*\n\\|^@.*\n\\|^\\.EN.*\n\\|\\\\)\\|\n%\n\\|^\\.\\\\\"\n" +(defvar calc-embedded-close-formula "\\'\\|\n$\\|\\$\\$?\\|\\\\]\\|^\\\\end[^{].*\n\\|^\\\\end{.*[^x]}.*\n\\|^@.*\n\\|^\\.EN.*\n\\|\\\\)\\|\n%\n\\|^\\.\\\\\"\n" "*A regular expression for the closing delimiter of a formula used by calc-embedded.") @@ -417,6 +417,8 @@ With any prefix argument, marks only the formula itself." (forward-char -1)) (setq calc-embed-outer-top (point)) (goto-char (match-end 0)) + (if (looking-at "[ \t]*$") + (end-of-line)) (if (eq (following-char) ?\n) (forward-char 1)) (or (bolp) |