[Emacs-diffs] Changes to emacs/lisp/calc/calc-prog.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-prog.el
diff -c emacs/lisp/calc/calc-prog.el:1.22 emacs/lisp/calc/calc-prog.el:1.23
*** emacs/lisp/calc/calc-prog.el:1.22   Wed Jan 19 17:20:34 2005
--- emacs/lisp/calc/calc-prog.el        Mon Jan 31 06:28:06 2005
***************
*** 477,482 ****
--- 477,483 ----
                     (format "Editing %s-Mode Syntax Table. "
                             (cond ((null lang) "Normal")
                                   ((eq lang 'tex) "TeX")
+                                    ((eq lang 'latex) "LaTeX")
                                   (t (capitalize (symbol-name lang))))))
       (calc-write-parse-table (cdr (assq lang calc-user-parse-tables))
                             lang)))
***************
*** 519,525 ****
      (cond ((stringp (car p))
           (let ((s (car p)))
             (if (and (string-match "\\`\\\\dots\\>" s)
!                     (not (eq calc-lang 'tex)))
                 (setq s (concat ".." (substring s 5))))
             (if (or (and (string-match
                           "[a-zA-Z0-9\"{}]\\|\\`:=\\'\\|\\`#\\|\\`%%" s)
--- 520,526 ----
      (cond ((stringp (car p))
           (let ((s (car p)))
             (if (and (string-match "\\`\\\\dots\\>" s)
!                     (not (eq calc-lang '(tex latex))))
                 (setq s (concat ".." (substring s 5))))
             (if (or (and (string-match
                           "[a-zA-Z0-9\"{}]\\|\\`:=\\'\\|\\`#\\|\\`%%" s)
***************
*** 582,592 ****
  (defun calc-fix-token-name (name &optional unquoted)
    (cond ((string-match "\\`\\.\\." name)
         (concat "\\dots" (substring name 2)))
!       ((and (equal name "{") (memq calc-lang '(tex eqn)))
         "(")
!       ((and (equal name "}") (memq calc-lang '(tex eqn)))
         ")")
!       ((and (equal name "&") (eq calc-lang 'tex))
         ",")
        ((equal name "#")
         (search-backward "#")
--- 583,593 ----
  (defun calc-fix-token-name (name &optional unquoted)
    (cond ((string-match "\\`\\.\\." name)
         (concat "\\dots" (substring name 2)))
!       ((and (equal name "{") (memq calc-lang '(tex latex eqn)))
         "(")
!       ((and (equal name "}") (memq calc-lang '(tex latex eqn)))
         ")")
!       ((and (equal name "&") (eq calc-lang '(tex latex)))
         ",")
        ((equal name "#")
         (search-backward "#")