Changeset 6e3bdda in git

Timestamp:

Sep 16, 1999, 1:06:45 PM (25 years ago)

Author:

Tim Wichmann <wichmann@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

6a0d85b26b900050d5794adc5f301cac04f63c67

Parents:

0f9a8423955ade8ec26e2364b05c1bb951aa7831

Message:

1999-09-16  T. Wichmann  <wichmann@arboretum.itwm.uni-kl.de>

	* singular.el (singular-interactive-mode-menu-2):
	folding/unfolding menu changed

1999-09-15  T. Wichmann  <wichmann@arboretum.itwm.uni-kl.de>

	* singular.el (singular-interactive-mode-menu-2): "Load Demo" menu
	item now is always enabled, if `singular-demo-exit-on-load' is t
	(singular-demo-exit): Added optional argument no-message
	(singular-interactive-font-lock-keywords-3): use
	font-lock-reference-face instead of f-l-reference-name-face


git-svn-id: file:///usr/local/Singular/svn/trunk@3613 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• emacs/singular.el (modified) (11 diffs)

emacs/singular.el

@@ -1 +1 @@
 ;;; singular.el --- Emacs support for Computer Algebra System Singular
 
-;; $Id: singular.el,v 1.42 1999-09-14 21:00:59 wichmann Exp $
+;; $Id: singular.el,v 1.43 1999-09-16 11:06:45 wichmann Exp $
 
 ;;; Commentary:
@@ -429 +429 @@
    singular-interactive-font-lock-keywords-2
    '(
-     ("^   [\\?].*`\\(\\sw\\sw+\\)`" 1 font-lock-reference-name-face t)
+     ;; note: we use font-lock-reference-face here even Emacs says that
+     ;; this face is obsolete and suggests to use font-lock-constant-face,
+     ;; since XEmacs20/21 does not know the constant-face but the
+     ;; reference-face. 
+     ("^   [\\?].*`\\(\\sw\\sw+;?\\)`" 1 font-lock-reference-face t)
      ))
   "Gaudy level highlighting for Singular interactive mode.")
@@ -655 +659 @@
      (list 
       "Commands"
-      ["Fold Latest Output" singular-folding-fold-latest-output t]
+      ["Fold/Unfold Latest Output" singular-folding-toggle-fold-latest-output t]
+      ["Fold/Unfold At Point" singular-folding-toggle-fold-at-point-or-all t]
       ["Fold All Output" singular-folding-fold-all-output t]
-      ["Fold At Point" singular-folding-fold-at-point t]
-      "---"
-      ["Unfold Latest Output" singular-folding-unfold-latest-output t]
       ["Unfold All Output" singular-folding-unfold-all-output t]
-      ["Unfold At Point" singular-folding-unfold-at-point t]
       "--"
       (append
@@ -668 +669 @@
       ["Load File..." singular-load-file t]
       "---"
-      ["Load Demo" singular-demo-load (not singular-demo-mode)]
+      ["Load Demo..." singular-demo-load (or singular-demo-exit-on-load
+                                             (not singular-demo-mode))]
       ["Exit Demo" singular-demo-exit singular-demo-mode]
       "---"
@@ -686 +688 @@
                         "---"
                         ["Preferences" (customize-group 'singular-interactive) t]
-                        ["Help" singular-help t])))
+                        ["Singular Help" singular-help t])))
 
 (defun customize-singular-interactive ()
@@ -3042 +3044 @@
       (if singular-demo-exit-on-load
           ;; silently exit running demo
-          (singular-demo-exit)
+          (singular-demo-exit t)
         (error "There already is a demo running, exit with `singular-demo-exit' first")))
 
@@ -3101 +3103 @@
   (force-mode-line-update))
 
-(defun singular-demo-exit ()
+(defun singular-demo-exit (&optional no-message)
   "Prematurely exit Singular demo mode.
 Cleans up everything that is left from the demo.
@@ -3117 +3119 @@
         ;; this is unwind-protected
         (narrow-to-region old-point-min old-point-max)))
-    (singular-demo-exit-internal)))
+    (singular-demo-exit-internal)
+    (or no-message
+        (if singular-demo-print-messages (message "Demo exited")))))
 
 (defun singular-demo-show-next-chunk ()
@@ -3818 +3822 @@
   (singular-debug 'interactive
                   (message "exit-cleanup called"))
-  (singular-demo-exit)
+  (singular-demo-exit t)
   (singular-scan-header-exit)
   (singular-menu-deinstall-libraries)
@@ -3831 +3835 @@
                     (message "Sentinel: %s" (substring message 0 -1)))
 
-    (singular-debug 'interactive
-                    (message "Sentinel: proc= %s, mark= %s" process (process-mark process)))
     (if (string-match "finished\\|exited\\|killed" message)
         (let ((process-buffer (process-buffer process)))
@@ -3851 +3853 @@
     (delete-process process)
     (save-excursion
+      ;; Because of timing problems it would be better if 
+      ;; singular-exit-sentinel would insert this string (see Version 1.41)
+      ;; but this is not possible for XEmacs: The function (process-mark)
+      ;; called within singular-exit-sentinel returns a mark with no
+      ;; associated buffer!
       (goto-char mark)
       (insert "// ** Singular process killed **\n"))))