Changeset 99e62ad in git

Timestamp:

Aug 14, 1998, 8:57:23 AM (26 years ago)

Author:

Tim Wichmann <wichmann@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c43e7bd9453af42df855704f07c6fe2ef772df1a

Parents:

39bc68d5d5208b0f0db79bc07072fed1944fad02

Message:

	* singular.el : commented code for singular-logo on startup in
	XEmacs. This code needs some rethinking...

	* singular.el (singular-toggle-truncate-lines): Added (recenter)
	according to function definition in XEmacs.
	(singular-other): Added check on unique buffer name.
	Added comments to functions and variables.


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

File:

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

emacs/singular.el

@@ -1 +1 @@
 ;;; singular.el --- Emacs support for Computer Algebra System Singular
 
-;; $Id: singular.el,v 1.25 1998-08-07 14:56:27 wichmann Exp $
+;; $Id: singular.el,v 1.26 1998-08-14 06:57:23 wichmann Exp $
 
 ;;; Commentary:
@@ -174 +174 @@
 ;; Additional faces for font locking
 (make-face 'font-lock-singular-error-face)
+
+(defvar font-lock-singular-error-face 'font-lock-singular-error-face
+  "Additional font-lock face for singular errors.")
+
 (cond 
  ;; XEmacs
  ((eq singular-emacs-flavor 'xemacs)
+  ;; That 'append avoids to overwrite the face if it is already set
   (set-face-foreground 'font-lock-singular-error-face "Red"
                        'global nil 'append)))
-(defvar font-lock-singular-error-face 'font-lock-singular-error-face
-  "NOT READY [docu]")
 
 (make-face 'font-lock-singular-warn-face)
+
+(defvar font-lock-singular-warn-face 'font-lock-singular-warn-face
+  "Additional font-lock face for singular warnings.")
+
 (cond
  ;; XEmacs
  ((eq singular-emacs-flavor 'xemacs)
+  ;; That 'append avoids to overwrite the face if it is already set
   (set-face-foreground 'font-lock-singular-warn-face "Orange" 
                        'global nil 'append)))
-(defvar font-lock-singular-warn-face 'font-lock-singular-warn-face
-  "NOT READY [docu]")
 
 (make-face 'font-lock-singular-prompt-face)
+
+(defvar font-lock-singular-warn-face 'font-lock-singular-prompt-face
+  "Addition font-lock face for the singular prompt.")
+
 (cond
  ;; XEmacs
  ((eq singular-emacs-flavor 'xemacs)
+  ;; That 'append avoids to overwrite the face if it is already set
   (set-face-foreground 'font-lock-singular-prompt-face "Gray50"
                        'global nil 'append)))
-(defvar font-lock-singular-warn-face 'font-lock-singular-prompt-face
-  "NOT READY [docu]")
 ;;}}}
 
@@ -436 +445 @@
 
 (defun singular-load-file (file &optional noexpand)
-  "docu NOT READY"
+  "Read a file in Singular (via '< \"FILE\";').
+If optional argument NOEXPAND is nil, FILE is expanded using
+`expand-file-name'."
   (interactive "fLoad file: ")
   (let* ((filename (if noexpand file (expand-file-name file)))
@@ -445 +456 @@
 
 (defun singular-load-library (file &optional noexpand)
-  "docu NOT READY"
+  "Read a Singular library (via 'LIB \"FILE\";').
+If optional argument NOEXPAND is nil, FILE is expanded using
+`expand-file-name'."
   (interactive "fLoad Library: ")
   (let* ((filename (if noexpand file (expand-file-name file)))
@@ -454 +467 @@
 
 (defun singular-exit-singular ()
-  "NOT READY [docu]"
+  "Exit Singular and kill Singular buffer.
+Sends string \"quit;\" to Singular process."
   (interactive)
   (let ((string "quit;")
@@ -462 +476 @@
   (kill-buffer (current-buffer)))
 
+;; The function `singular-toggle-truncate-lines' is obsolete in XEmacs
+;; but not in Emacs. So define it anyway.
 (defun singular-toggle-truncate-lines ()
   "Toggle truncate-lines."
   (interactive)
-  (setq truncate-lines (not truncate-lines)))
+  (setq truncate-lines (not truncate-lines))
+  (recenter))
 ;;}}}
 
@@ -1197 +1214 @@
 
 (defun singular-do-folding (where &optional unfold)
-  "NOT READY [docu]
-WHERE= 'last or 'all --> just output sections
-WHERE= 'at-point --> whatever is at point"
+  "Fold or unfold certain sections.
+WHERE may be 'last, 'all, or 'at-point. If WHERE equals 'last or 
+'all, only output sections are affected. If WHERE equals 'at-point,
+the section at point is affected (input or output).
+If optional argument UNFOLD is non-nil, then unfold section instead
+of folding it."
   (let (which)
     (cond 
      ((eq where 'last)
       (setq which (list (singular-latest-output-section t))))
+
      ((eq where 'at-point)
       (setq which (list (singular-section-at (point)))))
+
      ((eq where 'all)
       (setq which (singular-section-in (point-min) (point-max)))
@@ -1866 +1888 @@
   (setq major-mode 'singular-interactive-mode)
   (setq mode-name "Singular Interaction")
+
+  ;; key bindings, syntax tables and menus
   (use-local-map singular-interactive-mode-map)
   (set-syntax-table singular-interactive-mode-syntax-table)
@@ -1873 +1897 @@
     (easy-menu-add singular-interactive-mode-menu-1)
     (easy-menu-add singular-interactive-mode-menu-2)))
+
   (setq comment-start "// ")
   (setq comment-start-skip "// *")
@@ -2018 +2043 @@
             (singular-simple-sec-init (point))
 
+            ;; NOT READY: SINGULAR-LOGO
+;           (cond 
+;            ((eq singular-emacs-flavor 'xemacs)
+;             (set-extent-begin-glyph (make-extent (point-min) (point-min)) 
+;                                     singular-logo)
+;             (insert "\n")))
+
             ;; feed process with start file and read input ring.  Take
             ;; care about the undo information.
@@ -2039 +2071 @@
       (set-buffer old-buffer))))
 
+;; NOT READY: SINGULAR-LOGO
+;(cond
+; ((eq singular-emacs-flavor 'xemacs)
+;  (defvar singular-logo (make-glyph))
+;  (set-glyph-image singular-logo
+;                  (concat "~/" "singlogo.xpm")
+;                  'global 'x)))
+
 ;; Note:
 ;;
@@ -2085 +2125 @@
           (setq buffer (get-buffer-create buffer-name))
           (set-buffer buffer)
+
           (singular-debug 'interactive (message "Calling `singular-interactive-mode'"))
           (singular-interactive-mode)))
@@ -2103 +2144 @@
 
 (defun singular-generate-new-buffer-name (name)
-  "NOT READY [docu]
-name: should be without stars.
-Try to create a buffer named *name*.
-If fails, try to create buffer named *name<number>*
-Return buffer name with stars at start/end"
-  (let ((new-name (singular-process-name-to-buffer-name name))
+  "Generate a unique buffer name for a singular interactive buffer.
+The string NAME is the desired name for the singular interactive 
+buffer, without surrounding stars.
+The string returned is surrounded by stars.
+
+If no buffer with name \"*NAME*\" exists, return \"*NAME*\".
+Otherwise check for buffer called \"*NAME<n>*\" where n is a 
+increasing number and return \"*NAME<n>*\" if no such buffer
+exists."
+  (let ((new-name (singular-process-name-to-buffer-name name)) 
         (count 2))
     (while (get-buffer new-name)
@@ -2117 +2162 @@
   
 (defun singular-other (file) 
-  "NOT READY [docu]"
+  "Start a new Singular, different to the default Singular.
+FILE is a Singular executable.
+
+Asks in the minibuffer for a buffer-name and for Singular options.
+Calls `singular' with the appropriate arguments."
   (interactive "fSingular executable: ")
   ;; NOT READY [code]
@@ -2126 +2175 @@
 
     ;; Read buffer name from minibuffer at strip surrounding stars
-    (setq name (read-from-minibuffer "Singular buffer name: " name))
+    ;; NOT READY: This code is not very beautyful.
+    (let ((buffer-exists t)
+          (new-name name))
+      (while buffer-exists
+        (setq new-name (read-from-minibuffer "Singular buffer name: " name))
+        (if (get-buffer new-name)
+            (progn 
+              (message "This buffer already exists.")
+              (sleep-for 1))
+          (setq buffer-exists nil)
+          (setq name new-name))))
+        
+    
     (if (string-match "^\\*\\(.*\\)\\*$" name)
         (setq name (substring name (match-beginning 1) (match-end 1))))