Changeset 5ec0264 in git

Timestamp:

Jul 2, 1999, 3:45:24 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

3a143d010f11f13368af478242ae274faa4b4cf7

Parents:

e8d7926ff7b6049314794666722f0a7b2fae3ed8

Message:

* dirty hack to get fontification the way I wanted it (setting to
keywords-1 did not seem to work)
* starting new demo automatically exits running demo
* key-beinding for exiting demo


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

File:

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

emacs/singular.el

@@ -1 +1 @@
 ;;; singular.el --- Emacs support for Computer Algebra System Singular
 
-;; $Id: singular.el,v 1.26 1998-08-14 06:57:23 wichmann Exp $
+;; $Id: singular.el,v 1.27 1999-07-02 13:45:24 obachman Exp $
 
 ;;; Commentary:
@@ -216 +216 @@
 ;              "ring" "string" "vector"))
 
+(defvar singular-font-lock-keywords-0
+  '(
+    ("^\\(> \\|. \\)" . font-lock-singular-prompt-face)
+    ("^   [\\?].*" 0 font-lock-singular-error-face t)
+    ("^// \\(\\*\\*.*\\)" 1 font-lock-singular-warn-face t)
+    )
+  "Subdued level for highlighting in singular-(interactive)-mode")
+
 (defvar singular-font-lock-keywords-1
   '(
@@ -234 +242 @@
   "Gaudy level for highlihgting in singular-(interactive)-mode") 
 
-(defvar singular-font-lock-keywords singular-font-lock-keywords-1
+(defvar singular-font-lock-keywords singular-font-lock-keywords-0
   "Default highlighting for singular-(interactive)-mode")
 
 (defvar singular-font-lock-defaults 
   '((singular-font-lock-keywords
-     singular-font-lock-keywords-1
-     singular-font-lock-keywords-2)
+     singular-font-lock-keywords-0
+     singular-font-lock-keywords-0)
     nil                   ;; KEYWORDS-ONLY 
     nil                   ;; CASE-FOLD (ignore case when non-nil)
@@ -278 +286 @@
   (define-key singular-interactive-mode-map "\C-c\C-l" 'singular-load-library)
   (define-key singular-interactive-mode-map "\C-c\C-d" 'singular-demo-load)
+  (define-key singular-interactive-mode-map "\C-c\C-c\C-d" 'singular-demo-exit)
   (define-key singular-interactive-mode-map "\C-c\C-t" 'singular-toggle-truncate-lines)
   (define-key singular-interactive-mode-map "\C-c$" 'singular-exit-singular)
@@ -1474 +1483 @@
   ;; check for running demo
   (and singular-demo-mode
-       (error "Another demo is already running"))
+       (singular-demo-exit))
 
   (let ((old-point-min (point-min)))
@@ -2138 +2147 @@
     ;; pop to buffer
     (singular-debug 'interactive (message "Calling `pop-to-buffer'"))
-    (pop-to-buffer buffer)))
+    (pop-to-buffer buffer t)))
 
 ;; for convenience only